Revert "Allow mixed type dynamic constants."

This reverts commit 1854985.

Author: ssigwart

conf/config.neon

@@ -176,7 +176,6 @@ parameters:
 		- ZEND_DEBUG_BUILD
 		- ZEND_THREAD_SAFE
 		- E_ALL # different on PHP 8.4
-	mixedTypeConstantNames:
 	customRulesetUsed: null
 	editorUrl: null
 	editorUrlTitle: null

conf/parametersSchema.neon

@@ -140,7 +140,6 @@ parametersSchema:
 	resultCachePath: string()
 	resultCacheChecksProjectExtensionFilesDependencies: bool()
 	dynamicConstantNames: listOf(string())
-	mixedTypeConstantNames: listOf(string())
 	customRulesetUsed: schema(bool(), nullable())
 	rootDir: string()
 	tmpDir: string()

src/Analyser/ConstantResolver.php

@@ -33,9 +33,8 @@ final class ConstantResolver
 
 	/**
 	 * @param string[] $dynamicConstantNames
-	 * @param string[] $mixedTypeConstantNames
 	 */
-	public function __construct(private ReflectionProviderProvider $reflectionProviderProvider, private array $dynamicConstantNames, private array $mixedTypeConstantNames)
+	public function __construct(private ReflectionProviderProvider $reflectionProviderProvider, private array $dynamicConstantNames)
 	{
 	}
 
@@ -303,14 +302,8 @@ public function resolvePredefinedConstant(string $resolvedConstantName): ?Type
 
 	public function resolveConstantType(string $constantName, Type $constantType): Type
 	{
-		if ($constantType->isConstantValue()->yes()) {
-			if (in_array($constantName, $this->dynamicConstantNames, true)) {
-				return $constantType->generalize(GeneralizePrecision::lessSpecific());
-			}
-
-			if (in_array($constantName, $this->mixedTypeConstantNames, true)) {
-				return new MixedType();
-			}
+		if ($constantType->isConstantValue()->yes() && in_array($constantName, $this->dynamicConstantNames, true)) {
+			return $constantType->generalize(GeneralizePrecision::lessSpecific());
 		}
 
 		return $constantType;
@@ -329,16 +322,6 @@ public function resolveClassConstantType(string $className, string $constantName
 			}
 		}
 
-		if (in_array($lookupConstantName, $this->mixedTypeConstantNames, true)) {
-			if ($nativeType !== null) {
-				return $nativeType;
-			}
-
-			if ($constantType->isConstantValue()->yes()) {
-				return new MixedType();
-			}
-		}
-
 		return $constantType;
 	}
 

src/Analyser/ConstantResolverFactory.php

@@ -20,7 +20,6 @@ public function create(): ConstantResolver
 		return new ConstantResolver(
 			$this->reflectionProviderProvider,
 			$this->container->getParameter('dynamicConstantNames'),
-			$this->container->getParameter('mixedTypeConstantNames') ?? [],
 		);
 	}
 

src/DependencyInjection/ValidateIgnoredErrorsExtension.php

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

src/Testing/PHPStanTestCase.php

@@ -127,21 +127,17 @@ public static function getClassReflectionExtensionRegistryProvider(): ClassRefle
 
 	/**
 	 * @param string[] $dynamicConstantNames
-	 * @param string[] $mixedTypeConstantNames
 	 */
