diff --git a/src/Testing/TypeInferenceTestCase.php b/src/Testing/TypeInferenceTestCase.php index e86fab7d4b..0d187d45b5 100644 --- a/src/Testing/TypeInferenceTestCase.php +++ b/src/Testing/TypeInferenceTestCase.php @@ -56,33 +56,34 @@ abstract class TypeInferenceTestCase extends PHPStanTestCase protected static function createNodeScopeResolver(): NodeScopeResolver|GeneratorNodeScopeResolver { $reflectionProvider = self::createReflectionProvider(); - $typeSpecifier = self::getContainer()->getService('typeSpecifier'); + $container = self::getContainer(); + $typeSpecifier = $container->getService('typeSpecifier'); return new NodeScopeResolver( $reflectionProvider, - self::getContainer()->getByType(InitializerExprTypeResolver::class), + $container->getByType(InitializerExprTypeResolver::class), self::getReflector(), - self::getContainer()->getByType(ClassReflectionFactory::class), - self::getContainer()->getByType(ParameterOutTypeExtensionProvider::class), + $container->getByType(ClassReflectionFactory::class), + $container->getByType(ParameterOutTypeExtensionProvider::class), self::getParser(), - self::getContainer()->getByType(FileTypeMapper::class), - self::getContainer()->getByType(PhpVersion::class), - self::getContainer()->getByType(PhpDocInheritanceResolver::class), - self::getContainer()->getByType(FileHelper::class), + $container->getByType(FileTypeMapper::class), + $container->getByType(PhpVersion::class), + $container->getByType(PhpDocInheritanceResolver::class), + $container->getByType(FileHelper::class), $typeSpecifier, - self::getContainer()->getByType(DynamicThrowTypeExtensionProvider::class), - self::getContainer()->getByType(ReadWritePropertiesExtensionProvider::class), - self::getContainer()->getByType(ParameterClosureThisExtensionProvider::class), - self::getContainer()->getByType(ParameterClosureTypeExtensionProvider::class), + $container->getByType(DynamicThrowTypeExtensionProvider::class), + $container->getByType(ReadWritePropertiesExtensionProvider::class), + $container->getByType(ParameterClosureThisExtensionProvider::class), + $container->getByType(ParameterClosureTypeExtensionProvider::class), self::createScopeFactory($reflectionProvider, $typeSpecifier), - self::getContainer()->getParameter('polluteScopeWithLoopInitialAssignments'), - self::getContainer()->getParameter('polluteScopeWithAlwaysIterableForeach'), - self::getContainer()->getParameter('polluteScopeWithBlock'), + $container->getParameter('polluteScopeWithLoopInitialAssignments'), + $container->getParameter('polluteScopeWithAlwaysIterableForeach'), + $container->getParameter('polluteScopeWithBlock'), static::getEarlyTerminatingMethodCalls(), static::getEarlyTerminatingFunctionCalls(), - self::getContainer()->getParameter('exceptions')['implicitThrows'], - self::getContainer()->getParameter('treatPhpDocTypesAsCertain'), - self::getContainer()->getParameter('narrowMethodScopeFromConstructor'), + $container->getParameter('exceptions')['implicitThrows'], + $container->getParameter('treatPhpDocTypesAsCertain'), + $container->getParameter('narrowMethodScopeFromConstructor'), ); } diff --git a/tests/PHPStan/Analyser/Generator/GeneratorNodeScopeResolverRuleTest.php b/tests/PHPStan/Analyser/Generator/GeneratorNodeScopeResolverRuleTest.php index 76709d737e..4922e127c0 100644 --- a/tests/PHPStan/Analyser/Generator/GeneratorNodeScopeResolverRuleTest.php +++ b/tests/PHPStan/Analyser/Generator/GeneratorNodeScopeResolverRuleTest.php @@ -180,9 +180,10 @@ public function testRule(callable $ruleCallback, array $expectedErrors): void protected function createNodeScopeResolver(): GeneratorNodeScopeResolver { + $container = self::getContainer(); return new GeneratorNodeScopeResolver( - self::getContainer()->getByType(ExprPrinter::class), - self::getContainer(), + $container->getByType(ExprPrinter::class), + $container, ); } diff --git a/tests/PHPStan/Rules/Classes/ClassAttributesRuleTest.php b/tests/PHPStan/Rules/Classes/ClassAttributesRuleTest.php index 5b4375f033..978eb83e71 100644 --- a/tests/PHPStan/Rules/Classes/ClassAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Classes/ClassAttributesRuleTest.php @@ -28,6 +28,7 @@ class ClassAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ClassAttributesRule( new AttributesCheck( $reflectionProvider, @@ -43,9 +44,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Classes/ClassConstantAttributesRuleTest.php b/tests/PHPStan/Rules/Classes/ClassConstantAttributesRuleTest.php index a2a1f5328b..8e594f53eb 100644 --- a/tests/PHPStan/Rules/Classes/ClassConstantAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Classes/ClassConstantAttributesRuleTest.php @@ -23,6 +23,7 @@ class ClassConstantAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ClassConstantAttributesRule( new AttributesCheck( $reflectionProvider, @@ -38,9 +39,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php b/tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php index 9d24119731..1f6fb214a3 100644 --- a/tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php +++ b/tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php @@ -24,14 +24,15 @@ class ClassConstantRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ClassConstantRule( $reflectionProvider, new RuleLevelHelper($reflectionProvider, true, false, true, true, true, false, true), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new PhpVersion($this->phpVersion), true, diff --git a/tests/PHPStan/Rules/Classes/ExistingClassInClassExtendsRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassInClassExtendsRuleTest.php index 4ae78ffe28..7fb35730e8 100644 --- a/tests/PHPStan/Rules/Classes/ExistingClassInClassExtendsRuleTest.php +++ b/tests/PHPStan/Rules/Classes/ExistingClassInClassExtendsRuleTest.php @@ -18,12 +18,13 @@ class ExistingClassInClassExtendsRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassInClassExtendsRule( new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), $reflectionProvider, true, diff --git a/tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleTest.php index 4c4431ec02..dd97849d3b 100644 --- a/tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleTest.php +++ b/tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleTest.php @@ -19,13 +19,14 @@ class ExistingClassInInstanceOfRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassInInstanceOfRule( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, true, diff --git a/tests/PHPStan/Rules/Classes/ExistingClassInTraitUseRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassInTraitUseRuleTest.php index a605490cfc..ea3ab6b789 100644 --- a/tests/PHPStan/Rules/Classes/ExistingClassInTraitUseRuleTest.php +++ b/tests/PHPStan/Rules/Classes/ExistingClassInTraitUseRuleTest.php @@ -18,12 +18,13 @@ class ExistingClassInTraitUseRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassInTraitUseRule( new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), $reflectionProvider, true, diff --git a/tests/PHPStan/Rules/Classes/ExistingClassesInClassImplementsRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassesInClassImplementsRuleTest.php index c3aea0595c..d263d24aad 100644 --- a/tests/PHPStan/Rules/Classes/ExistingClassesInClassImplementsRuleTest.php +++ b/tests/PHPStan/Rules/Classes/ExistingClassesInClassImplementsRuleTest.php @@ -18,12 +18,13 @@ class ExistingClassesInClassImplementsRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassesInClassImplementsRule( new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), $reflectionProvider, true, diff --git a/tests/PHPStan/Rules/Classes/ExistingClassesInEnumImplementsRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassesInEnumImplementsRuleTest.php index 98bf1f3608..2fb677f6e1 100644 --- a/tests/PHPStan/Rules/Classes/ExistingClassesInEnumImplementsRuleTest.php +++ b/tests/PHPStan/Rules/Classes/ExistingClassesInEnumImplementsRuleTest.php @@ -19,12 +19,13 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassesInEnumImplementsRule( new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), $reflectionProvider, true, diff --git a/tests/PHPStan/Rules/Classes/ExistingClassesInInterfaceExtendsRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassesInInterfaceExtendsRuleTest.php index 18ecc90324..58d0bd9013 100644 --- a/tests/PHPStan/Rules/Classes/ExistingClassesInInterfaceExtendsRuleTest.php +++ b/tests/PHPStan/Rules/Classes/ExistingClassesInInterfaceExtendsRuleTest.php @@ -18,12 +18,13 @@ class ExistingClassesInInterfaceExtendsRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassesInInterfaceExtendsRule( new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), $reflectionProvider, true, diff --git a/tests/PHPStan/Rules/Classes/ForbiddenNameCheckExtensionRuleTest.php b/tests/PHPStan/Rules/Classes/ForbiddenNameCheckExtensionRuleTest.php index cf4d172f92..64eedaa7cb 100644 --- a/tests/PHPStan/Rules/Classes/ForbiddenNameCheckExtensionRuleTest.php +++ b/tests/PHPStan/Rules/Classes/ForbiddenNameCheckExtensionRuleTest.php @@ -23,15 +23,16 @@ class ForbiddenNameCheckExtensionRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new InstantiationRule( - self::getContainer(), + $container, $reflectionProvider, new FunctionCallParametersCheck(new RuleLevelHelper($reflectionProvider, true, false, true, false, false, false, true), new NullsafeCheck(), new UnresolvableTypeHelper(), new PropertyReflectionFinder(), true, true, true, true), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new ConsistentConstructorHelper(), true, diff --git a/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php b/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php index 945f08e533..26a872d9e8 100644 --- a/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php +++ b/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php @@ -23,15 +23,16 @@ class InstantiationRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new InstantiationRule( - self::getContainer(), + $container, $reflectionProvider, new FunctionCallParametersCheck(new RuleLevelHelper($reflectionProvider, true, false, true, false, false, false, true), new NullsafeCheck(), new UnresolvableTypeHelper(), new PropertyReflectionFinder(), true, true, true, true), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new ConsistentConstructorHelper(), true, diff --git a/tests/PHPStan/Rules/Classes/LocalTypeAliasesRuleTest.php b/tests/PHPStan/Rules/Classes/LocalTypeAliasesRuleTest.php index b08d3804bf..937678e376 100644 --- a/tests/PHPStan/Rules/Classes/LocalTypeAliasesRuleTest.php +++ b/tests/PHPStan/Rules/Classes/LocalTypeAliasesRuleTest.php @@ -23,17 +23,18 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new LocalTypeAliasesRule( new LocalTypeAliasesCheck( ['GlobalTypeAlias' => 'int|string'], self::createReflectionProvider(), - self::getContainer()->getByType(TypeNodeResolver::class), + $container->getByType(TypeNodeResolver::class), new MissingTypehintCheck(true, []), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new UnresolvableTypeHelper(), new GenericObjectTypeCheck(), diff --git a/tests/PHPStan/Rules/Classes/LocalTypeTraitAliasesRuleTest.php b/tests/PHPStan/Rules/Classes/LocalTypeTraitAliasesRuleTest.php index bd93fd00a2..42fc04162c 100644 --- a/tests/PHPStan/Rules/Classes/LocalTypeTraitAliasesRuleTest.php +++ b/tests/PHPStan/Rules/Classes/LocalTypeTraitAliasesRuleTest.php @@ -22,17 +22,18 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new LocalTypeTraitAliasesRule( new LocalTypeAliasesCheck( ['GlobalTypeAlias' => 'int|string'], self::createReflectionProvider(), - self::getContainer()->getByType(TypeNodeResolver::class), + $container->getByType(TypeNodeResolver::class), new MissingTypehintCheck(true, []), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new UnresolvableTypeHelper(), new GenericObjectTypeCheck(), diff --git a/tests/PHPStan/Rules/Classes/LocalTypeTraitUseAliasesRuleTest.php b/tests/PHPStan/Rules/Classes/LocalTypeTraitUseAliasesRuleTest.php index d2c40ea875..9cb131f4b0 100644 --- a/tests/PHPStan/Rules/Classes/LocalTypeTraitUseAliasesRuleTest.php +++ b/tests/PHPStan/Rules/Classes/LocalTypeTraitUseAliasesRuleTest.php @@ -22,17 +22,18 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new LocalTypeTraitUseAliasesRule( new LocalTypeAliasesCheck( ['GlobalTypeAlias' => 'int|string'], self::createReflectionProvider(), - self::getContainer()->getByType(TypeNodeResolver::class), + $container->getByType(TypeNodeResolver::class), new MissingTypehintCheck(true, []), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new UnresolvableTypeHelper(), new GenericObjectTypeCheck(), diff --git a/tests/PHPStan/Rules/Classes/MethodTagRuleTest.php b/tests/PHPStan/Rules/Classes/MethodTagRuleTest.php index 3587a486ac..7ad38610fc 100644 --- a/tests/PHPStan/Rules/Classes/MethodTagRuleTest.php +++ b/tests/PHPStan/Rules/Classes/MethodTagRuleTest.php @@ -21,14 +21,15 @@ protected function getRule(): TRule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new MethodTagRule( new MethodTagCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), new MissingTypehintCheck(true, []), diff --git a/tests/PHPStan/Rules/Classes/MethodTagTraitRuleTest.php b/tests/PHPStan/Rules/Classes/MethodTagTraitRuleTest.php index 2581708333..c49384db82 100644 --- a/tests/PHPStan/Rules/Classes/MethodTagTraitRuleTest.php +++ b/tests/PHPStan/Rules/Classes/MethodTagTraitRuleTest.php @@ -21,14 +21,15 @@ protected function getRule(): TRule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new MethodTagTraitRule( new MethodTagCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), new MissingTypehintCheck(true, []), diff --git a/tests/PHPStan/Rules/Classes/MethodTagTraitUseRuleTest.php b/tests/PHPStan/Rules/Classes/MethodTagTraitUseRuleTest.php index d2c390632a..7b297798f2 100644 --- a/tests/PHPStan/Rules/Classes/MethodTagTraitUseRuleTest.php +++ b/tests/PHPStan/Rules/Classes/MethodTagTraitUseRuleTest.php @@ -22,14 +22,15 @@ protected function getRule(): TRule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new MethodTagTraitUseRule( new MethodTagCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), new MissingTypehintCheck(true, []), diff --git a/tests/PHPStan/Rules/Classes/MixinRuleTest.php b/tests/PHPStan/Rules/Classes/MixinRuleTest.php index 7cbd36cda4..e3604e12d8 100644 --- a/tests/PHPStan/Rules/Classes/MixinRuleTest.php +++ b/tests/PHPStan/Rules/Classes/MixinRuleTest.php @@ -22,14 +22,15 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new MixinRule( new MixinCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), new MissingTypehintCheck(true, []), diff --git a/tests/PHPStan/Rules/Classes/MixinTraitRuleTest.php b/tests/PHPStan/Rules/Classes/MixinTraitRuleTest.php index 0c330061d8..b71109d5e2 100644 --- a/tests/PHPStan/Rules/Classes/MixinTraitRuleTest.php +++ b/tests/PHPStan/Rules/Classes/MixinTraitRuleTest.php @@ -21,14 +21,15 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new MixinTraitRule( new MixinCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), new MissingTypehintCheck(true, []), diff --git a/tests/PHPStan/Rules/Classes/MixinTraitUseRuleTest.php b/tests/PHPStan/Rules/Classes/MixinTraitUseRuleTest.php index 23108e7e09..a1a6adfd04 100644 --- a/tests/PHPStan/Rules/Classes/MixinTraitUseRuleTest.php +++ b/tests/PHPStan/Rules/Classes/MixinTraitUseRuleTest.php @@ -21,14 +21,15 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new MixinTraitUseRule( new MixinCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), new MissingTypehintCheck(true, []), diff --git a/tests/PHPStan/Rules/Classes/PropertyTagRuleTest.php b/tests/PHPStan/Rules/Classes/PropertyTagRuleTest.php index c78a1ab297..09c07f76a7 100644 --- a/tests/PHPStan/Rules/Classes/PropertyTagRuleTest.php +++ b/tests/PHPStan/Rules/Classes/PropertyTagRuleTest.php @@ -21,14 +21,15 @@ protected function getRule(): TRule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new PropertyTagRule( new PropertyTagCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), new MissingTypehintCheck(true, []), diff --git a/tests/PHPStan/Rules/Classes/PropertyTagTraitRuleTest.php b/tests/PHPStan/Rules/Classes/PropertyTagTraitRuleTest.php index df9bfe5254..6ce25d3c3d 100644 --- a/tests/PHPStan/Rules/Classes/PropertyTagTraitRuleTest.php +++ b/tests/PHPStan/Rules/Classes/PropertyTagTraitRuleTest.php @@ -21,14 +21,15 @@ protected function getRule(): TRule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new PropertyTagTraitRule( new PropertyTagCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), new MissingTypehintCheck(true, []), diff --git a/tests/PHPStan/Rules/Classes/PropertyTagTraitUseRuleTest.php b/tests/PHPStan/Rules/Classes/PropertyTagTraitUseRuleTest.php index cdce3b7f87..8f8dd243b7 100644 --- a/tests/PHPStan/Rules/Classes/PropertyTagTraitUseRuleTest.php +++ b/tests/PHPStan/Rules/Classes/PropertyTagTraitUseRuleTest.php @@ -21,14 +21,15 @@ protected function getRule(): TRule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new PropertyTagTraitUseRule( new PropertyTagCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), new MissingTypehintCheck(true, []), diff --git a/tests/PHPStan/Rules/Constants/ConstantAttributesRuleTest.php b/tests/PHPStan/Rules/Constants/ConstantAttributesRuleTest.php index 5014e4a415..698d60678c 100644 --- a/tests/PHPStan/Rules/Constants/ConstantAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Constants/ConstantAttributesRuleTest.php @@ -29,6 +29,7 @@ class ConstantAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ConstantAttributesRule( new AttributesCheck( $reflectionProvider, @@ -44,9 +45,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/EnumCases/EnumCaseAttributesRuleTest.php b/tests/PHPStan/Rules/EnumCases/EnumCaseAttributesRuleTest.php index 1028c66778..1b43de86af 100644 --- a/tests/PHPStan/Rules/EnumCases/EnumCaseAttributesRuleTest.php +++ b/tests/PHPStan/Rules/EnumCases/EnumCaseAttributesRuleTest.php @@ -24,6 +24,7 @@ class EnumCaseAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new EnumCaseAttributesRule( new AttributesCheck( $reflectionProvider, @@ -39,9 +40,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Exceptions/CaughtExceptionExistenceRuleTest.php b/tests/PHPStan/Rules/Exceptions/CaughtExceptionExistenceRuleTest.php index c56c830bb6..312ef01b05 100644 --- a/tests/PHPStan/Rules/Exceptions/CaughtExceptionExistenceRuleTest.php +++ b/tests/PHPStan/Rules/Exceptions/CaughtExceptionExistenceRuleTest.php @@ -17,13 +17,14 @@ class CaughtExceptionExistenceRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new CaughtExceptionExistenceRule( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, true, diff --git a/tests/PHPStan/Rules/Functions/ArrowFunctionAttributesRuleTest.php b/tests/PHPStan/Rules/Functions/ArrowFunctionAttributesRuleTest.php index 64ce4730fe..7f26ab879e 100644 --- a/tests/PHPStan/Rules/Functions/ArrowFunctionAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Functions/ArrowFunctionAttributesRuleTest.php @@ -23,6 +23,7 @@ class ArrowFunctionAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ArrowFunctionAttributesRule( new AttributesCheck( $reflectionProvider, @@ -38,9 +39,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Functions/ClosureAttributesRuleTest.php b/tests/PHPStan/Rules/Functions/ClosureAttributesRuleTest.php index 659659449e..ecc2531fe4 100644 --- a/tests/PHPStan/Rules/Functions/ClosureAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Functions/ClosureAttributesRuleTest.php @@ -23,6 +23,7 @@ class ClosureAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ClosureAttributesRule( new AttributesCheck( $reflectionProvider, @@ -38,9 +39,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Functions/ExistingClassesInArrowFunctionTypehintsRuleTest.php b/tests/PHPStan/Rules/Functions/ExistingClassesInArrowFunctionTypehintsRuleTest.php index 0ca5ca5013..2ad8d13f92 100644 --- a/tests/PHPStan/Rules/Functions/ExistingClassesInArrowFunctionTypehintsRuleTest.php +++ b/tests/PHPStan/Rules/Functions/ExistingClassesInArrowFunctionTypehintsRuleTest.php @@ -25,14 +25,15 @@ class ExistingClassesInArrowFunctionTypehintsRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassesInArrowFunctionTypehintsRule( new FunctionDefinitionCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new UnresolvableTypeHelper(), new PhpVersion($this->phpVersionId), diff --git a/tests/PHPStan/Rules/Functions/ExistingClassesInClosureTypehintsRuleTest.php b/tests/PHPStan/Rules/Functions/ExistingClassesInClosureTypehintsRuleTest.php index 1fa4bd16dc..7758fca476 100644 --- a/tests/PHPStan/Rules/Functions/ExistingClassesInClosureTypehintsRuleTest.php +++ b/tests/PHPStan/Rules/Functions/ExistingClassesInClosureTypehintsRuleTest.php @@ -25,14 +25,15 @@ class ExistingClassesInClosureTypehintsRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassesInClosureTypehintsRule( new FunctionDefinitionCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new UnresolvableTypeHelper(), new PhpVersion($this->phpVersionId), diff --git a/tests/PHPStan/Rules/Functions/ExistingClassesInTypehintsRuleTest.php b/tests/PHPStan/Rules/Functions/ExistingClassesInTypehintsRuleTest.php index 79beed0ea4..c92323fdec 100644 --- a/tests/PHPStan/Rules/Functions/ExistingClassesInTypehintsRuleTest.php +++ b/tests/PHPStan/Rules/Functions/ExistingClassesInTypehintsRuleTest.php @@ -25,14 +25,15 @@ class ExistingClassesInTypehintsRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassesInTypehintsRule( new FunctionDefinitionCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new UnresolvableTypeHelper(), new PhpVersion($this->phpVersionId), diff --git a/tests/PHPStan/Rules/Functions/FunctionAttributesRuleTest.php b/tests/PHPStan/Rules/Functions/FunctionAttributesRuleTest.php index 0ad48b3e98..3b7253311e 100644 --- a/tests/PHPStan/Rules/Functions/FunctionAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Functions/FunctionAttributesRuleTest.php @@ -23,6 +23,7 @@ class FunctionAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new FunctionAttributesRule( new AttributesCheck( $reflectionProvider, @@ -38,9 +39,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Functions/ParamAttributesRuleTest.php b/tests/PHPStan/Rules/Functions/ParamAttributesRuleTest.php index 0b0296bc6a..d6e6c46744 100644 --- a/tests/PHPStan/Rules/Functions/ParamAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Functions/ParamAttributesRuleTest.php @@ -23,6 +23,7 @@ class ParamAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ParamAttributesRule( new AttributesCheck( $reflectionProvider, @@ -38,9 +39,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Generics/ClassTemplateTypeRuleTest.php b/tests/PHPStan/Rules/Generics/ClassTemplateTypeRuleTest.php index 27ed122f68..3889dc5677 100644 --- a/tests/PHPStan/Rules/Generics/ClassTemplateTypeRuleTest.php +++ b/tests/PHPStan/Rules/Generics/ClassTemplateTypeRuleTest.php @@ -20,14 +20,15 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $typeAliasResolver = $this->createTypeAliasResolver(['TypeAlias' => 'int'], $reflectionProvider); + $container = self::getContainer(); return new ClassTemplateTypeRule( new TemplateTypeCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), $typeAliasResolver, diff --git a/tests/PHPStan/Rules/Generics/FunctionTemplateTypeRuleTest.php b/tests/PHPStan/Rules/Generics/FunctionTemplateTypeRuleTest.php index ef504c54da..2ecba0fc61 100644 --- a/tests/PHPStan/Rules/Generics/FunctionTemplateTypeRuleTest.php +++ b/tests/PHPStan/Rules/Generics/FunctionTemplateTypeRuleTest.php @@ -20,15 +20,16 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $typeAliasResolver = $this->createTypeAliasResolver(['TypeAlias' => 'int'], $reflectionProvider); + $container = self::getContainer(); return new FunctionTemplateTypeRule( - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(FileTypeMapper::class), new TemplateTypeCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), $typeAliasResolver, diff --git a/tests/PHPStan/Rules/Generics/InterfaceTemplateTypeRuleTest.php b/tests/PHPStan/Rules/Generics/InterfaceTemplateTypeRuleTest.php index e4c0da47f3..34115b037a 100644 --- a/tests/PHPStan/Rules/Generics/InterfaceTemplateTypeRuleTest.php +++ b/tests/PHPStan/Rules/Generics/InterfaceTemplateTypeRuleTest.php @@ -19,14 +19,15 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $typeAliasResolver = $this->createTypeAliasResolver(['TypeAlias' => 'int'], $reflectionProvider); + $container = self::getContainer(); return new InterfaceTemplateTypeRule( new TemplateTypeCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), $typeAliasResolver, diff --git a/tests/PHPStan/Rules/Generics/MethodTagTemplateTypeRuleTest.php b/tests/PHPStan/Rules/Generics/MethodTagTemplateTypeRuleTest.php index c936422dce..d8b2582bc1 100644 --- a/tests/PHPStan/Rules/Generics/MethodTagTemplateTypeRuleTest.php +++ b/tests/PHPStan/Rules/Generics/MethodTagTemplateTypeRuleTest.php @@ -20,16 +20,17 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $typeAliasResolver = $this->createTypeAliasResolver(['TypeAlias' => 'int'], $reflectionProvider); + $container = self::getContainer(); return new MethodTagTemplateTypeRule( new MethodTagTemplateTypeCheck( - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(FileTypeMapper::class), new TemplateTypeCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), $typeAliasResolver, diff --git a/tests/PHPStan/Rules/Generics/MethodTagTemplateTypeTraitRuleTest.php b/tests/PHPStan/Rules/Generics/MethodTagTemplateTypeTraitRuleTest.php index f26d3e1611..a47ea46988 100644 --- a/tests/PHPStan/Rules/Generics/MethodTagTemplateTypeTraitRuleTest.php +++ b/tests/PHPStan/Rules/Generics/MethodTagTemplateTypeTraitRuleTest.php @@ -20,16 +20,17 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $typeAliasResolver = $this->createTypeAliasResolver(['TypeAlias' => 'int'], $reflectionProvider); + $container = self::getContainer(); return new MethodTagTemplateTypeTraitRule( new MethodTagTemplateTypeCheck( - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(FileTypeMapper::class), new TemplateTypeCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), $typeAliasResolver, diff --git a/tests/PHPStan/Rules/Generics/MethodTemplateTypeRuleTest.php b/tests/PHPStan/Rules/Generics/MethodTemplateTypeRuleTest.php index d8b9b5a909..872d525b00 100644 --- a/tests/PHPStan/Rules/Generics/MethodTemplateTypeRuleTest.php +++ b/tests/PHPStan/Rules/Generics/MethodTemplateTypeRuleTest.php @@ -20,15 +20,16 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $typeAliasResolver = $this->createTypeAliasResolver(['TypeAlias' => 'int'], $reflectionProvider); + $container = self::getContainer(); return new MethodTemplateTypeRule( - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(FileTypeMapper::class), new TemplateTypeCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), $typeAliasResolver, diff --git a/tests/PHPStan/Rules/Generics/TraitTemplateTypeRuleTest.php b/tests/PHPStan/Rules/Generics/TraitTemplateTypeRuleTest.php index f40914464b..9336e1d873 100644 --- a/tests/PHPStan/Rules/Generics/TraitTemplateTypeRuleTest.php +++ b/tests/PHPStan/Rules/Generics/TraitTemplateTypeRuleTest.php @@ -20,15 +20,16 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $typeAliasResolver = $this->createTypeAliasResolver(['TypeAlias' => 'int'], $reflectionProvider); + $container = self::getContainer(); return new TraitTemplateTypeRule( - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(FileTypeMapper::class), new TemplateTypeCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), $typeAliasResolver, diff --git a/tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php index 1b850d15be..558607e8f5 100644 --- a/tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php +++ b/tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php @@ -33,15 +33,16 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); $ruleLevelHelper = new RuleLevelHelper($reflectionProvider, true, $this->checkThisOnly, true, $this->checkExplicitMixed, $this->checkImplicitMixed, false, true); + $container = self::getContainer(); return new CallStaticMethodsRule( new StaticMethodCallCheck( $reflectionProvider, $ruleLevelHelper, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, true, diff --git a/tests/PHPStan/Rules/Methods/ConsistentConstructorRuleTest.php b/tests/PHPStan/Rules/Methods/ConsistentConstructorRuleTest.php index 8b4c5fd973..186540b63e 100644 --- a/tests/PHPStan/Rules/Methods/ConsistentConstructorRuleTest.php +++ b/tests/PHPStan/Rules/Methods/ConsistentConstructorRuleTest.php @@ -13,10 +13,11 @@ class ConsistentConstructorRuleTest extends RuleTestCase protected function getRule(): Rule { + $container = self::getContainer(); return new ConsistentConstructorRule( new ConsistentConstructorHelper(), - self::getContainer()->getByType(MethodParameterComparisonHelper::class), - self::getContainer()->getByType(MethodVisibilityComparisonHelper::class), + $container->getByType(MethodParameterComparisonHelper::class), + $container->getByType(MethodVisibilityComparisonHelper::class), ); } diff --git a/tests/PHPStan/Rules/Methods/ExistingClassesInTypehintsRuleTest.php b/tests/PHPStan/Rules/Methods/ExistingClassesInTypehintsRuleTest.php index ee7e28cb76..e35e63bd3c 100644 --- a/tests/PHPStan/Rules/Methods/ExistingClassesInTypehintsRuleTest.php +++ b/tests/PHPStan/Rules/Methods/ExistingClassesInTypehintsRuleTest.php @@ -25,14 +25,15 @@ class ExistingClassesInTypehintsRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassesInTypehintsRule( new FunctionDefinitionCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new UnresolvableTypeHelper(), new PhpVersion($this->phpVersionId), diff --git a/tests/PHPStan/Rules/Methods/MethodAttributesRuleTest.php b/tests/PHPStan/Rules/Methods/MethodAttributesRuleTest.php index 2245a8cb2a..00ecb75183 100644 --- a/tests/PHPStan/Rules/Methods/MethodAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Methods/MethodAttributesRuleTest.php @@ -23,6 +23,7 @@ class MethodAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new MethodAttributesRule( new AttributesCheck( $reflectionProvider, @@ -38,9 +39,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Methods/StaticMethodCallableRuleTest.php b/tests/PHPStan/Rules/Methods/StaticMethodCallableRuleTest.php index 2511b87083..de79d04034 100644 --- a/tests/PHPStan/Rules/Methods/StaticMethodCallableRuleTest.php +++ b/tests/PHPStan/Rules/Methods/StaticMethodCallableRuleTest.php @@ -25,15 +25,16 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $ruleLevelHelper = new RuleLevelHelper($reflectionProvider, true, false, true, false, false, false, true); + $container = self::getContainer(); return new StaticMethodCallableRule( new StaticMethodCallCheck( $reflectionProvider, $ruleLevelHelper, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, true, diff --git a/tests/PHPStan/Rules/Namespaces/ExistingNamesInGroupUseRuleTest.php b/tests/PHPStan/Rules/Namespaces/ExistingNamesInGroupUseRuleTest.php index 470da7e107..7430c8ca8a 100644 --- a/tests/PHPStan/Rules/Namespaces/ExistingNamesInGroupUseRuleTest.php +++ b/tests/PHPStan/Rules/Namespaces/ExistingNamesInGroupUseRuleTest.php @@ -17,13 +17,14 @@ class ExistingNamesInGroupUseRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingNamesInGroupUseRule( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, true, diff --git a/tests/PHPStan/Rules/Namespaces/ExistingNamesInUseRuleTest.php b/tests/PHPStan/Rules/Namespaces/ExistingNamesInUseRuleTest.php index e78cd77e65..a5978a173b 100644 --- a/tests/PHPStan/Rules/Namespaces/ExistingNamesInUseRuleTest.php +++ b/tests/PHPStan/Rules/Namespaces/ExistingNamesInUseRuleTest.php @@ -17,13 +17,14 @@ class ExistingNamesInUseRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingNamesInUseRule( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, true, diff --git a/tests/PHPStan/Rules/PhpDoc/FunctionAssertRuleTest.php b/tests/PHPStan/Rules/PhpDoc/FunctionAssertRuleTest.php index 93ad74a014..84d94062bb 100644 --- a/tests/PHPStan/Rules/PhpDoc/FunctionAssertRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/FunctionAssertRuleTest.php @@ -19,14 +19,15 @@ class FunctionAssertRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new FunctionAssertRule(new AssertRuleHelper( $reflectionProvider, new UnresolvableTypeHelper(), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new MissingTypehintCheck(true, []), new GenericObjectTypeCheck(), diff --git a/tests/PHPStan/Rules/PhpDoc/IncompatiblePhpDocTypeRuleTest.php b/tests/PHPStan/Rules/PhpDoc/IncompatiblePhpDocTypeRuleTest.php index e7430a3ed4..9c5a496ef6 100644 --- a/tests/PHPStan/Rules/PhpDoc/IncompatiblePhpDocTypeRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/IncompatiblePhpDocTypeRuleTest.php @@ -23,8 +23,9 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $typeAliasResolver = $this->createTypeAliasResolver(['TypeAlias' => 'int'], $reflectionProvider); + $container = self::getContainer(); return new IncompatiblePhpDocTypeRule( - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(FileTypeMapper::class), new IncompatiblePhpDocTypeCheck( new GenericObjectTypeCheck(), new UnresolvableTypeHelper(), @@ -33,9 +34,9 @@ protected function getRule(): Rule $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), $typeAliasResolver, diff --git a/tests/PHPStan/Rules/PhpDoc/IncompatiblePropertyHookPhpDocTypeRuleTest.php b/tests/PHPStan/Rules/PhpDoc/IncompatiblePropertyHookPhpDocTypeRuleTest.php index 8dd6faa5d2..bf375abd9b 100644 --- a/tests/PHPStan/Rules/PhpDoc/IncompatiblePropertyHookPhpDocTypeRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/IncompatiblePropertyHookPhpDocTypeRuleTest.php @@ -23,8 +23,9 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $typeAliasResolver = $this->createTypeAliasResolver([], $reflectionProvider); + $container = self::getContainer(); return new IncompatiblePropertyHookPhpDocTypeRule( - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(FileTypeMapper::class), new IncompatiblePhpDocTypeCheck( new GenericObjectTypeCheck(), new UnresolvableTypeHelper(), @@ -33,9 +34,9 @@ protected function getRule(): Rule $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), $typeAliasResolver, diff --git a/tests/PHPStan/Rules/PhpDoc/IncompatiblePropertyPhpDocTypeRuleTest.php b/tests/PHPStan/Rules/PhpDoc/IncompatiblePropertyPhpDocTypeRuleTest.php index 17f4b86072..fbde4cf288 100644 --- a/tests/PHPStan/Rules/PhpDoc/IncompatiblePropertyPhpDocTypeRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/IncompatiblePropertyPhpDocTypeRuleTest.php @@ -22,6 +22,7 @@ protected function getRule(): Rule $reflectionProvider = self::createReflectionProvider(); $typeAliasResolver = $this->createTypeAliasResolver(['TypeAlias' => 'int'], $reflectionProvider); + $container = self::getContainer(); return new IncompatiblePropertyPhpDocTypeRule( new GenericObjectTypeCheck(), new UnresolvableTypeHelper(), @@ -30,9 +31,9 @@ protected function getRule(): Rule $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), $typeAliasResolver, diff --git a/tests/PHPStan/Rules/PhpDoc/InvalidPHPStanDocTagRuleTest.php b/tests/PHPStan/Rules/PhpDoc/InvalidPHPStanDocTagRuleTest.php index 6b5ba10a37..ba9b73ad41 100644 --- a/tests/PHPStan/Rules/PhpDoc/InvalidPHPStanDocTagRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/InvalidPHPStanDocTagRuleTest.php @@ -16,9 +16,10 @@ class InvalidPHPStanDocTagRuleTest extends RuleTestCase protected function getRule(): Rule { + $container = self::getContainer(); return new InvalidPHPStanDocTagRule( - self::getContainer()->getByType(Lexer::class), - self::getContainer()->getByType(PhpDocParser::class), + $container->getByType(Lexer::class), + $container->getByType(PhpDocParser::class), ); } diff --git a/tests/PHPStan/Rules/PhpDoc/InvalidPhpDocTagValueRuleTest.php b/tests/PHPStan/Rules/PhpDoc/InvalidPhpDocTagValueRuleTest.php index 81c0868e3e..dcb6f03bbf 100644 --- a/tests/PHPStan/Rules/PhpDoc/InvalidPhpDocTagValueRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/InvalidPhpDocTagValueRuleTest.php @@ -16,9 +16,10 @@ class InvalidPhpDocTagValueRuleTest extends RuleTestCase protected function getRule(): Rule { + $container = self::getContainer(); return new InvalidPhpDocTagValueRule( - self::getContainer()->getByType(Lexer::class), - self::getContainer()->getByType(PhpDocParser::class), + $container->getByType(Lexer::class), + $container->getByType(PhpDocParser::class), ); } diff --git a/tests/PHPStan/Rules/PhpDoc/InvalidPhpDocVarTagTypeRuleTest.php b/tests/PHPStan/Rules/PhpDoc/InvalidPhpDocVarTagTypeRuleTest.php index 1c3f33d575..687597c13a 100644 --- a/tests/PHPStan/Rules/PhpDoc/InvalidPhpDocVarTagTypeRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/InvalidPhpDocVarTagTypeRuleTest.php @@ -21,14 +21,15 @@ class InvalidPhpDocVarTagTypeRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new InvalidPhpDocVarTagTypeRule( - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(FileTypeMapper::class), $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new GenericObjectTypeCheck(), new MissingTypehintCheck(true, []), diff --git a/tests/PHPStan/Rules/PhpDoc/MethodAssertRuleTest.php b/tests/PHPStan/Rules/PhpDoc/MethodAssertRuleTest.php index 72c156b2f8..d4a8da69de 100644 --- a/tests/PHPStan/Rules/PhpDoc/MethodAssertRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/MethodAssertRuleTest.php @@ -19,14 +19,15 @@ class MethodAssertRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new MethodAssertRule(new AssertRuleHelper( $reflectionProvider, new UnresolvableTypeHelper(), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new MissingTypehintCheck(true, []), new GenericObjectTypeCheck(), diff --git a/tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionClassRuleTest.php b/tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionClassRuleTest.php index 8a9546216e..a86ee69a86 100644 --- a/tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionClassRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionClassRuleTest.php @@ -19,13 +19,14 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new RequireExtendsDefinitionClassRule( new RequireExtendsCheck( new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, true, diff --git a/tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionTraitRuleTest.php b/tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionTraitRuleTest.php index e345685e67..0c8d232f5d 100644 --- a/tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionTraitRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionTraitRuleTest.php @@ -19,14 +19,15 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new RequireExtendsDefinitionTraitRule( $reflectionProvider, new RequireExtendsCheck( new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, true, diff --git a/tests/PHPStan/Rules/PhpDoc/RequireImplementsDefinitionTraitRuleTest.php b/tests/PHPStan/Rules/PhpDoc/RequireImplementsDefinitionTraitRuleTest.php index 1d0421388f..1a4307d5e6 100644 --- a/tests/PHPStan/Rules/PhpDoc/RequireImplementsDefinitionTraitRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/RequireImplementsDefinitionTraitRuleTest.php @@ -19,13 +19,14 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new RequireImplementsDefinitionTraitRule( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, true, diff --git a/tests/PHPStan/Rules/PhpDoc/SealedDefinitionClassRuleTest.php b/tests/PHPStan/Rules/PhpDoc/SealedDefinitionClassRuleTest.php index 3ec5da8925..7332e38674 100644 --- a/tests/PHPStan/Rules/PhpDoc/SealedDefinitionClassRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/SealedDefinitionClassRuleTest.php @@ -19,12 +19,13 @@ protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new SealedDefinitionClassRule( new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, true, diff --git a/tests/PHPStan/Rules/PhpDoc/VarTagChangedExpressionTypeRuleTest.php b/tests/PHPStan/Rules/PhpDoc/VarTagChangedExpressionTypeRuleTest.php index d515b2c8af..e6008951aa 100644 --- a/tests/PHPStan/Rules/PhpDoc/VarTagChangedExpressionTypeRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/VarTagChangedExpressionTypeRuleTest.php @@ -15,9 +15,10 @@ class VarTagChangedExpressionTypeRuleTest extends RuleTestCase protected function getRule(): Rule { + $container = self::getContainer(); return new VarTagChangedExpressionTypeRule(new VarTagTypeRuleHelper( - self::getContainer()->getByType(TypeNodeResolver::class), - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(TypeNodeResolver::class), + $container->getByType(FileTypeMapper::class), self::createReflectionProvider(), true, true, diff --git a/tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php b/tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php index 513c9118a7..b0d9948e37 100644 --- a/tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php +++ b/tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php @@ -21,11 +21,12 @@ class WrongVariableNameInVarTagRuleTest extends RuleTestCase protected function getRule(): Rule { + $container = self::getContainer(); return new WrongVariableNameInVarTagRule( - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(FileTypeMapper::class), new VarTagTypeRuleHelper( - self::getContainer()->getByType(TypeNodeResolver::class), - self::getContainer()->getByType(FileTypeMapper::class), + $container->getByType(TypeNodeResolver::class), + $container->getByType(FileTypeMapper::class), self::createReflectionProvider(), $this->checkTypeAgainstPhpDocType, $this->strictWideningCheck, diff --git a/tests/PHPStan/Rules/Playground/PromoteParameterRuleTest.php b/tests/PHPStan/Rules/Playground/PromoteParameterRuleTest.php index 40f16771aa..fc4942719b 100644 --- a/tests/PHPStan/Rules/Playground/PromoteParameterRuleTest.php +++ b/tests/PHPStan/Rules/Playground/PromoteParameterRuleTest.php @@ -16,12 +16,13 @@ class PromoteParameterRuleTest extends RuleTestCase protected function getRule(): Rule { + $container = self::getContainer(); return new PromoteParameterRule( new UninitializedPropertyRule(new ConstructorsHelper( - self::getContainer(), + $container, [], )), - self::getContainer(), + $container, ClassPropertiesNode::class, false, 'checkUninitializedProperties', diff --git a/tests/PHPStan/Rules/Playground/PromoteParameterRuleWithOriginalRuleTest.php b/tests/PHPStan/Rules/Playground/PromoteParameterRuleWithOriginalRuleTest.php index 4495def574..27106d4c4b 100644 --- a/tests/PHPStan/Rules/Playground/PromoteParameterRuleWithOriginalRuleTest.php +++ b/tests/PHPStan/Rules/Playground/PromoteParameterRuleWithOriginalRuleTest.php @@ -21,17 +21,18 @@ class PromoteParameterRuleWithOriginalRuleTest extends RuleTestCase protected function getRule(): Rule { + $container = self::getContainer(); return new PromoteParameterRule( new OverridingMethodRule( - self::getContainer()->getByType(PhpVersion::class), - self::getContainer()->getByType(MethodSignatureRule::class), + $container->getByType(PhpVersion::class), + $container->getByType(MethodSignatureRule::class), true, - self::getContainer()->getByType(MethodParameterComparisonHelper::class), - self::getContainer()->getByType(MethodVisibilityComparisonHelper::class), - self::getContainer()->getByType(MethodPrototypeFinder::class), + $container->getByType(MethodParameterComparisonHelper::class), + $container->getByType(MethodVisibilityComparisonHelper::class), + $container->getByType(MethodPrototypeFinder::class), true, ), - self::getContainer(), + $container, InClassMethodNode::class, false, 'checkMissingOverrideMethodAttribute', diff --git a/tests/PHPStan/Rules/Properties/ExistingClassesInPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/ExistingClassesInPropertiesRuleTest.php index ac30206c91..c713d8200c 100644 --- a/tests/PHPStan/Rules/Properties/ExistingClassesInPropertiesRuleTest.php +++ b/tests/PHPStan/Rules/Properties/ExistingClassesInPropertiesRuleTest.php @@ -23,13 +23,14 @@ class ExistingClassesInPropertiesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassesInPropertiesRule( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new UnresolvableTypeHelper(), new PhpVersion($this->phpVersion), diff --git a/tests/PHPStan/Rules/Properties/ExistingClassesInPropertyHookTypehintsRuleTest.php b/tests/PHPStan/Rules/Properties/ExistingClassesInPropertyHookTypehintsRuleTest.php index 05610e0482..0059a8c1fb 100644 --- a/tests/PHPStan/Rules/Properties/ExistingClassesInPropertyHookTypehintsRuleTest.php +++ b/tests/PHPStan/Rules/Properties/ExistingClassesInPropertyHookTypehintsRuleTest.php @@ -22,14 +22,15 @@ class ExistingClassesInPropertyHookTypehintsRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new ExistingClassesInPropertyHookTypehintsRule( new FunctionDefinitionCheck( $reflectionProvider, new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, true), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), new UnresolvableTypeHelper(), new PhpVersion(PHP_VERSION_ID), diff --git a/tests/PHPStan/Rules/Properties/PropertyAttributesRuleTest.php b/tests/PHPStan/Rules/Properties/PropertyAttributesRuleTest.php index d321050a1c..a09e4e8f81 100644 --- a/tests/PHPStan/Rules/Properties/PropertyAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Properties/PropertyAttributesRuleTest.php @@ -25,6 +25,7 @@ class PropertyAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new PropertyAttributesRule( new AttributesCheck( $reflectionProvider, @@ -40,9 +41,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Properties/PropertyHookAttributesRuleTest.php b/tests/PHPStan/Rules/Properties/PropertyHookAttributesRuleTest.php index e59a22028d..f1db640b3f 100644 --- a/tests/PHPStan/Rules/Properties/PropertyHookAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Properties/PropertyHookAttributesRuleTest.php @@ -23,6 +23,7 @@ class PropertyHookAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new PropertyHookAttributesRule( new AttributesCheck( $reflectionProvider, @@ -38,9 +39,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Traits/TraitAttributesRuleTest.php b/tests/PHPStan/Rules/Traits/TraitAttributesRuleTest.php index 5fc1e04084..1a0ff65182 100644 --- a/tests/PHPStan/Rules/Traits/TraitAttributesRuleTest.php +++ b/tests/PHPStan/Rules/Traits/TraitAttributesRuleTest.php @@ -30,6 +30,7 @@ class TraitAttributesRuleTest extends RuleTestCase protected function getRule(): Rule { $reflectionProvider = self::createReflectionProvider(); + $container = self::getContainer(); return new TraitAttributesRule( new AttributesCheck( $reflectionProvider, @@ -45,9 +46,9 @@ protected function getRule(): Rule ), new ClassNameCheck( new ClassCaseSensitivityCheck($reflectionProvider, false), - new ClassForbiddenNameCheck(self::getContainer()), + new ClassForbiddenNameCheck($container), $reflectionProvider, - self::getContainer(), + $container, ), true, ), diff --git a/tests/PHPStan/Rules/Variables/UnsetRuleTest.php b/tests/PHPStan/Rules/Variables/UnsetRuleTest.php index 9f071f96e9..44b7d96857 100644 --- a/tests/PHPStan/Rules/Variables/UnsetRuleTest.php +++ b/tests/PHPStan/Rules/Variables/UnsetRuleTest.php @@ -18,9 +18,10 @@ class UnsetRuleTest extends RuleTestCase protected function getRule(): Rule { + $container = self::getContainer(); return new UnsetRule( - self::getContainer()->getByType(PropertyReflectionFinder::class), - self::getContainer()->getByType(PhpVersion::class), + $container->getByType(PropertyReflectionFinder::class), + $container->getByType(PhpVersion::class), ); }