[Performance] Remove findFirst on AliasUsesResolver and UsedImportsRe…

…solver (#4259) * [Performance] Remove findFirst on AliasUsesResolver and UsedImportsResolver * typo fix * typo fix
rectorphp · Jun 17, 2023 · 96dc306 · 96dc306
1 parent 8cb7e85
commit 96dc306
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 41 deletions.
diff --git a/rules/CodingStyle/ClassNameImport/AliasUsesResolver.php b/rules/CodingStyle/ClassNameImport/AliasUsesResolver.php
@@ -9,13 +9,11 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\UseUse;
-use Rector\Core\PhpParser\Node\BetterNodeFinder;
 
 final class AliasUsesResolver
 {
     public function __construct(
-        private readonly UseImportsTraverser $useImportsTraverser,
-        private readonly BetterNodeFinder $betterNodeFinder
+        private readonly UseImportsTraverser $useImportsTraverser
     ) {
     }
 
@@ -28,24 +26,14 @@ public function resolveFromNode(Node $node, array $stmts): array
         if (! $node instanceof Namespace_) {
             /** @var Namespace_[] $namespaces */
             $namespaces = array_filter($stmts, static fn (Stmt $stmt): bool => $stmt instanceof Namespace_);
-            foreach ($namespaces as $namespace) {
-                $isFoundInNamespace = (bool) $this->betterNodeFinder->findFirst(
-                    $namespace,
-                    static fn (Node $subNode): bool => $subNode === $node
-                );
-
-                if ($isFoundInNamespace) {
-                    $node = $namespace;
-                    break;
-                }
+            if (count($namespaces) !== 1) {
+                return [];
             }
-        }
 
-        if ($node instanceof Namespace_) {
-            return $this->resolveFromStmts($node->stmts);
+            $node = current($namespaces);
         }
 
-        return [];
+        return $this->resolveFromStmts($node->stmts);
     }
 
     /**

diff --git a/rules/CodingStyle/ClassNameImport/UsedImportsResolver.php b/rules/CodingStyle/ClassNameImport/UsedImportsResolver.php
@@ -27,30 +27,6 @@ public function __construct(
     ) {
     }
 
-    private function resolveCurrentNamespaceForNode(Node $node): ?Namespace_
-    {
-        if ($node instanceof Namespace_) {
-            return $node;
-        }
-
-        $file = $this->currentFileProvider->getFile();
-        if (! $file instanceof File) {
-            return null;
-        }
-
-        $stmts = $file->getNewStmts();
-        foreach ($stmts as $stmt) {
-            if ($stmt instanceof Namespace_) {
-                $foundNode = $this->betterNodeFinder->findFirst($stmt, static fn(Node $subNode): bool => $subNode === $node);
-                if ($foundNode instanceof Node) {
-                    return $stmt;
-                }
-            }
-        }
-
-        return null;
-    }
-
     /**
      * @return array<FullyQualifiedObjectType|AliasedObjectType>
      */
@@ -115,6 +91,27 @@ public function resolveFunctionImportsForStmts(array $stmts): array
         return $usedFunctionImports;
     }
 
+    private function resolveCurrentNamespaceForNode(Node $node): ?Namespace_
+    {
+        if ($node instanceof Namespace_) {
+            return $node;
+        }
+
+        $file = $this->currentFileProvider->getFile();
+        if (! $file instanceof File) {
+            return null;
+        }
+
+        $stmts = $file->getNewStmts();
+        $namespaces = array_filter($stmts, static fn (Stmt $stmt): bool => $stmt instanceof Namespace_);
+
+        if (count($namespaces) !== 1) {
+            return null;
+        }
+
+        return current($namespaces);
+    }
+
     /**
      * @return array<FullyQualifiedObjectType|AliasedObjectType>
      */