review

Jean-Beru · Jean-Beru · commit a766b4d43387 · 2025-09-02T16:33:11.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireAsDecoratorPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireAsDecoratorPass.php
@@ -39,7 +39,7 @@ private function processClass(string $id, ContainerBuilder $container, Definitio
     {
         $attributes = $reflectionClass->getAttributes(AsDecorator::class, \ReflectionAttribute::IS_INSTANCEOF);
 
-        if (!$attributes = $reflectionClass->getAttributes(AsDecorator::class, \ReflectionAttribute::IS_INSTANCEOF)) {
+        if ([] === $attributes) {
             return;
         }
 
@@ -55,7 +55,7 @@ private function processClass(string $id, ContainerBuilder $container, Definitio
 
             $definition = clone $definition;
             $definition->setDecoratedService($attribute->decorates, null, $attribute->priority, $attribute->onInvalid);
-            $container->setDefinition($id.'.'.ContainerBuilder::hash($attribute->decorates), $definition);
+            $container->setDefinition(\sprintf('.decorator.%s.%s', $attribute->decorates, $id), $definition);
         }
 
         $container->removeDefinition($id);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -1359,10 +1359,13 @@ public function testMultipleAsDecoratorAttribute()
         (new DecoratorServicePass())->process($container);
         (new AutowirePass())->process($container);
 
-        $this->assertSame(AsDecoratorMultiple::class.'.brovYQA', (string) $container->getAlias(AsDecoratorMultipleFoo::class));
-        $this->assertSame(AsDecoratorMultiple::class.'.brovYQA.inner', (string) $container->getDefinition(AsDecoratorMultiple::class.'.brovYQA')->getArgument(1));
-        $this->assertSame(AsDecoratorMultiple::class.'.NeMNE1z', (string) $container->getAlias(AsDecoratorMultipleBar::class));
-        $this->assertSame(AsDecoratorMultiple::class.'.NeMNE1z.inner', (string) $container->getDefinition(AsDecoratorMultiple::class.'.NeMNE1z')->getArgument(1));
+        $fooDecoratorName = '.decorator.'.AsDecoratorMultipleFoo::class.'.'.AsDecoratorMultiple::class;
+        $this->assertSame($fooDecoratorName, (string) $container->getAlias(AsDecoratorMultipleFoo::class));
+        $this->assertSame($fooDecoratorName.'.inner', (string) $container->getDefinition($fooDecoratorName)->getArgument(1));
+
+        $barDecoratorName = '.decorator.'.AsDecoratorMultipleBar::class.'.'.AsDecoratorMultiple::class;
+        $this->assertSame($barDecoratorName, (string) $container->getAlias(AsDecoratorMultipleBar::class));
+        $this->assertSame($barDecoratorName.'.inner', (string) $container->getDefinition($barDecoratorName)->getArgument(1));
     }
 
     public function testTypeSymbolExcluded()

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ private function processClass(string $id, ContainerBuilder $container, Definitio`
`39`	`39`	`{`
`40`	`40`	`$attributes = $reflectionClass->getAttributes(AsDecorator::class, \ReflectionAttribute::IS_INSTANCEOF);`
`41`	`41`
`42`		`- if (!$attributes = $reflectionClass->getAttributes(AsDecorator::class, \ReflectionAttribute::IS_INSTANCEOF)) {`
	`42`	`+ if ([] === $attributes) {`
`43`	`43`	`return;`
`44`	`44`	`}`
`45`	`45`
`@@ -55,7 +55,7 @@ private function processClass(string $id, ContainerBuilder $container, Definitio`
`55`	`55`
`56`	`56`	`$definition = clone $definition;`
`57`	`57`	`$definition->setDecoratedService($attribute->decorates, null, $attribute->priority, $attribute->onInvalid);`
`58`		`- $container->setDefinition($id.'.'.ContainerBuilder::hash($attribute->decorates), $definition);`
	`58`	`+ $container->setDefinition(\sprintf('.decorator.%s.%s', $attribute->decorates, $id), $definition);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`$container->removeDefinition($id);`