Sync with core Rector and fix rules & docs (#373)

Author: GeniJaho

composer.json

@@ -43,6 +43,13 @@
         "rector-dry-run": "vendor/bin/rector process --dry-run --ansi",
         "rector": "vendor/bin/rector process --ansi",
         "docs": "vendor/bin/rule-doc-generator generate src --output-file docs/rector_rules_overview.md --ansi",
+        "qa": [
+            "@rector",
+            "@fix",
+            "@phpstan",
+            "@docs",
+            "@test"
+        ],
         "make:rule": "php commands/make-rule.php"
     },
     "minimum-stability": "dev",

docs/rector_rules_overview.md

@@ -1,4 +1,4 @@
-# 80 Rules Overview
+# 83 Rules Overview
 
 ## AbortIfRector
 
@@ -59,28 +59,6 @@ Adds the `@extends` annotation to Factories.
 
 <br>
 
-## AddHasFactoryToModelsRector
-
-Adds the `HasFactory` trait to Models.
-
-:wrench: **configure it!**
-
-- class: [`RectorLaravel\Rector\Class_\AddHasFactoryToModelsRector`](../src/Rector/Class_/AddHasFactoryToModelsRector.php)
-
-```diff
- namespace App\Models;
-
- use Illuminate\Database\Eloquent\Factories\Factory;
- use Illuminate\Database\Eloquent\Model;
-
- class User extends Model
- {
-+    use \Illuminate\Database\Eloquent\Factories\HasFactory;
- }
-```
-
-<br>
-
 ## AddGenericReturnTypeToRelationsRector
 
 Add generic return type to relations in child of `Illuminate\Database\Eloquent\Model`
@@ -143,6 +121,25 @@ Add new `$guard` argument to Illuminate\Auth\Events\Login
 
 <br>
 
+## AddHasFactoryToModelsRector
+
+Adds the HasFactory trait to Models.
+
+:wrench: **configure it!**
+
+- class: [`RectorLaravel\Rector\Class_\AddHasFactoryToModelsRector`](../src/Rector/Class_/AddHasFactoryToModelsRector.php)
+
+```diff
+ use Illuminate\Database\Eloquent\Model;
+
+ class User extends Model
+ {
++    use \Illuminate\Database\Eloquent\Factories\HasFactory;
+ }
+```
+
+<br>
+
 ## AddMockConsoleOutputFalseToConsoleTestsRector
 
 Add "$this->mockConsoleOutput = false"; to console tests that work with output content
@@ -502,6 +499,36 @@ Refactor `whereDate()` queries to include both date and time comparisons with Ca
 
 <br>
 
+## ContainerBindConcreteWithClosureOnlyRector
+
+Drop the specified abstract class from the bind method and replace it with a closure that returns the abstract class.
+
+- class: [`RectorLaravel\Rector\MethodCall\ContainerBindConcreteWithClosureOnlyRector`](../src/Rector/MethodCall/ContainerBindConcreteWithClosureOnlyRector.php)
+
+```diff
+-$this->app->bind(SomeClass::class, function (): SomeClass {
++$this->app->bind(function (): SomeClass {
+     return new SomeClass();
+ });
+```
+
+<br>
+
+## ConvertEnumerableToArrayToAllRector
+
+Convert `toArray()` to `all()` when the collection does not contain any Arrayable objects.
+
+- class: [`RectorLaravel\Rector\MethodCall\ConvertEnumerableToArrayToAllRector`](../src/Rector/MethodCall/ConvertEnumerableToArrayToAllRector.php)
+
+```diff
+ use Illuminate\Support\Collection;
+
+-new Collection([0, 1, -1])->toArray();
++new Collection([0, 1, -1])->all();
+```
+
+<br>
+
 ## DatabaseExpressionCastsToMethodCallRector
 
 Convert DB Expression string casts to `getValue()` method calls.

src/NodeAnalyzer/LaravelServiceAnalyzer.php

@@ -53,7 +53,6 @@ public function getFacadeOrigin(StaticCall $staticCall): ?ObjectType
         if (! $reflectionMethod->isStatic() || $reflectionMethod->getNumberOfParameters() > 0) {
             return null;
         }
-        $reflectionMethod->setAccessible(true);
         $origin = $reflectionMethod->invoke(null);
         if (! is_string($origin)) {
             return null;

src/NodeAnalyzer/QueryBuilderAnalyzer.php

@@ -12,8 +12,8 @@
 final readonly class QueryBuilderAnalyzer
 {
     public function __construct(
-        private readonly NodeTypeResolver $nodeTypeResolver,
-        private readonly NodeNameResolver $nodeNameResolver,
+        private NodeTypeResolver $nodeTypeResolver,
+        private NodeNameResolver $nodeNameResolver,
     ) {}
 
     protected static function modelType(): ObjectType

src/Rector/Class_/AddHasFactoryToModelsRector.php

@@ -11,8 +11,8 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\ObjectType;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
-use Rector\Rector\AbstractRector;
 use Rector\Reflection\ReflectionResolver;
+use RectorLaravel\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 use Webmozart\Assert\Assert;
@@ -21,7 +21,7 @@
  * @changelog https://github.com/laravel/framework/pull/39310
  *
  * @see \RectorLaravel\Tests\Rector\Class_\AddHasFactoryToModelsRector\AddHasFactoryToModelsRectorTest
- * @see \RectorLaravel\Tests\Rector\Class_\AddHasFactoryToModelsRectorConfiguredTest\AddHasFactoryToModelsRectorConfiguredTest
+ * @see \RectorLaravel\Tests\Rector\Class_\AddHasFactoryToModelsRector\AddHasFactoryToModelsRectorConfiguredTest
  */
 final class AddHasFactoryToModelsRector extends AbstractRector implements ConfigurableRectorInterface
 {

src/Rector/FuncCall/FactoryFuncCallToStaticCallRector.php

@@ -11,7 +11,7 @@
 use PhpParser\Node\Expr\StaticCall;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
 use RectorLaravel\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 use Webmozart\Assert\Assert;
 
@@ -33,7 +33,7 @@ final class FactoryFuncCallToStaticCallRector extends AbstractRector implements
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition('Use the static factory method instead of global factory function.', [
-            new CodeSample(
+            new ConfiguredCodeSample(
                 <<<'CODE_SAMPLE'
 factory(User::class);
 CODE_SAMPLE
@@ -42,7 +42,8 @@ public function getRuleDefinition(): RuleDefinition
                 <<<'CODE_SAMPLE'
 User::factory();
 CODE_SAMPLE
-            ),
+                ,
+                ['App\User']),
         ]);
     }
 

src/Rector/MethodCall/ContainerBindConcreteWithClosureOnlyRector.php

@@ -9,9 +9,9 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
-use Rector\Rector\AbstractRector;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
+use RectorLaravel\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

src/Rector/Namespace_/FactoryDefinitionRector.php

@@ -21,7 +21,7 @@
 use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use RectorLaravel\AbstractRector;
 use RectorLaravel\NodeFactory\ModelFactoryNodeFactory;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 use Webmozart\Assert\Assert;
 
@@ -45,7 +45,7 @@ public function __construct(
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition('Upgrade legacy factories to support classes.', [
-            new CodeSample(
+            new ConfiguredCodeSample(
                 <<<'CODE_SAMPLE'
 use Faker\Generator as Faker;
 
@@ -73,7 +73,8 @@ public function definition()
     }
 }
 CODE_SAMPLE
-            ),
+                ,
+                ['App\User']),
         ]);
     }