Updated Rector to commit 069bb912035702f7ea78e30ede8c8865b80ab3ca

rectorphp/rector-src@069bb91 [TypeDeclaration] Drop AstResolver from NarrowObjectReturnTypeRector parent check (#8100)

Author: TomasVotruba

rules/TypeDeclaration/Rector/ClassMethod/NarrowObjectReturnTypeRector.php

@@ -10,6 +10,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\ObjectType;
@@ -18,7 +19,6 @@
 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;
@@ -40,10 +40,6 @@ final class NarrowObjectReturnTypeRector extends AbstractRector
      * @readonly
      */
     private ReflectionResolver $reflectionResolver;
-    /**
-     * @readonly
-     */
-    private AstResolver $astResolver;
     /**
      * @readonly
      */
@@ -64,11 +60,10 @@ final class NarrowObjectReturnTypeRector extends AbstractRector
      * @readonly
      */
     private ReflectionProvider $reflectionProvider;
-    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, AstResolver $astResolver, StaticTypeMapper $staticTypeMapper, TypeComparator $typeComparator, PhpDocInfoFactory $phpDocInfoFactory, DocBlockUpdater $docBlockUpdater, ReflectionProvider $reflectionProvider)
+    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, StaticTypeMapper $staticTypeMapper, TypeComparator $typeComparator, PhpDocInfoFactory $phpDocInfoFactory, DocBlockUpdater $docBlockUpdater, ReflectionProvider $reflectionProvider)
     {
         $this->betterNodeFinder = $betterNodeFinder;
         $this->reflectionResolver = $reflectionResolver;
-        $this->astResolver = $astResolver;
         $this->staticTypeMapper = $staticTypeMapper;
         $this->typeComparator = $typeComparator;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
@@ -224,23 +219,25 @@ private function isNarrowingValidFromParent(ClassMethod $classMethod, string $ac
         }
         $ancestors = array_filter($classReflection->getAncestors(), fn(ClassReflection $ancestorClassReflection): bool => $classReflection->getName() !== $ancestorClassReflection->getName());
         $methodName = $this->getName($classMethod);
+        $actualObjectType = new ObjectType($actualReturnClass);
         foreach ($ancestors as $ancestor) {
             if ($ancestor->getFileName() === null) {
                 continue;
             }
             if (!$ancestor->hasNativeMethod($methodName)) {
                 continue;
             }
-            $parentClassMethod = $this->astResolver->resolveClassMethod($ancestor->getName(), $methodName);
-            if (!$parentClassMethod instanceof ClassMethod) {
+            $parametersAcceptor = ParametersAcceptorSelector::combineAcceptors($ancestor->getNativeMethod($methodName)->getVariants());
+            // only a single, bare class-name return type can constrain narrowing
+            $parentNativeReturnType = $parametersAcceptor->getNativeReturnType();
+            if (!$parentNativeReturnType instanceof ObjectType) {
                 continue;
             }
-            $parentReturnType = $parentClassMethod->returnType;
-            if (!$parentReturnType instanceof Identifier && !$parentReturnType instanceof FullyQualified) {
-                continue;
+            if (!$parentNativeReturnType->isSuperTypeOf($actualObjectType)->yes()) {
+                return \false;
             }
-            $parentReturnTypeName = $parentReturnType->toString();
-            if (!$this->isNarrowingValid($parentClassMethod, $parentReturnTypeName, $actualReturnClass)) {
+            // skip narrowing when the parent @return is a generic type, e.g. Collection<int, Foo>
+            if ($parametersAcceptor->getReturnType() instanceof GenericObjectType) {
                 return \false;
             }
         }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '970310935d35fcb15108280c272b5e9798c69395';
+    public const PACKAGE_VERSION = '069bb912035702f7ea78e30ede8c8865b80ab3ca';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-06-28 21:10:14';
+    public const RELEASE_DATE = '2026-06-28 22:59:34';
     /**
      * @var int
      */