8000 Merge branch '6.0' into 6.1 · symfony/symfony@9cc2f4d · GitHub
[go: up one dir, main page]

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 9cc2f4d

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Fix LocaleListenerTest Accept-Language headers
2 parents c705787 + 82e5c2b commit 9cc2f4d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

Lines 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