[Config] Fallback to regular import when glob fails

nicolas-grekas · nicolas-grekas · commit 29802a259b19 · 2017-05-29T10:09:00.000+02:00
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -83,18 +83,17 @@ public function getLocator()
      */
     public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null)
     {
-        $ret = array();
-        $ct = 0;
-        if (!is_string($resource) || false === strpbrk($resource, '*?{[')) {
-            $ret[] = $this->doImport($resource, $type, $ignoreErrors, $sourceResource);
-        } else {
-            foreach ($this->glob($resource, false, $_, $ignoreErrors) as $path => $info) {
-                ++$ct;
+        if (is_string($resource) && false !== strpbrk($resource, '*?{[')) {
+            $ret = array();
+            foreach ($this->glob($resource, false, $_, true) as $path => $info) {
                 $ret[] = $this->doImport($path, $type, $ignoreErrors, $sourceResource);
             }
+            if ($ret) {
+                return count($ret) > 1 ? $ret : $ret[0];
+            }
         }
 
-        return $ct > 1 ? $ret : (isset($ret[0]) ? $ret[0] : null);
+        return $this->doImport($resource, $type, $ignoreErrors, $sourceResource);
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
@@ -66,6 +66,14 @@ public function testImportWithFileLocatorDelegation()
             $this->assertInstanceOf('Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceException', $e, '->import() throws a FileLoaderImportCircularReferenceException if the resource is already loading');
         }
     }
+
+    public function testImportWithGlobLikeResource()
+    {
+        $locatorMock = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+        $loader = new TestFileLoader($locatorMock);
+
+        $this->assertSame('[foo]', $loader->import('[foo]'));
+    }
 }
 
 class TestFileLoader extends FileLoader

Original file line number	Diff line number	Diff line change
`@@ -83,18 +83,17 @@ public function getLocator()`
`83`	`83`	`*/`
`84`	`84`	`public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null)`
`85`	`85`	`{`
`86`		`- $ret = array();`
`87`		`- $ct = 0;`
`88`		`- if (!is_string($resource) \|\| false === strpbrk($resource, '*?{[')) {`
`89`		`- $ret[] = $this->doImport($resource, $type, $ignoreErrors, $sourceResource);`
`90`		`- } else {`
`91`		`- foreach ($this->glob($resource, false, $_, $ignoreErrors) as $path => $info) {`
`92`		`- ++$ct;`
	`86`	`+ if (is_string($resource) && false !== strpbrk($resource, '*?{[')) {`
	`87`	`+ $ret = array();`
	`88`	`+ foreach ($this->glob($resource, false, $_, true) as $path => $info) {`
`93`	`89`	`$ret[] = $this->doImport($path, $type, $ignoreErrors, $sourceResource);`
`94`	`90`	`}`
	`91`	`+ if ($ret) {`
	`92`	`+ return count($ret) > 1 ? $ret : $ret[0];`
	`93`	`+ }`
`95`	`94`	`}`
`96`	`95`
`97`		`- return $ct > 1 ? $ret : (isset($ret[0]) ? $ret[0] : null);`
	`96`	`+ return $this->doImport($resource, $type, $ignoreErrors, $sourceResource);`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,14 @@ public function testImportWithFileLocatorDelegation()`
`66`	`66`	`$this->assertInstanceOf('Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceException', $e, '->import() throws a FileLoaderImportCircularReferenceException if the resource is already loading');`
`67`	`67`	`}`
`68`	`68`	`}`
	`69`	`+`
	`70`	`+ public function testImportWithGlobLikeResource()`
	`71`	`+ {`
	`72`	`+ $locatorMock = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();`
	`73`	`+ $loader = new TestFileLoader($locatorMock);`
	`74`	`+`
	`75`	`+ $this->assertSame('[foo]', $loader->import('[foo]'));`
	`76`	`+ }`
`69`	`77`	`}`
`70`	`78`
`71`	`79`	`class TestFileLoader extends FileLoader`