[TypeInfo] Fix handling ConstFetchNode

norkunas · norkunas · commit 6e237a9af04a · 2025-06-18T14:42:17.000+03:00
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php
@@ -927,7 +927,7 @@ public static function unionTypesProvider(): iterable
             Type::object(ParentDummy::class),
             Type::null(),
         )];
-        yield ['f', null];
+        yield ['f', Type::union(Type::string(), Type::int(), Type::float(), Type::bool(), Type::null())];
         yield ['g', Type::array(Type::union(Type::string(), Type::int()))];
     }
 
diff --git a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithConstants.php b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithConstants.php
@@ -0,0 +1,19 @@
+<?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\TypeInfo\Tests\Fixtures;
+
+final class DummyWithConstants
+{
+    public const DUMMY_A = 'a';
+    public const DUMMY_B = 'b';
+    public const DUMMY_C = 'c';
+}
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeResolver/StringTypeResolverTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeResolver/StringTypeResolverTest.php
@@ -19,6 +19,7 @@
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyBackedEnum;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyCollection;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyEnum;
+use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithConstants;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithTemplates;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\TypeInfo\TypeContext\TypeContext;
@@ -136,6 +137,7 @@ public static function resolveDataProvider(): iterable
         yield [Type::union(Type::int(), Type::float(), Type::string(), Type::bool()), 'scalar'];
         yield [Type::union(Type::int(), Type::float()), 'number'];
         yield [Type::union(Type::int(), Type::float(), Type::string()), 'numeric'];
+        yield [Type::union(Type::string(), Type::int(), Type::float(), Type::bool(), Type::null()), DummyWithConstants::class.'::DUMMY_*'];
         yield [Type::object(AbstractDummy::class), 'self', $typeContextFactory->createFromClassName(Dummy::class, AbstractDummy::class)];
         yield [Type::object(Dummy::class), 'static', $typeContextFactory->createFromClassName(Dummy::class, AbstractDummy::class)];
         yield [Type::object(AbstractDummy::class), 'parent', $typeContextFactory->createFromClassName(Dummy::class)];
diff --git a/src/Symfony/Component/TypeInfo/TypeResolver/StringTypeResolver.php b/src/Symfony/Component/TypeInfo/TypeResolver/StringTypeResolver.php
@@ -18,6 +18,7 @@
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNullNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
 use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
 use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode;
@@ -127,6 +128,7 @@ private function getTypeFromNode(TypeNode $node, ?TypeContext $typeContext): Typ
                 ConstExprNullNode::class => Type::null(),
                 ConstExprStringNode::class => Type::string(),
                 ConstExprTrueNode::class => Type::true(),
+                ConstFetchNode::class => Type::union(Type::string(), Type::int(), Type::float(), Type::bool(), Type::null()),
                 default => throw new \DomainException(\sprintf('Unhandled "%s" constant expression.', $node->constExpr::class)),
             };
         }

Original file line number	Diff line number	Diff line change
`@@ -927,7 +927,7 @@ public static function unionTypesProvider(): iterable`
`927`	`927`	`Type::object(ParentDummy::class),`
`928`	`928`	`Type::null(),`
`929`	`929`	`)];`
`930`		`- yield ['f', null];`
	`930`	`+ yield ['f', Type::union(Type::string(), Type::int(), Type::float(), Type::bool(), Type::null())];`
`931`	`931`	`yield ['g', Type::array(Type::union(Type::string(), Type::int()))];`
`932`	`932`	`}`
`933`	`933`