@@ -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 );
@@ -169,11 +169,25 @@ public function testRequestUnavailablePreferredLocaleFromAcceptLanguageHeader()
169169 $ this ->assertEquals ('de ' , $ request ->getLocale ());
170170 }
171171
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+
172186 public function testRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader ()
173187 {
174188 $ request = Request::create ('/ ' );
175189 $ 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 ' );
177191
178192 $ listener = new LocaleListener ($ this ->requestStack , 'de ' , null , true , ['fr ' , 'en ' ]);
179193 $ event = $ this ->getEvent ($ request );
0 commit comments