bug #21833 [Config] Sort "globbed" paths to make them predictable (nicolas-grekas)

fabpot · fabpot · commit e2e9c947217c · 2017-03-02T08:00:18.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [Config] Sort "globbed" paths to make them predictable | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Spotted while reviewing #21832 ping @jakzal FYI Note that glob already sorts its output, and Finder and glob skip dot dirs. Commits ------- ea1deff [Config] Sort "globbed" paths to make them predictable
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -129,8 +129,18 @@ protected function glob($resource, $recursive, &$prefix = null, $ignoreErrors =
         if (false === strpos($resource, '/**/') && (defined('GLOB_BRACE') || false === strpos($resource, '{'))) {
             foreach (glob($prefix.$resource, defined('GLOB_BRACE') ? GLOB_BRACE : 0) as $path) {
                 if ($recursive && is_dir($path)) {
-                    $flags = \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS;
-                    foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path, $flags)) as $path => $info) {
+                    $files = iterator_to_array(new \RecursiveIteratorIterator(
+                        new \RecursiveCallbackFilterIterator(
+                            new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
+                            function (\SplFileInfo $file) { return '.' !== $file->getBasename()[0]; }
+                        ),
+                        \RecursiveIteratorIterator::LEAVES_ONLY
+                    ));
+                    usort($files, function (\SplFileInfo $a, \SplFileInfo $b) {
+                        return (string) $a > (string) $b ? 1 : -1;
+                    });
+
+                    foreach ($files as $path => $info) {
                         if ($info->isFile()) {
                             yield $path => $info;
                         }
@@ -154,7 +164,7 @@ protected function glob($resource, $recursive, &$prefix = null, $ignoreErrors =
         }
 
         $prefixLen = strlen($prefix);
-        foreach ($finder->followLinks()->in($prefix) as $path => $info) {
+        foreach ($finder->followLinks()->sortByName()->in($prefix) as $path => $info) {
             if (preg_match($regex, substr($path, $prefixLen)) && $info->isFile()) {
                 yield $path => $info;
             }
