diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.2' into 3.3

Browse Source 
* 3.2:
  [FrameworkBundle] Fix tests
This commit is contained in:
Nicolas Grekas 2017-07-12 17:03:57 +02:00
commit d1cfec11c3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php
View File

@ -25,6 +25,10 @@ class RedirectableUrlMatcherTest extends TestCase
$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 @@ class RedirectableUrlMatcherTest extends TestCase
'httpsPort' => $context->getHttpsPort(),
'_route' => null,
),
$matcher->match('/foo')
$parameters
);
}