[CodingStyle] Refactor UseImportsAdder to return [FileWithoutNamespac…

…e] code on no namespaced code (#5254) * [Core] Refactor AbstractRector to add afterTraverse() method to ensure it returns [FileWithoutNamespace] code on no namespaced code * update UseImportsAdder
rectorphp · Nov 16, 2023 · 1595e34 · 1595e34
1 parent 60047ce
commit 1595e34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/packages/PostRector/Rector/NameImportingPostRector.php b/packages/PostRector/Rector/NameImportingPostRector.php
@@ -94,15 +94,9 @@ private function processNodeName(Name $name, File $file): ?Node
 
         $namespaces = array_filter(
             $file->getNewStmts(),
-            static fn (Stmt $stmt): bool => $stmt instanceof Namespace_ || $stmt instanceof FileWithoutNamespace
+            static fn (Stmt $stmt): bool => $stmt instanceof Namespace_
         );
 
-        // handle overlapped resolve last new stmts
-        // @see https://github.com/rectorphp/rector-src/pull/5251
-        if ($namespaces === []) {
-            return null;
-        }
-
         if (count($namespaces) > 1) {
             return null;
         }

diff --git a/rules/CodingStyle/Application/UseImportsAdder.php b/rules/CodingStyle/Application/UseImportsAdder.php
@@ -58,7 +58,7 @@ public function addImportsToStmts(
 
         $newUses = $this->createUses($useImportTypes, $constantUseImportTypes, $functionUseImportTypes, null);
         if ($newUses === []) {
-            return $stmts;
+            return [$fileWithoutNamespace];
         }
 
         // place after declare strict_types
@@ -78,7 +78,7 @@ public function addImportsToStmts(
                 $fileWithoutNamespace->stmts = $stmts;
                 $fileWithoutNamespace->stmts = array_values($fileWithoutNamespace->stmts);
 
-                return $fileWithoutNamespace->stmts;
+                return [$fileWithoutNamespace];
             }
         }
 
@@ -88,7 +88,7 @@ public function addImportsToStmts(
         $fileWithoutNamespace->stmts = array_merge($newUses, $stmts);
         $fileWithoutNamespace->stmts = array_values($fileWithoutNamespace->stmts);
 
-        return $fileWithoutNamespace->stmts;
+        return [$fileWithoutNamespace];
     }
 
     /**