@@ -120,7 +120,7 @@ public function testRequestLocaleIsNotOverridden()
120
120
public function testRequestPreferredLocaleFromAcceptLanguageHeader ()
121
121
{
122
122
$ 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 ' );
124
124
125
125
$ listener = new LocaleListener ($ this ->requestStack , 'de ' , null , true , ['de ' , 'fr ' ]);
126
126
$ event = $ this ->getEvent ($ request );
@@ -133,7 +133,7 @@ public function testRequestPreferredLocaleFromAcceptLanguageHeader()
133
133
public function testRequestSecondPreferredLocaleFromAcceptLanguageHeader ()
134
134
{
135
135
$ 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 ' );
137
137
138
138
$ listener = new LocaleListener ($ this ->requestStack , 'de ' , null , true , ['de ' , 'en ' ]);
139
139
$ event = $ this ->getEvent ($ request );
@@ -146,7 +146,7 @@ public function testRequestSecondPreferredLocaleFromAcceptLanguageHeader()
146
146
public function testDontUseAcceptLanguageHeaderIfNotEnabled ()
147
147
{
148
148
$ 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 ' );
150
150
151
151
$ listener = new LocaleListener ($ this ->requestStack , 'de ' , null , false , ['de ' , 'en ' ]);
152
152
$ event = $ this ->getEvent ($ request );
@@ -159,7 +159,7 @@ public function testDontUseAcceptLanguageHeaderIfNotEnabled()
159
159
public function testRequestUnavailablePreferredLocaleFromAcceptLanguageHeader ()
160
160
{
161
161
$ 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 ' );
163
163
164
164
$ listener = new LocaleListener ($ this ->requestStack , 'de ' , null , true , ['de ' , 'it ' ]);
165
165
$ event = $ this ->getEvent ($ request );
@@ -169,11 +169,25 @@ public function testRequestUnavailablePreferredLocaleFromAcceptLanguageHeader()
169
169
$ this ->assertEquals ('de ' , $ request ->getLocale ());
170
170
}
171
171
172
+ public function testRequestNoLocaleFromAcceptLanguageHeader ()
173
+ {
174
+ $ request = Request::create ('/ ' );
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 ' );
176
+
177
+ $ listener = new LocaleListener ($ this ->requestStack , 'de ' , null , true );
178
+ $ event = $ this ->getEvent ($ request );
179
+
180
+ $ listener ->setDefaultLocale ($ event );
181
+ $ listener ->onKernelRequest ($ event );
182
+
183
+ $ this ->assertEquals ('fr_FR ' , $ request ->getLocale ());
184
+ }
185
+
172
186
public function testRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader ()
173
187
{
174
188
$ request = Request::create ('/ ' );
175
189
$ request ->attributes ->set ('_locale ' , 'it ' );
176
- $ 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 '] );
190
+ $ 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 ' );
177
191
178
192
$ listener = new LocaleListener ($ this ->requestStack , 'de ' , null , true , ['fr ' , 'en ' ]);
179
193
$ event = $ this ->getEvent ($ request );
0 commit comments