Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit eb81ec1

Browse filesBrowse files
committed
Merge branch '6.1' into 6.2
* 6.1: remove wrong entries for #47150 Fix LocaleListenerTest Accept-Language headers
2 parents ed1b002 + 9cc2f4d commit eb81ec1
Copy full SHA for eb81ec1

File tree

2 files changed

+6
-8
lines changed
Filter options

2 files changed

+6
-8
lines changed

‎UPGRADE-6.1.md

Copy file name to clipboardExpand all lines: UPGRADE-6.1.md
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ Serializer
4242

4343
* Deprecate `ContextAwareNormalizerInterface`, use `NormalizerInterface` instead
4444
* Deprecate `ContextAwareDenormalizerInterface`, use `DenormalizerInterface` instead
45-
* Deprecate `ContextAwareEncoderInterface`, use `EncoderInterface` instead
46-
* Deprecate `ContextAwareDecoderInterface`, use `DecoderInterface` instead
4745
* Deprecate supporting denormalization for `AbstractUid` in `UidNormalizer`, use one of `AbstractUid` child class instead
4846
* Deprecate denormalizing to an abstract class in `UidNormalizer`
4947

‎src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function testRequestLocaleIsNotOverridden()
120120
public function testRequestPreferredLocaleFromAcceptLanguageHeader()
121121
{
122122
$request = Request::create('/');
123-
$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']);
123+
$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');
124124

125125
$listener = new LocaleListener($this->requestStack, 'de', null, true, ['de', 'fr']);
126126
$event = $this->getEvent($request);
@@ -133,7 +133,7 @@ public function testRequestPreferredLocaleFromAcceptLanguageHeader()
133133
public function testRequestSecondPreferredLocaleFromAcceptLanguageHeader()
134134
{
135135
$request = Request::create('/');
136-
$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']);
136+
$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');
137137

138138
$listener = new LocaleListener($this->requestStack, 'de', null, true, ['de', 'en']);
139139
$event = $this->getEvent($request);
@@ -146,7 +146,7 @@ public function testRequestSecondPreferredLocaleFromAcceptLanguageHeader()
146146
public function testDontUseAcceptLanguageHeaderIfNotEnabled()
147147
{
148148
$request = Request::create('/');
149-
$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']);
149+
$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');
150150

151151
$listener = new LocaleListener($this->requestStack, 'de', null, false, ['de', 'en']);
152152
$event = $this->getEvent($request);
@@ -159,7 +159,7 @@ public function testDontUseAcceptLanguageHeaderIfNotEnabled()
159159
public function testRequestUnavailablePreferredLocaleFromAcceptLanguageHeader()
160160
{
161161
$request = Request::create('/');
162-
$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']);
162+
$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');
163163

164164
$listener = new LocaleListener($this->requestStack, 'de', null, true, ['de', 'it']);
165165
$event = $this->getEvent($request);
@@ -172,7 +172,7 @@ public function testRequestUnavailablePreferredLocaleFromAcceptLanguageHeader()
172172
public function testRequestNoLocaleFromAcceptLanguageHeader()
173173
{
174174
$request = Request::create('/');
175-
$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']);
175+
$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');
176176

177177
$listener = new LocaleListener($this->requestStack, 'de', null, true);
178178
$event = $this->getEvent($request);
@@ -186,7 +186,7 @@ public function testRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader()
186186
{
187187
$request = Request::create('/');
188188
$request->attributes->set('_locale', 'it');
189-
$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']);
189+
$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');
190190

191191
$listener = new LocaleListener($this->requestStack, 'de', null, true, ['fr', 'en']);
192192
$event = $this->getEvent($request);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.