symfony
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
+22Lines changed: 22 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
+22Lines changed: 22 additions & 0 deletions
@@ -69,7 +69,7 @@ private function setLocale(Request $request): void
         if ($locale = $request->attributes->get('_locale')) {
             $request->setLocale($locale);
         } elseif ($this->useAcceptLanguageHeader) {
-            if ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales)) {
+            if ($request->getLanguages() && $preferredLanguage = $request->getPreferredLanguage($this->enabledLocales)) {
                 $request->setLocale($preferredLanguage);
             }
             $request->attributes->set('_vary_by_language', true);
 
@@ -131,6 +131,28 @@ public function testRequestPreferredLocaleFromAcceptLanguageHeader()
         $this->assertEquals('fr', $request->getLocale());
     }
 
+    public function testRequestDefaultLocaleIfNoAcceptLanguageHeaderIsPresent()
+    {
+        $request = new Request();
+        $listener = new LocaleListener($this->requestStack, 'de', null, true, ['lt', 'de']);
+        $event = $this->getEvent($request);
+
+        $listener->setDefaultLocale($event);
+        $listener->onKernelRequest($event);
+        $this->assertEquals('de', $request->getLocale());
+    }
+
+    public function testRequestVaryByLanguageAttributeIsSetIfUsingAcceptLanguageHeader()
+    {
+        $request = new Request();
+        $listener = new LocaleListener($this->requestStack, 'de', null, true, ['lt', 'de']);
+        $event = $this->getEvent($request);
+
+        $listener->setDefaultLocale($event);
+        $listener->onKernelRequest($event);
+        $this->assertTrue($request->attributes->get('_vary_by_language'));
+    }
+
     public function testRequestSecondPreferredLocaleFromAcceptLanguageHeader()
     {
         $request = Request::create('/');