[DependencyInjection] Fix autowiring tagged arguments from attributes

Okhoshi · nicolas-grekas · commit b2783a79b427 · 2021-10-22T20:05:59.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -159,10 +159,8 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot,
         $this->decoratedClass = null;
         $this->getPreviousValue = null;
 
-        if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && ($decoratedDefinition = $definition->getDecoratedService()) && null !== ($innerId = $decoratedDefinition[0]) && $this->container->has($innerId)) {
-            // If the class references to itself and is decorated, provide the inner service id and class to not get a circular reference
-            $this->decoratedClass = $this->container->findDefinition($innerId)->getClass();
-            $this->decoratedId = $decoratedDefinition[1] ?? $this->currentId.'.inner';
+        if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && null !== ($this->decoratedId = $definition->innerServiceId) && $this->container->has($this->decoratedId)) {
+            $this->decoratedClass = $this->container->findDefinition($this->decoratedId)->getClass();
         }
 
         $patchedIndexes = [];
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -62,10 +62,10 @@ public function __construct()
             new AutowireRequiredMethodsPass(),
             new AutowireRequiredPropertiesPass(),
             new ResolveBindingsPass(),
-            new CheckDefinitionValidityPass(),
-            new AutowirePass(false),
             new ServiceLocatorTagPass(),
             new DecoratorServicePass(),
+            new CheckDefinitionValidityPass(),
+            new AutowirePass(false),
             new ResolveTaggedIteratorArgumentPass(),
             new ResolveServiceSubscribersPass(),
             new ResolveReferencesToAliasesPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php
@@ -12,9 +12,10 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 
 /**
- * Resolves all TaggedIteratorArgument arguments.
+ * Resolves TaggedIteratorArgument and ServiceLocatorArgument.
  *
  * @author Roland Franssen <franssen.roland@gmail.com>
  */
