symfony · kbond · Feb 27, 2022
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/Service.php b/src/Symfony/Component/DependencyInjection/Attribute/Service.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Attribute;
+
+/**
+ * @author Kevin Bond <kevinbond@gmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+final class Service
+{
+    public function __construct(public string $id)
+    {
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
 * Add `$exclude` to `TaggedIterator` and `TaggedLocator` attributes
 * Add `$exclude` to `tagged_iterator` and `tagged_locator` configurator
 * Add an `env` function to the expression language provider
+ * Add a `Service` attribute to explicitly choose the injected service id

 6.0
 ---

@@ -14,6 +14,7 @@
 use Symfony\Component\Config\Resource\ClassExistenceResource;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+use Symfony\Component\DependencyInjection\Attribute\Service;
 use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
 use Symfony\Component\DependencyInjection\Attribute\Target;
@@ -22,6 +23,7 @@
 use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\LazyProxy\ProxyHelper;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\TypedReference;

 /**
@@ -256,6 +258,12 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                        $arguments[$index] = new ServiceLocatorArgument(new TaggedIteratorArgument($attribute->tag, $attribute->indexAttribute, $attribute->defaultIndexMethod, true, $attribute->defaultPriorityMethod, (array) $attribute->exclude));
                        break;
                    }
+
+                    if (Service::class === $attribute->getName()) {
+                        $attribute = $attribute->newInstance();
+                        $arguments[$index] = new Reference($attribute->id);
+                        break;
+                    }
                }

                if ('' !== ($arguments[$index] ?? '')) {

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -1121,4 +1121,23 @@ public function testDecorationWithServiceAndAliasedInterface()
        static::assertInstanceOf(DecoratedDecorator::class, $container->get(DecoratorInterface::class));
        static::assertInstanceOf(DecoratedDecorator::class, $container->get(DecoratorImpl::class));
    }
+
+    public function testServiceAttributeParameter()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(AutowireServiceParameter::class)
+            ->setAutowired(true)
+        ;
+
+        $container->register('some.id', \stdClass::class);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition(AutowireServiceParameter::class);
+
+        $this->assertCount(1, $definition->getArguments());
+        $this->assertSame('some.id', (string) $definition->getArgument(0));
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
@@ -2,6 +2,7 @@

 namespace Symfony\Component\DependencyInjection\Tests\Compiler;

+use Symfony\Component\DependencyInjection\Attribute\Service;
 use Symfony\Contracts\Service\Attribute\Required;

 class AutowireSetter
@@ -26,3 +27,10 @@ class AutowireProperty
    #[Required]
    public Foo $foo;
 }
+
+class AutowireServiceParameter
+{
+    public function __construct(#[Service('some.id')] $service)
+    {
+    }
+}