Merge branch '2.7' into 2.8

* 2.7:
  [TwigBridge] removed deprecations added in Twig 1.27
  PHP CS Fixer: use php_unit_dedicate_assert
  fixed Filesystem:makePathRelative and added 2 more testcases
  no 304 response if method is not cacheable
  move tags from decorated to decorating service

Author: fabpot

Compiler/DecoratorServicePass.php

@@ -52,10 +52,12 @@ public function process(ContainerBuilder $container)
                 $public = $alias->isPublic();
                 $container->setAlias($renamedId, new Alias((string) $alias, false));
             } else {
-                $definition = $container->getDefinition($inner);
-                $public = $definition->isPublic();
-                $definition->setPublic(false);
-                $container->setDefinition($renamedId, $definition);
+                $decoratedDefinition = $container->getDefinition($inner);
+                $definition->setTags($decoratedDefinition->getTags(), $definition->getTags());
+                $public = $decoratedDefinition->isPublic();
+                $decoratedDefinition->setPublic(false);
+                $decoratedDefinition->setTags(array());
+                $container->setDefinition($renamedId, $decoratedDefinition);
             }
 
             $container->setAlias($inner, new Alias($id, $public));

Tests/Compiler/DecoratorServicePassTest.php

@@ -124,6 +124,24 @@ public function testProcessWithPriority()
         $this->assertNull($quxDefinition->getDecoratedService());
     }
 
+    public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinition()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setTags(array('name' => 'bar'))
+        ;
+        $container
+            ->register('baz')
+            ->setDecoratedService('foo')
+        ;
+
+        $this->process($container);
+
+        $this->assertEmpty($container->getDefinition('baz.inner')->getTags());
+        $this->assertEquals(array('name' => 'bar'), $container->getDefinition('baz')->getTags());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $repeatedPass = new DecoratorServicePass();