Allow Class::function(...) and global_function(...) closures in PHP DSL for factories

GromNaN · GromNaN · commit 3d2d3430c234 · 2025-09-05T11:07:03.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FactoryTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FactoryTrait.php
@@ -22,8 +22,29 @@ trait FactoryTrait
      *
      * @return $this
      */
-    final public function factory(string|array|ReferenceConfigurator|Expression $factory): static
+    final public function factory(string|array|ReferenceConfigurator|Expression|\Closure $factory): static
     {
+        if ($factory instanceof \Closure) {
+            $function = new \ReflectionFunction($factory);
+            if ($function->isAnonymous()) {
+                throw new InvalidArgumentException(sprintf('The closure "%s" passed as factory cannot be an anonymous function', $function->getName()));
+            }
+
+            if ($function->getClosureThis()) {
+                throw new InvalidArgumentException(sprintf('The closure "%s" passed as factory cannot be a bound closure', $function->getName()));
+            }
+
+            if (null === $class = $function->getClosureScopeClass()) {
+                // Convert global_function(...) closure into 'global_function'
+                $this->definition->setFactory($function->getName());
+            } else {
+                // Convert Class::method(...) closure into [Class::name, 'method']
+                $this->definition->setFactory([$class->getName(), $function->getName()]);
+            }
+
+            return $this;
+        }
+
         if (\is_string($factory) && 1 === substr_count($factory, ':')) {
             $factoryParts = explode(':', $factory);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
@@ -23,7 +23,7 @@
         ->tag('foo', ['foo' => 'foo'])
         ->tag('foo', ['bar' => 'bar', 'baz' => 'baz'])
         ->tag('foo', ['name' => 'bar', 'baz' => 'baz'])
-        ->factory([FooClass::class, 'getInstance'])
+        ->factory(FooClass::getInstance(...))
         ->property('foo', 'bar')
         ->property('moo', service('foo.baz'))
         ->property('qux', ['%foo%' => 'foo is %foo%', 'foobar' => '%foo%'])
