Skip to content

Reflection getAttributes returns list #3548

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
merged 1 commit into from
Oct 7, 2024
Merged

Reflection getAttributes returns list #3548

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions src/Type/Php/ReflectionGetAttributesMethodReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
use PhpParser\Node\Expr\MethodCall;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Type\Accessory\AccessoryArrayListType;
use PHPStan\Type\ArrayType;
use PHPStan\Type\DynamicMethodReturnTypeExtension;
use PHPStan\Type\Generic\GenericObjectType;
use PHPStan\Type\MixedType;
use PHPStan\Type\IntegerType;
use PHPStan\Type\Type;
use ReflectionAttribute;
use function count;
Expand Down Expand Up @@ -42,7 +43,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
$argType = $scope->getType($methodCall->getArgs()[0]->value);
$classType = $argType->getClassStringObjectType();

return new ArrayType(new MixedType(), new GenericObjectType(ReflectionAttribute::class, [$classType]));
return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), new GenericObjectType(ReflectionAttribute::class, [$classType])));
}

}
2 changes: 1 addition & 1 deletion stubs/ReflectionClass.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ReflectionClass
public function newInstanceWithoutConstructor();

/**
* @return array<ReflectionAttribute<object>>
* @return list<ReflectionAttribute<object>>
*/
public function getAttributes(?string $name = null, int $flags = 0)
{
Expand Down
2 changes: 1 addition & 1 deletion stubs/ReflectionClassConstant.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class ReflectionClassConstant
{
/**
* @return array<ReflectionAttribute<object>>
* @return list<ReflectionAttribute<object>>
*/
public function getAttributes(?string $name = null, int $flags = 0)
{
Expand Down
2 changes: 1 addition & 1 deletion stubs/ReflectionFunctionAbstract.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ abstract class ReflectionFunctionAbstract
public function getFileName () {}

/**
* @return array<ReflectionAttribute<object>>
* @return list<ReflectionAttribute<object>>
*/
public function getAttributes(?string $name = null, int $flags = 0)
{
Expand Down
2 changes: 1 addition & 1 deletion stubs/ReflectionParameter.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class ReflectionParameter
{
/**
* @return array<ReflectionAttribute<object>>
* @return list<ReflectionAttribute<object>>
*/
public function getAttributes(?string $name = null, int $flags = 0)
{
Expand Down
2 changes: 1 addition & 1 deletion stubs/ReflectionProperty.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class ReflectionProperty
{
/**
* @return array<ReflectionAttribute<object>>
* @return list<ReflectionAttribute<object>>
*/
public function getAttributes(?string $name = null, int $flags = 0)
{
Expand Down
34 changes: 17 additions & 17 deletions tests/PHPStan/Analyser/nsrt/reflectionclass-issue-5511-php8.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,38 @@ function testGetAttributes(
$classStr = $reflectionClass->getAttributes($str);
$classNonsense = $reflectionClass->getAttributes("some random string");

assertType('array<ReflectionAttribute<object>>', $classAll);
assertType('array<ReflectionAttribute<Issue5511\Abc>>', $classAbc1);
assertType('array<ReflectionAttribute<Issue5511\Abc>>', $classAbc2);
assertType('array<ReflectionAttribute<Issue5511\Abc>>', $classGCN);
assertType('array<ReflectionAttribute<object>>', $classCN);
assertType('array<ReflectionAttribute<object>>', $classStr);
assertType('array<ReflectionAttribute<*ERROR*>>', $classNonsense);
assertType('list<ReflectionAttribute<object>>', $classAll);
assertType('list<ReflectionAttribute<Issue5511\Abc>>', $classAbc1);
assertType('list<ReflectionAttribute<Issue5511\Abc>>', $classAbc2);
assertType('list<ReflectionAttribute<Issue5511\Abc>>', $classGCN);
assertType('list<ReflectionAttribute<object>>', $classCN);
assertType('list<ReflectionAttribute<object>>', $classStr);
assertType('list<ReflectionAttribute<*ERROR*>>', $classNonsense);

$methodAll = $reflectionMethod->getAttributes();
$methodAbc = $reflectionMethod->getAttributes(Abc::class);
assertType('array<ReflectionAttribute<object>>', $methodAll);
assertType('array<ReflectionAttribute<Issue5511\Abc>>', $methodAbc);
assertType('list<ReflectionAttribute<object>>', $methodAll);
assertType('list<ReflectionAttribute<Issue5511\Abc>>', $methodAbc);

$paramAll = $reflectionParameter->getAttributes();
$paramAbc = $reflectionParameter->getAttributes(Abc::class);
assertType('array<ReflectionAttribute<object>>', $paramAll);
assertType('array<ReflectionAttribute<Issue5511\Abc>>', $paramAbc);
assertType('list<ReflectionAttribute<object>>', $paramAll);
assertType('list<ReflectionAttribute<Issue5511\Abc>>', $paramAbc);

$propAll = $reflectionProperty->getAttributes();
$propAbc = $reflectionProperty->getAttributes(Abc::class);
assertType('array<ReflectionAttribute<object>>', $propAll);
assertType('array<ReflectionAttribute<Issue5511\Abc>>', $propAbc);
assertType('list<ReflectionAttribute<object>>', $propAll);
assertType('list<ReflectionAttribute<Issue5511\Abc>>', $propAbc);

$constAll = $reflectionClassConstant->getAttributes();
$constAbc = $reflectionClassConstant->getAttributes(Abc::class);
assertType('array<ReflectionAttribute<object>>', $constAll);
assertType('array<ReflectionAttribute<Issue5511\Abc>>', $constAbc);
assertType('list<ReflectionAttribute<object>>', $constAll);
assertType('list<ReflectionAttribute<Issue5511\Abc>>', $constAbc);

$funcAll = $reflectionFunction->getAttributes();
$funcAbc = $reflectionFunction->getAttributes(Abc::class);
assertType('array<ReflectionAttribute<object>>', $funcAll);
assertType('array<ReflectionAttribute<Issue5511\Abc>>', $funcAbc);
assertType('list<ReflectionAttribute<object>>', $funcAll);
assertType('list<ReflectionAttribute<Issue5511\Abc>>', $funcAbc);
}

/**
Expand Down
Loading