Skip to content

Commit 555b9d9

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 3670939 + c111091 commit 555b9d9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Resource/GlobResource.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ public function getIterator()
9999
$prefix = str_replace('\\', '/', $this->prefix);
100100

101101
if (0 !== strpos($this->prefix, 'phar://') && false === strpos($this->pattern, '/**/') && (\defined('GLOB_BRACE') || false === strpos($this->pattern, '{'))) {
102-
foreach (glob($this->prefix.$this->pattern, \defined('GLOB_BRACE') ? GLOB_BRACE : 0) as $path) {
102+
$paths = glob($this->prefix.$this->pattern, GLOB_NOSORT | (\defined('GLOB_BRACE') ? GLOB_BRACE : 0));
103+
sort($paths);
104+
foreach ($paths as $path) {
103105
if ($this->excludedPrefixes) {
104106
$normalizedPath = str_replace('\\', '/', $path);
105107
do {

0 commit comments

Comments
 (0)