[DependencyInjection] Optimize out "current()" when it's used as service factory

Author: nicolas-grekas

Dumper/PhpDumper.php

@@ -1154,6 +1154,9 @@ private function addNewInstance(Definition $definition, string $return = '', str
         if (null !== $definition->getFactory()) {
             $callable = $definition->getFactory();
 
+            if ('current' === $callable && [0] === array_keys($definition->getArguments()) && \is_array($value) && [0] === array_keys($value)) {
+                return $return.$this->dumpValue($value[0]).$tail;
+            }
             if (['Closure', 'fromCallable'] === $callable && [0] === array_keys($definition->getArguments())) {
                 $callable = $definition->getArgument(0);
                 if ($callable instanceof ServiceClosureArgument) {

Tests/Dumper/PhpDumperTest.php

@@ -1503,6 +1503,37 @@ public function testWitherWithStaticReturnType()
         $this->assertInstanceOf(Foo::class, $wither->foo);
     }
 
+    public function testCurrentFactoryInlining()
+    {
+        $container = new ContainerBuilder();
+        $container->register(Foo::class);
+
+        $container
+            ->register('inlined_current', Foo::class)
+            ->setFactory('current')
+            ->setPublic(true)
+            ->setArguments([[new Reference(Foo::class)]]);
+
+        $container
+            ->register('not_inlined_current', Foo::class)
+            ->setFactory('current')
+            ->setPublic(true)
+            ->setArguments([[new Reference(Foo::class), 123]]);
+
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $dump = $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Service_CurrentFactoryInlining']);
+        file_put_contents(self::$fixturesPath.'/php/services_current_factory_inlining.php', $dump);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_current_factory_inlining.php', $dump);
+        eval('?>'.$dump);
+
+        $container = new \Symfony_DI_PhpDumper_Service_CurrentFactoryInlining();
+
+        $foo = $container->get('inlined_current');
+        $this->assertInstanceOf(Foo::class, $foo);
+        $this->assertSame($foo, $container->get('not_inlined_current'));
+    }
+
     public function testDumpServiceWithAbstractArgument()
     {
         $this->expectException(RuntimeException::class);

Tests/Fixtures/php/services_current_factory_inlining.php

@@ -0,0 +1,68 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class Symfony_DI_PhpDumper_Service_CurrentFactoryInlining extends Container
+{
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'inlined_current' => 'getInlinedCurrentService',
+            'not_inlined_current' => 'getNotInlinedCurrentService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    public function getRemovedIds(): array
+    {
+        return [
+            'Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo' => true,
+        ];
+    }
+
+    /**
+     * Gets the public 'inlined_current' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\Foo
+     */
+    protected static function getInlinedCurrentService($container)
+    {
+        return $container->services['inlined_current'] = ($container->privates['Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo());
+    }
+
+    /**
+     * Gets the public 'not_inlined_current' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\Foo
+     */
+    protected static function getNotInlinedCurrentService($container)
+    {
+        return $container->services['not_inlined_current'] = \current([($container->privates['Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo()), 123]);
+    }
+}