[DependencyInjection] Don't ignore attributes on the actual decorator

HypeMC · HypeMC · commit fdd2ec251e7e · 2023-06-07T22:02:05.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -87,7 +87,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
                 $instanceofDef->setAbstract(true)->setParent($parent ?: '.abstract.instanceof.'.$id);
                 $parent = '.instanceof.'.$interface.'.'.$key.'.'.$id;
                 $container->setDefinition($parent, $instanceofDef);
-                $instanceofTags[] = $instanceofDef->getTags();
+                $instanceofTags[] = [$interface, $instanceofDef->getTags()];
                 $instanceofBindings = $instanceofDef->getBindings() + $instanceofBindings;
 
                 foreach ($instanceofDef->getMethodCalls() as $methodCall) {
@@ -126,8 +126,9 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
             // Don't add tags to service decorators
             $i = \count($instanceofTags);
             while (0 <= --$i) {
-                foreach ($instanceofTags[$i] as $k => $v) {
-                    if (null === $definition->getDecoratedService() || \in_array($k, $tagsToKeep, true)) {
+                [$interface, $tags] = $instanceofTags[$i];
+                foreach ($tags as $k => $v) {
+                    if (null === $definition->getDecoratedService() || $interface === $definition->getClass() || \in_array($k, $tagsToKeep, true)) {
                         foreach ($v as $v) {
                             if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {
                                 continue;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -318,18 +318,26 @@ public function testDecoratorsAreNotAutomaticallyTagged()
         $decorator->setDecoratedService('decorated');
         $decorator->setInstanceofConditionals([
             parent::class => (new ChildDefinition(''))->addTag('tag'),
+            self::class => (new ChildDefinition(''))->addTag('other-tag'),
         ]);
         $decorator->setAutoconfigured(true);
         $decorator->addTag('manual');
 
         $container->registerForAutoconfiguration(parent::class)
             ->addTag('tag')
         ;
+        $container->registerForAutoconfiguration(self::class)
+            ->addTag('last-tag')
+        ;
 
         (new ResolveInstanceofConditionalsPass())->process($container);
         (new ResolveChildDefinitionsPass())->process($container);
 
-        $this->assertSame(['manual' => [[]]], $container->getDefinition('decorator')->getTags());
+        $this->assertSame([
+            'manual' => [[]],
+            'other-tag' => [[]],
+            'last-tag' => [[]],
+        ], $container->getDefinition('decorator')->getTags());
     }
 
     public function testDecoratorsKeepBehaviorDescribingTags()
