From c12b7f0fa0c5f79a627b08e08ce0a964b97e269d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 5 May 2022 18:31:39 +0200
Subject: [PATCH] [DependencyInjection] Fix resolving parameters found in
 #[Autowire]

---
 .../Component/DependencyInjection/Compiler/AutowirePass.php     | 1 +
 .../DependencyInjection/Tests/Compiler/AutowirePassTest.php     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index b8634eafe4a41..9fde89d142f9a 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -263,6 +263,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
 
                     if (Autowire::class === $attribute->getName()) {
                         $value = $attribute->newInstance()->value;
+                        $value = $this->container->getParameterBag()->resolveValue($value);
 
                         if ($value instanceof Reference && $parameter->allowsNull()) {
                             $value = new Reference($value, ContainerInterface::NULL_ON_INVALID_REFERENCE);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index c9422d98b26e1..eac1ec023d7a9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -1145,7 +1145,7 @@ public function testAutowireAttribute()
         $this->assertCount(8, $definition->getArguments());
         $this->assertEquals(new Reference('some.id'), $definition->getArgument(0));
         $this->assertEquals(new Expression("parameter('some.parameter')"), $definition->getArgument(1));
-        $this->assertSame('%some.parameter%/bar', $definition->getArgument(2));
+        $this->assertSame('foo/bar', $definition->getArgument(2));
         $this->assertEquals(new Reference('some.id'), $definition->getArgument(3));
         $this->assertEquals(new Expression("parameter('some.parameter')"), $definition->getArgument(4));
         $this->assertSame('bar', $definition->getArgument(5));