Fix rector rule to handle static method calls and update test expectations

Author: dereuromark

composer.json

@@ -38,5 +38,12 @@
     },
     "support": {
         "source": "https://github.com/cakephp/upgrade"
+    },
+    "require-dev": {
+        "cakephp/cakephp": "5.x-dev",
+        "cakephp/cakephp-codesniffer": "^5.0",
+        "cakephp/migrations": "^4.5.0",
+        "mikey179/vfsstream": "^1.6.8",
+        "phpunit/phpunit": "^10.5.38"
     }
 }

src/Rector/Rector/MethodCall/RemoveAssignmentFromVoidMethodRector.php

@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Stmt\Expression;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Rector\AbstractRector;
@@ -63,23 +64,41 @@ public function refactor(Node $node): ?Node
         }
 
         $assign = $node->expr;
-        if (!$assign->expr instanceof MethodCall) {
-            return null;
-        }
 
-        $methodCall = $assign->expr;
+        // Handle instance method calls
+        if ($assign->expr instanceof MethodCall) {
+            $methodCall = $assign->expr;
 
-        foreach ($this->voidMethods as $voidMethod) {
-            if (!$this->isObjectType($methodCall->var, $voidMethod->getObjectType())) {
-                continue;
-            }
+            foreach ($this->voidMethods as $voidMethod) {
+                if (!$this->isObjectType($methodCall->var, $voidMethod->getObjectType())) {
+                    continue;
+                }
 
-            if (!$this->isName($methodCall->name, $voidMethod->getMethod())) {
-                continue;
+                if (!$this->isName($methodCall->name, $voidMethod->getMethod())) {
+                    continue;
+                }
+
+                // Replace the assignment with just the method call
+                return new Expression($methodCall);
             }
+        }
 
-            // Replace the assignment with just the method call
-            return new Expression($methodCall);
+        // Handle static method calls
+        if ($assign->expr instanceof StaticCall) {
+            $staticCall = $assign->expr;
+
+            foreach ($this->voidMethods as $voidMethod) {
+                if (!$this->isName($staticCall->class, $voidMethod->getClass())) {
+                    continue;
+                }
+
+                if (!$this->isName($staticCall->name, $voidMethod->getMethod())) {
+                    continue;
+                }
+
+                // Replace the assignment with just the static call
+                return new Expression($staticCall);
+            }
         }
 
         return null;

tests/test_apps/upgraded/RectorCommand-testApply60/src/VoidMethods.php

@@ -21,7 +21,6 @@ class VoidMethods
 
     public function testAllowMethod(): void
     {
-        // Assignment should be removed
         $this->request->allowMethod('post');
 
         // Method call without assignment should stay the same
@@ -30,32 +29,27 @@ public function testAllowMethod(): void
 
     public function testConfigureLoad(): void
     {
-        // Assignment should be removed
         Configure::load('app', 'default');
     }
 
     public function testResponseEmitter(): void
     {
         $emitter = new ResponseEmitter();
-        // Assignment should be removed
         $emitter->emit($response);
     }
 
     public function testSessionClose(): void
     {
-        // Assignment should be removed
         $this->session->close();
     }
 
     public function testTableDeleteOrFail(): void
     {
-        // Assignment should be removed
         $this->table->deleteOrFail($entity);
     }
 
     public function testFixtureInsertTruncate(): void
     {
-        // Assignments should be removed
         $this->fixture->insert($connection);
         $this->fixture->truncate($connection);
     }