[Config] Allow empty globs

nicolas-grekas · nicolas-grekas · commit 6b9e51c28767 · 2017-05-31T10:32:23.000+02:00
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -83,13 +83,18 @@ public function getLocator()
      */
     public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null)
     {
-        if (is_string($resource) && false !== strpbrk($resource, '*?{[')) {
+        if (is_string($resource) && strlen($resource) !== $i = strcspn($resource, '*?{[')) {
             $ret = array();
-            foreach ($this->glob($resource, false, $_, true) as $path => $info) {
-                $ret[] = $this->doImport($path, $type, $ignoreErrors, $sourceResource);
+            $isSubpath = 0 !== $i && false !== strpos(substr($resource, 0, $i), '/');
+            foreach ($this->glob($resource, false, $tracker, $ignoreErrors || !$isSubpath) as $path => $info) {
+                if (null !== $res = $this->doImport($path, $type, $ignoreErrors, $sourceResource)) {
+                    $ret[] = $res;
+                }
+                $isSubpath = true;
             }
-            if ($ret) {
-                return count($ret) > 1 ? $ret : $ret[0];
+
+            if ($isSubpath) {
+                return isset($ret[1]) ? $ret : (isset($ret[0]) ? $ret[0] : null);
             }
         }
 
@@ -104,7 +109,7 @@ protected function glob($pattern, $recursive, &$resource = null, $ignoreErrors =
         if (strlen($pattern) === $i = strcspn($pattern, '*?{[')) {
             $prefix = $pattern;
             $pattern = '';
-        } elseif (0 === $i) {
+        } elseif (0 === $i || false === strpos(substr($pattern, 0, $i), '/')) {
             $prefix = '.';
             $pattern = '/'.$pattern;
         } else {
diff --git a/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Config\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\FileLoader;
 use Symfony\Component\Config\Loader\LoaderResolver;
 
@@ -74,6 +75,21 @@ public function testImportWithGlobLikeResource()
 
         $this->assertSame('[foo]', $loader->import('[foo]'));
     }
+
+    public function testImportWithNoGlobMatch()
+    {
+        $locatorMock = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
+        $loader = new TestFileLoader($locatorMock);
+
+        $this->assertNull($loader->import('./*.abc'));
+    }
+
+    public function testImportWithSimpleGlob()
+    {
+        $loader = new TestFileLoader(new FileLocator(__DIR__));
+
+        $this->assertSame(__FILE__, $loader->import('FileLoaderTest.*'));
+    }
 }
 
 class TestFileLoader extends FileLoader
