Merge branch '3.2' into 3.3

* 3.2:
  [FrameworkBundle] Fix tests

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php

@@ -25,6 +25,10 @@ public function testRedirectWhenNoSlash()
         $coll->add('foo', new Route('/foo/'));
 
         $matcher = new RedirectableUrlMatcher($coll, $context = new RequestContext());
+        $parameters = $matcher->match('/foo');
+        if ('foo' === $parameters['_route']) {
+            $parameters['_route'] = null; // FC with behavior on 3.4
+        }
 
         $this->assertEquals(array(
                 '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction',
@@ -35,7 +39,7 @@ public function testRedirectWhenNoSlash()
                 'httpsPort' => $context->getHttpsPort(),
                 '_route' => null,
             ),
-            $matcher->match('/foo')
+            $parameters
         );
     }