[DeadCode] Clean up PHPStan notice on ComplexNodeRemover::processRemo…

…veParamWithKeys() (#4018)
rectorphp · May 29, 2023 · 4ea7d0f · 4ea7d0f
1 parent e604829
commit 4ea7d0f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -739,7 +739,3 @@ parameters:
         -
             message: '#Offset 0 does not exist on array<PhpParser\\Node\\Stmt>\|null#'
             path: rules/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php
-
-        -
-            message: '#Method "processRemoveParamWithKeys\(\)" returns bool type, so the name should start with is/has/was#'
-            path: rules/Removing/NodeManipulator/ComplexNodeRemover.php
diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php
@@ -110,10 +110,10 @@ private function processRemoveParams(ClassMethod $classMethod): ?ClassMethod
             return null;
         }
 
-        $hasRemoved = $this->complexNodeRemover
+        $removedParamKeys = $this->complexNodeRemover
             ->processRemoveParamWithKeys($classMethod, $paramKeysToBeRemoved);
 
-        if ($hasRemoved) {
+        if ($removedParamKeys !== []) {
             return $classMethod;
         }
 

diff --git a/rules/Removing/NodeManipulator/ComplexNodeRemover.php b/rules/Removing/NodeManipulator/ComplexNodeRemover.php
@@ -171,34 +171,34 @@ private function removeConstructorDependency(Class_ $class, string $propertyName
 
     /**
      * @param int[] $paramKeysToBeRemoved
+     * @return int[]
      */
-    public function processRemoveParamWithKeys(ClassMethod $classMethod, array $paramKeysToBeRemoved): bool
+    public function processRemoveParamWithKeys(ClassMethod $classMethod, array $paramKeysToBeRemoved): array
     {
         $totalKeys = count($classMethod->params) - 1;
-        $hasRemoved = false;
+        $removedParamKeys = [];
 
         foreach ($paramKeysToBeRemoved as $paramKeyToBeRemoved) {
             $startNextKey = $paramKeyToBeRemoved + 1;
             for ($nextKey = $startNextKey; $nextKey <= $totalKeys; ++$nextKey) {
                 if (! isset($classMethod->params[$nextKey])) {
                     // no next param, break the inner loop, remove the param
-                    unset($classMethod->params[$paramKeyToBeRemoved]);
-                    return true;
+                    break;
                 }
 
                 if (in_array($nextKey, $paramKeysToBeRemoved, true)) {
                     // keep searching next key not in $paramKeysToBeRemoved
                     continue;
                 }
 
-                return $hasRemoved;
+                return [];
             }
 
             unset($classMethod->params[$paramKeyToBeRemoved]);
-            $hasRemoved = true;
+            $removedParamKeys[] = $paramKeyToBeRemoved;
         }
 
-        return $hasRemoved;
+        return $removedParamKeys;
     }
 
     /**