Merge branch 'main' into request-isset

benfaerber · web-flow · commit dc5801a57060 · 2025-05-04T22:01:46.000-06:00
diff --git a/config/sets/laravel-facade-aliases-to-full-names.php b/config/sets/laravel-facade-aliases-to-full-names.php
@@ -18,6 +18,7 @@
         'Bus' => 'Illuminate\Support\Facades\Bus',
         'Cache' => 'Illuminate\Support\Facades\Cache',
         'Config' => 'Illuminate\Support\Facades\Config',
+        'Context' => 'Illuminate\Support\Facades\Context',
         'Cookie' => 'Illuminate\Support\Facades\Cookie',
         'Crypt' => 'Illuminate\Support\Facades\Crypt',
         'Date' => 'Illuminate\Support\Facades\Date',
diff --git a/docs/rector_rules_overview.md b/docs/rector_rules_overview.md
@@ -1368,7 +1368,7 @@ Changes model scope methods to use the scope attribute
  {
 -    public function scopeActive($query)
 +    #[\Illuminate\Database\Eloquent\Attributes\Scope]
-+    public function active($query)
++    protected function active($query)
      {
          return $query->where('active', 1);
      }
diff --git a/phpunit.xml b/phpunit.xml
@@ -6,6 +6,7 @@
     colors="true"
     executionOrder="defects"
     cacheDirectory=".phpunit.cache"
+    displayDetailsOnTestsThatTriggerWarnings="true"
 >
     <testsuites>
         <testsuite name="main">
diff --git a/src/Rector/ClassMethod/MigrateToSimplifiedAttributeRector.php b/src/Rector/ClassMethod/MigrateToSimplifiedAttributeRector.php
@@ -55,6 +55,8 @@ public function refactor(Node $node): ?Node
 
         $classMethods = $node->getMethods();
 
+        $hasChanged = false;
+
         foreach ($node->stmts as $key => $stmt) {
             if (! $stmt instanceof ClassMethod) {
                 continue;
@@ -68,12 +70,17 @@ public function refactor(Node $node): ?Node
 
             if ($newNode instanceof ClassMethod) {
                 $node->stmts[$key] = $newNode;
+                $hasChanged = true;
             } elseif ($newNode === NodeVisitor::REMOVE_NODE) {
                 unset($node->stmts[$key]);
+                $hasChanged = true;
             }
         }
 
-        return $node;
+        return $hasChanged
+            ? $node
+            : null;
+
     }
 
     public function getRuleDefinition(): RuleDefinition
diff --git a/src/Rector/ClassMethod/ScopeNamedClassMethodToScopeAttributedClassMethodRector.php b/src/Rector/ClassMethod/ScopeNamedClassMethodToScopeAttributedClassMethodRector.php
@@ -4,6 +4,7 @@
 
 namespace RectorLaravel\Rector\ClassMethod;
 
+use PhpParser\Modifiers;
 use PhpParser\Node;
 use PhpParser\Node\Attribute;
 use PhpParser\Node\AttributeGroup;
@@ -98,6 +99,7 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
+            $classMethod->flags = Modifiers::PROTECTED;
             $classMethod->name = new Identifier($newName);
             $classMethod->attrGroups[] = new AttributeGroup([new Attribute(new FullyQualified(self::SCOPE_ATTRIBUTE))]);
             $changes = true;
diff --git a/src/Rector/Class_/AddExtendsAnnotationToModelFactoriesRector.php b/src/Rector/Class_/AddExtendsAnnotationToModelFactoriesRector.php
@@ -83,6 +83,8 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        $hasChanged = false;
+
         foreach ($node->stmts as $stmt) {
             if (! $stmt instanceof Property) {
                 continue;
@@ -92,32 +94,36 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            $this->addExtendsPhpDocTag($node, $stmt);
+            $hasChanged = $this->addExtendsPhpDocTag($node, $stmt);
+
+            break;
+        }
 
+        if ($hasChanged) {
             $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
 
-            break;
+            return $node;
         }
 
-        return $node;
+        return null;
     }
 
-    public function addExtendsPhpDocTag(Node $node, Property $property): void
+    private function addExtendsPhpDocTag(Node $node, Property $property): bool
     {
         if ($property->props === []) {
-            return;
+            return false;
         }
 
         $modelName = $this->getModelName($property->props[0]->default);
 
         if ($modelName === null) {
-            return;
+            return false;
         }
 
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
 
         if ($phpDocInfo->hasByName(self::EXTENDS_TAG_NAME)) {
-            return;
+            return false;
         }
 
         $phpDocTagNode = new PhpDocTagNode(self::EXTENDS_TAG_NAME, new ExtendsTagValueNode(
@@ -129,6 +135,8 @@ public function addExtendsPhpDocTag(Node $node, Property $property): void
         ));
 
         $phpDocInfo->addPhpDocTagNode($phpDocTagNode);
+
+        return true;
     }
 
     private function getModelName(?Expr $expr): ?string
diff --git a/src/Rector/Class_/ReplaceExpectsMethodsInTestsRector.php b/src/Rector/Class_/ReplaceExpectsMethodsInTestsRector.php
@@ -87,6 +87,8 @@ public function refactor(Node $node): ?Class_
             return null;
         }
 
