Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 3d55ff9021f5 · 2019-09-08T22:40:04.000+02:00
* 4.3:
  SCA: minor code tweaks
  [HttpClient] fallbackto CURLMOPT_MAXCONNECTS when CURLMOPT_MAX_HOST_CONNECTIONS is not available
  fixed typo
  [HttpKernel] Fix Apache mod_expires Session Cache-Control issue
  Fix getFileLinkFormat() to avoid returning the wrong URL in Profiler
diff --git a/Data/Util/LocaleScanner.php b/Data/Util/LocaleScanner.php
@@ -40,7 +40,7 @@ class LocaleScanner
      */
     public function scanLocales(string $sourceDir): array
     {
-        $locales = glob($sourceDir.'/*.txt');
+        $locales = glob($sourceDir.'/*.txt', GLOB_NOSORT);
 
         // Remove file extension and sort
         array_walk($locales, function (&$locale) { $locale = basename($locale, '.txt'); });

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class LocaleScanner`
`40`	`40`	`*/`
`41`	`41`	`public function scanLocales(string $sourceDir): array`
`42`	`42`	`{`
`43`		`- $locales = glob($sourceDir.'/*.txt');`
	`43`	`+ $locales = glob($sourceDir.'/*.txt', GLOB_NOSORT);`
`44`	`44`
`45`	`45`	`// Remove file extension and sort`
`46`	`46`	`array_walk($locales, function (&$locale) { $locale = basename($locale, '.txt'); });`