[DependencyInjection] Fix linting factories implemented via __callStatic

KevinVanSonsbeek · nicolas-grekas · commit e2f69af6bd39 · 2024-10-22T20:49:12.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
@@ -202,6 +202,10 @@ protected function getReflectionMethod(Definition $definition, string $method)
                 return new \ReflectionMethod(static function (...$arguments) {}, '__invoke');
             }
 
+            if ($r->hasMethod('__callStatic') && ($r = $r->getMethod('__callStatic')) && $r->isPublic()) {
+                return new \ReflectionMethod(static function (...$arguments) {}, '__invoke');
+            }
+
             throw new RuntimeException(sprintf('Invalid service "%s": method "%s()" does not exist.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -1015,6 +1015,17 @@ public function testCallableClass()
         $this->addToAssertionCount(1);
     }
 
+    public function testStaticCallableClass()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', StaticCallableClass::class)
+            ->setFactory([StaticCallableClass::class, 'staticMethodCall']);
+
+        (new CheckTypeDeclarationsPass())->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
     public function testIgnoreDefinitionFactoryArgument()
     {
         $container = new ContainerBuilder();
@@ -1050,3 +1061,10 @@ public function __call($name, $arguments)
     {
     }
 }
+
+class StaticCallableClass
+{
+    public static function __callStatic($name, $arguments)
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,10 @@ protected function getReflectionMethod(Definition $definition, string $method)`
`202`	`202`	`return new \ReflectionMethod(static function (...$arguments) {}, '__invoke');`
`203`	`203`	`}`
`204`	`204`
	`205`	`+ if ($r->hasMethod('__callStatic') && ($r = $r->getMethod('__callStatic')) && $r->isPublic()) {`
	`206`	`+ return new \ReflectionMethod(static function (...$arguments) {}, '__invoke');`
	`207`	`+ }`
	`208`	`+`
`205`	`209`	`throw new RuntimeException(sprintf('Invalid service "%s": method "%s()" does not exist.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));`
`206`	`210`	`}`
`207`	`211`
Original file line number	Diff line number	Diff line change
`@@ -1015,6 +1015,17 @@ public function testCallableClass()`
`1015`	`1015`	`$this->addToAssertionCount(1);`
`1016`	`1016`	`}`
`1017`	`1017`
	`1018`	`+ public function testStaticCallableClass()`
	`1019`	`+ {`
	`1020`	`+ $container = new ContainerBuilder();`
	`1021`	`+ $container->register('foo', StaticCallableClass::class)`
	`1022`	`+ ->setFactory([StaticCallableClass::class, 'staticMethodCall']);`
	`1023`	`+`
	`1024`	`+ (new CheckTypeDeclarationsPass())->process($container);`
	`1025`	`+`
	`1026`	`+ $this->addToAssertionCount(1);`
	`1027`	`+ }`
	`1028`	`+`
`1018`	`1029`	`public function testIgnoreDefinitionFactoryArgument()`
`1019`	`1030`	`{`
`1020`	`1031`	`$container = new ContainerBuilder();`
`@@ -1050,3 +1061,10 @@ public function __call($name, $arguments)`
`1050`	`1061`	`{`
`1051`	`1062`	`}`
`1052`	`1063`	`}`
	`1064`	`+`
	`1065`	`+class StaticCallableClass`
	`1066`	`+{`
	`1067`	`+ public static function __callStatic($name, $arguments)`
	`1068`	`+ {`
	`1069`	`+ }`
	`1070`	`+}`