Skip to content

Commit f8e9d34

Browse files
Merge branch '4.3' into 4.4
* 4.3: [Config] Disable default alphabet sorting in glob function due of unstable sort [HttpClient] always return the empty string when the response cannot have a body [TwigBundle][exception] Added missing css variable to highlight line in trace [Serializer] Improve messages for unexpected resources values [SecurityBundle] correct types for default arguments for firewall configs
2 parents 4bfc4b7 + 555b9d9 commit f8e9d34

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
@@ -102,7 +102,9 @@ public function getIterator()
102102
$prefix = str_replace('\\', '/', $this->prefix);
103103

104104
if (0 !== strpos($this->prefix, 'phar://') && false === strpos($this->pattern, '/**/') && (\defined('GLOB_BRACE') || false === strpos($this->pattern, '{'))) {
105-
foreach (glob($this->prefix.$this->pattern, \defined('GLOB_BRACE') ? GLOB_BRACE : 0) as $path) {
105+
$paths = glob($this->prefix.$this->pattern, GLOB_NOSORT | (\defined('GLOB_BRACE') ? GLOB_BRACE : 0));
106+
sort($paths);
107+
foreach ($paths as $path) {
106108
if ($this->excludedPrefixes) {
107109
$normalizedPath = str_replace('\\', '/', $path);
108110
do {

0 commit comments

Comments
 (0)