Performance: use direct find() instead of lookup all nodes then filte…

…r on BetterNodeFinder (#3507)
rectorphp · Mar 23, 2023 · 8609d3b · 8609d3b
1 parent b8a0d66
commit 8609d3b
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/PhpParser/Node/BetterNodeFinder.php b/src/PhpParser/Node/BetterNodeFinder.php
@@ -378,12 +378,10 @@ public function findSameNamedExprs(Expr | Variable | Property | PropertyFetch |
                 return [];
             }
 
-            $variables = $this->findInstancesOf($scopeNode, [Variable::class]);
-
-            return array_filter(
-                $variables,
-                fn (Variable $variable): bool => $this->nodeNameResolver->isName($variable, $exprName)
-            );
+            /** @var Variable[] $variables */
+            $variables = $this->find($scopeNode, fn (Node $node): bool =>
+                $node instanceof Variable && $this->nodeNameResolver->isName($node, $exprName));
+            return $variables;
         }
 
         if ($expr instanceof Property) {
@@ -399,13 +397,12 @@ public function findSameNamedExprs(Expr | Variable | Property | PropertyFetch |
             return [];
         }
 
-        $propertyFetches = $this->findInstancesOf($scopeNode, [PropertyFetch::class, StaticPropertyFetch::class]);
+        /** @var PropertyFetch[]|StaticPropertyFetch[] $propertyFetches */
+        $propertyFetches = $this->find($scopeNode, fn (Node $node): bool =>
+            ($node instanceof PropertyFetch || $node instanceof StaticPropertyFetch)
+                && $this->nodeNameResolver->isName($node->name, $exprName));
 
-        return array_filter(
-            $propertyFetches,
-            fn (PropertyFetch | StaticPropertyFetch $propertyFetch): bool =>
-                $this->nodeNameResolver->isName($propertyFetch->name, $exprName)
-        );
+        return $propertyFetches;
     }
 
     /**