Commit 2313443

tomasfejfarlookyman

authored and

committed

Fix for Psr\Container\ContainerInterface type

1 parent 7ad5b2c commit 2313443Copy full SHA for 2313443

File tree

+20

-2

lines changed

+20

-2

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ services:`
`28`	`28`	`-`
`29`	`29`	`factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Component\DependencyInjection\ContainerInterface, %symfony.constant_hassers%)`
`30`	`30`	`tags: [phpstan.broker.dynamicMethodReturnTypeExtension]`
	`31`	`+ -`
	`32`	`+ factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Psr\Container\ContainerInterface, %symfony.constant_hassers%)`
	`33`	`+ tags: [phpstan.broker.dynamicMethodReturnTypeExtension]`
`31`	`34`	`-`
`32`	`35`	`factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Bundle\FrameworkBundle\Controller\Controller, %symfony.constant_hassers%)`
`33`	`36`	`tags: [phpstan.broker.dynamicMethodReturnTypeExtension]`
`@@ -39,6 +42,9 @@ services:`
`39`	`42`	`-`
`40`	`43`	`factory: PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension(Symfony\Component\DependencyInjection\ContainerInterface)`
`41`	`44`	`tags: [phpstan.typeSpecifier.methodTypeSpecifyingExtension]`
	`45`	`+ -`
	`46`	`+ factory: PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension(Psr\Container\ContainerInterface)`
	`47`	`+ tags: [phpstan.typeSpecifier.methodTypeSpecifyingExtension]`
`42`	`48`	`-`
`43`	`49`	`factory: PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension(Symfony\Bundle\FrameworkBundle\Controller\Controller)`
`44`	`50`	`tags: [phpstan.typeSpecifier.methodTypeSpecifyingExtension]`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,13 @@ public function processNode(Node $node, Scope $scope): array`
`61`	`61`	`$isControllerType = (new ObjectType('Symfony\Bundle\FrameworkBundle\Controller\Controller'))->isSuperTypeOf($argType);`
`62`	`62`	`$isAbstractControllerType = (new ObjectType('Symfony\Bundle\FrameworkBundle\Controller\AbstractController'))->isSuperTypeOf($argType);`
`63`	`63`	`$isContainerType = (new ObjectType('Symfony\Component\DependencyInjection\ContainerInterface'))->isSuperTypeOf($argType);`
`64`		`- if (!$isControllerType->yes() && !$isAbstractControllerType->yes() && !$isContainerType->yes()) {`
	`64`	`+ $isPsrContainerType = (new ObjectType('Psr\Container\ContainerInterface'))->isSuperTypeOf($argType);`
	`65`	`+ if (`
	`66`	`+ !$isControllerType->yes()`
	`67`	`+ && !$isAbstractControllerType->yes()`
	`68`	`+ && !$isContainerType->yes()`
	`69`	`+ && !$isPsrContainerType->yes()`
	`70`	`+ ) {`
`65`	`71`	`return [];`
`66`	`72`	`}`
`67`	`73`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,13 @@ public function processNode(Node $node, Scope $scope): array`
`58`	`58`	`$isControllerType = (new ObjectType('Symfony\Bundle\FrameworkBundle\Controller\Controller'))->isSuperTypeOf($argType);`
`59`	`59`	`$isAbstractControllerType = (new ObjectType('Symfony\Bundle\FrameworkBundle\Controller\AbstractController'))->isSuperTypeOf($argType);`
`60`	`60`	`$isContainerType = (new ObjectType('Symfony\Component\DependencyInjection\ContainerInterface'))->isSuperTypeOf($argType);`
`61`		`- if (!$isControllerType->yes() && !$isAbstractControllerType->yes() && !$isContainerType->yes()) {`
	`61`	`+ $isPsrContainerType = (new ObjectType('Psr\Container\ContainerInterface'))->isSuperTypeOf($argType);`
	`62`	`+ if (`
	`63`	`+ !$isControllerType->yes()`
	`64`	`+ && !$isAbstractControllerType->yes()`
	`65`	`+ && !$isContainerType->yes()`
	`66`	`+ && !$isPsrContainerType->yes()`
	`67`	`+ ) {`
`62`	`68`	`return [];`
`63`	`69`	`}`
`64`	`70`

Comments

(0)