Allow mixed type dynamic constants.

Addresses phpstan/phpstan#7520

Revert "Allow mixed type dynamic constants."

This reverts commit 1854985.

Allow setting types for dynamic constants

Unit test fixes

Unit test fix 2

Lint fixes

Use TypeStringResolver directly

Remove old code

Author: ssigwart

src/Analyser/ConstantResolver.php

@@ -4,8 +4,10 @@
 
 use PhpParser\Node\Name;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\DependencyInjection\Container;
 use PHPStan\Php\ComposerPhpVersionFactory;
 use PHPStan\Php\PhpVersion;
+use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Reflection\NamespaceAnswerer;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider;
@@ -50,6 +52,9 @@ public function __construct(
 		private array $dynamicConstantNames,
 		private int|array|null $phpVersion,
 		private ComposerPhpVersionFactory $composerPhpVersionFactory,
+		private ?PhpVersion $composerMinPhpVersion,
+		private ?PhpVersion $composerMaxPhpVersion,
+		private ?Container $container,
 	)
 	{
 	}
@@ -404,8 +409,17 @@ private function getMaxPhpVersion(): ?PhpVersion
 
 	public function resolveConstantType(string $constantName, Type $constantType): Type
 	{
-		if ($constantType->isConstantValue()->yes() && in_array($constantName, $this->dynamicConstantNames, true)) {
-			return $constantType->generalize(GeneralizePrecision::lessSpecific());
+		if ($constantType->isConstantValue()->yes()) {
+			if (array_key_exists($constantName, $this->dynamicConstantNames)) {
+				$phpdocTypes = $this->dynamicConstantNames[$constantName];
+				$typeStringResolver = $this->container?->getByType(TypeStringResolver::class);
+				if ($typeStringResolver !== null) {
+					return $typeStringResolver->resolve($phpdocTypes, new NameScope(null, [], null));
+				}
+			}
+			if (in_array($constantName, $this->dynamicConstantNames, true)) {
+				return $constantType->generalize(GeneralizePrecision::lessSpecific());
+			}
 		}
 
 		return $constantType;
@@ -414,6 +428,20 @@ public function resolveConstantType(string $constantName, Type $constantType): T
 	public function resolveClassConstantType(string $className, string $constantName, Type $constantType, ?Type $nativeType): Type
 	{
 		$lookupConstantName = sprintf('%s::%s', $className, $constantName);
+		if (array_key_exists($lookupConstantName, $this->dynamicConstantNames)) {
+			if ($nativeType !== null) {
+				return $nativeType;
+			}
+
+			if ($constantType->isConstantValue()->yes()) {
+				$phpdocTypes = $this->dynamicConstantNames[$lookupConstantName];
+				$typeStringResolver = $this->container?->getByType(TypeStringResolver::class);
+				if ($typeStringResolver !== null) {
+					return $typeStringResolver->resolve($phpdocTypes, new NameScope(null, [], $className));
+				}
+			}
+		}
+
 		if (in_array($lookupConstantName, $this->dynamicConstantNames, true)) {
 			if ($nativeType !== null) {
 				return $nativeType;

src/Analyser/ConstantResolverFactory.php

@@ -27,6 +27,9 @@ public function create(): ConstantResolver
 			$this->container->getParameter('dynamicConstantNames'),
 			$this->container->getParameter('phpVersion'),
 			$composerFactory,
+			$composerFactory->getMinVersion(),
+			$composerFactory->getMaxVersion(),
+			$this->container,
 		);
 	}
 

src/Analyser/MutatingScope.php

@@ -6191,6 +6191,11 @@ public function getConstantReflection(Type $typeWithConstant, string $constantNa
 		return $typeWithConstant->getConstant($constantName);
 	}
 
+	public function getConstantExplicitTypeFromConfig(string $constantName, Type $constantType): Type
+	{
+		return $this->constantResolver->resolveConstantType($constantName, $constantType);
+	}
+
 	/**
 	 * @return array<string, ExpressionTypeHolder>
 	 */

src/Analyser/Scope.php

@@ -81,6 +81,8 @@ public function getMethodReflection(Type $typeWithMethod, string $methodName): ?
 
 	public function getConstantReflection(Type $typeWithConstant, string $constantName): ?ClassConstantReflection;
 
+	public function getConstantExplicitTypeFromConfig(string $constantName, Type $constantType): Type;
+
 	public function getIterableKeyType(Type $iteratee): Type;
 
 	public function getIterableValueType(Type $iteratee): Type;

src/DependencyInjection/ValidateIgnoredErrorsExtension.php

@@ -69,7 +69,7 @@ public function loadConfiguration(): void
 		ReflectionProviderStaticAccessor::registerInstance($reflectionProvider);
 		PhpVersionStaticAccessor::registerInstance(new PhpVersion(PHP_VERSION_ID));
 		$composerPhpVersionFactory = new ComposerPhpVersionFactory([]);
-		$constantResolver = new ConstantResolver($reflectionProviderProvider, [], null, $composerPhpVersionFactory);
+		$constantResolver = new ConstantResolver($reflectionProviderProvider, [], null, $composerPhpVersionFactory, null, null, null);
 
 		$phpDocParserConfig = new ParserConfig([]);
 		$ignoredRegexValidator = new IgnoredRegexValidator(

src/Testing/PHPStanTestCase.php

@@ -140,7 +140,7 @@ public static function createScopeFactory(ReflectionProvider $reflectionProvider
 
 		$reflectionProviderProvider = new DirectReflectionProviderProvider($reflectionProvider);
 		$composerPhpVersionFactory = $container->getByType(ComposerPhpVersionFactory::class);
-		$constantResolver = new ConstantResolver($reflectionProviderProvider, $dynamicConstantNames, null, $composerPhpVersionFactory);
+		$constantResolver = new ConstantResolver($reflectionProviderProvider, $dynamicConstantNames, null, $composerPhpVersionFactory, null, null, $container);
 
 		$initializerExprTypeResolver = new InitializerExprTypeResolver(
 			$constantResolver,

src/Type/Php/DefineConstantTypeSpecifyingExtension.php

@@ -52,11 +52,17 @@ public function specifyTypes(
 			return new SpecifiedTypes([], []);
 		}
 
+		$valueType = $scope->getType($node->getArgs()[1]->value);
+		$finalType = $scope->getConstantExplicitTypeFromConfig(
+			$constantName->getValue(),
+			$valueType,
+		);
+
 		return $this->typeSpecifier->create(
 			new Node\Expr\ConstFetch(
 				new Node\Name\FullyQualified($constantName->getValue()),
 			),
-			$scope->getType($node->getArgs()[1]->value),
+			$finalType,
 			TypeSpecifierContext::createTruthy(),
 			$scope,
 		)->setAlwaysOverwriteTypes();

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -8244,6 +8244,10 @@ public static function dataDynamicConstants(): array
 				'string',
 				'DynamicConstants\DynamicConstantClass::DYNAMIC_CONSTANT_IN_CLASS',
 			],
+			[
+				'string|null',
+				'DynamicConstants\DynamicConstantClass::DYNAMIC_CONSTANT_WITH_EXPLICIT_TYPES_IN_CLASS',
+			],
 			[
 				"'abc123def'",
 				'DynamicConstants\DynamicConstantClass::PURE_CONSTANT_IN_CLASS',
@@ -8253,13 +8257,17 @@ public static function dataDynamicConstants(): array
 				'DynamicConstants\NoDynamicConstantClass::DYNAMIC_CONSTANT_IN_CLASS',
 			],
 			[
-				'false',
+				'bool',
 				'GLOBAL_DYNAMIC_CONSTANT',
 			],
 			[
 				'123',
 				'GLOBAL_PURE_CONSTANT',
 			],
+			[
+				'string|null',
+				'GLOBAL_DYNAMIC_CONSTANT_WITH_EXPLICIT_TYPES',
+			],
 		];
 	}
 
@@ -8275,8 +8283,10 @@ public function testDynamicConstants(
 			$expression,
 			'die',
 			[
-				'DynamicConstants\\DynamicConstantClass::DYNAMIC_CONSTANT_IN_CLASS',
-				'GLOBAL_DYNAMIC_CONSTANT',
+				0 => 'DynamicConstants\\DynamicConstantClass::DYNAMIC_CONSTANT_IN_CLASS',
+				1 => 'GLOBAL_DYNAMIC_CONSTANT',
+				'DynamicConstants\\DynamicConstantClass::DYNAMIC_CONSTANT_WITH_EXPLICIT_TYPES_IN_CLASS' => 'string|null',
+				'GLOBAL_DYNAMIC_CONSTANT_WITH_EXPLICIT_TYPES' => 'string|null',
 			],
 		);
 	}

tests/PHPStan/Analyser/data/dynamic-constant.php

@@ -4,10 +4,12 @@
 
 define('GLOBAL_PURE_CONSTANT', 123);
 define('GLOBAL_DYNAMIC_CONSTANT', false);
+define('GLOBAL_DYNAMIC_CONSTANT_WITH_EXPLICIT_TYPES', null);
 
 class DynamicConstantClass
 {
 	const DYNAMIC_CONSTANT_IN_CLASS = 'abcdef';
+	const DYNAMIC_CONSTANT_WITH_EXPLICIT_TYPES_IN_CLASS = 'xyz';
 	const PURE_CONSTANT_IN_CLASS = 'abc123def';
 }