[DeadCode] Remove next attribute on RemoveUnusedVariableAssignRector (#…

…3917) * [DeadCode] Remove next attribute on RemoveUnusedVariableAssignRector * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · May 21, 2023 · 33c04c5 · 33c04c5
1 parent 8ec3a27
commit 33c04c5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php b/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php
@@ -234,10 +234,10 @@ private function refactorUsedVariable(Assign $assign, Scope $scope): null|Expr
             return null;
         }
 
-        $if = $parentNode->getAttribute(AttributeKey::NEXT_NODE);
+        $node = $this->betterNodeFinder->resolveNextNode($parentNode);
 
         // check if next node is if
-        if (! $if instanceof If_) {
+        if (! $node instanceof If_) {
             if (
                 $assign->var instanceof Variable &&
                 ! $scope->hasVariableType((string) $this->getName($assign->var))
@@ -249,7 +249,7 @@ private function refactorUsedVariable(Assign $assign, Scope $scope): null|Expr
             return null;
         }
 
-        if ($this->conditionSearcher->hasIfAndElseForVariableRedeclaration($assign, $if)) {
+        if ($this->conditionSearcher->hasIfAndElseForVariableRedeclaration($assign, $node)) {
             $this->removeNode($assign);
             return $assign;
         }