Add LARAVEL_FACTORIES set (#376)

GeniJaho · web-flow · commit 7e07220a85d0 · 2025-08-19T22:37:31.000+02:00
* Add LARAVEL_FACTORIES set

* Update docs

* Update README.md
diff --git a/README.md b/README.md
@@ -7,7 +7,11 @@
 [![Packagist Downloads](https://img.shields.io/packagist/dm/driftingly/rector-laravel)](https://packagist.org/packages/driftingly/rector-laravel/stats)
 [![Packagist Version](https://img.shields.io/packagist/v/driftingly/rector-laravel)](https://packagist.org/packages/driftingly/rector-laravel)
 
-See available [Laravel rules](/docs/rector_rules_overview.md)
+## Available Rules
+
+See all available Laravel rules [here](/docs/rector_rules_overview.md). This list includes even the rules that are not yet released, but are available under the `dev-main` branch.
+
+You can also find the released rules on the Rector [Find Rule](https://getrector.com/find-rule?activeRectorSetGroup=laravel) page.
 
 ## Install
 
@@ -77,15 +81,16 @@ return RectorConfig::configure()
 | Set                                                                                                                                                                                         | Purpose                                                                                                                                                                                                                                          |
 |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [LaravelSetList::LARAVEL_ARRAYACCESS_TO_METHOD_CALL](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-arrayaccess-to-method-call.php)                             | Converts uses of things like `$app['config']` to `$app->make('config')`.                                                                                                                                                                         |
-| [LaravelSetList::LARAVEL_ARRAY_STR_FUNCTION_TO_STATIC_CALL](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-array-str-functions-to-static-call.php)              | Converts most string and array helpers into Str and Arr Facades' static calls.<br/>https://laravel.com/docs/11.x/facades#facades-vs-helper-functions                                                                                             |
+| [LaravelSetList::LARAVEL_ARRAY_STR_FUNCTION_TO_STATIC_CALL](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-array-str-functions-to-static-call.php)              | Converts most string and array helpers into Str and Arr Facades' static calls.<br/>https://laravel.com/docs/12.x/facades#facades-vs-helper-functions                                                                                             |
 | [LaravelSetList::LARAVEL_CODE_QUALITY](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-code-quality.php)                                                         | Replaces magical call on `$this->app["something"]` to standalone variable with PHPDocs.                                                                                                                                                          |
 | [LaravelSetList::LARAVEL_COLLECTION](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-collection.php)                                                             | Improves the usage of Laravel Collections by using simpler, more efficient, or more readable methods.                                                                                                                                            |
-| [LaravelSetList::LARAVEL_CONTAINER_STRING_TO_FULLY_QUALIFIED_NAME](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-container-string-to-fully-qualified-name.php) | Changes the string or class const used for a service container make call.<br/>https://laravel.com/docs/11.x/container#the-make-method                                                                                                            |
-| [LaravelSetList::LARAVEL_ELOQUENT_MAGIC_METHOD_TO_QUERY_BUILDER](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-eloquent-magic-method-to-query-builder.php)     | Transforms magic method calls on Eloquent Models into corresponding Query Builder method calls.<br/>https://laravel.com/docs/11.x/eloquent                                                                                                       |
-| [LaravelSetList::LARAVEL_FACADE_ALIASES_TO_FULL_NAMES](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-facade-aliases-to-full-names.php)                         | Replaces Facade aliases with full Facade names.<br/>https://laravel.com/docs/11.x/facades#facade-class-reference                                                                                                                                 |
-| [LaravelSetList::LARAVEL_IF_HELPERS](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-if-helpers.php)                                                             | Replaces `abort()`, `report()`, `throw` statements inside conditions with `abort_if()`, `report_if()`, `throw_if()` function calls.<br/>https://laravel.com/docs/11.x/helpers#method-abort-if                                                    |
+| [LaravelSetList::LARAVEL_CONTAINER_STRING_TO_FULLY_QUALIFIED_NAME](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-container-string-to-fully-qualified-name.php) | Changes the string or class const used for a service container make call.<br/>https://laravel.com/docs/12.x/container#the-make-method                                                                                                            |
+| [LaravelSetList::LARAVEL_ELOQUENT_MAGIC_METHOD_TO_QUERY_BUILDER](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-eloquent-magic-method-to-query-builder.php)     | Transforms magic method calls on Eloquent Models into corresponding Query Builder method calls.<br/>https://laravel.com/docs/12.x/eloquent                                                                                                       |
+| [LaravelSetList::LARAVEL_FACADE_ALIASES_TO_FULL_NAMES](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-facade-aliases-to-full-names.php)                         | Replaces Facade aliases with full Facade names.<br/>https://laravel.com/docs/12.x/facades#facade-class-reference                                                                                                                                 |
+| [LaravelSetList::LARAVEL_FACTORIES](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-factories.php)                                                               | Makes working with Laravel Factories easier and more IDE friendly.                                                                                                                                                                               |
+| [LaravelSetList::LARAVEL_IF_HELPERS](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-if-helpers.php)                                                             | Replaces `abort()`, `report()`, `throw` statements inside conditions with `abort_if()`, `report_if()`, `throw_if()` function calls.<br/>https://laravel.com/docs/12.x/helpers#method-abort-if                                                    |
 | [LaravelSetList::LARAVEL_LEGACY_FACTORIES_TO_CLASSES](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-legacy-factories-to-classes.php)                           | Migrates Eloquent legacy model factories (with closures) into class based factories.<br/>https://laravel.com/docs/8.x/releases#model-factory-classes                                                                                             |
-| [LaravelSetList::LARAVEL_STATIC_TO_INJECTION](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-static-to-injection.php)                                           | Replaces Laravel's Facades with Dependency Injection.<br/>https://tomasvotruba.com/blog/2019/03/04/how-to-turn-laravel-from-static-to-dependency-injection-in-one-day/<br/>https://laravel.com/docs/11.x/facades#facades-vs-dependency-injection |
+| [LaravelSetList::LARAVEL_STATIC_TO_INJECTION](https://github.com/driftingly/rector-laravel/blob/main/config/sets/laravel-static-to-injection.php)                                           | Replaces Laravel's Facades with Dependency Injection.<br/>https://tomasvotruba.com/blog/2019/03/04/how-to-turn-laravel-from-static-to-dependency-injection-in-one-day/<br/>https://laravel.com/docs/12.x/facades#facades-vs-dependency-injection |
 
 ## Creating New Rules
 
diff --git a/config/sets/laravel-factories.php b/config/sets/laravel-factories.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use RectorLaravel\Rector\Class_\AddExtendsAnnotationToModelFactoriesRector;
+use RectorLaravel\Rector\Class_\AddHasFactoryToModelsRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->import(__DIR__ . '/../config.php');
+
+    $rectorConfig->rule(AddHasFactoryToModelsRector::class);
+    $rectorConfig->rule(AddExtendsAnnotationToModelFactoriesRector::class);
+};
diff --git a/config/sets/laravel-legacy-factories-to-classes.php b/config/sets/laravel-legacy-factories-to-classes.php
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use RectorLaravel\Rector\Class_\AddHasFactoryToModelsRector;
 use RectorLaravel\Rector\FuncCall\FactoryFuncCallToStaticCallRector;
 use RectorLaravel\Rector\MethodCall\FactoryApplyingStatesRector;
 use RectorLaravel\Rector\Namespace_\FactoryDefinitionRector;
@@ -14,7 +13,6 @@
     // https://laravel.com/docs/7.x/database-testing#writing-factories
     // https://laravel.com/docs/8.x/database-testing#defining-model-factories
     $rectorConfig->rule(FactoryDefinitionRector::class);
-    $rectorConfig->rule(AddHasFactoryToModelsRector::class);
 
     // https://laravel.com/docs/7.x/database-testing#using-factories
     // https://laravel.com/docs/8.x/database-testing#creating-models-using-factories
diff --git a/docs/rector_rules_overview.md b/docs/rector_rules_overview.md
@@ -1,4 +1,4 @@
-# 84 Rules Overview
+# 85 Rules Overview
 
 ## AbortIfRector
 
@@ -229,13 +229,19 @@ Convert migrations to anonymous classes.
 
 ## AppEnvironmentComparisonToParameterRector
 
-Replace `$app->environment() === 'local'` with `$app->environment('local')`
+Replace app environment comparison with parameter or method call
 
 - class: [`RectorLaravel\Rector\Expr\AppEnvironmentComparisonToParameterRector`](../src/Rector/Expr/AppEnvironmentComparisonToParameterRector.php)
 
 ```diff
--$app->environment() === 'production';
-+$app->environment('production');
+-$app->environment() === 'local';
+-$app->environment() !== 'production';
+-$app->environment() === 'testing';
+-in_array($app->environment(), ['local', 'testing']);
++$app->isLocal();
++! $app->isProduction();
++$app->environment('testing');
++$app->environment(['local', 'testing']);
 ```
 
 <br>
@@ -892,6 +898,32 @@ Changes middlewares from rule definitions from string to array notation.
 
 <br>
 
+## MakeModelAttributesAndScopesProtectedRector
+
+Makes Model attributes and scopes protected
+
+- class: [`RectorLaravel\Rector\ClassMethod\MakeModelAttributesAndScopesProtectedRector`](../src/Rector/ClassMethod/MakeModelAttributesAndScopesProtectedRector.php)
+
+```diff
+ class User extends Model
+ {
+-    public function foo(): Attribute
++    protected function foo(): Attribute
+     {
+         return Attribute::get(fn () => $this->bar);
+     }
+
+     #[Scope]
+-    public function active(Builder $query): Builder
++    protected function active(Builder $query): Builder
+     {
+         return $query->where('active', true);
+     }
+ }
+```
+
+<br>
+
 ## MigrateToSimplifiedAttributeRector
 
 Migrate to the new Model attributes syntax
diff --git a/src/Set/LaravelSetList.php b/src/Set/LaravelSetList.php
@@ -54,6 +54,8 @@ final class LaravelSetList
 
     final public const string LARAVEL_FACADE_ALIASES_TO_FULL_NAMES = __DIR__ . '/../../config/sets/laravel-facade-aliases-to-full-names.php';
 
+    final public const string LARAVEL_FACTORIES = __DIR__ . '/../../config/sets/laravel-factories.php';
+
     final public const string LARAVEL_IF_HELPERS = __DIR__ . '/../../config/sets/laravel-if-helpers.php';
 
     final public const string LARAVEL_LEGACY_FACTORIES_TO_CLASSES = __DIR__ . '/../../config/sets/laravel-legacy-factories-to-classes.php';
diff --git a/src/Set/LaravelSetProvider.php b/src/Set/LaravelSetProvider.php
@@ -67,6 +67,11 @@ public function provide(): array
                 'Container strings to FQN types',
                 LaravelSetList::LARAVEL_CONTAINER_STRING_TO_FULLY_QUALIFIED_NAME,
             ),
+            new Set(
+                self::GROUP_NAME,
+                'Factory improvements',
+                LaravelSetList::LARAVEL_FACTORIES,
+            ),
             new Set(
                 self::GROUP_NAME,
                 'Rename Aliases to FQN Classes',
