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

fabpot · fabpot · commit 4a973185e95f · 2022-09-23T08:25:01.000+02:00
This PR was squashed before being merged into the 6.2 branch. Discussion ---------- [HttpKernel] Use Accept-Language header even if there are no enabled locales | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Fix #47355 | License | MIT | Doc PR | N/A Don’t really know how I should consider this PR 🤔 It would affect people setting `set_locale_from_accept_language` to `true` with no `enabled_locales` when the request has a preferred language: - before: set the default locale as request locale - after: set the preferred language as request locale Commits ------- b20d074 [HttpKernel] Use Accept-Language header even if there are no enabled locales
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -18,7 +18,8 @@ CHANGELOG
    `workflow.state_machine`
  * Add `rate_limiter` configuration option to `messenger.transport` to allow rate limited transports using the RateLimiter component
  * Remove `@internal` tag from secret vaults to allow them to be used directly outside the framework bundle and custom vaults to be added
- * Deprecate "framework.form.legacy_error_messages" config node
+ * Deprecate `framework.form.legacy_error_messages` config node
+ * Set locale from request rather than default locale if `framework.enabled_locales` is empty and `framework.set_locale_from_accept_language` is true
 
 6.1
 ---
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -68,7 +68,7 @@ private function setLocale(Request $request)
     {
         if ($locale = $request->attributes->get('_locale')) {
             $request->setLocale($locale);
-        } elseif ($this->useAcceptLanguageHeader && $this->enabledLocales && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {
+        } elseif ($this->useAcceptLanguageHeader && ($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,7 +68,7 @@ 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))) {`
	`71`	`+ } elseif ($this->useAcceptLanguageHeader && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {`
`72`	`72`	`$request->setLocale($preferredLanguage);`
`73`	`73`	`$request->attributes->set('_vary_by_language', true);`
`74`	`74`	`}`
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()`