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

Loader/Psr4DirectoryLoader.php

@@ -39,6 +39,7 @@ public function __construct(
      */
     public function load(mixed $resource, ?string $type = null): ?RouteCollection
     {
+        $excluded = $resource['_excluded'] ?? [];
         $path = $this->locator->locate($resource['path'], $this->currentDirectory);
         if (!is_dir($path)) {
             return new RouteCollection();
@@ -48,7 +49,7 @@ public function load(mixed $resource, ?string $type = null): ?RouteCollection
             throw new InvalidArgumentException(\sprintf('Namespace "%s" is not a valid PSR-4 prefix.', $resource['namespace']));
         }
 
-        return $this->loadFromDirectory($path, trim($resource['namespace'], '\\'));
+        return $this->loadFromDirectory($path, trim($resource['namespace'], '\\'), $excluded);
     }
 
     public function supports(mixed $resource, ?string $type = null): bool
@@ -64,7 +65,7 @@ public function forDirectory(string $currentDirectory): static
         return $loader;
     }
 
-    private function loadFromDirectory(string $directory, string $psr4Prefix): RouteCollection
+    private function loadFromDirectory(string $directory, string $psr4Prefix, array $excluded = []): RouteCollection
     {
         $collection = new RouteCollection();
         $collection->addResource(new DirectoryResource($directory, '/\.php$/'));
@@ -79,8 +80,13 @@ private function loadFromDirectory(string $directory, string $psr4Prefix): Route
 
         /** @var \SplFileInfo $file */
         foreach ($files as $file) {
+            $normalizedPath = rtrim(str_replace('\\', '/', $file->getPathname()), '/');
+            if (isset($excluded[$normalizedPath])) {
+                continue;
+            }
+
             if ($file->isDir()) {
-                $collection->addCollection($this->loadFromDirectory($file->getPathname(), $psr4Prefix.'\\'.$file->getFilename()));
+                $collection->addCollection($this->loadFromDirectory($file->getPathname(), $psr4Prefix.'\\'.$file->getFilename(), $excluded));
 
                 continue;
             }

Tests/Loader/Psr4DirectoryLoaderTest.php

@@ -67,6 +67,38 @@ public function testAbstractController()
         $this->assertSame(MyChildController::class.'::someAction', $route->getDefault('_controller'));
     }
 
+    public function testExcludeSubNamespace()
+    {
+        $fixturesPath = \dirname(__DIR__).'/Fixtures';
+        $excluded = [
+            rtrim(str_replace('\\', '/', $fixturesPath.'/Psr4Controllers/SubNamespace'), '/') => true,
+        ];
+        $collection = $this->getLoader()->load(
+            ['path' => 'Psr4Controllers', 'namespace' => 'Symfony\Component\Routing\Tests\Fixtures\Psr4Controllers', '_excluded' => $excluded],
+            'attribute'
+        );
+
+        $this->assertNotNull($collection->get('my_route'));
+        $this->assertNull($collection->get('my_other_controller_one'));
+        $this->assertNull($collection->get('my_controller_with_a_trait'));
+        $this->assertNull($collection->get('my_child_controller_from_abstract'));
+    }
+
+    public function testExcludeSingleFile()
+    {
+        $fixturesPath = \dirname(__DIR__).'/Fixtures';
+        $excluded = [
+            rtrim(str_replace('\\', '/', $fixturesPath.'/Psr4Controllers/MyController.php'), '/') => true,
+        ];
+        $collection = $this->getLoader()->load(
+            ['path' => 'Psr4Controllers', 'namespace' => 'Symfony\Component\Routing\Tests\Fixtures\Psr4Controllers', '_excluded' => $excluded],
+            'attribute'
+        );
+
+        $this->assertNull($collection->get('my_route'));
+        $this->assertNotNull($collection->get('my_other_controller_one'));
+    }
+
     #[DataProvider('provideNamespacesThatNeedTrimming')]
     public function testPsr4NamespaceTrim(string $namespace)
     {