Fix backward compatibility

Author: ondrejmirtes

src/Testing/PHPStanTestCase.php

@@ -8,6 +8,7 @@
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Analyser\RicherScopeGetTypeHelper;
 use PHPStan\Analyser\ScopeFactory;
+use PHPStan\Analyser\TypeSpecifier;
 use PHPStan\BetterReflection\Reflector\Reflector;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\DependencyInjection\ContainerFactory;
@@ -129,16 +130,14 @@ public static function getClassReflectionExtensionRegistryProvider(): ClassRefle
 	/**
 	 * @param string[] $dynamicConstantNames
 	 */
-	public static function createScopeFactory(array $dynamicConstantNames = []): ScopeFactory
+	public static function createScopeFactory(ReflectionProvider $reflectionProvider, TypeSpecifier $typeSpecifier, array $dynamicConstantNames = []): ScopeFactory
 	{
 		$container = self::getContainer();
 
 		if (count($dynamicConstantNames) === 0) {
 			$dynamicConstantNames = $container->getParameter('dynamicConstantNames');
 		}
 
-		$reflectionProvider = self::createReflectionProvider();
-		$typeSpecifier = self::getContainer()->getService('typeSpecifier');
 		$reflectionProviderProvider = new DirectReflectionProviderProvider($reflectionProvider);
 		$composerPhpVersionFactory = $container->getByType(ComposerPhpVersionFactory::class);
 		$constantResolver = new ConstantResolver($reflectionProviderProvider, $dynamicConstantNames, null, $composerPhpVersionFactory, $container);

src/Testing/RuleTestCase.php

@@ -107,7 +107,7 @@ protected function createNodeScopeResolver(): NodeScopeResolver|GeneratorNodeSco
 			$readWritePropertiesExtensions !== [] ? new DirectReadWritePropertiesExtensionProvider($readWritePropertiesExtensions) : self::getContainer()->getByType(ReadWritePropertiesExtensionProvider::class),
 			self::getContainer()->getByType(ParameterClosureThisExtensionProvider::class),
 			self::getContainer()->getByType(ParameterClosureTypeExtensionProvider::class),
-			self::createScopeFactory(),
+			self::createScopeFactory($reflectionProvider, $typeSpecifier),
 			$this->shouldPolluteScopeWithLoopInitialAssignments(),
 			$this->shouldPolluteScopeWithAlwaysIterableForeach(),
 			self::getContainer()->getParameter('polluteScopeWithBlock'),
@@ -128,7 +128,10 @@ private function getAnalyser(DirectRuleRegistry $ruleRegistry): Analyser
 			$nodeScopeResolver = $this->createNodeScopeResolver();
 
 			$fileAnalyser = new FileAnalyser(
-				self::createScopeFactory(),
+				self::createScopeFactory(
+					$this->createReflectionProvider(),
+					$this->getTypeSpecifier(),
+				),
 				self::getContainer()->getByType(GeneratorScopeFactory::class),
 				$nodeScopeResolver,
 				$this->getParser(),
@@ -276,7 +279,7 @@ private function gatherAnalyserErrorsWithDelayedErrors(array $files): array
 			$ruleRegistry,
 			new IgnoreErrorExtensionProvider(self::getContainer()),
 			self::getContainer()->getByType(RuleErrorTransformer::class),
-			self::createScopeFactory(),
+			self::createScopeFactory($reflectionProvider, self::getContainer()->getService('typeSpecifier')),
 			new LocalIgnoresProcessor(),
 			true,
 		);

src/Testing/TypeInferenceTestCase.php

@@ -81,7 +81,7 @@ protected static function createNodeScopeResolver(): NodeScopeResolver|Generator
 			self::getContainer()->getByType(ReadWritePropertiesExtensionProvider::class),
 			self::getContainer()->getByType(ParameterClosureThisExtensionProvider::class),
 			self::getContainer()->getByType(ParameterClosureTypeExtensionProvider::class),
-			self::createScopeFactory(),
+			self::createScopeFactory($reflectionProvider, $typeSpecifier),
 			self::getContainer()->getParameter('polluteScopeWithLoopInitialAssignments'),
 			self::getContainer()->getParameter('polluteScopeWithAlwaysIterableForeach'),
 			self::getContainer()->getParameter('polluteScopeWithBlock'),
@@ -102,7 +102,7 @@ protected static function createScope(
 		array $dynamicConstantNames = [],
 	): MutatingScope
 	{
-		$scopeFactory = self::createScopeFactory($dynamicConstantNames);
+		$scopeFactory = self::createScopeFactory(self::createReflectionProvider(), self::getContainer()->getService('typeSpecifier'), $dynamicConstantNames);
 		return $scopeFactory->create(ScopeContext::create($file));
 	}
 

tests/PHPStan/Analyser/AnalyserTest.php

@@ -771,7 +771,10 @@ private function runAnalyser(
 			new DirectRuleRegistry([]),
 			new IgnoreErrorExtensionProvider(new NetteContainer(new Container([]))),
 			self::getContainer()->getByType(RuleErrorTransformer::class),
-			self::createScopeFactory(),
+			$this->createScopeFactory(
+				self::createReflectionProvider(),
+				self::getContainer()->getService('typeSpecifier'),
+			),
 			new LocalIgnoresProcessor(),
 			$reportUnmatchedIgnoredErrors,
 		);
@@ -824,7 +827,7 @@ private function createAnalyser(): Analyser
 			self::getContainer()->getByType(ReadWritePropertiesExtensionProvider::class),
 			self::getContainer()->getByType(ParameterClosureThisExtensionProvider::class),
 			self::getContainer()->getByType(ParameterClosureTypeExtensionProvider::class),
-			self::createScopeFactory(),
+			self::createScopeFactory($reflectionProvider, $typeSpecifier),
 			false,
 			true,
 			true,
@@ -837,7 +840,7 @@ private function createAnalyser(): Analyser
 		);
 		$lexer = new Lexer();
 		$fileAnalyser = new FileAnalyser(
-			self::createScopeFactory(),
+			self::createScopeFactory($reflectionProvider, $typeSpecifier),
 			self::getContainer()->getByType(GeneratorScopeFactory::class),
 			$nodeScopeResolver,
 			new RichParser(

tests/PHPStan/Analyser/TypeSpecifierTest.php

@@ -64,7 +64,7 @@ protected function setUp(): void
 		$reflectionProvider = self::createReflectionProvider();
 		$this->printer = new Printer();
 		$this->typeSpecifier = self::getContainer()->getService('typeSpecifier');
-		$this->scope = self::createScopeFactory()->create(ScopeContext::create(''));
+		$this->scope = self::createScopeFactory($reflectionProvider, $this->typeSpecifier)->create(ScopeContext::create(''));
 		$this->scope = $this->scope->enterClass($reflectionProvider->getClass('DateTime'));
 		$this->scope = $this->scope->assignVariable('bar', new ObjectType('Bar'), new ObjectType('Bar'), TrinaryLogic::createYes());
 		$this->scope = $this->scope->assignVariable('stringOrNull', new UnionType([new StringType(), new NullType()]), new UnionType([new StringType(), new NullType()]), TrinaryLogic::createYes());