Updated Rector to commit 86cde8ae0d3198c0ec0f39593ff9c5bfa25a6cd0

rectorphp/rector-src@86cde8a [TypeDeclaration] Also update generic collection docblock on NarrowObjectReturnTypeRector (#7616)

Author: TomasVotruba

rules/TypeDeclaration/Rector/ClassMethod/NarrowObjectReturnTypeRector.php

@@ -7,8 +7,14 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\ObjectType;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
+use Rector\BetterPhpDocParser\ValueObject\Type\FullyQualifiedIdentifierTypeNode;
+use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\PhpParser\AstResolver;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Rector\AbstractRector;
@@ -34,11 +40,21 @@ final class NarrowObjectReturnTypeRector extends AbstractRector
      * @readonly
      */
     private AstResolver $astResolver;
-    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, AstResolver $astResolver)
+    /**
+     * @readonly
+     */
+    private PhpDocInfoFactory $phpDocInfoFactory;
+    /**
+     * @readonly
+     */
+    private DocBlockUpdater $docBlockUpdater;
+    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, AstResolver $astResolver, PhpDocInfoFactory $phpDocInfoFactory, DocBlockUpdater $docBlockUpdater)
     {
         $this->betterNodeFinder = $betterNodeFinder;
         $this->reflectionResolver = $reflectionResolver;
         $this->astResolver = $astResolver;
+        $this->phpDocInfoFactory = $phpDocInfoFactory;
+        $this->docBlockUpdater = $docBlockUpdater;
     }
     public function getRuleDefinition(): RuleDefinition
     {
@@ -124,8 +140,25 @@ public function refactor(Node $node): ?Node
             return null;
         }
         $node->returnType = new FullyQualified($actualReturnClass);
+        $this->updateDocblock($node, $actualReturnClass);
         return $node;
     }
+    private function updateDocblock(ClassMethod $classMethod, string $actualReturnClass): void
+    {
+        $phpDocInfo = $this->phpDocInfoFactory->createFromNode($classMethod);
+        if (!$phpDocInfo instanceof PhpDocInfo) {
+            return;
+        }
+        $returnTagValueNode = $phpDocInfo->getReturnTagValue();
+        if (!$returnTagValueNode instanceof ReturnTagValueNode) {
+            return;
+        }
+        if (!$returnTagValueNode->type instanceof GenericTypeNode) {
+            return;
+        }
+        $returnTagValueNode->type->type = new FullyQualifiedIdentifierTypeNode($actualReturnClass);
+        $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($classMethod);
+    }
     private function isDeclaredTypeFinal(string $declaredType): bool
     {
         if ($declaredType === 'object') {

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'df4f9b6ee97a0a30775bba2ca88ff9d6562066b7';
+    public const PACKAGE_VERSION = '86cde8ae0d3198c0ec0f39593ff9c5bfa25a6cd0';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-11-09 17:45:20';
+    public const RELEASE_DATE = '2025-11-10 01:08:33';
     /**
      * @var int
      */