[DependencyInjection] adjust Autowire attribute implementation

Author: kbond

Attribute/Autowire.php

@@ -28,19 +28,27 @@ class Autowire
     /**
      * Use only ONE of the following.
      *
+     * @param string|null $value      Parameter value (ie "%kernel.project_dir%/some/path")
      * @param string|null $service    Service ID (ie "some.service")
      * @param string|null $expression Expression (ie 'service("some.service").someMethod()')
-     * @param string|null $value      Parameter value (ie "%kernel.project_dir%/some/path")
      */
     public function __construct(
+        ?string $value = null,
         ?string $service = null,
         ?string $expression = null,
-        ?string $value = null
     ) {
         if (!($service xor $expression xor null !== $value)) {
             throw new LogicException('#[Autowire] attribute must declare exactly one of $service, $expression, or $value.');
         }
 
+        if (null !== $value && str_starts_with($value, '@')) {
+            match (true) {
+                str_starts_with($value, '@@') => $value = substr($value, 1),
+                str_starts_with($value, '@=') => $expression = substr($value, 2),
+                default => $service = substr($value, 1),
+            };
+        }
+
         $this->value = match (true) {
             null !== $service => new Reference($service),
             null !== $expression => class_exists(Expression::class) ? new Expression($expression) : throw new LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed. Try running "composer require symfony/expression-language".'),

Tests/Compiler/AutowirePassTest.php

@@ -1141,11 +1141,15 @@ public function testAutowireAttribute()
 
         $definition = $container->getDefinition(AutowireAttribute::class);
 
-        $this->assertCount(4, $definition->getArguments());
+        $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->assertEquals(new Reference('invalid.id', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(3));
+        $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));
+        $this->assertSame('@bar', $definition->getArgument(6));
+        $this->assertEquals(new Reference('invalid.id', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(7));
 
         $container->compile();
 
@@ -1154,6 +1158,10 @@ public function testAutowireAttribute()
         $this->assertInstanceOf(\stdClass::class, $service->service);
         $this->assertSame('foo', $service->expression);
         $this->assertSame('foo/bar', $service->value);
+        $this->assertInstanceOf(\stdClass::class, $service->serviceAsValue);
+        $this->assertSame('foo', $service->expressionAsValue);
+        $this->assertSame('bar', $service->rawValue);
+        $this->assertSame('@bar', $service->escapedRawValue);
         $this->assertNull($service->invalid);
     }
 }

Tests/Fixtures/includes/autowiring_classes_80.php

@@ -37,6 +37,14 @@ public function __construct(
         public string $expression,
         #[Autowire(value: '%some.parameter%/bar')]
         public string $value,
+        #[Autowire('@some.id')]
+        public \stdClass $serviceAsValue,
+        #[Autowire("@=parameter('some.parameter')")]
+        public string $expressionAsValue,
+        #[Autowire('bar')]
+        public string $rawValue,
+        #[Autowire('@@bar')]
+        public string $escapedRawValue,
         #[Autowire(service: 'invalid.id')]
         public ?\stdClass $invalid = null,
     ) {