Skip to content

Fix ReflectionGetAttributesMethodReturnTypeExtension for UnionTypes #5463

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
staabm merged 11 commits into from
Apr 17, 2026
+101 −4
Merged

Fix ReflectionGetAttributesMethodReturnTypeExtension for UnionTypes #5463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4a7c911
Use per-class method reflection when resolving dynamic return type ex…
phpstan-bot Apr 14, 2026
b95b996
Iterate over union inner types instead of constructing new ObjectType…
phpstan-bot Apr 14, 2026
b77c951
Fix declaring class check in ReflectionGetAttributesMethodReturnTypeE…
phpstan-bot Apr 14, 2026
68abeeb
Skip extension for non-native reflection classes instead of removing …
phpstan-bot Apr 14, 2026
d039f90
Resolve ReflectionAttribute class from method return type instead of …
phpstan-bot Apr 14, 2026
7dcf3a9
Handle multiple ReflectionAttribute subclasses in return type resolution
phpstan-bot Apr 14, 2026
dde7229
Return union of GenericObjectType when multiple ReflectionAttribute s…
phpstan-bot Apr 14, 2026
1b42b47
Rename resolveReflectionAttributeClassNames to resolveReflectionAttri…
phpstan-bot Apr 14, 2026
a0c7ed7
Use early exit in resolveReflectionAttributeType to reduce nesting
phpstan-bot Apr 14, 2026
2066040
Use ParametersAcceptorSelector instead of hardcoded getVariants()[0]
phpstan-bot Apr 17, 2026
2069466
Update bug-14484.php
staabm Apr 17, 2026
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
35 changes: 32 additions & 3 deletions src/Type/Php/ReflectionGetAttributesMethodReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
use PhpParser\Node\Expr\MethodCall;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Reflection\ParametersAcceptorSelector;
use PHPStan\Type\Accessory\AccessoryArrayListType;
use PHPStan\Type\ArrayType;
use PHPStan\Type\DynamicMethodReturnTypeExtension;
use PHPStan\Type\Generic\GenericObjectType;
use PHPStan\Type\IntegerRangeType;
use PHPStan\Type\IntersectionType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use ReflectionAttribute;
use function count;

Expand All @@ -32,8 +35,7 @@

public function isMethodSupported(MethodReflection $methodReflection): bool
{
return $methodReflection->getDeclaringClass()->getName() === $this->className
&& $methodReflection->getName() === 'getAttributes';
return $methodReflection->getName() === 'getAttributes';
}

public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
Expand All @@ -44,7 +46,34 @@
$argType = $scope->getType($methodCall->getArgs()[0]->value);
$classType = $argType->getClassStringObjectType();

return new IntersectionType([new ArrayType(IntegerRangeType::createAllGreaterThanOrEqualTo(0), new GenericObjectType(ReflectionAttribute::class, [$classType])), new AccessoryArrayListType()]);
$variant = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->getArgs(), $methodReflection->getVariants());
$valueType = $this->resolveReflectionAttributeType($variant->getReturnType(), $classType);

return new IntersectionType([new ArrayType(IntegerRangeType::createAllGreaterThanOrEqualTo(0), $valueType), new AccessoryArrayListType()]);
}

