Simplify

Author: VincentLanglet

extension.neon

@@ -361,9 +361,3 @@ services:
 		class: PHPStan\Symfony\SymfonyContainerResultCacheMetaExtension
 		tags:
 			- phpstan.resultCacheMetaExtension
-	-
-		class: PHPStan\Type\Symfony\Container\KernelBrowserGetContainerDynamicReturnTypeExtension
-		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
-	-
-		class: PHPStan\Type\Symfony\Container\KernelTestCaseGetContainerDynamicReturnTypeExtension
-		tags: [phpstan.broker.dynamicStaticMethodReturnTypeExtension]

src/Rules/Symfony/ContainerInterfacePrivateServiceRule.php

@@ -10,7 +10,6 @@
 use PHPStan\Symfony\ServiceMap;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\ObjectType;
-use PHPStan\Type\Symfony\Container\TestContainerType;
 use PHPStan\Type\Type;
 use function sprintf;
 
@@ -44,17 +43,11 @@ public function processNode(Node $node, Scope $scope): array
 
 		$argType = $scope->getType($node->var);
 
-		if (
-			$argType instanceof TestContainerType
-			|| (new ObjectType('Symfony\Bundle\FrameworkBundle\Test\TestContainer'))->isSuperTypeOf($argType)->yes()
-		) {
-			return [];
-		}
-
+		$isTestContainer = $this->isTestContainer($argType, $scope);
 		$isOldServiceSubscriber = (new ObjectType('Symfony\Component\DependencyInjection\ServiceSubscriberInterface'))->isSuperTypeOf($argType);
 		$isServiceSubscriber = $this->isServiceSubscriber($argType, $scope);
 		$isServiceLocator = (new ObjectType('Symfony\Component\DependencyInjection\ServiceLocator'))->isSuperTypeOf($argType);
-		if ($isOldServiceSubscriber->yes() || $isServiceSubscriber->yes() || $isServiceLocator->yes()) {
+		if ($isTestContainer->yes() || $isOldServiceSubscriber->yes() || $isServiceSubscriber->yes() || $isServiceLocator->yes()) {
 			return [];
 		}
 
@@ -98,4 +91,25 @@ private function isServiceSubscriber(Type $containerType, Scope $scope): Trinary
 		return $isContainerServiceSubscriber->or($serviceSubscriberInterfaceType->isSuperTypeOf($containedClassType)->result);
 	}
 
+	private function isTestContainer(Type $containerType, Scope $scope): TrinaryLogic
+	{
+		$testContainer = new ObjectType('Symfony\Bundle\FrameworkBundle\Test\TestContainer');
+		$isTestContainer = $testContainer->isSuperTypeOf($containerType)->result;
+
+		$classReflection = $scope->getClassReflection();
+		if ($classReflection === null) {
+			return $isTestContainer;
+		}
+
+		$containerInterface = new ObjectType('Symfony\Component\DependencyInjection\ContainerInterface');
+		$kernelTestCase = new ObjectType('Symfony\Bundle\FrameworkBundle\Test\KernelTestCase');
+		$containedClassType = new ObjectType($classReflection->getName());
+
+		return $isTestContainer->or(
+			$containerInterface->isSuperTypeOf($containerType)->result->and(
+				$kernelTestCase->isSuperTypeOf($containedClassType)->result,
+			),
+		);
+	}
+
 }

src/Type/Symfony/Container/KernelBrowserGetContainerDynamicReturnTypeExtension.php

@@ -87,11 +87,4 @@ public function testGetPrivateServiceInTest(): void
 		);
 	}
 
-	public static function getAdditionalConfigFiles(): array
-	{
-		return [
-			__DIR__ . '/container-extensions.neon',
-		];
-	}
-
 }