[DX] Rename shouldImportName() to shouldSkipName() on ClassNameImport…

…Skipper (#5107)
rectorphp · Oct 2, 2023 · 8c9fe9a · 8c9fe9a
1 parent dae8c61
commit 8c9fe9a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/packages/PostRector/Rector/NameImportingPostRector.php b/packages/PostRector/Rector/NameImportingPostRector.php
@@ -103,18 +103,16 @@ private function processNodeName(Name $name, File $file): ?Node
 
         /** @var Use_[]|GroupUse[] $currentUses */
         $currentUses = $this->useImportsResolver->resolve();
+        if ($this->classNameImportSkipper->shouldSkipName($name, $currentUses)) {
+            return null;
+        }
 
-        if ($this->classNameImportSkipper->shouldImportName($name, $currentUses)) {
-            $nameInUse = $this->resolveNameInUse($name, $currentUses);
-
-            if ($nameInUse instanceof Name) {
-                return $nameInUse;
-            }
-
-            return $this->nameImporter->importName($name, $file);
+        $nameInUse = $this->resolveNameInUse($name, $currentUses);
+        if ($nameInUse instanceof Name) {
+            return $nameInUse;
         }
 
-        return null;
+        return $this->nameImporter->importName($name, $file);
     }
 
     /**

diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php
@@ -43,10 +43,10 @@ public function shouldSkipNameForFullyQualifiedObjectType(
     /**
      * @param Use_[]|GroupUse[] $uses
      */
-    public function shouldImportName(Name $name, array $uses): bool
+    public function shouldSkipName(Name $name, array $uses): bool
     {
         if (substr_count($name->toCodeString(), '\\') <= 1) {
-            return true;
+            return false;
         }
 
         $stringName = $name->toString();
@@ -65,14 +65,14 @@ public function shouldImportName(Name $name, array $uses): bool
                 }
 
                 if ($this->isConflictedShortNameInUse($useUse, $useName, $lastUseName, $stringName)) {
-                    return false;
+                    return true;
                 }
 
-                return $prefix . $useUse->name->toString() === $stringName;
+                return $prefix . $useUse->name->toString() !== $stringName;
             }
         }
 
-        return true;
+        return false;
     }
 
     private function isConflictedShortNameInUse(