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

Tests/LegacyOptionsTest.php

@@ -275,7 +275,7 @@ public function testOverloadCannotBeEvaluatedLazilyWithoutExpectedClosureParams(
         });
 
         $resolved = $this->options->resolve();
-        $this->assertTrue(is_callable($resolved['foo']));
+        $this->assertInternalType('callable', $resolved['foo']);
     }
 
     public function testOverloadCannotBeEvaluatedLazilyWithoutFirstParamTypeHint()
@@ -287,7 +287,7 @@ public function testOverloadCannotBeEvaluatedLazilyWithoutFirstParamTypeHint()
         });
 
         $resolved = $this->options->resolve();
-        $this->assertTrue(is_callable($resolved['foo']));
+        $this->assertInternalType('callable', $resolved['foo']);
     }
 
     public function testRemoveOptionAndNormalizer()