simplify ConstantResolver

Author: staabm

src/Analyser/ConstantResolver.php

@@ -45,7 +45,7 @@ public function __construct(
 		private ReflectionProviderProvider $reflectionProviderProvider,
 		private array $dynamicConstantNames,
 		private int|array|null $phpVersion,
-		private ?ComposerPhpVersionFactory $composerPhpVersionFactory,
+		private ComposerPhpVersionFactory $composerPhpVersionFactory,
 	)
 	{
 	}
@@ -370,10 +370,6 @@ private function getMinPhpVersion(): ?PhpVersion
 			return new PhpVersion($this->phpVersion['min']);
 		}
 
-		if ($this->composerPhpVersionFactory === null) {
-			return null;
-		}
-
 		return $this->composerPhpVersionFactory->getMinVersion();
 	}
 
@@ -391,10 +387,6 @@ private function getMaxPhpVersion(): ?PhpVersion
 			return new PhpVersion($this->phpVersion['max']);
 		}
 
-		if ($this->composerPhpVersionFactory === null) {
-			return null;
-		}
-
 		return $this->composerPhpVersionFactory->getMaxVersion();
 	}
 

src/DependencyInjection/ValidateIgnoredErrorsExtension.php

@@ -12,6 +12,7 @@
 use PHPStan\Command\IgnoredRegexValidator;
 use PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider;
 use PHPStan\File\FileExcluder;
+use PHPStan\Php\ComposerPhpVersionFactory;
 use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDoc\DirectTypeNodeResolverExtensionRegistryProvider;
 use PHPStan\PhpDoc\TypeNodeResolver;
@@ -65,7 +66,8 @@ public function loadConfiguration(): void
 		$reflectionProviderProvider = new DirectReflectionProviderProvider($reflectionProvider);
 		ReflectionProviderStaticAccessor::registerInstance($reflectionProvider);
 		PhpVersionStaticAccessor::registerInstance(new PhpVersion(PHP_VERSION_ID));
-		$constantResolver = new ConstantResolver($reflectionProviderProvider, [], null, null);
+		$composerPhpVersionFactory = new ComposerPhpVersionFactory($builder->parameters['composerAutoloaderProjectPaths']);
+		$constantResolver = new ConstantResolver($reflectionProviderProvider, [], null, $composerPhpVersionFactory);
 
 		$phpDocParserConfig = new ParserConfig([]);
 		$ignoredRegexValidator = new IgnoredRegexValidator(