Skip to content

[TypeDeclaration] Drop AstResolver from NarrowObjectReturnTypeRector parent check #8100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 1 commit into from
Jun 28, 2026
Merged

[TypeDeclaration] Drop AstResolver from NarrowObjectReturnTypeRector parent check #8100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions rules/TypeDeclaration/Rector/ClassMethod/NarrowObjectReturnTypeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,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;
Expand All @@ -19,7 +20,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;
Expand All @@ -37,7 +37,6 @@ final class NarrowObjectReturnTypeRector extends AbstractRector
public function __construct(
private readonly BetterNodeFinder $betterNodeFinder,
private readonly ReflectionResolver $reflectionResolver,
private readonly AstResolver $astResolver,
private readonly StaticTypeMapper $staticTypeMapper,
private readonly TypeComparator $typeComparator,
private readonly PhpDocInfoFactory $phpDocInfoFactory,
Expand Down Expand Up @@ -242,6 +241,8 @@ private function isNarrowingValidFromParent(ClassMethod $classMethod, string $ac

$methodName = $this->getName($classMethod);

$actualObjectType = new ObjectType($actualReturnClass);

foreach ($ancestors as $ancestor) {
if ($ancestor->getFileName() === null) {
continue;
Expand All @@ -251,19 +252,23 @@ private function isNarrowingValidFromParent(ClassMethod $classMethod, string $ac
continue;
}

$parentClassMethod = $this->astResolver->resolveClassMethod($ancestor->getName(), $methodName);
if (! $parentClassMethod instanceof ClassMethod) {
continue;
}
$parametersAcceptor = ParametersAcceptorSelector::combineAcceptors(
$ancestor->getNativeMethod($methodName)
->getVariants()
);

$parentReturnType = $parentClassMethod->returnType;
if (! $parentReturnType instanceof Identifier && ! $parentReturnType instanceof FullyQualified) {
// only a single, bare class-name return type can constrain narrowing
$parentNativeReturnType = $parametersAcceptor->getNativeReturnType();
if (! $parentNativeReturnType instanceof ObjectType) {
continue;
}

$parentReturnTypeName = $parentReturnType->toString();
if (! $parentNativeReturnType->isSuperTypeOf($actualObjectType)->yes()) {
return false;
}

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;
}
}
Expand Down
Loading