(fix) RemoveDoubleAssignRector: properly skip if the assigned express…

…ion is a call (#5191)
rectorphp · Jan 15, 2021 · deafb51 · deafb51
1 parent 96986b5
commit deafb51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/rules/dead-code/src/Rector/Assign/RemoveDoubleAssignRector.php b/rules/dead-code/src/Rector/Assign/RemoveDoubleAssignRector.php
@@ -80,7 +80,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if ($this->isCall($node->expr)) {
+        if ($this->isCall($previousStatement->expr->expr)) {
             return null;
         }
 

diff --git a/rules/dead-code/tests/Rector/Assign/RemoveDoubleAssignRector/Fixture/skip_calls.php.inc b/rules/dead-code/tests/Rector/Assign/RemoveDoubleAssignRector/Fixture/skip_calls.php.inc
@@ -10,20 +10,24 @@ class SkipCalls
         $item = array_pop($items);
         $item = array_pop($items);
         $item = array_pop($items);
+        $item = null;
     }
 
     public function staticCalls()
     {
         $item = StaticClass::dump();
         $item = StaticClass::dump();
         $item = StaticClass::dump();
+        $item = null;
     }
 
     public function nonStaticCalls()
     {
         $nonStaticClass = (new NonStaticClass());
         $item = $nonStaticClass->dump();
         $item = $nonStaticClass->dump();
+        $item = $nonStaticClass->dump();
+        $item = null;
     }
 }