Skip to content

[PropertyInfo] Fix multi phpdoc covered promoted properties #46611

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
nicolas-grekas merged 2 commits into from
Jun 10, 2022
Merged

[PropertyInfo] Fix multi phpdoc covered promoted properties #46611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1605b57
[PropertyInfo] Add failing test case for multi phpdoc covered promote…
ostrolucky Jun 1, 2022
f503e37
[PropertyInfo] Fix multi phpdoc covered promoted properties
simPod Jun 7, 2022
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
12 changes: 8 additions & 4 deletions src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@ public function getTypes(string $class, string $property, array $context = []):
continue;
}

if (
$tagDocNode->value instanceof ParamTagValueNode
&& null === $prefix
&& $tagDocNode->value->parameterName !== '$'.$property
) {
continue;
}

foreach ($this->phpStanTypeHelper->getTypes($tagDocNode->value, $nameScope) as $type) {
switch ($type->getClassName()) {
case 'self':
Expand Down Expand Up @@ -239,10 +247,6 @@ private function getDocBlockFromProperty(string $class, string $property): ?arra
$phpDocNode = $this->phpDocParser->parse($tokens);
$tokens->consumeTokenType(Lexer::TOKEN_END);

if (self::MUTATOR === $source && !$this->filterDocBlockParams($phpDocNode, $property)) {
return null;
}

return [$phpDocNode, $source, $reflectionProperty->class];
}

Expand Down
1 change: 1 addition & 0 deletions ...sts/Extractor/PhpStanExtractorTestDoc.php → .../Tests/Extractor/PhpStanExtractorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ public function php80TypesProvider()
return [
[Php80Dummy::class, 'promotedAndMutated', [new Type(Type::BUILTIN_TYPE_STRING)]],
[Php80Dummy::class, 'promoted', null],
[Php80Dummy::class, 'collection', [new Type(Type::BUILTIN_TYPE_ARRAY, collection: true, collectionValueType: new Type(Type::BUILTIN_TYPE_STRING))]],
[Php80PromotedDummy::class, 'promoted', null],
];
}
Expand Down
3 changes: 2 additions & 1 deletion src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ class Php80Dummy

/**
* @param string $promotedAndMutated
* @param array<string> $collection
*/
public function __construct(private mixed $promoted, private mixed $promotedAndMutated)
public function __construct(private mixed $promoted, private mixed $promotedAndMutated, private array $collection)
{
}

Expand Down