phpstan

rectorphp · Nov 11, 2021 · ab49291 · ab49291
1 parent 75299cf
commit ab49291
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/rules/Removing/NodeManipulator/ComplexNodeRemover.php b/rules/Removing/NodeManipulator/ComplexNodeRemover.php
@@ -45,6 +45,7 @@ public function removePropertyAndUsages(Property $property, array $classMethodNa
         $propertyFetches = $this->propertyFetchFinder->findPrivatePropertyFetches($property);
 
         $assigns = [];
+        $propertyNames = [];
         foreach ($propertyFetches as $propertyFetch) {
             if ($this->shouldSkipPropertyForClassMethod($propertyFetch, $classMethodNamesToSkip)) {
                 $shouldKeepProperty = true;
@@ -62,16 +63,11 @@ public function removePropertyAndUsages(Property $property, array $classMethodNa
                 continue;
             }
 
+            $propertyNames[] = $propertyName;
             $assigns[$propertyName][] = $assign;
         }
 
-        foreach ($assigns as $assignPropertyNamesAssign) {
-            foreach ($assignPropertyNamesAssign as $propertyNameAssign) {
-                // remove assigns
-                $this->assignRemover->removeAssignNode($propertyNameAssign);
-                $this->removeConstructorDependency($propertyNameAssign);
-            }
-        }
+        $this->processRemovePropertyAssigns($assigns, $propertyNames);
 
         if ($shouldKeepProperty) {
             return;
@@ -92,6 +88,22 @@ public function removePropertyAndUsages(Property $property, array $classMethodNa
         $this->nodeRemover->removeNode($property);
     }
 
+    /**
+     * @param array<string, Assign[]> $assigns
+     * @param string[] $propertyNames
+     */
+    private function processRemovePropertyAssigns(array $assigns, array $propertyNames): void
+    {
+        $propertyNames = array_unique($propertyNames);
+        foreach ($propertyNames as $propertyName) {
+            foreach ($assigns[$propertyName] as $propertyNameAssign) {
+                // remove assigns
+                $this->assignRemover->removeAssignNode($propertyNameAssign);
+                $this->removeConstructorDependency($propertyNameAssign);
+            }
+        }
+    }
+
     /**
      * @param string[] $classMethodNamesToSkip
      */