Closes #7330

Author: samsonasik

rules/CodingStyle/Node/NameImporter.php

@@ -138,7 +138,7 @@ private function addUseImport(
         FullyQualified $fullyQualified,
         FullyQualifiedObjectType $fullyQualifiedObjectType
     ): void {
-        if ($this->useNodesToAddCollector->hasImport($file, $fullyQualified, $fullyQualifiedObjectType)) {
+        if ($this->useNodesToAddCollector->hasImport($file, $fullyQualifiedObjectType)) {
             return;
         }
 

src/NodeTypeResolver/PhpDocNodeVisitor/NameImportingPhpDocNodeVisitor.php

@@ -146,7 +146,7 @@ private function processFqnNameImport(
             return null;
         }
 
-        if ($this->shouldImport($newNode, $identifierTypeNode, $fullyQualifiedObjectType)) {
+        if ($this->shouldImport($file, $newNode, $identifierTypeNode, $fullyQualifiedObjectType)) {
             $this->useNodesToAddCollector->addUseImport($fullyQualifiedObjectType);
             $this->hasChanged = true;
 
@@ -157,6 +157,7 @@ private function processFqnNameImport(
     }
 
     private function shouldImport(
+        File $file,
         IdentifierTypeNode $newNode,
         IdentifierTypeNode $identifierTypeNode,
         FullyQualifiedObjectType $fullyQualifiedObjectType
@@ -181,7 +182,7 @@ private function shouldImport(
 
         $firstPath = Strings::before($identifierTypeNode->name, '\\' . $newNode->name);
         if ($firstPath === null) {
-            return true;
+            return ! $this->useNodesToAddCollector->hasImport($file, $fullyQualifiedObjectType);
         }
 
         if ($firstPath === '') {

src/PostRector/Collector/UseNodesToAddCollector.php

@@ -86,7 +86,6 @@ public function getUseImportTypesByNode(File $file): array
 
     public function hasImport(
         File $file,
-        FullyQualified $fullyQualified,
         FullyQualifiedObjectType $fullyQualifiedObjectType
     ): bool {
         $useImports = $this->getUseImportTypesByNode($file);

src/StaticTypeMapper/PhpDocParser/IdentifierPhpDocTypeMapper.php

@@ -97,8 +97,7 @@ public function mapIdentifierTypeNode(IdentifierTypeNode $identifierTypeNode, No
                 return new UnionType($scalarTypes);
             }
 
-            $identifierTypeNode->name = ltrim($identifierTypeNode->name, '@');
-            $objectType = new ObjectType($identifierTypeNode->name);
+            $objectType = new ObjectType(ltrim($identifierTypeNode->name, '@'));
         }
 
         $scope = $node->getAttribute(AttributeKey::SCOPE);