-	public static function createScopeFactory(ReflectionProvider $reflectionProvider, TypeSpecifier $typeSpecifier, array $dynamicConstantNames = [], array $mixedTypeConstantNames = []): ScopeFactory
+	public static function createScopeFactory(ReflectionProvider $reflectionProvider, TypeSpecifier $typeSpecifier, array $dynamicConstantNames = []): ScopeFactory
 	{
 		$container = self::getContainer();
 
 		if (count($dynamicConstantNames) === 0) {
 			$dynamicConstantNames = $container->getParameter('dynamicConstantNames');
 		}
-		if (count($mixedTypeConstantNames) === 0) {
-			$mixedTypeConstantNames = $container->getParameter('mixedTypeConstantNames') ?? [];
-		}
 
 		$reflectionProviderProvider = new DirectReflectionProviderProvider($reflectionProvider);
-		$constantResolver = new ConstantResolver($reflectionProviderProvider, $dynamicConstantNames, $mixedTypeConstantNames);
+		$constantResolver = new ConstantResolver($reflectionProviderProvider, $dynamicConstantNames);
 
 		$initializerExprTypeResolver = new InitializerExprTypeResolver(
 			$constantResolver,

src/Testing/TypeInferenceTestCase.php

@@ -49,13 +49,11 @@ abstract class TypeInferenceTestCase extends PHPStanTestCase
 	/**
 	 * @param callable(Node , Scope ): void $callback
 	 * @param string[] $dynamicConstantNames
-	 * @param string[] $mixedTypeConstantNames
 	 */
 	public static function processFile(
 		string $file,
 		callable $callback,
 		array $dynamicConstantNames = [],
-		array $mixedTypeConstantNames = [],
 	): void
 	{
 		$reflectionProvider = self::createReflectionProvider();
@@ -90,7 +88,7 @@ public static function processFile(
 		);
 		$resolver->setAnalysedFiles(array_map(static fn (string $file): string => $fileHelper->normalizePath($file), array_merge([$file], static::getAdditionalAnalysedFiles())));
 
-		$scopeFactory = self::createScopeFactory($reflectionProvider, $typeSpecifier, $dynamicConstantNames, $mixedTypeConstantNames);
+		$scopeFactory = self::createScopeFactory($reflectionProvider, $typeSpecifier, $dynamicConstantNames);
 		$scope = $scopeFactory->create(ScopeContext::create($file));
 
 		$resolver->processNodes(

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -8535,102 +8535,6 @@ public function testDynamicConstantsWithNativeTypes(
 		);
 	}
 
-	public function dataMixedTypeConstants(): array
-	{
-		return [
-			[
-				'mixed',
-				'MixedTypeConstants\MixedTypeConstantClass::MIXED_TYPE_CONSTANT_IN_CLASS',
-			],
-			[
-				"'abc123def'",
-				'MixedTypeConstants\MixedTypeConstantClass::PURE_CONSTANT_IN_CLASS',
-			],
-			[
-				"'xyz'",
-				'MixedTypeConstants\NoMixedTypeConstantClass::MIXED_TYPE_CONSTANT_IN_CLASS',
-			],
-			[
-				'false',
-				'GLOBAL_MIXED_TYPE_CONSTANT',
-			],
-			[
-				'123',
-				'GLOBAL_PURE_CONSTANT',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider dataMixedTypeConstants
-	 */
-	public function testMixedTypeConstants(
-		string $description,
-		string $expression,
-	): void
-	{
-		$this->assertTypes(
-			__DIR__ . '/data/mixed-type-constant.php',
-			$description,
-			$expression,
-			'die',
-			[],
-			true,
-			[
-				'MixedTypeConstants\\MixedTypeConstantClass::MIXED_TYPE_CONSTANT_IN_CLASS',
-				'GLOBAL_MIXED_TYPE_CONSTANT',
-			],
-		);
-	}
-
-	public function dataMixedTypeConstantsWithNativeTypes(): array
-	{
-		return [
-			[
-				'int',
-				'MixedTypeConstantNativeTypes\Foo::FOO',
-			],
-			[
-				'int|string',
-				'MixedTypeConstantNativeTypes\Foo::BAR',
-			],
-			[
-				'int',
-				'$foo::FOO',
-			],
-			[
-				'int|string',
-				'$foo::BAR',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider dataMixedTypeConstantsWithNativeTypes
-	 */
-	public function testMixedTypeConstantsWithNativeTypes(
-		string $description,
-		string $expression,
-	): void
-	{
-		if (PHP_VERSION_ID < 80300) {
-			$this->markTestSkipped('Test requires PHP 8.3.');
-		}
-
-		$this->assertTypes(
-			__DIR__ . '/data/mixed-type-constant-native-types.php',
-			$description,
-			$expression,
-			'die',
-			[],
-			true,
-			[
-				'MixedTypeConstantNativeTypes\Foo::FOO',
-				'MixedTypeConstantNativeTypes\Foo::BAR',
-			],
-		);
-	}
-
 	public function dataIsset(): array
 	{
 		return [
@@ -9641,7 +9545,6 @@ public function testTryCatchScope(
 
 	/**
 	 * @param string[] $dynamicConstantNames
-	 * @param string[] $mixedTypeConstantNames
 	 */
 	private function assertTypes(
 		string $file,
@@ -9650,7 +9553,6 @@ private function assertTypes(
 		string $evaluatedPointExpression = 'die',
 		array $dynamicConstantNames = [],
 		bool $useCache = true,
-		array $mixedTypeConstantNames = [],
 	): void
 	{
 		$assertType = function (Scope $scope) use ($expression, $description, $evaluatedPointExpression): void {
@@ -9685,7 +9587,6 @@ static function (Node $node, Scope $scope) use ($file, $evaluatedPointExpression
 				$assertType($scope);
 			},
 			$dynamicConstantNames,
-			$mixedTypeConstantNames,
 		);
 	}