@@ -27,6 +28,14 @@ class ResolveTaggedIteratorArgumentPass extends AbstractRecursivePass
      */
     protected function processValue($value, bool $isRoot = false)
     {
+        if ($value instanceof ServiceLocatorArgument) {
+            if ($value->getTaggedIteratorArgument()) {
+                $value->setValues($this->findAndSortTaggedServices($value->getTaggedIteratorArgument(), $this->container));
+            }
+
+            return ServiceLocatorTagPass::register($this->container, $value->getValues());
+        }
+
         if (!$value instanceof TaggedIteratorArgument) {
             return parent::processValue($value, $isRoot);
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -985,8 +985,8 @@ public function testAutowireDecorator()
             ->setAutowired(true)
         ;
 
-        (new AutowirePass())->process($container);
         (new DecoratorServicePass())->process($container);
+        (new AutowirePass())->process($container);
 
         $definition = $container->getDefinition(Decorator::class);
         $this->assertSame(Decorator::class.'.inner', (string) $definition->getArgument(1));
@@ -1008,8 +1008,8 @@ public function testAutowireDecoratorChain()
             ->setAutowired(true)
         ;
 
-        (new AutowirePass())->process($container);
         (new DecoratorServicePass())->process($container);
+        (new AutowirePass())->process($container);
 
         $definition = $container->getDefinition(DecoratedDecorator::class);
         $this->assertSame(DecoratedDecorator::class.'.inner', (string) $definition->getArgument(0));
@@ -1026,8 +1026,8 @@ public function testAutowireDecoratorRenamedId()
             ->setAutowired(true)
         ;
 
-        (new AutowirePass())->process($container);
         (new DecoratorServicePass())->process($container);
+        (new AutowirePass())->process($container);
 
         $definition = $container->getDefinition(Decorator::class);
         $this->assertSame('renamed', (string) $definition->getArgument(1));
@@ -1044,11 +1044,12 @@ public function testDoNotAutowireDecoratorWhenSeveralArgumentOfTheType()
             ->setAutowired(true)
         ;
 
+        (new DecoratorServicePass())->process($container);
         try {
             (new AutowirePass())->process($container);
             $this->fail('AutowirePass should have thrown an exception');
         } catch (AutowiringFailedException $e) {
-            $this->assertSame('Cannot autowire service "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator": argument "$decorated1" of method "__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\DecoratorInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "Symfony\Component\DependencyInjection\Tests\Compiler\Decorated", "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator".', (string) $e->getMessage());
+            $this->assertSame('Cannot autowire service "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator": argument "$decorated1" of method "__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\DecoratorInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator", "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator.inner".', (string) $e->getMessage());
         }
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -175,6 +175,33 @@ public function testCanDecorateServiceLocator()
         $this->assertSame($container->get('foo'), $container->get(DecoratedServiceLocator::class)->get('foo'));
     }
 
+    public function testAliasDecoratedService()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('service', ServiceLocator::class)
+            ->setPublic(true)
+            ->setArguments([[]])
+        ;
+        $container->register('decorator', DecoratedServiceLocator::class)
+            ->setDecoratedService('service')
+            ->setAutowired(true)
+            ->setPublic(true)
+        ;
+        $container->setAlias(ServiceLocator::class, 'decorator.inner')
+            ->setPublic(true)
+        ;
+        $container->register('user_service', DecoratedServiceLocator::class)
+            ->setAutowired(true)
+        ;
+
+        $container->compile();
+
+        $this->assertInstanceOf(DecoratedServiceLocator::class, $container->get('service'));
+        $this->assertInstanceOf(ServiceLocator::class, $container->get(ServiceLocator::class));
+        $this->assertSame($container->get('service'), $container->get('decorator'));
+    }
+
     /**
      * @dataProvider getYamlCompileTests
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -46,7 +46,6 @@ public function getRemovedIds(): array
         return [
             '.service_locator.DlIAmAe' => true,
             '.service_locator.DlIAmAe.foo_service' => true,
-            '.service_locator.t5IGRMW' => true,
             'Psr\\Container\\ContainerInterface' => true,
             'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => true,
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber_php81.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber_php81.php
@@ -46,7 +46,6 @@ public function getRemovedIds(): array
         return [
             '.service_locator.JmEob1b' => true,
             '.service_locator.JmEob1b.foo_service' => true,
-            '.service_locator.KIgkoLM' => true,
             'Psr\\Container\\ContainerInterface' => true,
             'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => true,

Original file line number	Diff line number	Diff line change
`@@ -985,8 +985,8 @@ public function testAutowireDecorator()`
`985`	`985`	`->setAutowired(true)`
`986`	`986`	`;`
`987`	`987`
`988`		`- (new AutowirePass())->process($container);`
`989`	`988`	`(new DecoratorServicePass())->process($container);`
	`989`	`+ (new AutowirePass())->process($container);`
`990`	`990`
`991`	`991`	`$definition = $container->getDefinition(Decorator::class);`
`992`	`992`	`$this->assertSame(Decorator::class.'.inner', (string) $definition->getArgument(1));`
`@@ -1008,8 +1008,8 @@ public function testAutowireDecoratorChain()`
`1008`	`1008`	`->setAutowired(true)`
`1009`	`1009`	`;`
`1010`	`1010`
`1011`		`- (new AutowirePass())->process($container);`
`1012`	`1011`	`(new DecoratorServicePass())->process($container);`
	`1012`	`+ (new AutowirePass())->process($container);`
`1013`	`1013`
`1014`	`1014`	`$definition = $container->getDefinition(DecoratedDecorator::class);`
`1015`	`1015`	`$this->assertSame(DecoratedDecorator::class.'.inner', (string) $definition->getArgument(0));`
`@@ -1026,8 +1026,8 @@ public function testAutowireDecoratorRenamedId()`
`1026`	`1026`	`->setAutowired(true)`
`1027`	`1027`	`;`
`1028`	`1028`
`1029`		`- (new AutowirePass())->process($container);`
`1030`	`1029`	`(new DecoratorServicePass())->process($container);`
	`1030`	`+ (new AutowirePass())->process($container);`
`1031`	`1031`
`1032`	`1032`	`$definition = $container->getDefinition(Decorator::class);`
`1033`	`1033`	`$this->assertSame('renamed', (string) $definition->getArgument(1));`
`@@ -1044,11 +1044,12 @@ public function testDoNotAutowireDecoratorWhenSeveralArgumentOfTheType()`
`1044`	`1044`	`->setAutowired(true)`
`1045`	`1045`	`;`
`1046`	`1046`
	`1047`	`+ (new DecoratorServicePass())->process($container);`
`1047`	`1048`	`try {`
`1048`	`1049`	`(new AutowirePass())->process($container);`
`1049`	`1050`	`$this->fail('AutowirePass should have thrown an exception');`
`1050`	`1051`	`} catch (AutowiringFailedException $e) {`
`1051`		- $this->assertSame('Cannot autowire service "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator": argument "$decorated1" of method "__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\DecoratorInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "Symfony\Component\DependencyInjection\Tests\Compiler\Decorated", "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator".', (string) $e->getMessage());
	`1052`	+ $this->assertSame('Cannot autowire service "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator": argument "$decorated1" of method "__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\DecoratorInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator", "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator.inner".', (string) $e->getMessage());
`1052`	`1053`	`}`
`1053`	`1054`	`}`
`1054`	`1055`