Merge branch '2.7' into 2.8

fabpot · fabpot · commit 3d61c765daa1 · 2016-10-24T08:52:36.000-07:00
* 2.7:
  Fix edge case with StreamedResponse where headers are sent twice
  removed usage of Twig_Compiler::addIndentation
  merge tags instead of completely replacing them
diff --git a/Compiler/DecoratorServicePass.php b/Compiler/DecoratorServicePass.php
@@ -53,7 +53,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()));
                 $definition->setAutowiringTypes(array_merge($decoratedDefinition->getAutowiringTypes(), $definition->getAutowiringTypes()));
                 $public = $decoratedDefinition->isPublic();
                 $decoratedDefinition->setPublic(false);
diff --git a/Tests/Compiler/DecoratorServicePassTest.php b/Tests/Compiler/DecoratorServicePassTest.php
@@ -129,17 +129,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());
     }
 
     public function testProcessMergesAutowiringTypesInDecoratingDefinitionAndRemoveThemFromDecoratedDefinition()

Original file line number	Diff line number	Diff line change
`@@ -129,17 +129,18 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio`
`129`	`129`	`$container = new ContainerBuilder();`
`130`	`130`	`$container`
`131`	`131`	`->register('foo')`
`132`		`- ->setTags(array('name' => 'bar'))`
	`132`	`+ ->setTags(array('bar' => array('attr' => 'baz')))`
`133`	`133`	`;`
`134`	`134`	`$container`
`135`	`135`	`->register('baz')`
	`136`	`+ ->setTags(array('foobar' => array('attr' => 'bar')))`
`136`	`137`	`->setDecoratedService('foo')`
`137`	`138`	`;`
`138`	`139`
`139`	`140`	`$this->process($container);`
`140`	`141`
`141`	`142`	`$this->assertEmpty($container->getDefinition('baz.inner')->getTags());`
`142`		`- $this->assertEquals(array('name' => 'bar'), $container->getDefinition('baz')->getTags());`
	`143`	`+ $this->assertEquals(array('bar' => array('attr' => 'baz'), 'foobar' => array('attr' => 'bar')), $container->getDefinition('baz')->getTags());`
`143`	`144`	`}`
`144`	`145`
`145`	`146`	`public function testProcessMergesAutowiringTypesInDecoratingDefinitionAndRemoveThemFromDecoratedDefinition()`