merge tags instead of completely replacing them

symfony · fabpot · Oct 23, 2016 · Oct 23, 2016 · Oct 23, 2016 · c333eb70b67e1531de0131e3a14ea3c71eb92442
commit c333eb70b67e1531de0131e3a14ea3c71eb92442
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
@@ -87,17 +87,18 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
        $container = new ContainerBuilder();
        $container
            ->register('foo')
-            ->setTags(array('name' => 'bar'))
+            ->setTags(array('bar' => array('attr' => 'baz')))
        ;
        $container
            ->register('baz')
+            ->setTags(array('foobar' => array('attr' => 'bar')))
            ->setDecoratedService('foo')
        ;

        $this->process($container);

        $this->assertEmpty($container->getDefinition('baz.inner')->getTags());
-        $this->assertEquals(array('name' => 'bar'), $container->getDefinition('baz')->getTags());
+        $this->assertEquals(array('bar' => array('attr' => 'baz'), 'foobar' => array('attr' => 'bar')), $container->getDefinition('baz')->getTags());
    }

    protected function process(ContainerBuilder $container)