Fix review

Jean-Beru · Jean-Beru · commit 0e2916ad08b9 · 2022-04-14T21:18:53.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireAsDecoratorPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireAsDecoratorPass.php
@@ -16,10 +16,10 @@
 use Symfony\Component\DependencyInjection\Definition;
 
 /**
- * Reads #[AsDecorator] attributes on definitions that are autoconfigured
+ * Reads #[AsDecorator] attributes on definitions that are autowired
  * and don't have the "container.ignore_attributes" tag.
  */
-final class RegisterDecoratorAttributesPass implements CompilerPassInterface
+final class AutowireAsDecoratorPass implements CompilerPassInterface
 {
     /**
      * {@inheritdoc}
@@ -33,12 +33,12 @@ public function process(ContainerBuilder $container)
         }
     }
 
-    public function accept(Definition $definition): bool
+    private function accept(Definition $definition): bool
     {
-        return !$definition->hasTag('container.ignore_attributes');
+        return !$definition->hasTag('container.ignore_attributes') && $definition->isAutowired();
     }
 
-    public function processClass(Definition $definition, \ReflectionClass $reflectionClass)
+    private function processClass(Definition $definition, \ReflectionClass $reflectionClass)
     {
         foreach ($reflectionClass->getAttributes(AsDecorator::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
             $attribute = $attribute->newInstance();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -275,7 +275,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                     }
 
                     if (Inner::class === $attribute->getName()) {
-                        $arguments[$index] = new Reference( "$class.inner", ContainerInterface::NULL_ON_INVALID_REFERENCE);
+                        $arguments[$index] = new Reference( $this->currentId.'.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE);
 
                         break;
                     }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -43,7 +43,7 @@ public function __construct()
             100 => [
                 new ResolveClassPass(),
                 new RegisterAutoconfigureAttributesPass(),
-                new RegisterDecoratorAttributesPass(),
+                new AutowireAsDecoratorPass(),
                 new AttributeAutoconfigurationPass(),
                 new ResolveInstanceofConditionalsPass(),
                 new RegisterEnvVarProcessorsPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
 use Symfony\Component\DependencyInjection\Compiler\DecoratorServicePass;
-use Symfony\Component\DependencyInjection\Compiler\RegisterDecoratorAttributesPass;
+use Symfony\Component\DependencyInjection\Compiler\AutowireAsDecoratorPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -1166,7 +1166,7 @@ public function testAutowireAttribute()
         $this->assertNull($service->invalid);
     }
 
-    public function testDecoratorAttribute()
+    public function testAsDecoratorAttribute()
     {
         $container = new ContainerBuilder();
 
@@ -1176,7 +1176,7 @@ public function testDecoratorAttribute()
         $container->register(AsDecoratorBaz::class)->setAutowired(true);
 
         (new ResolveClassPass())->process($container);
-        (new RegisterDecoratorAttributesPass())->process($container);
+        (new AutowireAsDecoratorPass())->process($container);
         (new DecoratorServicePass())->process($container);
         (new AutowirePass())->process($container);
 

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@`
`16`	`16`	`use Symfony\Component\DependencyInjection\Definition;`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * Reads #[AsDecorator] attributes on definitions that are autoconfigured`
	`19`	`+ * Reads #[AsDecorator] attributes on definitions that are autowired`
`20`	`20`	`* and don't have the "container.ignore_attributes" tag.`
`21`	`21`	`*/`
`22`		`-final class RegisterDecoratorAttributesPass implements CompilerPassInterface`
	`22`	`+final class AutowireAsDecoratorPass implements CompilerPassInterface`
`23`	`23`	`{`
`24`	`24`	`/**`
`25`	`25`	`* {@inheritdoc}`
`@@ -33,12 +33,12 @@ public function process(ContainerBuilder $container)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function accept(Definition $definition): bool`
	`36`	`+ private function accept(Definition $definition): bool`
`37`	`37`	`{`
`38`		`- return !$definition->hasTag('container.ignore_attributes');`
	`38`	`+ return !$definition->hasTag('container.ignore_attributes') && $definition->isAutowired();`
`39`	`39`	`}`
`40`	`40`
`41`		`- public function processClass(Definition $definition, \ReflectionClass $reflectionClass)`
	`41`	`+ private function processClass(Definition $definition, \ReflectionClass $reflectionClass)`
`42`	`42`	`{`
`43`	`43`	`foreach ($reflectionClass->getAttributes(AsDecorator::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {`
`44`	`44`	`$attribute = $attribute->newInstance();`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`if (Inner::class === $attribute->getName()) {`
`278`		`- $arguments[$index] = new Reference( "$class.inner", ContainerInterface::NULL_ON_INVALID_REFERENCE);`
	`278`	`+ $arguments[$index] = new Reference( $this->currentId.'.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE);`
`279`	`279`
`280`	`280`	`break;`
`281`	`281`	`}`