Fix for Psr\Container\ContainerInterface type

Author: tomasfejfar

extension.neon

@@ -28,6 +28,9 @@ services:
 -
 factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Component\DependencyInjection\ContainerInterface, %symfony.constant_hassers%)
 tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
+-
+factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Psr\Container\ContainerInterface, %symfony.constant_hassers%)
+tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 -
 factory: PHPStan\Type\Symfony\ServiceDynamicReturnTypeExtension(Symfony\Bundle\FrameworkBundle\Controller\Controller, %symfony.constant_hassers%)
 tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
@@ -39,6 +42,9 @@ services:
 -
 factory: PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension(Symfony\Component\DependencyInjection\ContainerInterface)
 tags: [phpstan.typeSpecifier.methodTypeSpecifyingExtension]
+-
+factory: PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension(Psr\Container\ContainerInterface)
+tags: [phpstan.typeSpecifier.methodTypeSpecifyingExtension]
 -
 factory: PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension(Symfony\Bundle\FrameworkBundle\Controller\Controller)
 tags: [phpstan.typeSpecifier.methodTypeSpecifyingExtension]

src/Rules/Symfony/ContainerInterfacePrivateServiceRule.php

@@ -61,7 +61,13 @@ public function processNode(Node $node, Scope $scope): array
 $isControllerType = (new ObjectType('Symfony\Bundle\FrameworkBundle\Controller\Controller'))->isSuperTypeOf($argType);
 $isAbstractControllerType = (new ObjectType('Symfony\Bundle\FrameworkBundle\Controller\AbstractController'))->isSuperTypeOf($argType);
 $isContainerType = (new ObjectType('Symfony\Component\DependencyInjection\ContainerInterface'))->isSuperTypeOf($argType);
-if (!$isControllerType->yes() && !$isAbstractControllerType->yes() && !$isContainerType->yes()) {
+$isPsrContainerType = (new ObjectType('Psr\Container\ContainerInterface'))->isSuperTypeOf($argType);
+if (
+!$isControllerType->yes()
+&& !$isAbstractControllerType->yes()
+&& !$isContainerType->yes()
+&& !$isPsrContainerType->yes()
+) {
 return [];
 }
 

src/Rules/Symfony/ContainerInterfaceUnknownServiceRule.php

@@ -58,7 +58,13 @@ public function processNode(Node $node, Scope $scope): array
 $isControllerType = (new ObjectType('Symfony\Bundle\FrameworkBundle\Controller\Controller'))->isSuperTypeOf($argType);
 $isAbstractControllerType = (new ObjectType('Symfony\Bundle\FrameworkBundle\Controller\AbstractController'))->isSuperTypeOf($argType);
 $isContainerType = (new ObjectType('Symfony\Component\DependencyInjection\ContainerInterface'))->isSuperTypeOf($argType);
-if (!$isControllerType->yes() && !$isAbstractControllerType->yes() && !$isContainerType->yes()) {
+$isPsrContainerType = (new ObjectType('Psr\Container\ContainerInterface'))->isSuperTypeOf($argType);
+if (
+!$isControllerType->yes()
+&& !$isAbstractControllerType->yes()
+&& !$isContainerType->yes()
+&& !$isPsrContainerType->yes()
+) {
 return [];
 }