Keep existing behaviour when loading a config and the glob doesn't match

pierredup · pierredup · commit 1c86fb4df036 · 2017-01-15T11:54:46.000+02:00
diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
@@ -42,11 +42,15 @@ public function locate($name, $currentPath = null, $first = true)
         }
 
         if ($this->isAbsolutePath($name)) {
-            if (array() === $files = glob($name, GLOB_BRACE)) {
+            if (file_exists($name)) {
+                return $name;
+            }
+
+            if (array() === $files = glob($name, defined('GLOB_BRACE') ? GLOB_BRACE : 0)) {
                 throw new FileLocatorFileNotFoundException(sprintf('The file "%s" does not exist.', $name));
             }
 
-            if ($first) {
+            if (true === $first) {
                 return array_shift($files);
             }
 
@@ -62,18 +66,8 @@ public function locate($name, $currentPath = null, $first = true)
         $paths = array_unique($paths);
         $filepaths = array();
 
-        $load = function ($file) use (&$filepaths) {
-            if (@file_exists($file)) {
-                $filepaths[] = $file;
-            }
-        };
-
         foreach ($paths as $path) {
-            if (array() !== $files = glob($path.DIRECTORY_SEPARATOR.$name)) {
-                array_walk($files, $load);
-            } else {
-                $load($path.DIRECTORY_SEPARATOR.$name);
-            }
+            $filepaths = array_merge($filepaths, glob($path.DIRECTORY_SEPARATOR.$name, defined('GLOB_BRACE') ? GLOB_BRACE : 0));
         }
 
         if (!$filepaths) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -112,10 +112,12 @@ private function parseImports(\DOMDocument $xml, $file)
                 $resourceFile = $defaultDirectory.DIRECTORY_SEPARATOR.$resourceFile;
             }
 
-            $files = glob($resourceFile, GLOB_BRACE);
-
-            foreach ($files as $resource) {
-                $this->import($resource, XmlUtils::phpize($import->getAttribute('type')) ?: null, (bool) XmlUtils::phpize($import->getAttribute('ignore-errors')), $file);
+            if (array() !== $files = glob($resourceFile, defined('GLOB_BRACE') ? GLOB_BRACE : 0)) {
+                foreach ($files as $resource) {
+                    $this->import($resource, XmlUtils::phpize($import->getAttribute('type')) ?: null, (bool) XmlUtils::phpize($import->getAttribute('ignore-errors')), $file);
+                }
+            } else {
+                $this->import($resourceFile, XmlUtils::phpize($import->getAttribute('type')) ?: null, (bool) XmlUtils::phpize($import->getAttribute('ignore-errors')), $file);
             }
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -143,10 +143,12 @@ private function parseImports($content, $file)
                 $import['resource'] = $defaultDirectory.DIRECTORY_SEPARATOR.$import['resource'];
             }
 
-            $files = glob($import['resource'], GLOB_BRACE);
-
-            foreach ($files as $resource) {
-                $this->import($resource, isset($import['type']) ? $import['type'] : null, isset($import['ignore_errors']) ? (bool) $import['ignore_errors'] : false, $file);
+            if (array() !== $files = glob($import['resource'], defined('GLOB_BRACE') ? GLOB_BRACE : 0)) {
+                foreach ($files as $resource) {
+                    $this->import($resource, isset($import['type']) ? $import['type'] : null, isset($import['ignore_errors']) ? (bool) $import['ignore_errors'] : false, $file);
+                }
+            } else {
+                $this->import($import['resource'], isset($import['type']) ? $import['type'] : null, isset($import['ignore_errors']) ? (bool) $import['ignore_errors'] : false, $file);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,12 @@ private function parseImports(\DOMDocument $xml, $file)`
`112`	`112`	`$resourceFile = $defaultDirectory.DIRECTORY_SEPARATOR.$resourceFile;`
`113`	`113`	`}`
`114`	`114`
`115`		`- $files = glob($resourceFile, GLOB_BRACE);`
`116`		`-`
`117`		`- foreach ($files as $resource) {`
`118`		`- $this->import($resource, XmlUtils::phpize($import->getAttribute('type')) ?: null, (bool) XmlUtils::phpize($import->getAttribute('ignore-errors')), $file);`
	`115`	`+ if (array() !== $files = glob($resourceFile, defined('GLOB_BRACE') ? GLOB_BRACE : 0)) {`
	`116`	`+ foreach ($files as $resource) {`
	`117`	`+ $this->import($resource, XmlUtils::phpize($import->getAttribute('type')) ?: null, (bool) XmlUtils::phpize($import->getAttribute('ignore-errors')), $file);`
	`118`	`+ }`
	`119`	`+ } else {`
	`120`	`+ $this->import($resourceFile, XmlUtils::phpize($import->getAttribute('type')) ?: null, (bool) XmlUtils::phpize($import->getAttribute('ignore-errors')), $file);`
`119`	`121`	`}`
`120`	`122`	`}`
`121`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,10 +143,12 @@ private function parseImports($content, $file)`
`143`	`143`	`$import['resource'] = $defaultDirectory.DIRECTORY_SEPARATOR.$import['resource'];`
`144`	`144`	`}`
`145`	`145`
`146`		`- $files = glob($import['resource'], GLOB_BRACE);`
`147`		`-`
`148`		`- foreach ($files as $resource) {`
`149`		`- $this->import($resource, isset($import['type']) ? $import['type'] : null, isset($import['ignore_errors']) ? (bool) $import['ignore_errors'] : false, $file);`
	`146`	`+ if (array() !== $files = glob($import['resource'], defined('GLOB_BRACE') ? GLOB_BRACE : 0)) {`
	`147`	`+ foreach ($files as $resource) {`
	`148`	`+ $this->import($resource, isset($import['type']) ? $import['type'] : null, isset($import['ignore_errors']) ? (bool) $import['ignore_errors'] : false, $file);`
	`149`	`+ }`
	`150`	`+ } else {`
	`151`	`+ $this->import($import['resource'], isset($import['type']) ? $import['type'] : null, isset($import['ignore_errors']) ? (bool) $import['ignore_errors'] : false, $file);`
`150`	`152`	`}`
`151`	`153`	`}`
`152`	`154`	`}`