[NodeManipulator] Remove parent lookup on ClassMethodPropertyFetchMan…

…ipulator (#4170) * [NodeManipulator] Remove parent lookup on ClassMethodPropertyFetchManipulator * remove dep
rectorphp · Jun 11, 2023 · 424b874 · 424b874
1 parent ea2ee12
commit 424b874
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/src/Kernel/RectorKernel.php b/src/Kernel/RectorKernel.php
@@ -17,7 +17,7 @@ final class RectorKernel
     /**
      * @var string
      */
-    private const CACHE_KEY = 'v90';
+    private const CACHE_KEY = 'v91';
 
     private ContainerInterface|null $container = null;
 

diff --git a/src/NodeManipulator/ClassMethodPropertyFetchManipulator.php b/src/NodeManipulator/ClassMethodPropertyFetchManipulator.php
@@ -12,9 +12,9 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Param;
+use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeTraverser;
-use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
 
@@ -23,7 +23,6 @@ final class ClassMethodPropertyFetchManipulator
     public function __construct(
         private readonly SimpleCallableNodeTraverser $simpleCallableNodeTraverser,
         private readonly NodeNameResolver $nodeNameResolver,
-        private readonly BetterNodeFinder $betterNodeFinder,
         private readonly FunctionLikeManipulator $functionLikeManipulator
     ) {
     }
@@ -43,7 +42,11 @@ public function findParamAssignToPropertyName(ClassMethod $classMethod, string $
 
         $this->simpleCallableNodeTraverser->traverseNodesWithCallable(
             (array) $classMethod->stmts,
-            function (Node $node) use ($propertyName, &$assignedParamName, $classMethod): ?int {
+            function (Node $node) use ($propertyName, &$assignedParamName): ?int {
+                if ($node instanceof Class_) {
+                    return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                }
+
                 if (! $node instanceof Assign) {
                     return null;
                 }
@@ -60,11 +63,6 @@ function (Node $node) use ($propertyName, &$assignedParamName, $classMethod): ?i
                     return null;
                 }
 
-                $parentClassMethod = $this->betterNodeFinder->findParentType($node, ClassMethod::class);
-                if ($parentClassMethod !== $classMethod) {
-                    return null;
-                }
-
                 $assignedParamName = $this->nodeNameResolver->getName($node->expr);
 
                 return NodeTraverser::STOP_TRAVERSAL;
@@ -104,7 +102,11 @@ public function findAssignsToPropertyName(ClassMethod $classMethod, string $prop
 
         $this->simpleCallableNodeTraverser->traverseNodesWithCallable(
             (array) $classMethod->stmts,
-            function (Node $node) use ($propertyName, &$assignExprs, $paramNames, $classMethod): ?int {
+            function (Node $node) use ($propertyName, &$assignExprs, $paramNames): ?int {
+                if ($node instanceof Class_) {
+                    return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                }
+
                 if (! $node instanceof Assign) {
                     return null;
                 }
@@ -122,11 +124,6 @@ function (Node $node) use ($propertyName, &$assignExprs, $paramNames, $classMeth
                     return null;
                 }
 
-                $parentClassMethod = $this->betterNodeFinder->findParentType($node, ClassMethod::class);
-                if ($parentClassMethod !== $classMethod) {
-                    return null;
-                }
-
                 $assignExprs[] = $node->expr;
                 return null;
             }