Fix namespace of named type in class constant native type by patching PHP-Parser

Author: ondrejmirtes

composer.json

@@ -97,6 +97,9 @@
 				"patches/ReflectionProperty.patch",
 				"patches/SessionHandler.patch"
 			],
+			"nikic/php-parser": [
+				"patches/NameResolver.patch"
+			],
 			"rector/rector": [
 				"patches/NameNodeMapper.patch"
 			]

composer.lock

@@ -0,0 +1,12 @@
+--- lib/PhpParser/NodeVisitor/NameResolver.php	2023-11-28 14:02:15
++++ lib/PhpParser/NodeVisitor/NameResolver.php	2023-11-28 14:03:53
+@@ -119,6 +119,9 @@
+             }
+         } else if ($node instanceof Stmt\ClassConst) {
+             $this->resolveAttrGroups($node);
++            if (null !== $node->type) {
++                $node->type = $this->resolveType($node->type);
++            }
+         } else if ($node instanceof Stmt\EnumCase) {
+             $this->resolveAttrGroups($node);
+         } elseif ($node instanceof Expr\StaticCall

patches/NameResolver.patch

@@ -993,7 +993,7 @@ public function getConstant(string $name): ConstantReflection
 
 			$nativeType = null;
 			if ($reflectionConstant->getType() !== null) {
-				$nativeType = TypehintHelper::decideTypeFromReflection($reflectionConstant->getType(), null, $this);
+				$nativeType = TypehintHelper::decideTypeFromReflection($reflectionConstant->getType(), null, $declaringClass);
 			} elseif ($this->signatureMapProvider->hasClassConstantMetadata($declaringClass->getName(), $name)) {
 				$nativeType = $this->signatureMapProvider->getClassConstantMetadata($declaringClass->getName(), $name)['nativeType'];
 			}

src/Reflection/ClassReflection.php

@@ -925,6 +925,7 @@ public function dataFileAsserts(): iterable
 
 		if (PHP_VERSION_ID >= 80300) {
 			yield from $this->gatherAssertTypes(__DIR__ . '/data/class-constant-native-type.php');
+			yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Constants/data/bug-10212.php');
 		}
 
 		if (PHP_VERSION_ID >= 80000) {

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -86,4 +86,18 @@ public function testNativeType(): void
 		]);
 	}
 
+	public function testBug10212(): void
+	{
+		if (PHP_VERSION_ID < 80300) {
+			$this->markTestSkipped('Test requires PHP 8.3.');
+		}
+
+		$this->analyse([__DIR__ . '/data/bug-10212.php'], [
+			[
+				'Constant Bug10212\HelloWorld::B (Bug10212\X\Foo) does not accept value Bug10212\Foo::Bar.',
+				15,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Constants/ValueAssignedToClassConstantRuleTest.php

@@ -0,0 +1,22 @@
+<?php // lint >= 8.3
+
+namespace Bug10212;
+
+use function PHPStan\Testing\assertType;
+
+enum Foo
+{
+	case Bar;
+}
+
+class HelloWorld
+{
+	public const string A = 'foo';
+	public const X\Foo B = Foo::Bar;
+	public const Foo C = Foo::Bar;
+}
+
+function(HelloWorld $hw): void {
+	assertType(X\Foo::class, $hw::B);
+	assertType(Foo::class, $hw::C);
+};