bug #62717 [PropertyInfo] fix @var tag support for PhpStanExtractor (qconer)

nicolas-grekas · nicolas-grekas · commit 491c2f48462c · 2025-12-10T11:26:35.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [PropertyInfo] fix ``@var`` tag support for `PhpStanExtractor` | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #62712 | License | MIT added fallback when no __construct PHPDocBlock exists duplicate for #62713 Commits ------- 4158e3b fix: fix property info var tag extractor
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php
@@ -154,7 +154,7 @@ public function getTypes(string $class, string $property, array $context = []):
     public function getTypesFromConstructor(string $class, string $property): ?array
     {
         if (null === $tagDocNode = $this->getDocBlockFromConstructor($class, $property)) {
-            return null;
+            return $this->getTypes($class, $property);
         }
 
         $types = [];
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php
@@ -370,11 +370,29 @@ public static function constructorTypesProvider()
             ['date', [new Type(Type::BUILTIN_TYPE_INT)]],
             ['timezone', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeZone')]],
             ['dateObject', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeInterface')]],
-            ['dateTime', null],
+            ['dateTime', [new Type(Type::BUILTIN_TYPE_INT)]],
             ['ddd', null],
         ];
     }
 
+    /**
+     * @dataProvider provideConstructorTypesWithOnlyVarTags
+     */
+    public function testExtractConstructorTypesWithOnlyVarTags($property, ?array $type = null)
+    {
+        $this->assertEquals($type, $this->extractor->getTypesFromConstructor('Symfony\Component\PropertyInfo\Tests\Fixtures\ConstructorDummyWithVarTagsDocBlock', $property));
+    }
+
+    public static function provideConstructorTypesWithOnlyVarTags()
+    {
+        yield ['date', [new Type(Type::BUILTIN_TYPE_INT)]];
+        yield ['dateObject', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeInterface')]];
+        yield ['objectsArray', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ConstructorDummy'))]];
+        yield ['dateTime', null];
+        yield ['mixed', null];
+        yield ['timezone', null];
+    }
+
     /**
      * @dataProvider unionTypesProvider
      */
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ConstructorDummyWithVarTagsDocBlock.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ConstructorDummyWithVarTagsDocBlock.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+
+
+class ConstructorDummyWithVarTagsDocBlock
+{
+    public function __construct(
+        public \DateTimeZone $timezone,
+        /** @var int */
+        public $date,
+        /** @var \DateTimeInterface */
+        public $dateObject,
+        public \DateTimeImmutable $dateTime,
+        public $mixed,
+        /** @var ConstructorDummy[] */
+        public array $objectsArray,
+    )
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function getTypes(string $class, string $property, array $context = []):`
`154`	`154`	`public function getTypesFromConstructor(string $class, string $property): ?array`
`155`	`155`	`{`
`156`	`156`	`if (null === $tagDocNode = $this->getDocBlockFromConstructor($class, $property)) {`
`157`		`- return null;`
	`157`	`+ return $this->getTypes($class, $property);`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`$types = [];`