[DependencyInjection] Add #[Target] to tell how a dependency is used and hint named autowiring aliases

Author: nicolas-grekas

DependencyInjection/RegisterControllerArgumentLocatorsPass.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\DependencyInjection;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\DependencyInjection\Attribute\Target;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
@@ -148,7 +149,7 @@ public function process(ContainerBuilder $container)
                         } elseif ($p->allowsNull() && !$p->isOptional()) {
                             $invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
                         }
-                    } elseif (isset($bindings[$bindingName = $type.' $'.$p->name]) || isset($bindings[$bindingName = '$'.$p->name]) || isset($bindings[$bindingName = $type])) {
+                    } elseif (isset($bindings[$bindingName = $type.' $'.$name = Target::parseName($p)]) || isset($bindings[$bindingName = '$'.$name]) || isset($bindings[$bindingName = $type])) {
                         $binding = $bindings[$bindingName];
 
                         [$bindingValue, $bindingId, , $bindingType, $bindingFile] = $binding->getValues();

Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Attribute\Target;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
@@ -397,6 +398,27 @@ public function testAlias()
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
         $this->assertSame([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));
     }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testBindWithTarget()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', WithTarget::class)
+            ->setBindings(['string $someApiKey' => new Reference('the_api_key')])
+            ->addTag('controller.service_arguments');
+
+        (new RegisterControllerArgumentLocatorsPass())->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $locator = $container->getDefinition((string) $locator['foo::fooAction']->getValues()[0]);
+
+        $expected = ['apiKey' => new ServiceClosureArgument(new Reference('the_api_key'))];
+        $this->assertEquals($expected, $locator->getArgument(0));
+    }
 }
 
 class RegisterTestController
@@ -458,3 +480,12 @@ public function fooAction(string $someArg)
     {
     }
 }
+
+class WithTarget
+{
+    public function fooAction(
+        #[Target('some.api.key')]
+        string $apiKey
+    ) {
+    }
+}

composer.json

@@ -32,7 +32,7 @@
         "symfony/config": "^5.0",
         "symfony/console": "^4.4|^5.0",
         "symfony/css-selector": "^4.4|^5.0",
-        "symfony/dependency-injection": "^5.1.8",
+        "symfony/dependency-injection": "^5.3",
         "symfony/dom-crawler": "^4.4|^5.0",
         "symfony/expression-language": "^4.4|^5.0",
         "symfony/finder": "^4.4|^5.0",
@@ -53,7 +53,7 @@
         "symfony/config": "<5.0",
         "symfony/console": "<4.4",
         "symfony/form": "<5.0",
-        "symfony/dependency-injection": "<5.1.8",
+        "symfony/dependency-injection": "<5.3",
         "symfony/doctrine-bridge": "<5.0",
         "symfony/http-client": "<5.0",
         "symfony/mailer": "<5.0",