[DependencyInjection] Rename #[InnerService] to #[MapDecorated]

chalasr · chalasr · commit 512812afef4b · 2022-04-19T19:12:19.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/MapDecorated.php b/src/Symfony/Component/DependencyInjection/Attribute/MapDecorated.php
@@ -12,6 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Attribute;
 
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
-class InnerService
+class MapDecorated
 {
 }
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 6.1
 ---
 
+ * Add `#[MapDecorated]` attribute telling to which parameter the decorated service should be mapped in a decorator
+ * Add `#[AsDecorator]` attribute to make a service decorates another
  * 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
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -15,7 +15,7 @@
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\DependencyInjection\Attribute\InnerService;
+use Symfony\Component\DependencyInjection\Attribute\MapDecorated;
 use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
 use Symfony\Component\DependencyInjection\Attribute\Target;
@@ -273,8 +273,9 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                         break;
                     }
 
-                    if (InnerService::class === $attribute->getName()) {
-                        $arguments[$index] = new Reference($this->currentId.'.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE);
+                    if (MapDecorated::class === $attribute->getName()) {
+                        $definition = $this->container->getDefinition($this->currentId)
+                        $arguments[$index] = new Reference($definition->innerServiceId ?? $this->currentId.'.inner', $definition->decorationOnInvalid ?? ContainerInterface::NULL_ON_INVALID_REFERENCE);
 
                         break;
                     }
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
@@ -4,7 +4,7 @@
 
 use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\DependencyInjection\Attribute\InnerService;
+use Symfony\Component\DependencyInjection\Attribute\MapDecorated;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Contracts\Service\Attribute\Required;
 
@@ -65,23 +65,23 @@ class AsDecoratorFoo implements AsDecoratorInterface
 #[AsDecorator(decorates: AsDecoratorFoo::class, priority: 10)]
 class AsDecoratorBar10 implements AsDecoratorInterface
 {
-    public function __construct(string $arg1, #[InnerService] AsDecoratorInterface $inner)
+    public function __construct(string $arg1, #[MapDecorated] AsDecoratorInterface $inner)
     {
     }
 }
 
 #[AsDecorator(decorates: AsDecoratorFoo::class, priority: 20)]
 class AsDecoratorBar20 implements AsDecoratorInterface
 {
-    public function __construct(string $arg1, #[InnerService] AsDecoratorInterface $inner)
+    public function __construct(string $arg1, #[MapDecorated] AsDecoratorInterface $inner)
     {
     }
 }
 
 #[AsDecorator(decorates: \NonExistent::class, onInvalid: ContainerInterface::NULL_ON_INVALID_REFERENCE)]
 class AsDecoratorBaz implements AsDecoratorInterface
 {
-    public function __construct(#[InnerService] AsDecoratorInterface $inner = null)
+    public function __construct(#[MapDecorated] AsDecoratorInterface $inner = null)
     {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Attribute;`
`13`	`13`
`14`	`14`	`#[\Attribute(\Attribute::TARGET_PARAMETER)]`
`15`		`-class InnerService`
	`15`	`+class MapDecorated`
`16`	`16`	`{`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Symfony\Component\DependencyInjection\Attribute\AsDecorator;`
`6`	`6`	`use Symfony\Component\DependencyInjection\Attribute\Autowire;`
`7`		`-use Symfony\Component\DependencyInjection\Attribute\InnerService;`
	`7`	`+use Symfony\Component\DependencyInjection\Attribute\MapDecorated;`
`8`	`8`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`9`	`9`	`use Symfony\Contracts\Service\Attribute\Required;`
`10`	`10`
`@@ -65,23 +65,23 @@ class AsDecoratorFoo implements AsDecoratorInterface`
`65`	`65`	`#[AsDecorator(decorates: AsDecoratorFoo::class, priority: 10)]`
`66`	`66`	`class AsDecoratorBar10 implements AsDecoratorInterface`
`67`	`67`	`{`
`68`		`- public function __construct(string $arg1, #[InnerService] AsDecoratorInterface $inner)`
	`68`	`+ public function __construct(string $arg1, #[MapDecorated] AsDecoratorInterface $inner)`
`69`	`69`	`{`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`#[AsDecorator(decorates: AsDecoratorFoo::class, priority: 20)]`
`74`	`74`	`class AsDecoratorBar20 implements AsDecoratorInterface`
`75`	`75`	`{`
`76`		`- public function __construct(string $arg1, #[InnerService] AsDecoratorInterface $inner)`
	`76`	`+ public function __construct(string $arg1, #[MapDecorated] AsDecoratorInterface $inner)`
`77`	`77`	`{`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`#[AsDecorator(decorates: \NonExistent::class, onInvalid: ContainerInterface::NULL_ON_INVALID_REFERENCE)]`
`82`	`82`	`class AsDecoratorBaz implements AsDecoratorInterface`
`83`	`83`	`{`
`84`		`- public function __construct(#[InnerService] AsDecoratorInterface $inner = null)`
	`84`	`+ public function __construct(#[MapDecorated] AsDecoratorInterface $inner = null)`
`85`	`85`	`{`
`86`	`86`	`}`
`87`	`87`	`}`