[DeadCode] Skip used in compact() on RemoveUnusedConstructorParamRect…

…or (#2345) * [DeadCode] Skip used in compact() on RemoveUnusedConstructorParamRector * Fixed 🎉 * phpstan * phpstan * [ci-review] Rector Rectify Co-authored-by: GitHub Action <action@github.com>
rectorphp · May 22, 2022 · 68906c7 · 68906c7
1 parent 20731ae
commit 68906c7
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 39 deletions.
diff --git a/...ector/ClassMethod/RemoveUnusedConstructorParamRector/Fixture/skip_used_in_compact.php.inc b/...ector/ClassMethod/RemoveUnusedConstructorParamRector/Fixture/skip_used_in_compact.php.inc
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector\Fixture;
+
+final class SkipUsedInCompact
+{
+    public $data;
+
+    public function __construct($hey, $man)
+    {
+        $this->data = compact('hey', 'man');
+    }
+}
diff --git a/rules/DeadCode/NodeCollector/UnusedParameterResolver.php b/rules/DeadCode/NodeCollector/UnusedParameterResolver.php
@@ -6,12 +6,12 @@
 
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassMethod;
-use Rector\Core\NodeManipulator\ClassMethodManipulator;
+use Rector\Core\NodeAnalyzer\ParamAnalyzer;
 
 final class UnusedParameterResolver
 {
     public function __construct(
-        private readonly ClassMethodManipulator $classMethodManipulator
+        private readonly ParamAnalyzer $paramAnalyzer
     ) {
     }
 
@@ -30,7 +30,7 @@ public function resolve(ClassMethod $classMethod): array
                 continue;
             }
 
-            if ($this->classMethodManipulator->isParameterUsedInClassMethod($param, $classMethod)) {
+            if ($this->paramAnalyzer->isParamUsedInClassMethod($classMethod, $param)) {
                 continue;
             }
 

diff --git a/src/NodeAnalyzer/ParamAnalyzer.php b/src/NodeAnalyzer/ParamAnalyzer.php
@@ -7,20 +7,25 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\ConstFetch;
+use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassMethod;
+use Rector\Core\NodeManipulator\FuncCallManipulator;
 use Rector\Core\PhpParser\Comparing\NodeComparator;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\PhpParser\Node\Value\ValueResolver;
+use Rector\NodeNameResolver\NodeNameResolver;
 
 final class ParamAnalyzer
 {
     public function __construct(
         private readonly BetterNodeFinder $betterNodeFinder,
         private readonly NodeComparator $nodeComparator,
-        private readonly ValueResolver $valueResolver
+        private readonly ValueResolver $valueResolver,
+        private readonly NodeNameResolver $nodeNameResolver,
+        private readonly FuncCallManipulator $funcCallManipulator
     ) {
     }
 
@@ -29,21 +34,24 @@ public function isParamUsedInClassMethod(ClassMethod $classMethod, Param $param)
         return (bool) $this->betterNodeFinder->findFirstInFunctionLikeScoped($classMethod, function (Node $node) use (
             $param
         ): bool {
-            if (! $node instanceof Variable && ! $node instanceof Closure) {
+            if (! $node instanceof Variable && ! $node instanceof Closure && ! $node instanceof FuncCall) {
                 return false;
             }
 
             if ($node instanceof Variable) {
                 return $this->nodeComparator->areNodesEqual($node, $param->var);
             }
 
-            foreach ($node->uses as $use) {
-                if ($this->nodeComparator->areNodesEqual($use->var, $param->var)) {
-                    return true;
-                }
+            if ($node instanceof Closure) {
+                return $this->isVariableInClosureUses($node, $param->var);
             }
 
-            return false;
+            if (! $this->nodeNameResolver->isName($node, 'compact')) {
+                return false;
+            }
+
+            $arguments = $this->funcCallManipulator->extractArgumentsFromCompactFuncCalls([$node]);
+            return $this->nodeNameResolver->isNames($param, $arguments);
         });
     }
 
@@ -78,4 +86,15 @@ public function hasDefaultNull(Param $param): bool
     {
         return $param->default instanceof ConstFetch && $this->valueResolver->isNull($param->default);
     }
+
+    private function isVariableInClosureUses(Closure $closure, Variable $variable): bool
+    {
+        foreach ($closure->uses as $use) {
+            if ($this->nodeComparator->areNodesEqual($use->var, $variable)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/NodeManipulator/ClassMethodManipulator.php b/src/NodeManipulator/ClassMethodManipulator.php
@@ -5,7 +5,6 @@
 namespace Rector\Core\NodeManipulator;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Param;
@@ -14,7 +13,6 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\ObjectType;
 use Rector\Core\Exception\ShouldNotHappenException;
-use Rector\Core\PhpParser\Comparing\NodeComparator;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\Core\ValueObject\MethodName;
@@ -27,37 +25,10 @@ public function __construct(
         private readonly BetterNodeFinder $betterNodeFinder,
         private readonly NodeNameResolver $nodeNameResolver,
         private readonly NodeTypeResolver $nodeTypeResolver,
-        private readonly NodeComparator $nodeComparator,
-        private readonly FuncCallManipulator $funcCallManipulator,
         private readonly ReflectionResolver $reflectionResolver
     ) {
     }
 
-    public function isParameterUsedInClassMethod(Param $param, ClassMethod $classMethod): bool
-    {
-        $isUsedDirectly = (bool) $this->betterNodeFinder->findFirst(
-            (array) $classMethod->stmts,
-            fn (Node $node): bool => $this->nodeComparator->areNodesEqual($node, $param->var)
-        );
-
-        if ($isUsedDirectly) {
-            return true;
-        }
-
-        /** @var FuncCall[] $compactFuncCalls */
-        $compactFuncCalls = $this->betterNodeFinder->find((array) $classMethod->stmts, function (Node $node): bool {
-            if (! $node instanceof FuncCall) {
-                return false;
-            }
-
-            return $this->nodeNameResolver->isName($node, 'compact');
-        });
-
-        $arguments = $this->funcCallManipulator->extractArgumentsFromCompactFuncCalls($compactFuncCalls);
-
-        return $this->nodeNameResolver->isNames($param, $arguments);
-    }
-
     public function isNamedConstructor(ClassMethod $classMethod): bool
     {
         if (! $this->nodeNameResolver->isName($classMethod, MethodName::CONSTRUCT)) {