bug #46272 [DependencyInjection] Fix resolving parameters found in #[Autowire] (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 0e6fc82f79c6 · 2022-05-05T18:40:45.000+02:00
This PR was merged into the 6.1 branch. Discussion ---------- [DependencyInjection] Fix resolving parameters found in #[Autowire] | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - As reported by Andrew Barlow at https://symfony.com/blog/new-in-symfony-6-1-service-autowiring-attributes#comment-24967 Commits ------- c12b7f0 [DependencyInjection] Fix resolving parameters found in #[Autowire]
diff --git 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
@@ -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));
