[DI] Fix tags merging in decorating service

chalasr · chalasr · commit 7e1d19bbff5d · 2016-10-23T10:46:54.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container)
                 $container->setAlias($renamedId, new Alias((string) $alias, false));
             } else {
                 $decoratedDefinition = $container->getDefinition($inner);
-                $definition->setTags($decoratedDefinition->getTags(), $definition->getTags());
+                $definition->setTags(array_merge($decoratedDefinition->getTags(), $definition->getTags()));
                 $public = $decoratedDefinition->isPublic();
                 $decoratedDefinition->setPublic(false);
                 $decoratedDefinition->setTags(array());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
@@ -100,6 +100,25 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
         $this->assertEquals(array('name' => 'bar'), $container->getDefinition('baz')->getTags());
     }
 
+    public function testProcessMergesTagsInDecoratingDefinition()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setTags(array('name' => 'bar'))
+        ;
+        $container
+            ->register('baz')
+            ->setTags(array('name' => 'baz', 'alias' => 'bar'))
+            ->setDecoratedService('foo')
+        ;
+
+        $this->process($container);
+
+        $this->assertEmpty($container->getDefinition('baz.inner')->getTags());
+        $this->assertEquals(array('name' => 'baz', 'alias' => 'bar'), $container->getDefinition('baz')->getTags());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $repeatedPass = new DecoratorServicePass();
