Merge branch '5.4' into 6.0

* 5.4:
  [Translation] Throw exception if symfony/finder is not installed for PhpExtractor
  fix tests
  Fix tests failing with DBAL 3
  Fix circular reference in autowired decorators
  [Security] Do not deauthenticate token on user change if not an AbstractToken

Author: derrabus

Compiler/AutowirePass.php

@@ -150,8 +150,10 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot,
         $this->decoratedClass = null;
         $this->getPreviousValue = null;
 
-        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();
+        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';
         }
 
         foreach ($this->methodCalls as $i => $call) {

Tests/Compiler/AutowirePassTest.php

@@ -951,8 +951,8 @@ public function testAutowireDecorator()
             ->setAutowired(true)
         ;
 
-        (new DecoratorServicePass())->process($container);
         (new AutowirePass())->process($container);
+        (new DecoratorServicePass())->process($container);
 
         $definition = $container->getDefinition(Decorator::class);
         $this->assertSame(Decorator::class.'.inner', (string) $definition->getArgument(1));
@@ -974,8 +974,8 @@ public function testAutowireDecoratorChain()
             ->setAutowired(true)
         ;
 
-        (new DecoratorServicePass())->process($container);
         (new AutowirePass())->process($container);
+        (new DecoratorServicePass())->process($container);
 
         $definition = $container->getDefinition(DecoratedDecorator::class);
         $this->assertSame(DecoratedDecorator::class.'.inner', (string) $definition->getArgument(0));
@@ -992,8 +992,8 @@ public function testAutowireDecoratorRenamedId()
             ->setAutowired(true)
         ;
 
-        (new DecoratorServicePass())->process($container);
         (new AutowirePass())->process($container);
+        (new DecoratorServicePass())->process($container);
 
         $definition = $container->getDefinition(Decorator::class);
         $this->assertSame('renamed', (string) $definition->getArgument(1));
@@ -1010,12 +1010,11 @@ 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\NonAutowirableDecorator", "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator.inner".', (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\Decorated", "Symfony\Component\DependencyInjection\Tests\Compiler\NonAutowirableDecorator".', (string) $e->getMessage());
         }
     }
 
@@ -1069,4 +1068,23 @@ public function testArgumentWithTarget()
 
         $this->assertSame(BarInterface::class.' $imageStorage', (string) $container->getDefinition('with_target')->getArgument(0));
     }
+
+    public function testDecorationWithServiceAndAliasedInterface()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(DecoratorImpl::class, DecoratorImpl::class)
+            ->setAutowired(true)
+            ->setPublic(true);
+        $container->setAlias(DecoratorInterface::class, DecoratorImpl::class)->setPublic(true);
+        $container->register(DecoratedDecorator::class, DecoratedDecorator::class)
+            ->setAutowired(true)
+            ->setPublic(true)
+            ->setDecoratedService(DecoratorImpl::class);
+
+        $container->compile();
+
+        static::assertInstanceOf(DecoratedDecorator::class, $container->get(DecoratorInterface::class));
+        static::assertInstanceOf(DecoratedDecorator::class, $container->get(DecoratorImpl::class));
+    }
 }

Tests/Fixtures/includes/autowiring_classes.php

@@ -376,6 +376,10 @@ interface DecoratorInterface
 {
 }
 
+class DecoratorImpl implements DecoratorInterface
+{
+}
+
 class Decorated implements DecoratorInterface
 {
     public function __construct($quz = null, \NonExistent $nonExistent = null, DecoratorInterface $decorated = null, array $foo = [])