fix

rectorphp · Jun 11, 2022 · ee28b38 · ee28b38
1 parent ccdd189
commit ee28b38
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/rules/Removing/NodeManipulator/ComplexNodeRemover.php b/rules/Removing/NodeManipulator/ComplexNodeRemover.php
@@ -51,7 +51,7 @@ public function removePropertyAndUsages(
             $removeAssignSideEffect,
             $propertyName,
             &$totalPropertyFetch
-        ) {
+        ):?Node {
             // here should be checked all expr like stmts that can hold assign, e.f. if, foreach etc. etc.
             if (! $node instanceof Expression) {
                 return null;
@@ -81,17 +81,22 @@ public function removePropertyAndUsages(
                 return null;
             }
 
+            $currentTotalPropertyFetch = $totalPropertyFetch;
             foreach ($propertyFetches as $propertyFetch) {
                 if ($this->nodeNameResolver->isName($propertyFetch->name, $propertyName)) {
                     if (! $removeAssignSideEffect && $this->sideEffectNodeDetector->detect($assign->expr)) {
                         return null;
                     }
 
-                    $this->nodeRemover->removeNode($node);
                     --$totalPropertyFetch;
                 }
             }
 
+            if ($totalPropertyFetch < $currentTotalPropertyFetch) {
+                $this->nodeRemover->removeNode($node);
+                return $node;
+            }
+
             return null;
         });