Updated Rector to commit dfa1141cf2b77ec1c65e7795599508f116e7b73b

rectorphp/rector-src@dfa1141 [TypeDeclaration] Do not change valid generic docblock on NarrowObjectReturnTypeRector (#7617)

Author: TomasVotruba

rules/TypeDeclaration/Rector/ClassMethod/NarrowObjectReturnTypeRector.php

@@ -9,16 +9,19 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 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\NodeTypeResolver\TypeComparator\TypeComparator;
 use Rector\PhpParser\AstResolver;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Rector\AbstractRector;
 use Rector\Reflection\ReflectionResolver;
+use Rector\StaticTypeMapper\StaticTypeMapper;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
@@ -40,6 +43,14 @@ final class NarrowObjectReturnTypeRector extends AbstractRector
      * @readonly
      */
     private AstResolver $astResolver;
+    /**
+     * @readonly
+     */
+    private StaticTypeMapper $staticTypeMapper;
+    /**
+     * @readonly
+     */
+    private TypeComparator $typeComparator;
     /**
      * @readonly
      */
@@ -48,11 +59,13 @@ final class NarrowObjectReturnTypeRector extends AbstractRector
      * @readonly
      */
     private DocBlockUpdater $docBlockUpdater;
-    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, AstResolver $astResolver, PhpDocInfoFactory $phpDocInfoFactory, DocBlockUpdater $docBlockUpdater)
+    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, AstResolver $astResolver, StaticTypeMapper $staticTypeMapper, TypeComparator $typeComparator, PhpDocInfoFactory $phpDocInfoFactory, DocBlockUpdater $docBlockUpdater)
     {
         $this->betterNodeFinder = $betterNodeFinder;
         $this->reflectionResolver = $reflectionResolver;
         $this->astResolver = $astResolver;
+        $this->staticTypeMapper = $staticTypeMapper;
+        $this->typeComparator = $typeComparator;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->docBlockUpdater = $docBlockUpdater;
     }
@@ -153,10 +166,24 @@ private function updateDocblock(ClassMethod $classMethod, string $actualReturnCl
         if (!$returnTagValueNode instanceof ReturnTagValueNode) {
             return;
         }
-        if (!$returnTagValueNode->type instanceof GenericTypeNode) {
+        if ($returnTagValueNode->type instanceof IdentifierTypeNode) {
+            $oldType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($returnTagValueNode->type, $classMethod);
+        } elseif ($returnTagValueNode->type instanceof GenericTypeNode) {
+            $oldType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($returnTagValueNode->type->type, $classMethod);
+        } else {
             return;
         }
-        $returnTagValueNode->type->type = new FullyQualifiedIdentifierTypeNode($actualReturnClass);
+        if ($oldType instanceof ObjectType) {
+            $objectType = new ObjectType($actualReturnClass);
+            if ($this->typeComparator->areTypesEqual($oldType, $objectType)) {
+                return;
+            }
+        }
+        if ($returnTagValueNode->type instanceof IdentifierTypeNode) {
+            $returnTagValueNode->type = new FullyQualifiedIdentifierTypeNode($actualReturnClass);
+        } else {
+            $returnTagValueNode->type->type = new FullyQualifiedIdentifierTypeNode($actualReturnClass);
+        }
         $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($classMethod);
     }
     private function isDeclaredTypeFinal(string $declaredType): bool

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '86cde8ae0d3198c0ec0f39593ff9c5bfa25a6cd0';
+    public const PACKAGE_VERSION = 'dfa1141cf2b77ec1c65e7795599508f116e7b73b';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-11-10 01:08:33';
+    public const RELEASE_DATE = '2025-11-10 02:03:44';
     /**
      * @var int
      */