|
3 | 3 | namespace PHPStan\Testing;
|
4 | 4 |
|
5 | 5 | use PHPStan\Analyser\ConstantResolver;
|
6 |
| -use PHPStan\Analyser\DirectScopeFactory; |
| 6 | +use PHPStan\Analyser\DirectInternalScopeFactory; |
7 | 7 | use PHPStan\Analyser\Error;
|
8 | 8 | use PHPStan\Analyser\MutatingScope;
|
9 | 9 | use PHPStan\Analyser\NodeScopeResolver;
|
@@ -164,21 +164,23 @@ public function createScopeFactory(ReflectionProvider $reflectionProvider, TypeS
|
164 | 164 | $reflectionProviderProvider = new DirectReflectionProviderProvider($reflectionProvider);
|
165 | 165 | $constantResolver = new ConstantResolver($reflectionProviderProvider, $dynamicConstantNames);
|
166 | 166 |
|
167 |
| - return new DirectScopeFactory( |
168 |
| - MutatingScope::class, |
169 |
| - $reflectionProvider, |
170 |
| - new InitializerExprTypeResolver($constantResolver, $reflectionProviderProvider, new PhpVersion(PHP_VERSION_ID), $container->getByType(OperatorTypeSpecifyingExtensionRegistryProvider::class)), |
171 |
| - $container->getByType(DynamicReturnTypeExtensionRegistryProvider::class), |
172 |
| - $container->getByType(ExprPrinter::class), |
173 |
| - $typeSpecifier, |
174 |
| - new PropertyReflectionFinder(), |
175 |
| - $this->getParser(), |
176 |
| - $container->getByType(NodeScopeResolver::class), |
177 |
| - $this->shouldTreatPhpDocTypesAsCertain(), |
178 |
| - $container->getByType(PhpVersion::class), |
179 |
| - $container->getParameter('featureToggles')['explicitMixedInUnknownGenericNew'], |
180 |
| - $container->getParameter('featureToggles')['explicitMixedForGlobalVariables'], |
181 |
| - $constantResolver, |
| 167 | + return new ScopeFactory( |
| 168 | + new DirectInternalScopeFactory( |
| 169 | + MutatingScope::class, |
| 170 | + $reflectionProvider, |
| 171 | + new InitializerExprTypeResolver($constantResolver, $reflectionProviderProvider, new PhpVersion(PHP_VERSION_ID), $container->getByType(OperatorTypeSpecifyingExtensionRegistryProvider::class)), |
| 172 | + $container->getByType(DynamicReturnTypeExtensionRegistryProvider::class), |
| 173 | + $container->getByType(ExprPrinter::class), |
| 174 | + $typeSpecifier, |
| 175 | + new PropertyReflectionFinder(), |
| 176 | + $this->getParser(), |
| 177 | + $container->getByType(NodeScopeResolver::class), |
| 178 | + $this->shouldTreatPhpDocTypesAsCertain(), |
| 179 | + $container->getByType(PhpVersion::class), |
| 180 | + $container->getParameter('featureToggles')['explicitMixedInUnknownGenericNew'], |
| 181 | + $container->getParameter('featureToggles')['explicitMixedForGlobalVariables'], |
| 182 | + $constantResolver, |
| 183 | + ), |
182 | 184 | );
|
183 | 185 | }
|
184 | 186 |
|
|
0 commit comments