bug #46611 [PropertyInfo] Fix multi phpdoc covered promoted properties (ostrolucky, simPod)

nicolas-grekas · nicolas-grekas · commit bf255fa05fd5 · 2022-06-10T11:20:25.000+02:00
This PR was merged into the 6.1 branch. Discussion ---------- [PropertyInfo] Fix multi phpdoc covered promoted properties | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | Tickets | Fix #46550 | License | MIT I came up with this solution Commits ------- f503e37 [PropertyInfo] Fix multi phpdoc covered promoted properties 1605b57 [PropertyInfo] Add failing test case for multi phpdoc covered promoted properties
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php
@@ -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':
@@ -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];
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php
@@ -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],
         ];
     }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php
@@ -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)
     {
     }
 

Original file line number	Diff line number	Diff line change
`@@ -467,6 +467,7 @@ public function php80TypesProvider()`
`467`	`467`	`return [`
`468`	`468`	`[Php80Dummy::class, 'promotedAndMutated', [new Type(Type::BUILTIN_TYPE_STRING)]],`
`469`	`469`	`[Php80Dummy::class, 'promoted', null],`
	`470`	`+ [Php80Dummy::class, 'collection', [new Type(Type::BUILTIN_TYPE_ARRAY, collection: true, collectionValueType: new Type(Type::BUILTIN_TYPE_STRING))]],`
`470`	`471`	`[Php80PromotedDummy::class, 'promoted', null],`
`471`	`472`	`];`
`472`	`473`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,9 @@ class Php80Dummy`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @param string $promotedAndMutated`
	`20`	`+ * @param array<string> $collection`
`20`	`21`	`*/`
`21`		`- public function __construct(private mixed $promoted, private mixed $promotedAndMutated)`
	`22`	`+ public function __construct(private mixed $promoted, private mixed $promotedAndMutated, private array $collection)`
`22`	`23`	`{`
`23`	`24`	`}`
`24`	`25`