Updated Rector to commit a181f3feb3bb9fdd5c1913afc1272a47521004e2

rectorphp/rector-src@a181f3f [PostRector] Skip inline {@see } used use statement on remove unused imports (#8080)

Author: TomasVotruba

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'a7b3eb3a76e0591713ee30e7a869b8942ddfca40';
+    public const PACKAGE_VERSION = 'a181f3feb3bb9fdd5c1913afc1272a47521004e2';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-06-23 12:23:20';
+    public const RELEASE_DATE = '2026-06-24 14:45:58';
     /**
      * @var int
      */

src/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php

@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\BetterPhpDocParser\PhpDocInfo;
 
+use RectorPrefix202606\Nette\Utils\Strings;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
 use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ExtendsTagValueNode;
@@ -33,6 +34,7 @@
 use Rector\BetterPhpDocParser\ValueObject\Type\ShortenedIdentifierTypeNode;
 use Rector\Exception\ShouldNotHappenException;
 use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
+use Rector\StaticTypeMapper\Naming\NameScopeFactory;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 use Rector\Validation\RectorAssert;
 use RectorPrefix202606\Webmozart\Assert\InvalidArgumentException;
@@ -65,6 +67,15 @@ final class PhpDocInfo
      * @readonly
      */
     private PhpDocNodeByTypeFinder $phpDocNodeByTypeFinder;
+    /**
+     * @readonly
+     */
+    private NameScopeFactory $nameScopeFactory;
+    /**
+     * @see https://regex101.com/r/7GCrlj/2
+     * @var string
+     */
+    private const INLINE_GENERIC_USES_CLASS_REFERENCE_REGEX = '#\{@(?:uses|used-by|see)\s+(?<class_name>[^}\s]+)#';
     /**
      * @var array<class-string<PhpDocTagValueNode>, string>
      */
@@ -74,14 +85,15 @@ final class PhpDocInfo
      * @readonly
      */
     private PhpDocNode $originalPhpDocNode;
-    public function __construct(PhpDocNode $phpDocNode, BetterTokenIterator $betterTokenIterator, StaticTypeMapper $staticTypeMapper, \PhpParser\Node $node, AnnotationNaming $annotationNaming, PhpDocNodeByTypeFinder $phpDocNodeByTypeFinder)
+    public function __construct(PhpDocNode $phpDocNode, BetterTokenIterator $betterTokenIterator, StaticTypeMapper $staticTypeMapper, \PhpParser\Node $node, AnnotationNaming $annotationNaming, PhpDocNodeByTypeFinder $phpDocNodeByTypeFinder, NameScopeFactory $nameScopeFactory)
     {
         $this->phpDocNode = $phpDocNode;
         $this->betterTokenIterator = $betterTokenIterator;
         $this->staticTypeMapper = $staticTypeMapper;
         $this->node = $node;
         $this->annotationNaming = $annotationNaming;
         $this->phpDocNodeByTypeFinder = $phpDocNodeByTypeFinder;
+        $this->nameScopeFactory = $nameScopeFactory;
         $this->originalPhpDocNode = clone $phpDocNode;
         if (!$betterTokenIterator->containsTokenType(Lexer::TOKEN_PHPDOC_EOL)) {
             $this->isSingleLine = \true;
@@ -411,6 +423,27 @@ public function getGenericTagClassNames(): array
         }
         return $resolvedClasses;
     }
+    /**
+     * @return string[]
+     */
+    public function getInlineGenericUsesTagClassNames(): array
+    {
+        $printedPhpDocNode = (string) $this->phpDocNode;
+        if (strpos($printedPhpDocNode, '{') === \false) {
+            return [];
+        }
+        $matches = Strings::matchAll($printedPhpDocNode, self::INLINE_GENERIC_USES_CLASS_REFERENCE_REGEX);
+        $classNames = [];
+        foreach ($matches as $match) {
+            $reference = $match['class_name'];
+            $resolvedClassNames = $this->resolveInlineGenericUsesReferenceClassNames($reference);
+            if ($resolvedClassNames === []) {
+                continue;
+            }
+            $classNames = array_merge($classNames, $resolvedClassNames);
+        }
+        return array_unique($classNames);
+    }
     /**
      * @return string[]
      */
@@ -468,6 +501,33 @@ private function resolveNameForPhpDocTagValueNode(PhpDocTagValueNode $phpDocTagV
         }
         return null;
     }
