[CodingStyle] Remove parent lookup on AliasUsesResolver (#4257)

* [CodingStyle] Remove parent lookup on AliasUsesResolver * clean up for consistency
rectorphp · Jun 17, 2023 · 8cb7e85 · 8cb7e85
1 parent 906a774
commit 8cb7e85
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/rules/CodingStyle/ClassNameImport/AliasUsesResolver.php b/rules/CodingStyle/ClassNameImport/AliasUsesResolver.php
@@ -20,12 +20,25 @@ public function __construct(
     }
 
     /**
+     * @param Stmt[] $stmts
      * @return string[]
      */
-    public function resolveFromNode(Node $node): array
+    public function resolveFromNode(Node $node, array $stmts): array
     {
         if (! $node instanceof Namespace_) {
-            $node = $this->betterNodeFinder->findParentType($node, Namespace_::class);
+            /** @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 ($node instanceof Namespace_) {

diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/AliasClassNameImportSkipVoter.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/AliasClassNameImportSkipVoter.php
@@ -28,7 +28,7 @@ public function __construct(
 
     public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool
     {
-        $aliasedUses = $this->aliasUsesResolver->resolveFromNode($node);
+        $aliasedUses = $this->aliasUsesResolver->resolveFromNode($node, $file->getNewStmts());
         $shortNameLowered = $fullyQualifiedObjectType->getShortNameLowered();
 
         foreach ($aliasedUses as $aliasedUse) {