Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit 2f587c3dce45 · 2018-02-04T14:31:53.000+01:00
* 3.4:
  fix merge
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -70,7 +70,7 @@ public function getLocator()
      * @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();
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php
@@ -113,7 +113,7 @@ public function testSchemeRequirement()
         $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'));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function getLocator()`
`70`	`70`	`* @throws FileLoaderImportCircularReferenceException`
`71`	`71`	`* @throws FileLocatorFileNotFoundException`
`72`	`72`	`*/`
`73`		`- public function import($resource, $type = null, bool $ignoreErrors = false, $sourceResource = null)`
	`73`	`+ public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null)`
`74`	`74`	`{`
`75`	`75`	`if (is_string($resource) && strlen($resource) !== $i = strcspn($resource, '*?{[')) {`
`76`	`76`	`$ret = array();`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function testSchemeRequirement()`
`113`	`113`	`$coll = new RouteCollection();`
`114`	`114`	`$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));`
`115`	`115`	`$matcher = $this->getUrlMatcher($coll, new RequestContext());`
`116`		`- $matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn(array('_route' => 'foo'));`
	`116`	`+ $matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn(array());`
`117`	`117`	`$this->assertSame(array('_route' => 'foo'), $matcher->match('/foo'));`
`118`	`118`	`}`
`119`	`119`