[AutoImport] Add ShortClassImportSkipVoter to reduce repetitive same check on both docblock and FullyQualified node check (#7288)

Author: samsonasik

rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ShortClassImportSkipVoter.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\CodingStyle\ClassNameImport\ClassNameImportSkipVoter;
+
+use PhpParser\Node;
+use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
+use Rector\Configuration\Option;
+use Rector\Configuration\Parameter\SimpleParameterProvider;
+use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
+use Rector\ValueObject\Application\File;
+
+final readonly class ShortClassImportSkipVoter implements ClassNameImportSkipVoterInterface
+{
+    public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool
+    {
+        $className = ltrim($fullyQualifiedObjectType->getClassName(), '\\');
+
+        if (substr_count($className, '\\') === 0) {
+            return ! SimpleParameterProvider::provideBoolParameter(Option::IMPORT_SHORT_CLASSES);
+        }
+
+        return false;
+    }
+}

rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php

@@ -12,8 +12,6 @@
 use PhpParser\Node\Stmt\Use_;
 use PhpParser\Node\UseItem;
 use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
-use Rector\Configuration\Option;
-use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Rector\Naming\Naming\UseImportsResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
@@ -50,7 +48,7 @@ public function shouldSkipNameForFullyQualifiedObjectType(
     public function shouldSkipName(FullyQualified $fullyQualified, array $uses): bool
     {
         if (substr_count($fullyQualified->toCodeString(), '\\') === 1) {
-            return $this->shouldSkipShortName($fullyQualified);
+            return $this->isFunctionOrConstantImport($fullyQualified);
         }
 
         // verify long name, as short name verify may conflict
@@ -87,16 +85,6 @@ public function shouldSkipName(FullyQualified $fullyQualified, array $uses): boo
         return false;
     }
 
-    private function shouldSkipShortName(FullyQualified $fullyQualified): bool
-    {
-        if ($this->isFunctionOrConstantImport($fullyQualified)) {
-            return true;
-        }
-
-        // Importing root namespace classes (like \DateTime) is optional
-        return ! SimpleParameterProvider::provideBoolParameter(Option::IMPORT_SHORT_CLASSES);
-    }
-
     private function isFunctionOrConstantImport(FullyQualified $fullyQualified): bool
     {
         if ($fullyQualified->getAttribute(AttributeKey::IS_CONSTFETCH_NAME) === true) {

src/DependencyInjection/LazyContainerFactory.php

@@ -46,6 +46,7 @@
 use Rector\CodingStyle\ClassNameImport\ClassNameImportSkipVoter\ClassLikeNameClassNameImportSkipVoter;
 use Rector\CodingStyle\ClassNameImport\ClassNameImportSkipVoter\FullyQualifiedNameClassNameImportSkipVoter;
 use Rector\CodingStyle\ClassNameImport\ClassNameImportSkipVoter\ReservedClassNameImportSkipVoter;
+use Rector\CodingStyle\ClassNameImport\ClassNameImportSkipVoter\ShortClassImportSkipVoter;
 use Rector\CodingStyle\ClassNameImport\ClassNameImportSkipVoter\UsesClassNameImportSkipVoter;
 use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
 use Rector\Config\RectorConfig;
@@ -264,6 +265,7 @@ final class LazyContainerFactory
         FullyQualifiedNameClassNameImportSkipVoter::class,
         UsesClassNameImportSkipVoter::class,
         ReservedClassNameImportSkipVoter::class,
+        ShortClassImportSkipVoter::class,
     ];
 
     /**

src/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php

@@ -16,8 +16,6 @@
 use Rector\BetterPhpDocParser\PhpDoc\SpacelessPhpDocTagNode;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
 use Rector\CodingStyle\ClassNameImport\ClassNameImportSkipper;
-use Rector\Configuration\Option;
-use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Rector\Exception\ShouldNotHappenException;
 use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
 use Rector\PostRector\Collector\UseNodesToAddCollector;
@@ -80,11 +78,6 @@ public function enterNode(Node $node): ?Node
             return null;
         }
 
-        // Importing root namespace classes (like \DateTime) is optional
-        if ($this->shouldSkipShortClassName($staticType)) {
-            return null;
-        }
-
         $file = $this->currentFileProvider->getFile();
         if (! $file instanceof File) {
             return null;
@@ -199,16 +192,6 @@ private function shouldImport(
         return count($namespaceParts) > 1;
     }
 
-    private function shouldSkipShortClassName(FullyQualifiedObjectType $fullyQualifiedObjectType): bool
-    {
-        $importShortClasses = SimpleParameterProvider::provideBoolParameter(Option::IMPORT_SHORT_CLASSES);
-        if ($importShortClasses) {
-            return false;
-        }
-
-        return substr_count($fullyQualifiedObjectType->getClassName(), '\\') === 0;
-    }
-
     private function processDoctrineAnnotationTagValueNode(
         DoctrineAnnotationTagValueNode $doctrineAnnotationTagValueNode
     ): void {