Merge branch '6.1' into 6.2

chalasr · chalasr · commit eb81ec1e1fc4 · 2022-09-21T15:18:42.000+02:00
* 6.1: remove wrong entries for #47150 Fix LocaleListenerTest Accept-Language headers
diff --git a/UPGRADE-6.1.md b/UPGRADE-6.1.md
@@ -42,8 +42,6 @@ Serializer
 
  * Deprecate `ContextAwareNormalizerInterface`, use `NormalizerInterface` instead
  * Deprecate `ContextAwareDenormalizerInterface`, use `DenormalizerInterface` instead
- * Deprecate `ContextAwareEncoderInterface`, use `EncoderInterface` instead
- * Deprecate `ContextAwareDecoderInterface`, use `DecoderInterface` instead
  * Deprecate supporting denormalization for `AbstractUid` in `UidNormalizer`, use one of `AbstractUid` child class instead
  * Deprecate denormalizing to an abstract class in `UidNormalizer`
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -120,7 +120,7 @@ public function testRequestLocaleIsNotOverridden()
     public function testRequestPreferredLocaleFromAcceptLanguageHeader()
     {
         $request = Request::create('/');
-        $request->headers->set('Accept-Language', ['Accept-Language: fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5']);
+        $request->headers->set('Accept-Language', 'fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5');
 
         $listener = new LocaleListener($this->requestStack, 'de', null, true, ['de', 'fr']);
         $event = $this->getEvent($request);
@@ -133,7 +133,7 @@ public function testRequestPreferredLocaleFromAcceptLanguageHeader()
     public function testRequestSecondPreferredLocaleFromAcceptLanguageHeader()
     {
         $request = Request::create('/');
-        $request->headers->set('Accept-Language', ['Accept-Language: fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5']);
+        $request->headers->set('Accept-Language', 'fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5');
 
         $listener = new LocaleListener($this->requestStack, 'de', null, true, ['de', 'en']);
         $event = $this->getEvent($request);
@@ -146,7 +146,7 @@ public function testRequestSecondPreferredLocaleFromAcceptLanguageHeader()
     public function testDontUseAcceptLanguageHeaderIfNotEnabled()
     {
         $request = Request::create('/');
-        $request->headers->set('Accept-Language', ['Accept-Language: fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5']);
+        $request->headers->set('Accept-Language', 'fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5');
 
         $listener = new LocaleListener($this->requestStack, 'de', null, false, ['de', 'en']);
         $event = $this->getEvent($request);
@@ -159,7 +159,7 @@ public function testDontUseAcceptLanguageHeaderIfNotEnabled()
     public function testRequestUnavailablePreferredLocaleFromAcceptLanguageHeader()
     {
         $request = Request::create('/');
-        $request->headers->set('Accept-Language', ['Accept-Language: fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5']);
+        $request->headers->set('Accept-Language', 'fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5');
 
         $listener = new LocaleListener($this->requestStack, 'de', null, true, ['de', 'it']);
         $event = $this->getEvent($request);
@@ -172,7 +172,7 @@ public function testRequestUnavailablePreferredLocaleFromAcceptLanguageHeader()
     public function testRequestNoLocaleFromAcceptLanguageHeader()
     {
         $request = Request::create('/');
-        $request->headers->set('Accept-Language', ['Accept-Language: fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5']);
+        $request->headers->set('Accept-Language', 'fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5');
 
         $listener = new LocaleListener($this->requestStack, 'de', null, true);
         $event = $this->getEvent($request);
@@ -186,7 +186,7 @@ public function testRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader()
     {
         $request = Request::create('/');
         $request->attributes->set('_locale', 'it');
-        $request->headers->set('Accept-Language', ['Accept-Language: fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5']);
+        $request->headers->set('Accept-Language', 'fr-FR,fr;q=0.9,en-GB;q=0.8,en;q=0.7,en-US;q=0.6,es;q=0.5');
 
         $listener = new LocaleListener($this->requestStack, 'de', null, true, ['fr', 'en']);
         $event = $this->getEvent($request);
