symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
Lines changed: 10 additions & 7 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
Lines changed: 10 additions & 7 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
Lines changed: 22 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
Lines changed: 22 additions & 0 deletions
@@ -110,14 +110,17 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
                 $definition->setShared($shared);
             }
 
-            $i = \count($instanceofTags);
-            while (0 <= --$i) {
-                foreach ($instanceofTags[$i] as $k => $v) {
-                    foreach ($v as $v) {
-                        if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {
-                            continue;
+            // Don't add tags to service decorators
+            if (null === $definition->getDecoratedService()) {
+                $i = \count($instanceofTags);
+                while (0 <= --$i) {
+                    foreach ($instanceofTags[$i] as $k => $v) {
+                        foreach ($v as $v) {
+                            if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {
+                                continue;
+                            }
+                            $definition->addTag($k, $v);
                         }
-                        $definition->addTag($k, $v);
                     }
                 }
             }
 
@@ -283,4 +283,26 @@ public function testBindings()
         $this->assertInstanceOf(BoundArgument::class, $bindings['$toto']);
         $this->assertSame(123, $bindings['$toto']->getValues()[0]);
     }
+
+    public function testDecoratorsAreNotAutomaticallyTagged()
+    {
+        $container = new ContainerBuilder();
+
+        $decorator = $container->register('decorator', self::class);
+        $decorator->setDecoratedService('decorated');
+        $decorator->setInstanceofConditionals([
+            parent::class => (new ChildDefinition(''))->addTag('tag'),
+        ]);
+        $decorator->setAutoconfigured(true);
+        $decorator->addTag('manual');
+
+        $container->registerForAutoconfiguration(parent::class)
+            ->addTag('tag')
+        ;
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+        (new ResolveChildDefinitionsPass())->process($container);
+
+        $this->assertSame(['manual' => [[]]], $container->getDefinition('decorator')->getTags());
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -110,14 +110,17 @@ private function processDefinition(ContainerBuilder $container, $id, Definition`
`110`	`110`	`$definition->setShared($shared);`
`111`	`111`	`}`
`112`	`112`
`113`		`- $i = \count($instanceofTags);`
`114`		`- while (0 <= --$i) {`
`115`		`- foreach ($instanceofTags[$i] as $k => $v) {`
`116`		`- foreach ($v as $v) {`
`117`		`- if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {`
`118`		`- continue;`
	`113`	`+ // Don't add tags to service decorators`
	`114`	`+ if (null === $definition->getDecoratedService()) {`
	`115`	`+ $i = \count($instanceofTags);`
	`116`	`+ while (0 <= --$i) {`
	`117`	`+ foreach ($instanceofTags[$i] as $k => $v) {`
	`118`	`+ foreach ($v as $v) {`
	`119`	`+ if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {`
	`120`	`+ continue;`
	`121`	`+ }`
	`122`	`+ $definition->addTag($k, $v);`
`119`	`123`	`}`
`120`		`- $definition->addTag($k, $v);`
`121`	`124`	`}`
`122`	`125`	`}`
`123`	`126`	`}`