Merge branch '6.4' into 7.4

* 6.4:
  [RateLimiter] Fix retryAfter when consuming exactly all remaining tokens in FixedWindow and TokenBucket
  [RateLimiter] Fix retryAfter value on last token consume (SlidingWindow)
  [RateLimiter] Fix reservations outside the second fixed window
  [Filesystem] makePathRelative with existing files, remove ending /
  [Config][Routing] Fix exclude option being ignored for non-glob and PSR-4 resources
  [Serializer][Validator] Fix propertyPath in ConstraintViolationListNormalizer with MetadataAwareNameConverter
  [Messenger][Amqp] Don't use retry routing key when sending to failure transport
  [Messenger] Fix re-sending failed messages to a different failure transport
  [DependencyInjection] Fix #[AsTaggedItem] discovery through multi-level decoration chains
  [DependencyInjection] Fix PriorityTaggedServiceTrait not discovering #[AsTaggedItem] on decorated services
  [Mailer] Clarify the purpose of SentMessage's "message id" concept
  [TwigBridge] Fix Bootstrap 4 form error layout
  [Form] Fix merging POST params and files when collection entries have mismatched indices
  [Validator] Fix type error for non-array items when Unique::fields is set
  [HttpKernel] Fix default locale ignored when Accept-Language has no enabled-locale match
  [FrameworkBundle] Make `ConfigDebugCommand` use its container to resolve env vars
  [Console] Fix various completion edge cases
  [Messenger][AmazonSqs] Add test for default queue_name when not set in DSN path or options

Author: nicolas-grekas

EventListener/LocaleListener.php

@@ -36,6 +36,7 @@ public function __construct(
         private bool $useAcceptLanguageHeader = false,
         private array $enabledLocales = [],
     ) {
+        $this->enabledLocales = $enabledLocales ? array_values(array_unique(array_merge([$defaultLocale], $enabledLocales))) : [];
     }
 
     public function setDefaultLocale(KernelEvent $event): void

Tests/EventListener/LocaleListenerTest.php

@@ -188,6 +188,20 @@ public function testRequestUnavailablePreferredLocaleFromAcceptLanguageHeader()
         $this->assertEquals('de', $request->getLocale());
     }
 
+    public function testDefaultLocaleReturnedWhenNoAcceptLanguageMatchAndDefaultLocaleIsNotFirstEnabledLocale()
+    {
+        $request = Request::create('/');
+        $request->headers->set('Accept-Language', 'es;q=0.9,ja;q=0.8');
+
+        // 'de' is the default locale but is NOT first in enabled_locales
+        $listener = new LocaleListener(new RequestStack(), 'de', null, true, ['it', 'fr', 'de']);
+        $event = $this->getEvent($request);
+
+        $listener->setDefaultLocale($event);
+        $listener->onKernelRequest($event);
+        $this->assertEquals('de', $request->getLocale());
+    }
+
     public function testRequestNoLocaleFromAcceptLanguageHeader()
     {
         $request = Request::create('/');