Fix rebase

Author: ssigwart

src/Analyser/ConstantResolver.php

@@ -52,8 +52,6 @@ public function __construct(
 		private array $dynamicConstantNames,
 		private int|array|null $phpVersion,
 		private ComposerPhpVersionFactory $composerPhpVersionFactory,
-		private ?PhpVersion $composerMinPhpVersion,
-		private ?PhpVersion $composerMaxPhpVersion,
 		private ?Container $container,
 	)
 	{

src/Analyser/ConstantResolverFactory.php

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

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, null, null, null);
+		$constantResolver = new ConstantResolver($reflectionProviderProvider, [], null, $composerPhpVersionFactory, 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, null, null, $container);
+		$constantResolver = new ConstantResolver($reflectionProviderProvider, $dynamicConstantNames, null, $composerPhpVersionFactory, $container);
 
 		$initializerExprTypeResolver = new InitializerExprTypeResolver(
 			$constantResolver,