bug #28159 [DI] Fix autowire inner service (hason)

nicolas-grekas · nicolas-grekas · commit 441322fdc7c7 · 2018-08-08T13:48:58.000+02:00
This PR was merged into the 4.1 branch. Discussion ---------- [DI] Fix autowire inner service | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25631 | License | MIT | Doc PR | - This PR fix multiple levels of decoration. Unfortunately, this [good question](#25631 (comment)) in origin PR has not been heard 🎧 😄. @dunglas @chalasr Commits ------- b79d097 [DI] Fix autowire inner service
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -144,11 +144,12 @@ private function doProcessValue($value, $isRoot = false)
      */
     private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot): array
     {
+        $this->decoratedId = null;
+        $this->decoratedClass = null;
+        $this->getPreviousValue = null;
+
         if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && $this->container->has($this->decoratedId = $definition->innerServiceId)) {
             $this->decoratedClass = $this->container->findDefinition($this->decoratedId)->getClass();
-        } else {
-            $this->decoratedId = null;
-            $this->decoratedClass = null;
         }
 
         foreach ($this->methodCalls as $i => $call) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -834,6 +834,29 @@ public function testAutowireDecorator()
         $this->assertSame(Decorator::class.'.inner', (string) $definition->getArgument(1));
     }
 
+    public function testAutowireDecoratorChain()
+    {
+        $container = new ContainerBuilder();
+        $container->register(LoggerInterface::class, NullLogger::class);
+        $container->register(Decorated::class, Decorated::class);
+        $container
+            ->register(Decorator::class, Decorator::class)
+            ->setDecoratedService(Decorated::class)
+            ->setAutowired(true)
+        ;
+        $container
+            ->register(DecoratedDecorator::class, DecoratedDecorator::class)
+            ->setDecoratedService(Decorated::class)
+            ->setAutowired(true)
+        ;
+
+        (new DecoratorServicePass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition(DecoratedDecorator::class);
+        $this->assertSame(DecoratedDecorator::class.'.inner', (string) $definition->getArgument(0));
+    }
+
     public function testAutowireDecoratorRenamedId()
     {
         $container = 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
@@ -373,6 +373,13 @@ public function __construct(LoggerInterface $logger, DecoratorInterface $decorat
     }
 }
 
+class DecoratedDecorator implements DecoratorInterface
+{
+    public function __construct(DecoratorInterface $decorator)
+    {
+    }
+}
+
 class NonAutowirableDecorator implements DecoratorInterface
 {
     public function __construct(LoggerInterface $logger, DecoratorInterface $decorated1, DecoratorInterface $decorated2)

Original file line number	Diff line number	Diff line change
`@@ -373,6 +373,13 @@ public function __construct(LoggerInterface $logger, DecoratorInterface $decorat`
`373`	`373`	`}`
`374`	`374`	`}`
`375`	`375`
	`376`	`+class DecoratedDecorator implements DecoratorInterface`
	`377`	`+{`
	`378`	`+ public function __construct(DecoratorInterface $decorator)`
	`379`	`+ {`
	`380`	`+ }`
	`381`	`+}`
	`382`	`+`
`376`	`383`	`class NonAutowirableDecorator implements DecoratorInterface`
`377`	`384`	`{`
`378`	`385`	`public function __construct(LoggerInterface $logger, DecoratorInterface $decorated1, DecoratorInterface $decorated2)`