Try to implement resolving named arguments for autowire inline

DaDeather · DaDeather · commit dd16390a5290 · 2024-03-07T08:03:58.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -321,8 +321,8 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                     }
 
                     if ($attribute instanceof AutowireInline) {
-                        $value = $attribute->buildDefinition($value, $type, $parameter);
-                        $value = $this->doProcessValue($value);
+                        $value = $this->container->getDefinition(ContainerBuilder::hash($attribute));
+                        $value = $this->processValue($value);
                     } elseif ($lazy = $attribute->lazy) {
                         $definition = (new Definition($type))
                             ->setFactory('current')
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -66,6 +66,7 @@ public function __construct()
             new ServiceLocatorTagPass(),
             new DecoratorServicePass(),
             new CheckDefinitionValidityPass(),
+            new ResolveAutowireInlineAttributesPass(),
             new AutowirePass(false),
             new ServiceLocatorTagPass(),
             new ResolveTaggedIteratorArgumentPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveAutowireInlineAttributesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveAutowireInlineAttributesPass.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Attribute\AutowireInline;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\VarExporter\ProxyHelper;
+
+/**
+ * Inspects existing autowired services for {@see AutowireInline} attribute and registers the definitions for reuse.
+ *
+ * @author Ismail Özgün Turan <oezguen.turan@dadadev.com>
+ */
+class ResolveAutowireInlineAttributesPass extends AbstractRecursivePass
+{
+    protected bool $skipScalars = true;
+
+    protected function processValue(mixed $value, bool $isRoot = false): mixed
+    {
+        $value = parent::processValue($value, $isRoot);
+
+        if (!$value instanceof Definition || !$value->isAutowired() || $value->isAbstract() || !$value->getClass()) {
+            return $value;
+        }
+
+        if (!$reflectionClass = $this->container->getReflectionClass($value->getClass(), false)) {
+            $this->container->log($this, sprintf('Skipping service "%s": Class or interface "%s" cannot be loaded.', $this->currentId, $value->getClass()));
+
+            return $value;
+        }
+
+        $constructorReflectionMethod = $reflectionClass->getConstructor();
+        if ($constructorReflectionMethod === null) {
+            return $value;
+        }
+
+        $reflectionParameters = $constructorReflectionMethod->getParameters();
+        foreach ($reflectionParameters as $reflectionParameter) {
+            $autowireInlineAttributes = $reflectionParameter->getAttributes(AutowireInline::class);
+            if ($autowireInlineAttributes === []) {
+                continue;
+            }
+
+            foreach ($autowireInlineAttributes as $autowireInlineAttribute) {
+                /** @var AutowireInline $autowireInlineAttributeInstance */
+                $autowireInlineAttributeInstance = $autowireInlineAttribute->newInstance();
+
+                $type = ProxyHelper::exportType($reflectionParameter, true);
+                $definition = $autowireInlineAttributeInstance->buildDefinition($autowireInlineAttributeInstance->value, $type, $reflectionParameter);
+
+                $this->container->setDefinition(ContainerBuilder::hash($autowireInlineAttributeInstance), $definition);
+            }
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveAutowireInlineAttributesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveAutowireInlineAttributesPassTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveAutowireInlineAttributesPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveNamedArgumentsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
+
+class ResolveAutowireInlineAttributesPassTest extends TestCase
+{
+    public function testAttribute()
+    {
+        $container = new ContainerBuilder();
+        $container->register(Foo::class)->setAutowired(true);
+
+        $container->register('autowire_inline1', AutowireInlineAttributes1::class)
+            ->setAutowired(true);
+
+        $container->register('autowire_inline2', AutowireInlineAttributes2::class)
+            ->setAutowired(true);
+
+        (new ResolveNamedArgumentsPass())->process($container);
+        (new ResolveClassPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
+        (new ResolveAutowireInlineAttributesPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $autowireInlineAttributes1 = $container->get('autowire_inline1');
+        self::assertInstanceOf(AutowireInlineAttributes1::class, $autowireInlineAttributes1);
+
+        $autowireInlineAttributes2 = $container->get('autowire_inline2');
+        self::assertInstanceOf(AutowireInlineAttributes2::class, $autowireInlineAttributes2);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
@@ -5,6 +5,7 @@
 use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
+use Symfony\Component\DependencyInjection\Attribute\AutowireInline;
 use Symfony\Component\DependencyInjection\Attribute\Lazy;
 use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
@@ -140,3 +141,32 @@ public function __construct(#[Lazy, Autowire(lazy: true)] A $a)
     {
     }
 }
+
+class AutowireInlineAttributesBar {
+    public function __construct(Foo $foo, string $someString)
+    {
+    }
+}
+
+class AutowireInlineAttributes1
+{
+    public function __construct(
+        #[AutowireInline(AutowireInlineAttributesBar::class, [
+            '$foo' => Foo::class,
+            '$someString' => 'testString',
+        ])]
+        public AutowireInlineAttributesBar $inlined,
+    ) {
+    }
+}
+
+class AutowireInlineAttributes2
+{
+    public function __construct(
+        #[AutowireInline(AutowireInlineAttributesBar::class, [
+            '$someString' => 'testString',
+        ])]
+        public AutowireInlineAttributesBar $inlined,
+    ) {
+    }
+}
