Use TypeStringResolver directly

Author: ssigwart

src/Analyser/ConstantResolver.php

@@ -3,6 +3,8 @@
 namespace PHPStan\Analyser;
 
 use PhpParser\Node\Name;
+use PHPStan\DependencyInjection\Container;
+use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Reflection\NamespaceAnswerer;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider;
@@ -34,7 +36,7 @@ final class ConstantResolver
 	/**
 	 * @param string[] $dynamicConstantNames
 	 */
-	public function __construct(private ReflectionProviderProvider $reflectionProviderProvider, private array $dynamicConstantNames)
+	public function __construct(private ReflectionProviderProvider $reflectionProviderProvider, private array $dynamicConstantNames, private ?Container $container)
 	{
 	}
 
@@ -305,7 +307,10 @@ public function resolveConstantType(string $constantName, Type $constantType): T
 		if ($constantType->isConstantValue()->yes()) {
 			if (array_key_exists($constantName, $this->dynamicConstantNames)) {
 				$phpdocTypes = $this->dynamicConstantNames[$constantName];
-				return $this->reflectionProviderProvider->getReflectionProvider()->getSignatureMapProvider()->getTypeFromString($phpdocTypes, null);
+				$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());
@@ -325,7 +330,10 @@ public function resolveClassConstantType(string $className, string $constantName
 
 			if ($constantType->isConstantValue()->yes()) {
 				$phpdocTypes = $this->dynamicConstantNames[$lookupConstantName];
-				return $this->getReflectionProvider()->getSignatureMapProvider()->getTypeFromString($phpdocTypes, $className);
+				$typeStringResolver = $this->container?->getByType(TypeStringResolver::class);
+				if ($typeStringResolver !== null) {
+					return $typeStringResolver->resolve($phpdocTypes, new NameScope(null, [], $className));
+				}
 			}
 		}
 

src/Analyser/ConstantResolverFactory.php

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

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, [], null);
 
 		$phpDocParserConfig = new ParserConfig([]);
 		$ignoredRegexValidator = new IgnoredRegexValidator(

src/Reflection/BetterReflection/BetterReflectionProvider.php

@@ -475,9 +475,4 @@ private function resolveName(
 		return null;
 	}
 
-	public function getSignatureMapProvider(): SignatureMapProvider
-	{
-		return $this->signatureMapProvider;
-	}
-
 }

src/Reflection/ClassReflection.php

@@ -177,11 +177,6 @@ public function getNativeReflection(): ReflectionClass|ReflectionEnum
 		return $this->reflection;
 	}
 
-	public function getSignatureMapProvider(): SignatureMapProvider
-	{
-		return $this->signatureMapProvider;
-	}
-
 	public function getFileName(): ?string
 	{
 		if (!is_bool($this->filename)) {

src/Reflection/ReflectionProvider.php

@@ -4,7 +4,6 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
-use PHPStan\Reflection\SignatureMap\SignatureMapProvider;
 
 /** @api */
 interface ReflectionProvider
@@ -37,6 +36,4 @@ public function getConstant(Node\Name $nameNode, ?NamespaceAnswerer $namespaceAn
 
 	public function resolveConstantName(Node\Name $nameNode, ?NamespaceAnswerer $namespaceAnswerer): ?string;
 
-	public function getSignatureMapProvider(): SignatureMapProvider;
-
 }

src/Reflection/ReflectionProvider/DummyReflectionProvider.php

@@ -9,7 +9,6 @@
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\NamespaceAnswerer;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\Reflection\SignatureMap\SignatureMapProvider;
 use PHPStan\ShouldNotHappenException;
 
 final class DummyReflectionProvider implements ReflectionProvider
@@ -70,9 +69,4 @@ public function resolveConstantName(Node\Name $nameNode, ?NamespaceAnswerer $nam
 		return null;
 	}
 
-	public function getSignatureMapProvider(): SignatureMapProvider
-	{
-		throw new ShouldNotHappenException();
-	}
-
 }

src/Reflection/ReflectionProvider/MemoizingReflectionProvider.php

@@ -9,7 +9,6 @@
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\NamespaceAnswerer;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\Reflection\SignatureMap\SignatureMapProvider;
 use function strtolower;
 
 final class MemoizingReflectionProvider implements ReflectionProvider
@@ -97,9 +96,4 @@ public function resolveConstantName(Node\Name $nameNode, ?NamespaceAnswerer $nam
 		return $this->provider->resolveConstantName($nameNode, $namespaceAnswerer);
 	}
 
-	public function getSignatureMapProvider(): SignatureMapProvider
-	{
-		return $this->provider->getSignatureMapProvider();
-	}
-
 }

src/Reflection/SignatureMap/SignatureMapParser.php

@@ -46,7 +46,7 @@ public function getFunctionSignature(array $map, ?string $className): FunctionSi
 		);
 	}
 
-	public function getTypeFromString(string $typeString, ?string $className): Type
+	private function getTypeFromString(string $typeString, ?string $className): Type
 	{
 		if ($typeString === '') {
 			return new MixedType(true);

src/Reflection/SignatureMap/SignatureMapProvider.php

@@ -40,6 +40,4 @@ public function hasClassConstantMetadata(string $className, string $constantName
 	 */
 	public function getClassConstantMetadata(string $className, string $constantName): array;
 
-	public function getTypeFromString(string $typeString, ?string $className): Type;
-
 }