fix merge
This commit is contained in:
parent
f5060c122b
commit
81dafca6db
@ -113,7 +113,7 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
|
|||||||
$coll = new RouteCollection();
|
$coll = new RouteCollection();
|
||||||
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
|
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
|
||||||
$matcher = $this->getUrlMatcher($coll, new RequestContext());
|
$matcher = $this->getUrlMatcher($coll, new RequestContext());
|
||||||
$matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn(array('_route' => 'foo'));
|
$matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn(array());
|
||||||
$this->assertSame(array('_route' => 'foo'), $matcher->match('/foo'));
|
$this->assertSame(array('_route' => 'foo'), $matcher->match('/foo'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user