Commit 2834e4a

committed

Simplify

1 parent c8644e1 commit 2834e4aCopy full SHA for 2834e4a

File tree

7 files changed

+23

-108

lines changed

extension.neon
src
- Rules/Symfony
  - ContainerInterfacePrivateServiceRule.php
- Type/Symfony/Container
tests/Rules/Symfony
- ContainerInterfacePrivateServiceRuleTest.php
- container-extensions.neon

7 files changed

+23

-108

lines changed

`‎extension.neon‎`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -361,9 +361,3 @@ services:`
`361`	`361`	`class: PHPStan\Symfony\SymfonyContainerResultCacheMetaExtension`
`362`	`362`	`tags:`
`363`	`363`	`- phpstan.resultCacheMetaExtension`
`364`		`- -`
`365`		`- class: PHPStan\Type\Symfony\Container\KernelBrowserGetContainerDynamicReturnTypeExtension`
`366`		`- tags: [phpstan.broker.dynamicMethodReturnTypeExtension]`
`367`		`- -`
`368`		`- class: PHPStan\Type\Symfony\Container\KernelTestCaseGetContainerDynamicReturnTypeExtension`
`369`		`- tags: [phpstan.broker.dynamicStaticMethodReturnTypeExtension]`

`‎src/Rules/Symfony/ContainerInterfacePrivateServiceRule.php‎`

Lines changed: 23 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`use PHPStan\Symfony\ServiceMap;`
`11`	`11`	`use PHPStan\TrinaryLogic;`
`12`	`12`	`use PHPStan\Type\ObjectType;`
`13`		`-use PHPStan\Type\Symfony\Container\TestContainerType;`
`14`	`13`	`use PHPStan\Type\Type;`
`15`	`14`	`use function sprintf;`
`16`	`15`
`@@ -44,17 +43,11 @@ public function processNode(Node $node, Scope $scope): array`
`44`	`43`
`45`	`44`	`$argType = $scope->getType($node->var);`
`46`	`45`
`47`		`- if (`
`48`		`- $argType instanceof TestContainerType`
`49`		`- \|\| (new ObjectType('Symfony\Bundle\FrameworkBundle\Test\TestContainer'))->isSuperTypeOf($argType)->yes()`
`50`		`- ) {`
`51`		`- return [];`
`52`		`- }`
`53`		`-`
	`46`	`+ $isTestContainer = $this->isTestContainer($argType, $scope);`
`54`	`47`	`$isOldServiceSubscriber = (new ObjectType('Symfony\Component\DependencyInjection\ServiceSubscriberInterface'))->isSuperTypeOf($argType);`
`55`	`48`	`$isServiceSubscriber = $this->isServiceSubscriber($argType, $scope);`
`56`	`49`	`$isServiceLocator = (new ObjectType('Symfony\Component\DependencyInjection\ServiceLocator'))->isSuperTypeOf($argType);`
`57`		`- if ($isOldServiceSubscriber->yes() \|\| $isServiceSubscriber->yes() \|\| $isServiceLocator->yes()) {`
	`50`	`+ if ($isTestContainer->yes() \|\| $isOldServiceSubscriber->yes() \|\| $isServiceSubscriber->yes() \|\| $isServiceLocator->yes()) {`
`58`	`51`	`return [];`
`59`	`52`	`}`
`60`	`53`
`@@ -98,4 +91,25 @@ private function isServiceSubscriber(Type $containerType, Scope $scope): Trinary`
`98`	`91`	`return $isContainerServiceSubscriber->or($serviceSubscriberInterfaceType->isSuperTypeOf($containedClassType)->result);`
`99`	`92`	`}`
`100`	`93`
	`94`	`+ private function isTestContainer(Type $containerType, Scope $scope): TrinaryLogic`
	`95`	`+ {`
	`96`	`+ $testContainer = new ObjectType('Symfony\Bundle\FrameworkBundle\Test\TestContainer');`
	`97`	`+ $isTestContainer = $testContainer->isSuperTypeOf($containerType)->result;`
	`98`	`+`
	`99`	`+ $classReflection = $scope->getClassReflection();`
	`100`	`+ if ($classReflection === null) {`
	`101`	`+ return $isTestContainer;`
	`102`	`+ }`
	`103`	`+`
	`104`	`+ $containerInterface = new ObjectType('Symfony\Component\DependencyInjection\ContainerInterface');`
	`105`	`+ $kernelTestCase = new ObjectType('Symfony\Bundle\FrameworkBundle\Test\KernelTestCase');`
	`106`	`+ $containedClassType = new ObjectType($classReflection->getName());`
	`107`	`+`
	`108`	`+ return $isTestContainer->or(`
	`109`	`+ $containerInterface->isSuperTypeOf($containerType)->result->and(`
	`110`	`+ $kernelTestCase->isSuperTypeOf($containedClassType)->result,`
	`111`	`+ ),`
	`112`	`+ );`
	`113`	`+ }`
	`114`	`+`
`101`	`115`	`}`

`‎src/Type/Symfony/Container/KernelBrowserGetContainerDynamicReturnTypeExtension.php‎`

Lines changed: 0 additions & 29 deletions

This file was deleted.

`‎src/Type/Symfony/Container/KernelTestCaseGetContainerDynamicReturnTypeExtension.php‎`

Lines changed: 0 additions & 29 deletions

This file was deleted.

`‎src/Type/Symfony/Container/TestContainerType.php‎`

Lines changed: 0 additions & 21 deletions

This file was deleted.

`‎tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleTest.php‎`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,4 @@ public function testGetPrivateServiceInTest(): void`
`87`	`87`	`);`
`88`	`88`	`}`
`89`	`89`
`90`		`- public static function getAdditionalConfigFiles(): array`
`91`		`- {`
`92`		`- return [`
`93`		`- __DIR__ . '/container-extensions.neon',`
`94`		`- ];`
`95`		`- }`
`96`		`-`
`97`	`90`	`}`

`‎tests/Rules/Symfony/container-extensions.neon‎`

Lines changed: 0 additions & 7 deletions

This file was deleted.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2834e4a

File tree

7 files changed

7 files changed

`‎extension.neon‎`

`‎src/Rules/Symfony/ContainerInterfacePrivateServiceRule.php‎`

`‎src/Type/Symfony/Container/KernelBrowserGetContainerDynamicReturnTypeExtension.php‎`

`‎src/Type/Symfony/Container/KernelTestCaseGetContainerDynamicReturnTypeExtension.php‎`

`‎src/Type/Symfony/Container/TestContainerType.php‎`

`‎tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleTest.php‎`

`‎tests/Rules/Symfony/container-extensions.neon‎`

0 commit comments