Skip to content

Commit 72a068f

Browse files
Merge branch '3.4' into 4.3
* 3.4: [Config] Disable default alphabet sorting in glob function due of unstable sort [Serializer] Improve messages for unexpected resources values [SecurityBundle] correct types for default arguments for firewall configs
2 parents 5e575fa + 3e915e5 commit 72a068f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Finder.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,8 @@ public function in($dirs)
595595
foreach ((array) $dirs as $dir) {
596596
if (is_dir($dir)) {
597597
$resolvedDirs[] = $this->normalizeDir($dir);
598-
} elseif ($glob = glob($dir, (\defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR)) {
598+
} elseif ($glob = glob($dir, (\defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR | GLOB_NOSORT)) {
599+
sort($glob);
599600
$resolvedDirs = array_merge($resolvedDirs, array_map([$this, 'normalizeDir'], $glob));
600601
} else {
601602
throw new DirectoryNotFoundException(sprintf('The "%s" directory does not exist.', $dir));

0 commit comments

Comments
 (0)