+        $hasChanged = false;
+
         foreach ($node->getMethods() as $classMethod) {
             $result = $this->expectedClassMethodAnalyzer->findExpectedJobCallsWithClassMethod($classMethod);
 
@@ -96,6 +98,7 @@ public function refactor(Node $node): ?Class_
 
             if ($result->isActionable()) {
                 $this->fixUpClassMethod($classMethod, $result, 'Illuminate\Support\Facades\Bus');
+                $hasChanged = true;
             }
 
             $result = $this->expectedClassMethodAnalyzer->findExpectedEventCallsWithClassMethod($classMethod);
@@ -106,10 +109,14 @@ public function refactor(Node $node): ?Class_
 
             if ($result->isActionable()) {
                 $this->fixUpClassMethod($classMethod, $result, 'Illuminate\Support\Facades\Event');
+                $hasChanged = true;
             }
         }
 
-        return $node;
+        return $hasChanged
+            ? $node
+            : null;
+
     }
 
     private function fixUpClassMethod(
diff --git a/src/Rector/MethodCall/EloquentOrderByToLatestOrOldestRector.php b/src/Rector/MethodCall/EloquentOrderByToLatestOrOldestRector.php
@@ -112,7 +112,9 @@ private function isOrderByMethodCall(MethodCall $methodCall): bool
 
     private function isAllowedPattern(MethodCall $methodCall): bool
     {
-        $columnArg = $methodCall->args[0] instanceof Arg ? $methodCall->args[0]->value : null;
+        $columnArg = $methodCall->args !== [] && $methodCall->args[0] instanceof Arg
+            ? $methodCall->args[0]->value
+            : null;
 
         // If no patterns are specified, consider all column names as matching
         if ($this->allowedPatterns === []) {
@@ -142,19 +144,19 @@ private function isAllowedPattern(MethodCall $methodCall): bool
         return false;
     }
 
-    private function convertOrderByToLatest(MethodCall $methodCall): MethodCall
+    private function convertOrderByToLatest(MethodCall $methodCall): ?MethodCall
     {
         if (! isset($methodCall->args[0]) && ! $methodCall->args[0] instanceof VariadicPlaceholder) {
-            return $methodCall;
+            return null;
         }
 
         $columnVar = $methodCall->args[0] instanceof Arg ? $methodCall->args[0]->value : null;
         if (! $columnVar instanceof Expr) {
-            return $methodCall;
+            return null;
         }
 
         if (isset($methodCall->args[1]) && (! $methodCall->args[1] instanceof Arg || ! $methodCall->args[1]->value instanceof String_)) {
-            return $methodCall;
+            return null;
         }
 
         if (isset($methodCall->args[1]) && $methodCall->args[1] instanceof Arg && $methodCall->args[1]->value instanceof String_) {
diff --git a/src/Rector/MethodCall/UseComponentPropertyWithinCommandsRector.php b/src/Rector/MethodCall/UseComponentPropertyWithinCommandsRector.php
@@ -78,23 +78,36 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        $hasChanged = false;
+
         foreach ($node->stmts as $key => $stmt) {
             if (! $stmt instanceof ClassMethod) {
                 continue;
             }
 
-            $node->stmts[$key] = $this->refactorClassMethod($stmt);
+            $changedClassMethod = $this->refactorClassMethod($stmt);
+
+            if ($changedClassMethod instanceof ClassMethod) {
+                $node->stmts[$key] = $changedClassMethod;
+
+                $hasChanged = true;
+            }
         }
 
-        return $node;
+        return $hasChanged
+            ? $node
+            : null;
+
     }
 
-    private function refactorClassMethod(ClassMethod $classMethod): ClassMethod
+    private function refactorClassMethod(ClassMethod $classMethod): ?ClassMethod
     {
         if ($classMethod->stmts === null) {
-            return $classMethod;
+            return null;
         }
 
+        $hasChanged = false;
+
         foreach ($classMethod->stmts as $stmt) {
             if (! $stmt instanceof Expression) {
                 continue;
@@ -123,8 +136,12 @@ private function refactorClassMethod(ClassMethod $classMethod): ClassMethod
 
             $stmt->expr->var =
                 new PropertyFetch(new Variable('this'), 'components');
+
+            $hasChanged = true;
         }
 
-        return $classMethod;
+        return $hasChanged
+            ? $classMethod
+            : null;
     }
 }
diff --git a/tests/Rector/ClassMethod/ScopeNamedClassMethodToScopeAttributedClassMethodRector/Fixture/fixture.php.inc b/tests/Rector/ClassMethod/ScopeNamedClassMethodToScopeAttributedClassMethodRector/Fixture/fixture.php.inc
@@ -23,7 +23,7 @@ use Illuminate\Database\Eloquent\Model;
 class SomeClass extends Model
 {
     #[\Illuminate\Database\Eloquent\Attributes\Scope]
-    public function someMethod()
+    protected function someMethod()
     {
 
     }
diff --git a/tests/Rector/ClassMethod/ScopeNamedClassMethodToScopeAttributedClassMethodRector/Fixture/non_duplicate_nodes.php.inc b/tests/Rector/ClassMethod/ScopeNamedClassMethodToScopeAttributedClassMethodRector/Fixture/non_duplicate_nodes.php.inc
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 class NonDuplicateAttributeNodes extends Model
 {
     #[\Illuminate\Database\Eloquent\Attributes\Scope]
-    public function scopeSomeMethod()
+    protected function scopeSomeMethod()
     {
 
     }
diff --git a/tests/Rector/FuncCall/ArgumentFuncCallToMethodCallRector/Fixture/broadcast.php.inc b/tests/Rector/FuncCall/ArgumentFuncCallToMethodCallRector/Fixture/broadcast.php.inc
@@ -18,12 +18,12 @@ namespace RectorLaravel\Tests\Rector\FuncCall\ArgumentFuncCallToMethodCallRector
 
 class Broadcast
 {
-    public function __construct(private readonly \Illuminate\Contracts\Broadcasting\Factory $broadcastingFactory)
+    public function __construct(private readonly \Illuminate\Contracts\Broadcasting\Factory $factory)
     {
     }
     public function action()
     {
-        return $this->broadcastingFactory->event('template.blade');
+        return $this->factory->event('template.blade');
     }
 }
 
diff --git a/tests/Rector/FuncCall/ArgumentFuncCallToMethodCallRector/Fixture/config.php.inc b/tests/Rector/FuncCall/ArgumentFuncCallToMethodCallRector/Fixture/config.php.inc
@@ -23,17 +23,17 @@ namespace RectorLaravel\Tests\Rector\FuncCall\ArgumentFuncCallToMethodCallRector
 
 class Config
 {
-    public function __construct(private readonly \Illuminate\Contracts\Config\Repository $configRepository)
+    public function __construct(private readonly \Illuminate\Contracts\Config\Repository $repository)
     {
     }
     public function actionGet()
     {
-        $value = $this->configRepository->get('value');
+        $value = $this->repository->get('value');
     }
 
     public function actionSet($value)
     {
-        $this->configRepository->set(['value' => $value]);
+        $this->repository->set(['value' => $value]);
     }
 }
 
diff --git a/tests/Rector/FuncCall/ArgumentFuncCallToMethodCallRector/Fixture/view.php.inc b/tests/Rector/FuncCall/ArgumentFuncCallToMethodCallRector/Fixture/view.php.inc
@@ -19,13 +19,13 @@ namespace RectorLaravel\Tests\Rector\FuncCall\ArgumentFuncCallToMethodCallRector
 
 class View
 {
-    public function __construct(private readonly \Illuminate\Contracts\View\Factory $viewFactory)
+    public function __construct(private readonly \Illuminate\Contracts\View\Factory $factory)
     {
     }
     public function action()
     {
-        $template = $this->viewFactory->make('template.blade');
-        $viewFactory = $this->viewFactory;
+        $template = $this->factory->make('template.blade');
+        $viewFactory = $this->factory;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1368,7 +1368,7 @@ Changes model scope methods to use the scope attribute`
`1368`	`1368`	`{`
`1369`	`1369`	`- public function scopeActive($query)`
`1370`	`1370`	`+ #[\Illuminate\Database\Eloquent\Attributes\Scope]`
`1371`		`-+ public function active($query)`
	`1371`	`++ protected function active($query)`
`1372`	`1372`	`{`
`1373`	`1373`	`return $query->where('active', 1);`
`1374`	`1374`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`colors="true"`
`7`	`7`	`executionOrder="defects"`
`8`	`8`	`cacheDirectory=".phpunit.cache"`
	`9`	`+ displayDetailsOnTestsThatTriggerWarnings="true"`
`9`	`10`	`>`
`10`	`11`	`<testsuites>`
`11`	`12`	`<testsuite name="main">`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,8 @@ public function refactor(Node $node): ?Node`
`83`	`83`	`return null;`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ $hasChanged = false;`
	`87`	`+`
`86`	`88`	`foreach ($node->stmts as $stmt) {`
`87`	`89`	`if (! $stmt instanceof Property) {`
`88`	`90`	`continue;`
`@@ -92,32 +94,36 @@ public function refactor(Node $node): ?Node`
`92`	`94`	`continue;`
`93`	`95`	`}`
`94`	`96`
`95`		`- $this->addExtendsPhpDocTag($node, $stmt);`
	`97`	`+ $hasChanged = $this->addExtendsPhpDocTag($node, $stmt);`
	`98`	`+`
	`99`	`+ break;`
	`100`	`+ }`
`96`	`101`
	`102`	`+ if ($hasChanged) {`
`97`	`103`	`$this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);`
`98`	`104`
`99`		`- break;`
	`105`	`+ return $node;`
`100`	`106`	`}`
`101`	`107`
`102`		`- return $node;`
	`108`	`+ return null;`
`103`	`109`	`}`
`104`	`110`
`105`		`- public function addExtendsPhpDocTag(Node $node, Property $property): void`
	`111`	`+ private function addExtendsPhpDocTag(Node $node, Property $property): bool`
`106`	`112`	`{`
`107`	`113`	`if ($property->props === []) {`
`108`		`- return;`
	`114`	`+ return false;`
`109`	`115`	`}`
`110`	`116`
`111`	`117`	`$modelName = $this->getModelName($property->props[0]->default);`
`112`	`118`
`113`	`119`	`if ($modelName === null) {`
`114`		`- return;`
	`120`	`+ return false;`
`115`	`121`	`}`
`116`	`122`
`117`	`123`	`$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);`
`118`	`124`
`119`	`125`	`if ($phpDocInfo->hasByName(self::EXTENDS_TAG_NAME)) {`
`120`		`- return;`
	`126`	`+ return false;`
`121`	`127`	`}`
`122`	`128`
`123`	`129`	`$phpDocTagNode = new PhpDocTagNode(self::EXTENDS_TAG_NAME, new ExtendsTagValueNode(`
`@@ -129,6 +135,8 @@ public function addExtendsPhpDocTag(Node $node, Property $property): void`
`129`	`135`	`));`
`130`	`136`
`131`	`137`	`$phpDocInfo->addPhpDocTagNode($phpDocTagNode);`
	`138`	`+`
	`139`	`+ return true;`
`132`	`140`	`}`
`133`	`141`
`134`	`142`	`private function getModelName(?Expr $expr): ?string`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ public function refactor(Node $node): ?Class_`
`87`	`87`	`return null;`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ $hasChanged = false;`
	`91`	`+`
`90`	`92`	`foreach ($node->getMethods() as $classMethod) {`
`91`	`93`	`$result = $this->expectedClassMethodAnalyzer->findExpectedJobCallsWithClassMethod($classMethod);`
`92`	`94`
`@@ -96,6 +98,7 @@ public function refactor(Node $node): ?Class_`
`96`	`98`
`97`	`99`	`if ($result->isActionable()) {`
`98`	`100`	`$this->fixUpClassMethod($classMethod, $result, 'Illuminate\Support\Facades\Bus');`
	`101`	`+ $hasChanged = true;`
`99`	`102`	`}`
`100`	`103`
`101`	`104`	`$result = $this->expectedClassMethodAnalyzer->findExpectedEventCallsWithClassMethod($classMethod);`
`@@ -106,10 +109,14 @@ public function refactor(Node $node): ?Class_`
`106`	`109`
`107`	`110`	`if ($result->isActionable()) {`
`108`	`111`	`$this->fixUpClassMethod($classMethod, $result, 'Illuminate\Support\Facades\Event');`
	`112`	`+ $hasChanged = true;`
`109`	`113`	`}`
`110`	`114`	`}`
`111`	`115`
`112`		`- return $node;`
	`116`	`+ return $hasChanged`
	`117`	`+ ? $node`
	`118`	`+ : null;`
	`119`	`+`
`113`	`120`	`}`
`114`	`121`
`115`	`122`	`private function fixUpClassMethod(`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,9 @@ private function isOrderByMethodCall(MethodCall $methodCall): bool`
`112`	`112`
`113`	`113`	`private function isAllowedPattern(MethodCall $methodCall): bool`
`114`	`114`	`{`
`115`		`- $columnArg = $methodCall->args[0] instanceof Arg ? $methodCall->args[0]->value : null;`
	`115`	`+ $columnArg = $methodCall->args !== [] && $methodCall->args[0] instanceof Arg`
	`116`	`+ ? $methodCall->args[0]->value`
	`117`	`+ : null;`
`116`	`118`
`117`	`119`	`// If no patterns are specified, consider all column names as matching`
`118`	`120`	`if ($this->allowedPatterns === []) {`
`@@ -142,19 +144,19 @@ private function isAllowedPattern(MethodCall $methodCall): bool`
`142`	`144`	`return false;`
`143`	`145`	`}`
`144`	`146`
`145`		`- private function convertOrderByToLatest(MethodCall $methodCall): MethodCall`
	`147`	`+ private function convertOrderByToLatest(MethodCall $methodCall): ?MethodCall`
`146`	`148`	`{`
`147`	`149`	`if (! isset($methodCall->args[0]) && ! $methodCall->args[0] instanceof VariadicPlaceholder) {`
`148`		`- return $methodCall;`
	`150`	`+ return null;`
`149`	`151`	`}`
`150`	`152`
`151`	`153`	`$columnVar = $methodCall->args[0] instanceof Arg ? $methodCall->args[0]->value : null;`
`152`	`154`	`if (! $columnVar instanceof Expr) {`
`153`		`- return $methodCall;`
	`155`	`+ return null;`
`154`	`156`	`}`
`155`	`157`
`156`	`158`	`if (isset($methodCall->args[1]) && (! $methodCall->args[1] instanceof Arg \|\| ! $methodCall->args[1]->value instanceof String_)) {`
`157`		`- return $methodCall;`
	`159`	`+ return null;`
`158`	`160`	`}`
`159`	`161`
`160`	`162`	`if (isset($methodCall->args[1]) && $methodCall->args[1] instanceof Arg && $methodCall->args[1]->value instanceof String_) {`
Original file line number	Diff line number	Diff line change
`@@ -78,23 +78,36 @@ public function refactor(Node $node): ?Node`
`78`	`78`	`return null;`
`79`	`79`	`}`
`80`	`80`
	`81`	`+ $hasChanged = false;`
	`82`	`+`
`81`	`83`	`foreach ($node->stmts as $key => $stmt) {`
`82`	`84`	`if (! $stmt instanceof ClassMethod) {`
`83`	`85`	`continue;`
`84`	`86`	`}`
`85`	`87`
`86`		`- $node->stmts[$key] = $this->refactorClassMethod($stmt);`
	`88`	`+ $changedClassMethod = $this->refactorClassMethod($stmt);`
	`89`	`+`
	`90`	`+ if ($changedClassMethod instanceof ClassMethod) {`
	`91`	`+ $node->stmts[$key] = $changedClassMethod;`
	`92`	`+`
	`93`	`+ $hasChanged = true;`
	`94`	`+ }`
`87`	`95`	`}`
`88`	`96`
`89`		`- return $node;`
	`97`	`+ return $hasChanged`
	`98`	`+ ? $node`
	`99`	`+ : null;`
	`100`	`+`
`90`	`101`	`}`
`91`	`102`
`92`		`- private function refactorClassMethod(ClassMethod $classMethod): ClassMethod`
	`103`	`+ private function refactorClassMethod(ClassMethod $classMethod): ?ClassMethod`
`93`	`104`	`{`
`94`	`105`	`if ($classMethod->stmts === null) {`
`95`		`- return $classMethod;`
	`106`	`+ return null;`
`96`	`107`	`}`
`97`	`108`
	`109`	`+ $hasChanged = false;`
	`110`	`+`
`98`	`111`	`foreach ($classMethod->stmts as $stmt) {`
`99`	`112`	`if (! $stmt instanceof Expression) {`
`100`	`113`	`continue;`
`@@ -123,8 +136,12 @@ private function refactorClassMethod(ClassMethod $classMethod): ClassMethod`
`123`	`136`
`124`	`137`	`$stmt->expr->var =`
`125`	`138`	`new PropertyFetch(new Variable('this'), 'components');`
	`139`	`+`
	`140`	`+ $hasChanged = true;`
`126`	`141`	`}`
`127`	`142`
`128`		`- return $classMethod;`
	`143`	`+ return $hasChanged`
	`144`	`+ ? $classMethod`
	`145`	`+ : null;`
`129`	`146`	`}`
`130`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ use Illuminate\Database\Eloquent\Model;`
`23`	`23`	`class SomeClass extends Model`
`24`	`24`	`{`
`25`	`25`	`#[\Illuminate\Database\Eloquent\Attributes\Scope]`
`26`		`- public function someMethod()`
	`26`	`+ protected function someMethod()`
`27`	`27`	`{`
`28`	`28`
`29`	`29`	`}`