[DependencyInjection] Fix generating adapters of functional interfaces

nicolas-grekas · nicolas-grekas · commit abfa0c36cf5c · 2025-06-19T22:47:42.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php b/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php
@@ -25,7 +25,7 @@
  */
 class LazyClosure
 {
-    public readonly object $service;
+    public readonly object|string $service;
 
     public function __construct(
         private \Closure $initializer,
@@ -87,9 +87,14 @@ public static function getCode(string $initializer, array $callable, Definition
             $code = ' implements \\'.$r->name.' { '.$code;
         }
 
-        $code = 'new class('.$initializer.') extends \\'.self::class
-            .$code.' { '.($methodReflector->hasReturnType() && 'void' === (string) $methodReflector->getReturnType() ? '' : 'return ').'$this->service->'.$callable[1].'('.$args.'); } '
-            .'}';
+        $return = $methodReflector->hasReturnType() && 'void' === (string) $methodReflector->getReturnType() ? '' : 'return ';
+
+        if ('__invoke' === $callable[1]) {
+            $code .= ' { '.$return.'$this->service->'.$callable[1].'('.$args.'); } ';
+        } else {
+            $code .= ' { if (\is_object($this->service)) { '.$return.'$this->service->'.$callable[1].'('.$args.'); } else { '.$return.'[$this->service, \''.$callable[1].'\']('.$args.'); } } ';
+        }
+        $code = 'new class('.$initializer.') extends \\'.self::class.$code.'}';
 
         return $asClosure ? '('.$code.')->'.$method.'(...)' : $code;
     }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1060,7 +1060,8 @@ private function createService(Definition $definition, array &$inlineServices, b
             }
 
             if (\is_array($callable) && (
-                $callable[0] instanceof Reference
+                'Closure' !== $class
+                || $callable[0] instanceof Reference
                 || $callable[0] instanceof Definition && !isset($inlineServices[spl_object_hash($callable[0])])
             )) {
                 $initializer = function () use ($callable, &$inlineServices) {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1202,10 +1202,10 @@ private function addNewInstance(Definition $definition, string $return = '', ?st
                 throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s).', $callable[1] ?: 'n/a'));
             }
 
-            if (['...'] === $arguments && ($definition->isLazy() || 'Closure' !== ($definition->getClass() ?? 'Closure')) && (
+            if (['...'] === $arguments && ('Closure' !== ($definition->getClass() ?? 'Closure') || $definition->isLazy() && (
                 $callable[0] instanceof Reference
                 || ($callable[0] instanceof Definition && !$this->definitionVariables->contains($callable[0]))
-            )) {
+            ))) {
                 $initializer = 'fn () => '.$this->dumpValue($callable[0]);
 
                 return $return.LazyClosure::getCode($initializer, $callable, $definition, $this->container, $id).$tail;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -49,6 +49,7 @@
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
 use Symfony\Component\DependencyInjection\Tests\Compiler\FooAnnotation;
+use Symfony\Component\DependencyInjection\Tests\Compiler\MyCallable;
 use Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Wither;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
@@ -522,6 +523,19 @@ public function testClosureProxy()
         $this->assertInstanceOf(Foo::class, $container->get('closure_proxy')->theMethod());
     }
 
+    public function testClosureProxyWithStaticMethod()
+    {
+        $container = new ContainerBuilder();
+        $container->register('closure_proxy', SingleMethodInterface::class)
+            ->setPublic('true')
+            ->setFactory(['Closure', 'fromCallable'])
+            ->setArguments([[MyCallable::class, 'theMethodImpl']]);
+        $container->compile();
+
+        $this->assertInstanceOf(SingleMethodInterface::class, $container->get('closure_proxy'));
+        $this->assertSame(124, $container->get('closure_proxy')->theMethod());
+    }
+
     public function testCreateServiceClass()
     {
         $builder = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -582,4 +582,9 @@ class MyCallable
     public function __invoke(): void
     {
     }
+
+    public static function theMethodImpl(): int
+    {
+        return 124;
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/callable_adapter_consumer.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/callable_adapter_consumer.php
@@ -50,6 +50,6 @@ public function getRemovedIds(): array
      */
     protected static function getBarService($container)
     {
-        return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\CallableAdapterConsumer(new class(fn () => new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo()) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure implements \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface { public function theMethod() { return $this->service->cloneFoo(...\func_get_args()); } });
+        return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\CallableAdapterConsumer(new class(fn () => new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo()) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure implements \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface { public function theMethod() { if (\is_object($this->service)) { return $this->service->cloneFoo(...\func_get_args()); } else { return [$this->service, 'cloneFoo'](...\func_get_args()); } } });
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure_proxy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure_proxy.php
@@ -55,6 +55,6 @@ protected function createProxy($class, \Closure $factory)
      */
     protected static function getClosureProxyService($container, $lazyLoad = true)
     {
-        return $container->services['closure_proxy'] = new class(fn () => ($container->privates['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure implements \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface { public function theMethod() { return $this->service->cloneFoo(...\func_get_args()); } };
+        return $container->services['closure_proxy'] = new class(fn () => ($container->privates['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure implements \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface { public function theMethod() { if (\is_object($this->service)) { return $this->service->cloneFoo(...\func_get_args()); } else { return [$this->service, 'cloneFoo'](...\func_get_args()); } } };
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_closure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_closure.php
@@ -57,7 +57,7 @@ protected function createProxy($class, \Closure $factory)
      */
     protected static function getClosure1Service($container, $lazyLoad = true)
     {
-        return $container->services['closure1'] = (new class(fn () => ($container->privates['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure { public function cloneFoo(?\stdClass $bar = null): \Symfony\Component\DependencyInjection\Tests\Compiler\Foo { return $this->service->cloneFoo(...\func_get_args()); } })->cloneFoo(...);
+        return $container->services['closure1'] = (new class(fn () => ($container->privates['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure { public function cloneFoo(?\stdClass $bar = null): \Symfony\Component\DependencyInjection\Tests\Compiler\Foo { if (\is_object($this->service)) { return $this->service->cloneFoo(...\func_get_args()); } else { return [$this->service, 'cloneFoo'](...\func_get_args()); } } })->cloneFoo(...);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1060,7 +1060,8 @@ private function createService(Definition $definition, array &$inlineServices, b`
`1060`	`1060`	`}`
`1061`	`1061`
`1062`	`1062`	`if (\is_array($callable) && (`
`1063`		`- $callable[0] instanceof Reference`
	`1063`	`+ 'Closure' !== $class`
	`1064`	`+ \|\| $callable[0] instanceof Reference`
`1064`	`1065`	`\|\| $callable[0] instanceof Definition && !isset($inlineServices[spl_object_hash($callable[0])])`
`1065`	`1066`	`)) {`
`1066`	`1067`	`$initializer = function () use ($callable, &$inlineServices) {`
Original file line number	Diff line number	Diff line change
`@@ -582,4 +582,9 @@ class MyCallable`
`582`	`582`	`public function __invoke(): void`
`583`	`583`	`{`
`584`	`584`	`}`
	`585`	`+`
	`586`	`+ public static function theMethodImpl(): int`
	`587`	`+ {`
	`588`	`+ return 124;`
	`589`	`+ }`
`585`	`590`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@ public function getRemovedIds(): array`
`50`	`50`	`*/`
`51`	`51`	`protected static function getBarService($container)`
`52`	`52`	`{`
`53`		`- return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\CallableAdapterConsumer(new class(fn () => new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo()) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure implements \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface { public function theMethod() { return $this->service->cloneFoo(...\func_get_args()); } });`
	`53`	+ return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\CallableAdapterConsumer(new class(fn () => new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo()) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure implements \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface { public function theMethod() { if (\is_object($this->service)) { return $this->service->cloneFoo(...\func_get_args()); } else { return [$this->service, 'cloneFoo'](...\func_get_args()); } } });
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,6 @@ protected function createProxy($class, \Closure $factory)`
`55`	`55`	`*/`
`56`	`56`	`protected static function getClosureProxyService($container, $lazyLoad = true)`
`57`	`57`	`{`
`58`		`- return $container->services['closure_proxy'] = new class(fn () => ($container->privates['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure implements \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface { public function theMethod() { return $this->service->cloneFoo(...\func_get_args()); } };`
	`58`	+ return $container->services['closure_proxy'] = new class(fn () => ($container->privates['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure implements \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface { public function theMethod() { if (\is_object($this->service)) { return $this->service->cloneFoo(...\func_get_args()); } else { return [$this->service, 'cloneFoo'](...\func_get_args()); } } };
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected function createProxy($class, \Closure $factory)`
`57`	`57`	`*/`
`58`	`58`	`protected static function getClosure1Service($container, $lazyLoad = true)`
`59`	`59`	`{`
`60`		`- return $container->services['closure1'] = (new class(fn () => ($container->privates['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure { public function cloneFoo(?\stdClass $bar = null): \Symfony\Component\DependencyInjection\Tests\Compiler\Foo { return $this->service->cloneFoo(...\func_get_args()); } })->cloneFoo(...);`
	`60`	+ return $container->services['closure1'] = (new class(fn () => ($container->privates['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure { public function cloneFoo(?\stdClass $bar = null): \Symfony\Component\DependencyInjection\Tests\Compiler\Foo { if (\is_object($this->service)) { return $this->service->cloneFoo(...\func_get_args()); } else { return [$this->service, 'cloneFoo'](...\func_get_args()); } } })->cloneFoo(...);
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`