Updated Rector to commit 82f51819fd199d651798f94e588056f1b2d1377b

rectorphp/rector-src@82f5181 [fix] avoid changing generic interface in NarrowObjectReturnTypeRector, focus on objects as in definition (#7700)

Author: TomasVotruba

rules/TypeDeclaration/Rector/ClassMethod/NarrowObjectReturnTypeRector.php

@@ -8,9 +8,9 @@
 use PhpParser\Node\Name\FullyQualified;
 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\Reflection\ReflectionProvider;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\ObjectType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
@@ -60,7 +60,11 @@ final class NarrowObjectReturnTypeRector extends AbstractRector
      * @readonly
      */
     private DocBlockUpdater $docBlockUpdater;
-    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, AstResolver $astResolver, StaticTypeMapper $staticTypeMapper, TypeComparator $typeComparator, PhpDocInfoFactory $phpDocInfoFactory, DocBlockUpdater $docBlockUpdater)
+    /**
+     * @readonly
+     */
+    private ReflectionProvider $reflectionProvider;
+    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, AstResolver $astResolver, StaticTypeMapper $staticTypeMapper, TypeComparator $typeComparator, PhpDocInfoFactory $phpDocInfoFactory, DocBlockUpdater $docBlockUpdater, ReflectionProvider $reflectionProvider)
     {
         $this->betterNodeFinder = $betterNodeFinder;
         $this->reflectionResolver = $reflectionResolver;
@@ -69,10 +73,11 @@ public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolv
         $this->typeComparator = $typeComparator;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->docBlockUpdater = $docBlockUpdater;
+        $this->reflectionProvider = $reflectionProvider;
     }
     public function getRuleDefinition(): RuleDefinition
     {
-        return new RuleDefinition('Narrows return type from generic object or parent class to specific class in final classes/methods', [new CodeSample(<<<'CODE_SAMPLE'
+        return new RuleDefinition('Narrows return type from generic `object` or parent class to specific class in final classes/methods', [new CodeSample(<<<'CODE_SAMPLE'
 final class TalkFactory extends AbstractFactory
 {
     protected function build(): object
@@ -133,19 +138,29 @@ public function refactor(Node $node): ?Node
         if (!$classReflection->isFinalByKeyword() && !$node->isFinal()) {
             return null;
         }
-        $actualReturnClass = $this->getActualReturnClass($node);
+        $actualReturnClass = $this->getActualReturnedClass($node);
         if ($actualReturnClass === null) {
             return null;
         }
         $declaredType = $returnType->toString();
+        // already most narrow type
         if ($declaredType === $actualReturnClass) {
             return null;
         }
-        if ($this->isDeclaredTypeFinal($declaredType)) {
-            return null;
-        }
-        if ($this->isActualTypeAnonymous($actualReturnClass)) {
-            return null;
+        // non-existing class
+        if ($declaredType !== 'object') {
+            if (!$this->reflectionProvider->hasClass($declaredType)) {
+                return null;
+            }
+            $declaredTypeClassReflection = $this->reflectionProvider->getClass($declaredType);
+            // already last final object
+            if ($declaredTypeClassReflection->isFinalByKeyword()) {
+                return null;
+            }
+            // this rule narrows only object or class types, not interfaces
+            if (!$declaredTypeClassReflection->isClass()) {
+                return null;
+            }
         }
         if (!$this->isNarrowingValid($node, $declaredType, $actualReturnClass)) {
             return null;
@@ -169,8 +184,6 @@ private function updateDocblock(ClassMethod $classMethod, string $actualReturnCl
         }
         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;
         }
@@ -180,34 +193,9 @@ private function updateDocblock(ClassMethod $classMethod, string $actualReturnCl
                 return;
             }
         }
-        if ($returnTagValueNode->type instanceof IdentifierTypeNode) {
-            $returnTagValueNode->type = new FullyQualifiedIdentifierTypeNode($actualReturnClass);
-        } else {
-            $returnTagValueNode->type->type = new FullyQualifiedIdentifierTypeNode($actualReturnClass);
-        }
+        $returnTagValueNode->type = new FullyQualifiedIdentifierTypeNode($actualReturnClass);
         $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($classMethod);
     }
-    private function isDeclaredTypeFinal(string $declaredType): bool
-    {
-        if ($declaredType === 'object') {
-            return \false;
-        }
-        $declaredObjectType = new ObjectType($declaredType);
-        $classReflection = $declaredObjectType->getClassReflection();
-        if (!$classReflection instanceof ClassReflection) {
-            return \false;
-        }
-        return $classReflection->isFinalByKeyword();
-    }
-    private function isActualTypeAnonymous(string $actualType): bool
-    {
-        $actualObjectType = new ObjectType($actualType);
-        $classReflection = $actualObjectType->getClassReflection();
-        if (!$classReflection instanceof ClassReflection) {
-            return \false;
-        }
-        return $classReflection->isAnonymous();
-    }
     private function isNarrowingValid(ClassMethod $classMethod, string $declaredType, string $actualType): bool
     {
         if ($declaredType === 'object') {
@@ -258,7 +246,7 @@ private function isNarrowingValidFromParent(ClassMethod $classMethod, string $ac
         }
         return \true;
     }
-    private function getActualReturnClass(ClassMethod $classMethod): ?string
+    private function getActualReturnedClass(ClassMethod $classMethod): ?string
     {
         $returnStatements = $this->betterNodeFinder->findReturnsScoped($classMethod);
         if ($returnStatements === []) {

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'bd510e6e343aaadd95a50e36fecfdbd349af2af8';
+    public const PACKAGE_VERSION = '82f51819fd199d651798f94e588056f1b2d1377b';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-12-02 07:32:41';
+    public const RELEASE_DATE = '2025-12-02 08:38:48';
     /**
      * @var int
      */