Make use of key to remove property (#4032)

rectorphp · May 30, 2023 · 73c1ac4 · 73c1ac4
1 parent 46d2aac
commit 73c1ac4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php b/rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php
@@ -87,26 +87,27 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
     {
         $hasChanged = false;
 
-        foreach ($node->stmts as $property) {
-            if (! $property instanceof Property) {
+        foreach ($node->stmts as $key => $stmt) {
+            if (! $stmt instanceof Property) {
                 continue;
             }
 
-            if ($this->shouldSkipProperty($property)) {
+            if ($this->shouldSkipProperty($stmt)) {
                 continue;
             }
 
-            if ($this->propertyManipulator->isPropertyUsedInReadContext($node, $property, $scope)) {
+            if ($this->propertyManipulator->isPropertyUsedInReadContext($node, $stmt, $scope)) {
                 continue;
             }
 
             // use different variable to avoid re-assign back $hasRemoved to false
             // when already asssigned to true
             $isRemoved = $this->complexNodeRemover->removePropertyAndUsages(
                 $node,
-                $property,
+                $stmt,
                 $this->removeAssignSideEffect,
-                $scope
+                $scope,
+                $key
             );
 
             if ($isRemoved) {

diff --git a/rules/Removing/NodeManipulator/ComplexNodeRemover.php b/rules/Removing/NodeManipulator/ComplexNodeRemover.php
@@ -43,7 +43,8 @@ public function removePropertyAndUsages(
         Class_ $class,
         Property $property,
         bool $removeAssignSideEffect,
-        Scope $scope
+        Scope $scope,
+        int $propertyStmtKey,
     ): bool {
         $propertyName = $this->nodeNameResolver->getName($property);
         $totalPropertyFetch = $this->propertyFetchAnalyzer->countLocalPropertyFetchName($class, $propertyName);
@@ -114,7 +115,7 @@ public function removePropertyAndUsages(
             $this->nodeRemover->removeNode($expression);
         }
 
-        $this->nodeRemover->removeNode($property);
+        unset($class->stmts[$propertyStmtKey]);
 
         return true;
     }