Skip to content

Commit c6262e9

Browse files
staabmondrejmirtes
authored andcommitted
Reduce ContainerFactory::postInitializeContainer() calls
1 parent 745d02b commit c6262e9

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

tests/PHPStan/Analyser/AnalyserTest.php

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -800,26 +800,27 @@ private function createAnalyser(): Analyser
800800
$reflectionProvider = self::createReflectionProvider();
801801
$fileHelper = $this->getFileHelper();
802802

803-
$typeSpecifier = self::getContainer()->getService('typeSpecifier');
804-
$fileTypeMapper = self::getContainer()->getByType(FileTypeMapper::class);
805-
$phpDocInheritanceResolver = new PhpDocInheritanceResolver($fileTypeMapper, self::getContainer()->getByType(StubPhpDocProvider::class));
803+
$container = self::getContainer();
804+
$typeSpecifier = $container->getService('typeSpecifier');
805+
$fileTypeMapper = $container->getByType(FileTypeMapper::class);
806+
$phpDocInheritanceResolver = new PhpDocInheritanceResolver($fileTypeMapper, $container->getByType(StubPhpDocProvider::class));
806807

807808
$nodeScopeResolver = new NodeScopeResolver(
808809
$reflectionProvider,
809-
self::getContainer()->getByType(InitializerExprTypeResolver::class),
810+
$container->getByType(InitializerExprTypeResolver::class),
810811
self::getReflector(),
811-
self::getContainer()->getByType(ClassReflectionFactory::class),
812-
self::getContainer()->getByType(ParameterOutTypeExtensionProvider::class),
812+
$container->getByType(ClassReflectionFactory::class),
813+
$container->getByType(ParameterOutTypeExtensionProvider::class),
813814
$this->getParser(),
814815
$fileTypeMapper,
815-
self::getContainer()->getByType(PhpVersion::class),
816+
$container->getByType(PhpVersion::class),
816817
$phpDocInheritanceResolver,
817818
$fileHelper,
818819
$typeSpecifier,
819-
self::getContainer()->getByType(DynamicThrowTypeExtensionProvider::class),
820-
self::getContainer()->getByType(ReadWritePropertiesExtensionProvider::class),
821-
self::getContainer()->getByType(ParameterClosureThisExtensionProvider::class),
822-
self::getContainer()->getByType(ParameterClosureTypeExtensionProvider::class),
820+
$container->getByType(DynamicThrowTypeExtensionProvider::class),
821+
$container->getByType(ReadWritePropertiesExtensionProvider::class),
822+
$container->getByType(ParameterClosureThisExtensionProvider::class),
823+
$container->getByType(ParameterClosureTypeExtensionProvider::class),
823824
self::createScopeFactory($reflectionProvider, $typeSpecifier),
824825
false,
825826
true,
@@ -833,17 +834,17 @@ private function createAnalyser(): Analyser
833834
$lexer = new Lexer();
834835
$fileAnalyser = new FileAnalyser(
835836
self::createScopeFactory($reflectionProvider, $typeSpecifier),
836-
self::getContainer()->getByType(GeneratorScopeFactory::class),
837+
$container->getByType(GeneratorScopeFactory::class),
837838
$nodeScopeResolver,
838839
new RichParser(
839840
new Php7($lexer),
840841
new NameResolver(),
841-
self::getContainer(),
842+
$container,
842843
new IgnoreLexer(),
843844
),
844845
new DependencyResolver($fileHelper, $reflectionProvider, new ExportedNodeResolver($reflectionProvider, $fileTypeMapper, new ExprPrinter(new Printer())), $fileTypeMapper),
845846
new IgnoreErrorExtensionProvider(new NetteContainer(new Container([]))),
846-
self::getContainer()->getByType(RuleErrorTransformer::class),
847+
$container->getByType(RuleErrorTransformer::class),
847848
new LocalIgnoresProcessor(),
848849
);
849850

0 commit comments

Comments
 (0)