bug #47675 [HttpKernel] Use Accept-Language header even if there are no enabled locales (MatTheCat)

chalasr · chalasr · commit f76a3b05a0b4 · 2022-09-23T18:34:32.000+02:00
This PR was squashed before being merged into the 6.1 branch. Discussion ---------- [HttpKernel] Use Accept-Language header even if there are no enabled locales | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #47377 | License | MIT | Doc PR | N/A Commits ------- d97d51c [HttpKernel] Use Accept-Language header even if there are no enabled locales
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -68,8 +68,10 @@ private function setLocale(Request $request)
     {
         if ($locale = $request->attributes->get('_locale')) {
             $request->setLocale($locale);
-        } elseif ($this->useAcceptLanguageHeader && $this->enabledLocales && ($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);
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -179,7 +179,7 @@ public function testRequestNoLocaleFromAcceptLanguageHeader()
 
         $listener->setDefaultLocale($event);
         $listener->onKernelRequest($event);
-        $this->assertEquals('de', $request->getLocale());
+        $this->assertEquals('fr_FR', $request->getLocale());
     }
 
     public function testRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader()

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 && $this->enabledLocales && ($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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public function testRequestNoLocaleFromAcceptLanguageHeader()`
`179`	`179`
`180`	`180`	`$listener->setDefaultLocale($event);`
`181`	`181`	`$listener->onKernelRequest($event);`
`182`		`- $this->assertEquals('de', $request->getLocale());`
	`182`	`+ $this->assertEquals('fr_FR', $request->getLocale());`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`public function testRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader()`