$composerPhpVersionFactory is not nullable

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

src/Testing/PHPStanTestCase.php

@@ -21,6 +21,7 @@
 use PHPStan\Internal\DirectoryCreatorException;
 use PHPStan\Node\Printer\ExprPrinter;
 use PHPStan\Parser\Parser;
+use PHPStan\Php\ComposerPhpVersionFactory;
 use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDoc\TypeNodeResolver;
 use PHPStan\PhpDoc\TypeStringResolver;
@@ -137,7 +138,8 @@ public static function createScopeFactory(ReflectionProvider $reflectionProvider
 		}
 
 		$reflectionProviderProvider = new DirectReflectionProviderProvider($reflectionProvider);
-		$constantResolver = new ConstantResolver($reflectionProviderProvider, $dynamicConstantNames, null, null);
+		$composerPhpVersionFactory = $container->getByType(ComposerPhpVersionFactory::class);
+		$constantResolver = new ConstantResolver($reflectionProviderProvider, $dynamicConstantNames, null, $composerPhpVersionFactory);
 
 		$initializerExprTypeResolver = new InitializerExprTypeResolver(
 			$constantResolver,

tests/PHPStan/Analyser/nsrt/bug-4434.php

@@ -10,14 +10,14 @@ class HelloWorld
 	public function testSendEmailToLog(): void
 	{
 		foreach ([1] as $emailFile) {
-			assertType('int<5, max>', PHP_MAJOR_VERSION);
-			assertType('int<5, max>', \PHP_MAJOR_VERSION);
+			assertType('int<5, 8>', PHP_MAJOR_VERSION);
+			assertType('int<5, 8>', \PHP_MAJOR_VERSION);
 			if (PHP_MAJOR_VERSION === 7) {
 				assertType('7', PHP_MAJOR_VERSION);
 				assertType('7', \PHP_MAJOR_VERSION);
 			} else {
-				assertType('int<5, 6>|int<8, max>', PHP_MAJOR_VERSION);
-				assertType('int<5, 6>|int<8, max>', \PHP_MAJOR_VERSION);
+				assertType('8|int<5, 6>', PHP_MAJOR_VERSION);
+				assertType('8|int<5, 6>', \PHP_MAJOR_VERSION);
 			}
 		}
 	}
@@ -28,14 +28,14 @@ class HelloWorld2
 	public function testSendEmailToLog(): void
 	{
 		foreach ([1] as $emailFile) {
-			assertType('int<5, max>', PHP_MAJOR_VERSION);
-			assertType('int<5, max>', \PHP_MAJOR_VERSION);
+			assertType('int<5, 8>', PHP_MAJOR_VERSION);
+			assertType('int<5, 8>', \PHP_MAJOR_VERSION);
 			if (PHP_MAJOR_VERSION === 100) {
-				assertType('100', PHP_MAJOR_VERSION);
-				assertType('100', \PHP_MAJOR_VERSION);
+				assertType('*NEVER*', PHP_MAJOR_VERSION);
+				assertType('*NEVER*', \PHP_MAJOR_VERSION);
 			} else {
-				assertType('int<5, 99>|int<101, max>', PHP_MAJOR_VERSION);
-				assertType('int<5, 99>|int<101, max>', \PHP_MAJOR_VERSION);
+				assertType('int<5, 8>', PHP_MAJOR_VERSION);
+				assertType('int<5, 8>', \PHP_MAJOR_VERSION);
 			}
 		}
 	}

tests/PHPStan/Analyser/nsrt/predefined-constants.php

@@ -4,10 +4,10 @@
 
 // core, https://www.php.net/manual/en/reserved.constants.php
 assertType('non-falsy-string', PHP_VERSION);
-assertType('int<5, max>', PHP_MAJOR_VERSION);
+assertType('int<5, 8>', PHP_MAJOR_VERSION);
 assertType('int<0, max>', PHP_MINOR_VERSION);
 assertType('int<0, max>', PHP_RELEASE_VERSION);
-assertType('int<50207, max>', PHP_VERSION_ID);
+assertType('int<50207, 80499>', PHP_VERSION_ID);
 assertType('string', PHP_EXTRA_VERSION);
 assertType('0|1', PHP_ZTS);
 assertType('0|1', PHP_DEBUG);