Merge branch '5.4' into 6.0

* 5.4: (26 commits)
  [Dotenv] Fix testBootEnv() to start from a fresh context
  fix tests
  relax expected exception message for forward-compatibility with 5.4
  fix expected exception messages after changes made in Definition class
  [DependencyInjection] show class name on DI errors
  skip command completion tests with older Symfony Console versions
  Use GitHub issue form templates
  Fix CS
  add ResponseIsUnprocessable
  Add missing translations for Persian (fa)
  skip command completion tests with older Symfony Console versions
  prevent issues with timezones and DST by using only UNIX timestamps
  Add the missing translations for Bahasa Indonesia (id)
  [Finder] Fix .gitignore infinite loop
  Update README.md
  fix messenger DI dependency for registerAttributeForAutoconfiguration
  [Messenger] Autoconfigurable attributes
  Fix deprecations on PHP 8.2
  [Dotenv] Fix testLoadEnv() .env.dist isolation
  Since 5.0, throws \UnexpectedValueException has been removed.
  ...

Author: nicolas-grekas

Compiler/AutowirePass.php

@@ -160,10 +160,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 = [];

Compiler/PassConfig.php

@@ -62,10 +62,11 @@ public function __construct()
             new AutowireRequiredMethodsPass(),
             new AutowireRequiredPropertiesPass(),
             new ResolveBindingsPass(),
+            new ServiceLocatorTagPass(),
+            new DecoratorServicePass(),
             new CheckDefinitionValidityPass(),
             new AutowirePass(false),
             new ServiceLocatorTagPass(),
-            new DecoratorServicePass(),
             new ResolveTaggedIteratorArgumentPass(),
             new ResolveServiceSubscribersPass(),
             new ResolveReferencesToAliasesPass(),

Definition.php

@@ -252,15 +252,15 @@ public function addArgument(mixed $argument): static
     public function replaceArgument(int|string $index, mixed $argument): static
     {
         if (0 === \count($this->arguments)) {
-            throw new OutOfBoundsException('Cannot replace arguments if none have been configured yet.');
+            throw new OutOfBoundsException(sprintf('Cannot replace arguments for class "%s" if none have been configured yet.', $this->class));
         }
 
         if (\is_int($index) && ($index < 0 || $index > \count($this->arguments) - 1)) {
-            throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d].', $index, \count($this->arguments) - 1));
+            throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d] of the arguments of class "%s".', $index, \count($this->arguments) - 1, $this->class));
         }
 
         if (!\array_key_exists($index, $this->arguments)) {
-            throw new OutOfBoundsException(sprintf('The argument "%s" doesn\'t exist.', $index));
+            throw new OutOfBoundsException(sprintf('The argument "%s" doesn\'t exist in class "%s".', $index, $this->class));
         }
 
         $this->arguments[$index] = $argument;
@@ -296,7 +296,7 @@ public function getArguments(): array
     public function getArgument(int|string $index): mixed
     {
         if (!\array_key_exists($index, $this->arguments)) {
-            throw new OutOfBoundsException(sprintf('The argument "%s" doesn\'t exist.', $index));
+            throw new OutOfBoundsException(sprintf('The argument "%s" doesn\'t exist in class "%s".', $index, $this->class));
         }
 
         return $this->arguments[$index];

Tests/Compiler/AutowirePassTest.php

@@ -990,8 +990,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));
@@ -1013,8 +1013,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));
@@ -1031,8 +1031,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));
@@ -1049,11 +1049,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());
         }
     }
 

Tests/Compiler/IntegrationTest.php

@@ -186,6 +186,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
      */

Tests/DefinitionTest.php

@@ -284,7 +284,7 @@ public function testGetArgumentShouldCheckBounds()
     public function testReplaceArgumentShouldCheckBounds()
     {
         $this->expectException(\OutOfBoundsException::class);
-        $this->expectExceptionMessage('The index "1" is not in the range [0, 0].');
+        $this->expectExceptionMessage('The index "1" is not in the range [0, 0] of the arguments of class "stdClass".');
         $def = new Definition('stdClass');
 
         $def->addArgument('foo');
@@ -294,7 +294,7 @@ public function testReplaceArgumentShouldCheckBounds()
     public function testReplaceArgumentWithoutExistingArgumentsShouldCheckBounds()
     {
         $this->expectException(\OutOfBoundsException::class);
-        $this->expectExceptionMessage('Cannot replace arguments if none have been configured yet.');
+        $this->expectExceptionMessage('Cannot replace arguments for class "stdClass" if none have been configured yet.');
         $def = new Definition('stdClass');
         $def->replaceArgument(0, 'bar');
     }

Tests/Fixtures/php/services_subscriber.php

@@ -44,6 +44,7 @@ public function isCompiled(): bool
     public function getRemovedIds(): array
     {
         return [
+            '.service_locator.DlIAmAe' => true,
             '.service_locator.t5IGRMW' => true,
             '.service_locator.zFfA7ng' => true,
             '.service_locator.zFfA7ng.foo_service' => true,

Tests/Fixtures/php/services_subscriber_php81.php

@@ -44,6 +44,7 @@ public function isCompiled(): bool
     public function getRemovedIds(): array
     {
         return [
+            '.service_locator.JmEob1b' => true,
             '.service_locator.KIgkoLM' => true,
             '.service_locator.qUb.lJI' => true,
             '.service_locator.qUb.lJI.foo_service' => true,