Merge branch '3.4' into 4.0
* 3.4: fix merge
This commit is contained in:
commit
2f587c3dce
@ -70,7 +70,7 @@ abstract class FileLoader extends Loader
|
||||
* @throws FileLoaderImportCircularReferenceException
|
||||
* @throws FileLocatorFileNotFoundException
|
||||
*/
|
||||
public function import($resource, $type = null, bool $ignoreErrors = false, $sourceResource = null)
|
||||
public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null)
|
||||
{
|
||||
if (is_string($resource) && strlen($resource) !== $i = strcspn($resource, '*?{[')) {
|
||||
$ret = array();
|
||||
|
@ -113,7 +113,7 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
|
||||
$coll = new RouteCollection();
|
||||
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
|
||||
$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'));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user