Merge branch '2.7' into 2.8

* 2.7:
  Pass on previous exception in FatalThrowableError
  [Routing] remove dead code
  [Routing] fix typo

Author: fabpot

Tests/Matcher/DumpedRedirectableUrlMatcherTest.php

@@ -25,7 +25,7 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
 
         $class = 'DumpedRedirectableUrlMatcher'.++$i;
         $dumper = new PhpMatcherDumper($routes);
-        $dumpedRoutes = eval('?>'.$dumper->dump(array('class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher')));
+        eval('?>'.$dumper->dump(array('class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher')));
 
         return $this->getMockBuilder($class)
             ->setConstructorArgs(array($context ?: new RequestContext()))

Tests/Matcher/DumpedUrlMatcherTest.php

@@ -41,7 +41,7 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
 
         $class = 'DumpedUrlMatcher'.++$i;
         $dumper = new PhpMatcherDumper($routes);
-        $dumpedRoutes = eval('?>'.$dumper->dump(array('class' => $class)));
+        eval('?>'.$dumper->dump(array('class' => $class)));
 
         return new $class($context ?: new RequestContext());
     }

Tests/Matcher/RedirectableUrlMatcherTest.php

@@ -17,7 +17,7 @@
 
 class RedirectableUrlMatcherTest extends UrlMatcherTest
 {
-    public function testRedirectWhenNoSlash()
+    public function testMissingTrailingSlash()
     {
         $coll = new RouteCollection();
         $coll->add('foo', new Route('/foo/'));
@@ -56,7 +56,7 @@ public function testSchemeRedirectRedirectsToFirstScheme()
         $matcher->match('/foo');
     }
 
-    public function testNoSchemaRedirectIfOnOfMultipleSchemesMatches()
+    public function testNoSchemaRedirectIfOneOfMultipleSchemesMatches()
     {
         $coll = new RouteCollection();
         $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https', 'http')));