Detect even factory calls

shipmonk-rnd · Dec 23, 2024 · 384aa1e · 384aa1e
1 parent e642b86
commit 384aa1e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/Provider/SymfonyUsageProvider.php b/src/Provider/SymfonyUsageProvider.php
@@ -30,11 +30,11 @@ class SymfonyUsageProvider implements MemberUsageProvider
     private bool $enabled;
 
     /**
-     * class => methods[]
+     * class => [method => true]
      *
      * @var array<string, array<string, true>>
      */
-    private array $dicClasses = [];
+    private array $dicCalls = [];
 
     public function __construct(
         ?PHPStanSymfonyConfiguration $symfonyConfiguration,
@@ -166,7 +166,7 @@ private function getUsagesFromReflection(InClassNode $node): array
         $usages = [];
 
         foreach ($nativeReflection->getMethods() as $method) {
-            if (isset($this->dicClasses[$className][$method->getName()])) {
+            if (isset($this->dicCalls[$className][$method->getName()])) {
                 $usages[] = $this->createUsage($classReflection->getNativeMethod($method->getName()));
             }
 
@@ -220,13 +220,9 @@ protected function fillDicClasses(string $containerXmlPath): void
                 continue;
             }
 
-            $this->dicClasses[$class]['__construct'] = true;
+            $this->dicCalls[$class]['__construct'] = true;
 
-            if (!isset($serviceDefinition->call)) {
-                continue;
-            }
-
-            foreach ($serviceDefinition->call as $callDefinition) {
+            foreach ($serviceDefinition->call ?? [] as $callDefinition) {
                 /** @var SimpleXMLElement $callAttributes */
                 $callAttributes = $callDefinition->attributes();
                 $method = $callAttributes->method !== null ? (string) $callAttributes->method : null;
@@ -235,7 +231,20 @@ protected function fillDicClasses(string $containerXmlPath): void
                     continue;
                 }
 
-                $this->dicClasses[$class][$method] = true;
+                $this->dicCalls[$class][$method] = true;
+            }
+
+            foreach ($serviceDefinition->factory ?? [] as $factoryDefinition) {
+                /** @var SimpleXMLElement $factoryAttributes */
+                $factoryAttributes = $factoryDefinition->attributes();
+                $class = $factoryAttributes->class !== null ? (string) $factoryAttributes->class : null;
+                $method = $factoryAttributes->method !== null ? (string) $factoryAttributes->method : null;
+
+                if ($class === null || $method === null) {
+                    continue;
+                }
+
+                $this->dicCalls[$class][$method] = true;
             }
         }
     }

diff --git a/tests/Rule/data/providers/symfony.php b/tests/Rule/data/providers/symfony.php
@@ -94,6 +94,7 @@ public function __construct() {}
 
 class DicClass1 extends DicClassParent {
     public function calledViaDic(): void {}
+    public function calledViaDicFactory(): void {}
 }
 
 class DicClass2 {

diff --git a/tests/Rule/data/providers/symfony/services.xml b/tests/Rule/data/providers/symfony/services.xml
@@ -4,6 +4,7 @@
         <service id="Symfony\DicClass1" class="Symfony\DicClass1" public="true" autowire="true" autoconfigure="true">
             <call method="calledViaDic">
             </call>
+            <factory class="Symfony\DicClass1" method="calledViaDicFactory"/>
         </service>
         <service id="Symfony\DicClass2" class="Symfony\DicClass2" public="true" autowire="true" autoconfigure="true">
         </service>