Merge branch 'refs/heads/main' into fix-json-get-calls-with-route-helper

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

@@ -17,10 +17,26 @@
                     new ObjectType('Illuminate\Foundation\Application'),
                     'make',
                 ),
+                new ArrayDimFetchToMethodCall(
+                    new ObjectType('Illuminate\Contracts\Foundation\Application'),
+                    'make',
+                ),
                 new ArrayDimFetchToMethodCall(
                     new ObjectType('Illuminate\Config\Repository'),
                     'get',
                 ),
+                new ArrayDimFetchToMethodCall(
+                    new ObjectType('Illuminate\Contracts\Config\Repository'),
+                    'make',
+                ),
+                new ArrayDimFetchToMethodCall(
+                    new ObjectType('Illuminate\Contracts\Container\Container\Application'),
+                    'make',
+                ),
+                new ArrayDimFetchToMethodCall(
+                    new ObjectType('Illuminate\Contracts\Container\Container'),
+                    'make',
+                ),
             ],
         );
 };

pint.json

@@ -0,0 +1,6 @@
+{
+    "rules": {
+        "single_line_empty_body": false,
+        "concat_space": false
+    }
+}

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

@@ -95,7 +95,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

@@ -76,7 +76,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;
 

src/Rector/MethodCall/RefactorBlueprintGeometryColumnsRector.php

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

src/Rector/MethodCall/ReplaceWithoutJobsEventsAndNotificationsWithFacadeFakeRector.php

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

src/Rector/StaticCall/DispatchToHelperFunctionsRector.php

@@ -8,6 +8,7 @@
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Name;
+use PhpParser\Node\Name\FullyQualified;
 use PHPStan\Broker\ClassNotFoundException;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
@@ -128,7 +129,7 @@ private function createDispatchableCall(StaticCall $staticCall, string $method):
         return new FuncCall(
             new Name($method),
             [
-                new Arg(new New_(new Name($class), $staticCall->args)),
+                new Arg(new New_(new FullyQualified($class), $staticCall->args)),
             ],
         );
     }

src/Rector/StaticCall/EloquentMagicMethodToQueryBuilderRector.php

@@ -109,14 +109,14 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $queryMethodCall = $this->nodeFactory->createStaticCall($originalClassName, 'query');
+        $staticCall = $this->nodeFactory->createStaticCall($originalClassName, 'query');
 
-        $newNode = $this->nodeFactory->createMethodCall($queryMethodCall, $methodName);
+        $methodCall = $this->nodeFactory->createMethodCall($staticCall, $methodName);
         foreach ($node->args as $arg) {
-            $newNode->args[] = $arg;
+            $methodCall->args[] = $arg;
         }
 
-        return $newNode;
+        return $methodCall;
     }
 
     /**

src/Rector/StaticCall/ReplaceAssertTimesSendWithAssertSentTimesRector.php

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

tests/Rector/StaticCall/DispatchToHelperFunctionsRector/Fixture/bus_dispatchable.php.inc

@@ -12,4 +12,4 @@ namespace RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector\
 
 use RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector\Source\TestJob;
 
-dispatch(new RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector\Source\TestJob('param1', 'param2'));
+dispatch(new \RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector\Source\TestJob('param1', 'param2'));

tests/Rector/StaticCall/DispatchToHelperFunctionsRector/Fixture/event_dispatchable.php.inc

@@ -12,4 +12,4 @@ namespace RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector\
 
 use RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector\Source\TestEvent;
 
-event(new RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector\Source\TestEvent('param1', 'param2'));
+event(new \RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector\Source\TestEvent('param1', 'param2'));