Read short-names map through ClassNameImportContext in FullyQualifiedName skip voter

rules/CodingStyle/ClassNameImport/ClassNameImportContext.php

@@ -32,10 +32,21 @@ final class ClassNameImportContext
     private array $usedImportTypes = [];
 
     public function __construct(
-        private readonly AliasUsesResolver $aliasUsesResolver
+        private readonly AliasUsesResolver $aliasUsesResolver,
+        private readonly ShortNameResolver $shortNameResolver
     ) {
     }
 
+    /**
+     * Short names actually used in the file (class-likes, names, docblock types) mapped to their FQN
+     *
+     * @return array<string, string>
+     */
+    public function resolveShortNamesToFullyQualifiedNames(File $file): array
+    {
+        return $this->shortNameResolver->resolveFromFile($file);
+    }
+
     /**
      * @return string[]
      */

rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php

@@ -6,7 +6,7 @@
 
 use Nette\Utils\Strings;
 use PhpParser\Node;
-use Rector\CodingStyle\ClassNameImport\ShortNameResolver;
+use Rector\CodingStyle\ClassNameImport\ClassNameImportContext;
 use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 use Rector\ValueObject\Application\File;
@@ -23,15 +23,14 @@
 final readonly class FullyQualifiedNameClassNameImportSkipVoter implements ClassNameImportSkipVoterInterface
 {
     public function __construct(
-        private ShortNameResolver $shortNameResolver
+        private ClassNameImportContext $classNameImportContext
     ) {
     }
 
     public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool
     {
         // "new X" or "X::static()"
-        /** @var array<string, string> $shortNamesToFullyQualifiedNames */
-        $shortNamesToFullyQualifiedNames = $this->shortNameResolver->resolveFromFile($file);
+        $shortNamesToFullyQualifiedNames = $this->classNameImportContext->resolveShortNamesToFullyQualifiedNames($file);
         $fullyQualifiedObjectTypeShortName = $fullyQualifiedObjectType->getShortName();
         $className = $fullyQualifiedObjectType->getClassName();