+    /**
+     * @return string[]
+     */
+    private function resolveInlineGenericUsesReferenceClassNames(string $reference): array
+    {
+        $reference = explode('|', $reference, 2)[0];
+        $reference = explode('::', $reference, 2)[0];
+        $referenceToResolve = $reference;
+        $reference = ltrim($reference, '\\');
+        try {
+            RectorAssert::className($reference);
+        } catch (InvalidArgumentException $exception) {
+            return [];
+        }
+        // fqcn not reference to any use statements
+        if (strncmp($referenceToResolve, '\\', strlen('\\')) === 0) {
+            return [$referenceToResolve];
+        }
+        $nameScope = $this->nameScopeFactory->createNameScopeFromNodeWithoutTemplateTypes($this->node);
+        $resolvedClassName = $nameScope->resolveStringName($referenceToResolve);
+        if (strpos($reference, '\\') !== \false) {
+            // Keep both forms: resolved class for namespace-aware matching and original class
+            // for alias-partial matching in unused import checks.
+            return array_unique([$resolvedClassName, $reference]);
+        }
+        return [$resolvedClassName];
+    }
     /**
      * @return \PHPStan\Type\MixedType|\PHPStan\Type\Type
      */

src/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php

@@ -15,6 +15,7 @@
 use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
 use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\StaticTypeMapper\Naming\NameScopeFactory;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 final class PhpDocInfoFactory
 {
@@ -42,18 +43,23 @@ final class PhpDocInfoFactory
      * @readonly
      */
     private PhpDocNodeByTypeFinder $phpDocNodeByTypeFinder;
+    /**
+     * @readonly
+     */
+    private NameScopeFactory $nameScopeFactory;
     /**
      * @var array<int, PhpDocInfo>
      */
     private array $phpDocInfosByObjectId = [];
-    public function __construct(PhpDocNodeMapper $phpDocNodeMapper, Lexer $lexer, BetterPhpDocParser $betterPhpDocParser, StaticTypeMapper $staticTypeMapper, AnnotationNaming $annotationNaming, PhpDocNodeByTypeFinder $phpDocNodeByTypeFinder)
+    public function __construct(PhpDocNodeMapper $phpDocNodeMapper, Lexer $lexer, BetterPhpDocParser $betterPhpDocParser, StaticTypeMapper $staticTypeMapper, AnnotationNaming $annotationNaming, PhpDocNodeByTypeFinder $phpDocNodeByTypeFinder, NameScopeFactory $nameScopeFactory)
     {
         $this->phpDocNodeMapper = $phpDocNodeMapper;
         $this->lexer = $lexer;
         $this->betterPhpDocParser = $betterPhpDocParser;
         $this->staticTypeMapper = $staticTypeMapper;
         $this->annotationNaming = $annotationNaming;
         $this->phpDocNodeByTypeFinder = $phpDocNodeByTypeFinder;
+        $this->nameScopeFactory = $nameScopeFactory;
     }
     public function createFromNodeOrEmpty(Node $node): \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo
     {
@@ -121,7 +127,7 @@ private function setPositionOfLastToken(PhpDocNode $phpDocNode): void
     private function createFromPhpDocNode(PhpDocNode $phpDocNode, BetterTokenIterator $betterTokenIterator, Node $node): \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo
     {
         $this->phpDocNodeMapper->transform($phpDocNode, $betterTokenIterator);
-        $phpDocInfo = new \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo($phpDocNode, $betterTokenIterator, $this->staticTypeMapper, $node, $this->annotationNaming, $this->phpDocNodeByTypeFinder);
+        $phpDocInfo = new \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo($phpDocNode, $betterTokenIterator, $this->staticTypeMapper, $node, $this->annotationNaming, $this->phpDocNodeByTypeFinder, $this->nameScopeFactory);
         $node->setAttribute(AttributeKey::PHP_DOC_INFO, $phpDocInfo);
         return $phpDocInfo;
     }

src/PostRector/Rector/UnusedImportRemovingPostRector.php

@@ -139,6 +139,8 @@ private function findNamesInDocBlocks($rootNode): array
                 $names = array_merge($names, $constFetchNodeNames);
                 $genericTagClassNames = $phpDocInfo->getGenericTagClassNames();
                 $names = array_merge($names, $genericTagClassNames);
+                $inlineGenericUsesTagClassNames = $phpDocInfo->getInlineGenericUsesTagClassNames();
+                $names = array_merge($names, $inlineGenericUsesTagClassNames);
                 $arrayItemTagClassNames = $phpDocInfo->getArrayItemNodeClassNames();
                 $names = array_merge($names, $arrayItemTagClassNames);
             }