Merge branch 'main' into feature/declare-type-configs

Author: peterfox

README.md

@@ -46,6 +46,7 @@ return RectorConfig::configure()
 | [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_TYPE_DECLARATIONS](https://github.com/driftingly/rector-laravel/blob/main/config/sets/type-declaration.php)                                                        | Adds type hints to Closures and Arrow Functions where possible                                                                                                                                                                                   |
+| [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')`.                                                                                                                                                                         |
 
 ## Contributors
 

config/sets/laravel-arrayaccess-to-method-call.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+use PHPStan\Type\ObjectType;
+use Rector\Config\RectorConfig;
+use Rector\Transform\Rector\ArrayDimFetch\ArrayDimFetchToMethodCallRector;
+use Rector\Transform\ValueObject\ArrayDimFetchToMethodCall;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->import(__DIR__ . '/../config.php');
+
+    $rectorConfig
+        ->ruleWithConfiguration(
+            ArrayDimFetchToMethodCallRector::class,
+            [
+                new ArrayDimFetchToMethodCall(
+                    new ObjectType('Illuminate\Foundation\Application'),
+                    'make',
+                ),
+                new ArrayDimFetchToMethodCall(
+                    new ObjectType('Illuminate\Config\Repository'),
+                    'get',
+                ),
+            ],
+        );
+};

config/sets/laravel100.php

@@ -35,13 +35,15 @@
     $rectorConfig
         ->ruleWithConfiguration(RenamePropertyRector::class, [
             // https://github.com/laravel/laravel/commit/edcbe6de7c3f17070bf0ccaa2e2b785158ae5ceb
-            new RenameProperty('App\Http\Kernel', 'routeMiddleware', 'middlewareAliases'),
+            new RenameProperty('Illuminate\Foundation\Http\Kernel', 'routeMiddleware', 'middlewareAliases'),
         ]);
 
     $rectorConfig
         ->ruleWithConfiguration(RenameMethodRector::class, [
             // https://github.com/laravel/framework/pull/42591/files
             new MethodCallRename('Illuminate\Support\Facades\Bus', 'dispatchNow', 'dispatchSync'),
+            new MethodCallRename('Illuminate\Foundation\Bus\Dispatchable', 'dispatchNow', 'dispatchSync'),
+            new MethodCallRename('Illuminate\Foundation\Bus\DispatchesJobs', 'dispatchNow', 'dispatchSync'),
         ]);
 
     $rectorConfig

config/sets/laravel90.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Arguments\Rector\ClassMethod\ArgumentAdderRector;
-use Rector\Arguments\ValueObject\ArgumentAdder;
+use Rector\Arguments\ValueObject\ArgumentAdderWithoutDefaultValue;
 use Rector\Config\RectorConfig;
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
 use Rector\Renaming\ValueObject\MethodCallRename;
@@ -19,29 +19,27 @@
 
     // https://github.com/laravel/framework/commit/8f9ddea4481717943ed4ecff96d86b703c81a87d
     $rectorConfig
-        ->ruleWithConfiguration(ArgumentAdderRector::class, [new ArgumentAdder(
+        ->ruleWithConfiguration(ArgumentAdderRector::class, [new ArgumentAdderWithoutDefaultValue(
             'Illuminate\Contracts\Foundation\Application',
             'storagePath',
             0,
             'path',
-            ''
         ),
         ]);
 
     // https://github.com/laravel/framework/commit/e6c8aaea886d35cc55bd3469f1a95ad56d53e474
     $rectorConfig
-        ->ruleWithConfiguration(ArgumentAdderRector::class, [new ArgumentAdder(
+        ->ruleWithConfiguration(ArgumentAdderRector::class, [new ArgumentAdderWithoutDefaultValue(
             'Illuminate\Foundation\Application',
             'langPath',
             0,
             'path',
-            ''
         ),
         ]);
 
     // https://github.com/laravel/framework/commit/e095ac0e928b5620f33c9b60816fde5ece867d32
     $rectorConfig
-        ->ruleWithConfiguration(ArgumentAdderRector::class, [new ArgumentAdder(
+        ->ruleWithConfiguration(ArgumentAdderRector::class, [new ArgumentAdderWithoutDefaultValue(
             'Illuminate\Database\Eloquent\Model',
             'touch',
             0,
@@ -51,7 +49,7 @@
 
     // https://github.com/laravel/framework/commit/6daecf43dd931dc503e410645ff4a7d611e3371f
     $rectorConfig
-        ->ruleWithConfiguration(ArgumentAdderRector::class, [new ArgumentAdder(
+        ->ruleWithConfiguration(ArgumentAdderRector::class, [new ArgumentAdderWithoutDefaultValue(
             'Illuminate\Queue\Failed\FailedJobProviderInterface',
             'flush',
             0,

src/Rector/Class_/ReplaceExpectsMethodsInTestsRector.php

@@ -74,7 +74,7 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param  Node\Stmt\Class_  $node
+     * @param  Class_  $node
      */
     public function refactor(Node $node): ?Class_
     {

src/Rector/Expr/AppEnvironmentComparisonToParameterRector.php

@@ -51,7 +51,7 @@ public function refactor(Node $node): MethodCall|StaticCall|null
             return null;
         }
 
-        /** @var Node\Expr\MethodCall|Node\Expr\StaticCall|null $methodCall */
+        /** @var MethodCall|StaticCall|null $methodCall */
         $methodCall = array_values(
             array_filter(
                 [$node->left, $node->right],

src/Rector/FuncCall/FactoryFuncCallToStaticCallRector.php

@@ -51,7 +51,7 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param  Node\Expr\FuncCall  $node
+     * @param  FuncCall  $node
      */
     public function refactor(Node $node): ?Node
     {

src/Rector/FuncCall/SleepFuncToSleepStaticCallRector.php

@@ -41,7 +41,7 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param  Node\Stmt\Expression  $node
+     * @param  Expression  $node
      */
     public function refactor(Node $node): ?Node
     {

src/Rector/MethodCall/EloquentWhereRelationTypeHintingParameterRector.php

@@ -96,7 +96,7 @@ private function changeClosureParamType(MethodCall|StaticCall $node): void
             ['whereHasMorph', 'orWhereHasMorph', 'whereDoesntHaveMorph', 'orWhereDoesntHaveMorph']
         ) ? 2 : 1;
 
-        /** @var Node\Expr\ArrowFunction|Node\Expr\Closure $closure */
+        /** @var ArrowFunction|Closure $closure */
         $closure = $node->getArgs()[$position]
 ->value;
 

src/Rector/MethodCall/EloquentWhereTypeHintClosureParameterRector.php

@@ -77,7 +77,7 @@ private function isWhereMethodWithClosureOrArrowFunction(MethodCall|StaticCall $
 
     private function changeClosureParamType(MethodCall|StaticCall $node): void
     {
-        /** @var Node\Expr\ArrowFunction|Node\Expr\Closure $closure */
+        /** @var ArrowFunction|Closure $closure */
         $closure = $node->getArgs()[0]
             ->value;