private function resolveReflectionAttributeType(Type $returnType, Type $classType): Type
{
$nativeReflectionAttributeType = new ObjectType(ReflectionAttribute::class);

$valueTypes = [];
foreach ($returnType->getIterableValueType()->getObjectClassNames() as $className) {
if (!$nativeReflectionAttributeType->isSuperTypeOf(new ObjectType($className))->yes()) {

Check warning on line 61 in src/Type/Php/ReflectionGetAttributesMethodReturnTypeExtension.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\TrinaryLogicMutator":

@@ @@
 
 		$valueTypes = [];
 		foreach ($returnType->getIterableValueType()->getObjectClassNames() as $className) {
-			if (!$nativeReflectionAttributeType->isSuperTypeOf(new ObjectType($className))->yes()) {
+			if ($nativeReflectionAttributeType->isSuperTypeOf(new ObjectType($className))->no()) {
 				continue;
 			}

Check warning on line 61 in src/Type/Php/ReflectionGetAttributesMethodReturnTypeExtension.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\IsSuperTypeOfCalleeAndArgumentMutator":

@@ @@
 
 		$valueTypes = [];
 		foreach ($returnType->getIterableValueType()->getObjectClassNames() as $className) {
-			if (!$nativeReflectionAttributeType->isSuperTypeOf(new ObjectType($className))->yes()) {
+			if (!(new ObjectType($className))->isSuperTypeOf($nativeReflectionAttributeType)->yes()) {
 				continue;
 			}

Check warning on line 61 in src/Type/Php/ReflectionGetAttributesMethodReturnTypeExtension.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\TrinaryLogicMutator":

@@ @@
 
 		$valueTypes = [];
 		foreach ($returnType->getIterableValueType()->getObjectClassNames() as $className) {
-			if (!$nativeReflectionAttributeType->isSuperTypeOf(new ObjectType($className))->yes()) {
+			if ($nativeReflectionAttributeType->isSuperTypeOf(new ObjectType($className))->no()) {
 				continue;
 			}

Check warning on line 61 in src/Type/Php/ReflectionGetAttributesMethodReturnTypeExtension.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\IsSuperTypeOfCalleeAndArgumentMutator":

@@ @@
 
 		$valueTypes = [];
 		foreach ($returnType->getIterableValueType()->getObjectClassNames() as $className) {
-			if (!$nativeReflectionAttributeType->isSuperTypeOf(new ObjectType($className))->yes()) {
+			if (!(new ObjectType($className))->isSuperTypeOf($nativeReflectionAttributeType)->yes()) {
 				continue;
 			}
continue;
}

$valueTypes[] = new GenericObjectType($className, [$classType]);
}
Comment on lines +60 to +66
Copy link
Copy Markdown
Contributor

@VincentLanglet VincentLanglet Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would creates an issue with a method which returns something like array<Attribute1|Attribute2> since you're matching the first one only.

Copy link
Copy Markdown
Collaborator Author

@phpstan-bot phpstan-bot Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both make tests and make phpstan pass cleanly.

Summary of the change:

In resolveReflectionAttributeClassName, instead of returning the first class name from the method's return type that is a subtype of ReflectionAttribute, the code now collects all matching class names and only uses the result when there is exactly one unambiguous match. When there are zero or multiple matches (e.g., a return type like array<Attribute1|Attribute2> where both extend ReflectionAttribute), it falls back to the native ReflectionAttribute::class.

This handles the existing cases correctly:

  • Native reflection: return type value is ReflectionAttribute → one match → uses it
  • BetterReflection adapters: return type value is BRAdapter\ReflectionAttribute|FakeReflectionAttribute → one match (only the adapter extends native ReflectionAttribute) → uses it
  • Hypothetical Attribute1|Attribute2: two matches → falls back to ReflectionAttribute::class (the common base)


if (count($valueTypes) === 0) {
return new GenericObjectType(ReflectionAttribute::class, [$classType]);
}

if (count($valueTypes) === 1) {
return $valueTypes[0];
}

return TypeCombinator::union(...$valueTypes);
}

}
68 changes: 68 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-14466.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?php // lint >= 8.0

declare(strict_types = 1);

namespace Bug14466;

use ReflectionAttribute;
use ReflectionClass;
use ReflectionMethod;
use function PHPStan\Testing\assertType;

interface I
{

}

class Bug
{
/**
* @param ReflectionClass<*> $object
*/
protected function c(ReflectionClass $object): void
{
$requirements = $object->getAttributes(I::class, ReflectionAttribute::IS_INSTANCEOF);

assertType('list<ReflectionAttribute<Bug14466\I>>', $requirements);
}

/**
* @param ReflectionMethod $object
*/
protected function m(ReflectionMethod $object): void
{
$requirements = $object->getAttributes(I::class, ReflectionAttribute::IS_INSTANCEOF);

assertType('list<ReflectionAttribute<Bug14466\I>>', $requirements);
}

/**
* @param ReflectionClass<*>|ReflectionMethod $object
*/
protected function classOrMethod(ReflectionClass|ReflectionMethod $object): void
{
$requirements = $object->getAttributes(I::class, ReflectionAttribute::IS_INSTANCEOF);

assertType('list<ReflectionAttribute<Bug14466\I>>', $requirements);
}

/**
* @param ReflectionClass<*>|\ReflectionProperty $object
*/
protected function classOrProperty(ReflectionClass|\ReflectionProperty $object): void
{
$requirements = $object->getAttributes(I::class, ReflectionAttribute::IS_INSTANCEOF);

assertType('list<ReflectionAttribute<Bug14466\I>>', $requirements);
}

/**
* @param ReflectionMethod|\ReflectionProperty $object
*/
protected function methodOrProperty(ReflectionMethod|\ReflectionProperty $object): void
{
$requirements = $object->getAttributes(I::class, ReflectionAttribute::IS_INSTANCEOF);

assertType('list<ReflectionAttribute<Bug14466\I>>', $requirements);
}
}
2 changes: 1 addition & 1 deletion tests/PHPStan/Analyser/nsrt/bug-14484.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
<?php // lint >= 8.0

namespace Bug14484;

Expand Down
Loading