[DeadCode] Ensure parent assign is Expression Stmt for RemoveUnusedVa…

…riableAssignRector (#1893)
rectorphp · Mar 3, 2022 · 1b717dc · 1b717dc
1 parent 18f306e
commit 1b717dc
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php b/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php
@@ -227,7 +227,7 @@ private function isUsedInPreviousAssign(Assign $assign, Expr $expr): bool
     private function refactorUsedVariable(Assign $assign): null|Expr
     {
         $parentNode = $assign->getAttribute(AttributeKey::PARENT_NODE);
-        if (! $parentNode instanceof Node) {
+        if (! $parentNode instanceof Expression) {
             return null;
         }
 
@@ -238,10 +238,7 @@ private function refactorUsedVariable(Assign $assign): null|Expr
             if (
                 $assign->var instanceof Variable &&
                 ! $this->isUsedInPreviousNode($assign->var) &&
-                ! $this->exprUsedInNextNodeAnalyzer->isUsed($assign->var) && $this->isUsedInAssignExpr(
-                    $assign->expr,
-                    $assign
-                )) {
+                ! $this->exprUsedInNextNodeAnalyzer->isUsed($assign->var)) {
                 return $this->cleanCastedExpr($assign->expr);
             }