[TypeInfo] Fix promoted property with @var tag

mtarld · mtarld · commit 6275905a6775 · 2025-03-12T16:17:55.000+01:00
diff --git a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php
@@ -14,6 +14,10 @@ final class DummyWithPhpDoc
      */
     public function __construct(
         public mixed $promoted,
+        /**
+         * @var string
+         */
+        public mixed $promotedVar,
     ) {
     }
 
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeResolver/PhpDocAwareReflectionTypeResolverTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeResolver/PhpDocAwareReflectionTypeResolverTest.php
@@ -29,6 +29,7 @@ public function testReadPhpDoc()
 
         $this->assertEquals(Type::array(Type::object(Dummy::class)), $resolver->resolve($reflection->getProperty('arrayOfDummies')));
         $this->assertEquals(Type::bool(), $resolver->resolve($reflection->getProperty('promoted')));
+        $this->assertEquals(Type::string(), $resolver->resolve($reflection->getProperty('promotedVar')));
         $this->assertEquals(Type::object(Dummy::class), $resolver->resolve($reflection->getMethod('getNextDummy')));
         $this->assertEquals(Type::object(Dummy::class), $resolver->resolve($reflection->getMethod('getNextDummy')->getParameters()[0]));
     }
diff --git a/src/Symfony/Component/TypeInfo/TypeResolver/PhpDocAwareReflectionTypeResolver.php b/src/Symfony/Component/TypeInfo/TypeResolver/PhpDocAwareReflectionTypeResolver.php
@@ -64,36 +64,38 @@ public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
             throw new UnsupportedException(\sprintf('Expected subject to be a "ReflectionProperty", a "ReflectionParameter" or a "ReflectionFunctionAbstract", "%s" given.', get_debug_type($subject)), $subject);
         }
 
-        $docComment = match (true) {
-            $subject instanceof \ReflectionProperty => $subject->isPromoted() ? $subject->getDeclaringClass()?->getConstructor()?->getDocComment() : $subject->getDocComment(),
-            $subject instanceof \ReflectionParameter => $subject->getDeclaringFunction()->getDocComment(),
-            $subject instanceof \ReflectionFunctionAbstract => $subject->getDocComment(),
+        $typeContext ??= $this->typeContextFactory->createFromReflection($subject);
+
+        $docComments = match (true) {
+            $subject instanceof \ReflectionProperty => $subject->isPromoted()
+                ? ['@var' => $subject->getDocComment(), '@param' => $subject->getDeclaringClass()?->getConstructor()?->getDocComment()]
+                : ['@var' => $subject->getDocComment()],
+            $subject instanceof \ReflectionParameter => ['@param' => $subject->getDeclaringFunction()->getDocComment()],
+            $subject instanceof \ReflectionFunctionAbstract => ['@return' => $subject->getDocComment()],
         };
 
-        if (!$docComment) {
-            return $this->reflectionTypeResolver->resolve($subject);
-        }
+        foreach ($docComments as $tagName => $docComment) {
+            if (!$docComment) {
+                continue;
+            }
 
-        $typeContext ??= $this->typeContextFactory->createFromReflection($subject);
+            $tokens = new TokenIterator($this->lexer->tokenize($docComment));
+            $docNode = $this->phpDocParser->parse($tokens);
 
-        $tagName = match (true) {
-            $subject instanceof \ReflectionProperty => $subject->isPromoted() ? '@param' : '@var',
-            $subject instanceof \ReflectionParameter => '@param',
-            $subject instanceof \ReflectionFunctionAbstract => '@return',
-        };
+            foreach ($docNode->getTagsByName($tagName) as $tag) {
+                $tagValue = $tag->value;
 
-        $tokens = new TokenIterator($this->lexer->tokenize($docComment));
-        $docNode = $this->phpDocParser->parse($tokens);
+                if ('@var' === $tagName && $tagValue instanceof VarTagValueNode) {
+                    return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                }
 
-        foreach ($docNode->getTagsByName($tagName) as $tag) {
-            $tagValue = $tag->value;
+                if ('@param' === $tagName && $tagValue instanceof ParamTagValueNode && '$'.$subject->getName() === $tagValue->parameterName) {
+                    return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                }
 
-            if (
-                $tagValue instanceof VarTagValueNode
-                || $tagValue instanceof ParamTagValueNode && $tagName && '$'.$subject->getName() === $tagValue->parameterName
-                || $tagValue instanceof ReturnTagValueNode
-            ) {
-                return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                if ('@return' === $tagName && $tagValue instanceof ReturnTagValueNode) {
+                    return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public function testReadPhpDoc()`
`29`	`29`
`30`	`30`	`$this->assertEquals(Type::array(Type::object(Dummy::class)), $resolver->resolve($reflection->getProperty('arrayOfDummies')));`
`31`	`31`	`$this->assertEquals(Type::bool(), $resolver->resolve($reflection->getProperty('promoted')));`
	`32`	`+ $this->assertEquals(Type::string(), $resolver->resolve($reflection->getProperty('promotedVar')));`
`32`	`33`	`$this->assertEquals(Type::object(Dummy::class), $resolver->resolve($reflection->getMethod('getNextDummy')));`
`33`	`34`	`$this->assertEquals(Type::object(Dummy::class), $resolver->resolve($reflection->getMethod('getNextDummy')->getParameters()[0]));`
`34`	`35`	`}`