[DeadCode] Skip used as assign var next on RemoveJustPropertyFetchRec…

…tor (#3605) * [DeadCode] Skip used as assign var next on RemoveJustPropertyFetchRector * Fixed 🎉 * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Apr 10, 2023 · 951e9f9 · 951e9f9
1 parent 7cc59fe
commit 951e9f9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/packages/ReadWrite/NodeFinder/NodeUsageFinder.php b/packages/ReadWrite/NodeFinder/NodeUsageFinder.php
@@ -12,6 +12,7 @@
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeNestingScope\NodeFinder\ScopeAwareNodeFinder;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 
 final class NodeUsageFinder
 {
@@ -43,7 +44,12 @@ public function findVariableUsages(array $nodes, Variable $variable): array
                 return false;
             }
 
-            return $this->nodeNameResolver->isName($node, $variableName);
+            if (! $this->nodeNameResolver->isName($node, $variableName)) {
+                return false;
+            }
+
+            $assignedTo = $node->getAttribute(AttributeKey::ASSIGNED_TO);
+            return ! $assignedTo instanceof Node;
         });
     }
 

diff --git a/...AwareInterface/RemoveJustPropertyFetchRector/Fixture/skip_used_as_assign_var_next.php.inc b/...AwareInterface/RemoveJustPropertyFetchRector/Fixture/skip_used_as_assign_var_next.php.inc
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\StmtsAwareInterface\RemoveJustPropertyFetchRector\Fixture;
+
+final class SkipUsedAsAssignVarNext
+{
+    public function run($arg)
+    {
+        $line = $arg->line;
+        $total = $line->amount;
+        $arg->line = $line;
+
+        return $total;
+    }
+}
diff --git a/rules/Removing/Rector/FuncCall/RemoveFuncCallRector.php b/rules/Removing/Rector/FuncCall/RemoveFuncCallRector.php
@@ -74,14 +74,14 @@ public function configure(array $configuration): void
         $this->removedFunctions = $configuration;
     }
 
-    private function removeNodeIfNeeded(Expression $node, FuncCall $expr): void
+    private function removeNodeIfNeeded(Expression $expression, FuncCall $funcCall): void
     {
         foreach ($this->removedFunctions as $removedFunction) {
-            if (! $this->isName($expr->name, $removedFunction)) {
+            if (! $this->isName($funcCall->name, $removedFunction)) {
                 continue;
             }
 
-            $this->removeNode($node);
+            $this->removeNode($expression);
 
             break;
         }