Merge branch '6.1' into 6.2

chalasr · chalasr · commit 829c5d67cc87 · 2022-09-23T18:36:37.000+02:00
* 6.1:
  [HttpKernel] Use Accept-Language header even if there are no enabled locales
diff --git a/EventListener/LocaleListener.php b/EventListener/LocaleListener.php
@@ -68,8 +68,10 @@ private function setLocale(Request $request)
     {
         if ($locale = $request->attributes->get('_locale')) {
             $request->setLocale($locale);
-        } elseif ($this->useAcceptLanguageHeader && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {
-            $request->setLocale($preferredLanguage);
+        } elseif ($this->useAcceptLanguageHeader) {
+            if ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales)) {
+                $request->setLocale($preferredLanguage);
+            }
             $request->attributes->set('_vary_by_language', true);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,10 @@ private function setLocale(Request $request)`
`68`	`68`	`{`
`69`	`69`	`if ($locale = $request->attributes->get('_locale')) {`
`70`	`70`	`$request->setLocale($locale);`
`71`		`- } elseif ($this->useAcceptLanguageHeader && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {`
`72`		`- $request->setLocale($preferredLanguage);`
	`71`	`+ } elseif ($this->useAcceptLanguageHeader) {`
	`72`	`+ if ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales)) {`
	`73`	`+ $request->setLocale($preferredLanguage);`
	`74`	`+ }`
`73`	`75`	`$request->attributes->set('_vary_by_language', true);`
`74`	`76`	`}`
`75`	`77`	`}`