Allow fetching private services from ServiceLocator

phpstan · Apr 27, 2021 · e4b9ea9 · e4b9ea9
1 parent 8ae41d1
commit e4b9ea9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/Rules/Symfony/ContainerInterfacePrivateServiceRule.php b/src/Rules/Symfony/ContainerInterfacePrivateServiceRule.php
@@ -54,7 +54,8 @@ public function processNode(Node $node, Scope $scope): array
 		$isTestContainerType = (new ObjectType('Symfony\Bundle\FrameworkBundle\Test\TestContainer'))->isSuperTypeOf($argType);
 		$isOldServiceSubscriber = (new ObjectType('Symfony\Component\DependencyInjection\ServiceSubscriberInterface'))->isSuperTypeOf($argType);
 		$isServiceSubscriber = (new ObjectType('Symfony\Contracts\Service\ServiceSubscriberInterface'))->isSuperTypeOf($argType);
-		if ($isTestContainerType->yes() || $isOldServiceSubscriber->yes() || $isServiceSubscriber->yes()) {
+		$isServiceLocator = (new ObjectType('Symfony\Component\DependencyInjection\ServiceLocator'))->isSuperTypeOf($argType);
+		if ($isTestContainerType->yes() || $isOldServiceSubscriber->yes() || $isServiceSubscriber->yes() || $isServiceLocator->yes()) {
 			return [];
 		}
 

diff --git a/tests/Rules/Symfony/ExampleController.php b/tests/Rules/Symfony/ExampleController.php
@@ -39,4 +39,9 @@ public function unknownGuardedServiceOutsideOfContext(): void
 		$this->get('unknown');
 	}
 
+	public function privateServiceFromServiceLocator(): void
+	{
+		$this->get('service_locator')->get('private');
+	}
+
 }
diff --git a/tests/Rules/Symfony/container.xml b/tests/Rules/Symfony/container.xml
@@ -3,5 +3,10 @@
     <services>
         <service id="private" class="Foo" public="false"></service>
         <service id="public" class="Foo"></service>
+        <service id="service_locator" class="Symfony\Component\DependencyInjection\ServiceLocator" public="true">
+            <argument type="collection">
+                <argument key="private" type="service" id="private"/>
+            </argument>
+        </service>
     </services>
 </container>