[Config][Routing] Fix exclude option being ignored for non-glob and PSR-4 resources

Author: NeilPeyssard

Loader/FileLoader.php

@@ -72,27 +72,40 @@ public function getLocator(): FileLocatorInterface
      */
     public function import(mixed $resource, ?string $type = null, bool $ignoreErrors = false, ?string $sourceResource = null, string|array|null $exclude = null)
     {
-        if (\is_string($resource) && \strlen($resource) !== ($i = strcspn($resource, '*?{[')) && !str_contains($resource, "\n")) {
-            $excluded = [];
-            foreach ((array) $exclude as $pattern) {
-                foreach ($this->glob($pattern, true, $_, false, true) as $path => $info) {
-                    // normalize Windows slashes and remove trailing slashes
-                    $excluded[rtrim(str_replace('\\', '/', $path), '/')] = true;
-                }
+        $excluded = [];
+        foreach ((array) $exclude as $pattern) {
+            foreach ($this->glob($pattern, true, $_, false, true) as $path => $info) {
+                // normalize Windows slashes and remove trailing slashes
+                $excluded[rtrim(str_replace('\\', '/', $path), '/')] = true;
             }
+        }
 
-            $ret = [];
-            $isSubpath = 0 !== $i && str_contains(substr($resource, 0, $i), '/');
-            foreach ($this->glob($resource, false, $_, $ignoreErrors || !$isSubpath, false, $excluded) as $path => $info) {
-                if (null !== $res = $this->doImport($path, 'glob' === $type ? null : $type, $ignoreErrors, $sourceResource)) {
-                    $ret[] = $res;
-                }
-                $isSubpath = true;
+        if (\is_string($resource) && !class_exists($resource)) {
+            $isGlobPattern = \strlen($resource) !== strcspn($resource, '*?{[');
+
+            if (!$isGlobPattern && $excluded) {
+                $resource = rtrim(str_replace('\\', '/', $resource), '/');
+                $resource .= '/**/*';
+                $isGlobPattern = true;
             }
 
-            if ($isSubpath) {
-                return isset($ret[1]) ? $ret : ($ret[0] ?? null);
+            if ($isGlobPattern && !str_contains($resource, "\n")) {
+                $ret = [];
+                $i = strcspn($resource, '*?{[');
+                $isSubpath = 0 !== $i && str_contains(substr($resource, 0, $i), '/');
+                foreach ($this->glob($resource, false, $_, $ignoreErrors || !$isSubpath, false, $excluded) as $path => $info) {
+                    if (null !== $res = $this->doImport($path, 'glob' === $type ? null : $type, $ignoreErrors, $sourceResource)) {
+                        $ret[] = $res;
+                    }
+                    $isSubpath = true;
+                }
+
+                if ($isSubpath) {
+                    return isset($ret[1]) ? $ret : ($ret[0] ?? null);
+                }
             }
+        } elseif (\is_array($resource) && $excluded) {
+            $resource['_excluded'] = $excluded;
         }
 
         return $this->doImport($resource, $type, $ignoreErrors, $sourceResource);

Tests/Fixtures/Include/SubDir/ExcludeFile.txt

@@ -118,11 +118,14 @@ public function testImportWithSimpleGlob()
         $this->assertSame(__FILE__, strtr($loader->import('FileLoaderTest.*'), '/', \DIRECTORY_SEPARATOR));
     }
 
-    public function testImportWithExclude()
+    /**
+     * @dataProvider importWithExcludeProvider
+     */
+    public function testImportWithExclude(string $include, string $exclude, int $expectedCount)
     {
         $loader = new TestFileLoader(new FileLocator(__DIR__.'/../Fixtures'));
-        $loadedFiles = $loader->import('Include/*', null, false, null, __DIR__.'/../Fixtures/Include/{ExcludeFile.txt}');
-        $this->assertCount(2, $loadedFiles);
+        $loadedFiles = $loader->import($include, null, false, null, $exclude);
+        $this->assertCount($expectedCount, $loadedFiles);
         $this->assertNotContains('ExcludeFile.txt', $loadedFiles);
     }
 
@@ -137,6 +140,24 @@ public function testExcludeTrailingSlashConsistency(string $exclude)
         $this->assertNotContains('baz.txt', $loadedFiles);
     }
 
+    public static function importWithExcludeProvider(): iterable
+    {
+        yield ['Include/*', __DIR__.'/../Fixtures/Include/{ExcludeFile.txt}', 2];
+        yield ['Include/', __DIR__.'/../Fixtures/Include/{ExcludeFile.txt}', 4];
+        yield ['Include', __DIR__.'/../Fixtures/Include/{ExcludeFile.txt}', 4];
+        yield ['Include/**/*', __DIR__.'/../Fixtures/Include/{ExcludeFile.txt}', 4];
+        yield ['Include/*', __DIR__.'/../Fixtures/Include/{Exclude*.txt}', 2];
+        yield ['Include/', __DIR__.'/../Fixtures/Include/{Exclude*.txt}', 4];
+        yield ['Include', __DIR__.'/../Fixtures/Include/{Exclude*.txt}', 4];
+        yield ['Include/**/*', __DIR__.'/../Fixtures/Include/{Exclude*.txt}', 4];
+        yield ['Include/', __DIR__.'/../Fixtures/Include/**/{ExcludeFile.txt}', 3];
+        yield ['Include', __DIR__.'/../Fixtures/Include/**/{ExcludeFile.txt}', 3];
+        yield ['Include/**/*', __DIR__.'/../Fixtures/Include/**/{ExcludeFile.txt}', 3];
+        yield ['Include/', __DIR__.'/../Fixtures/Include/**/{Exclude*.txt}', 3];
+        yield ['Include', __DIR__.'/../Fixtures/Include/**/{Exclude*.txt}', 3];
+        yield ['Include/**/*', __DIR__.'/../Fixtures/Include/**/{Exclude*.txt}', 3];
+    }
+
     public static function excludeTrailingSlashConsistencyProvider(): iterable
     {
         yield [__DIR__.'/../Fixtures/Exclude/ExcludeToo/'];

Tests/Fixtures/Include/SubDir/IncludeFile.txt

@@ -173,6 +173,8 @@ public function testBraceFallback()
         $expected = [
             $dir.'/Exclude/ExcludeToo/AnotheExcludedFile.txt',
             $dir.'/ExcludeTrailingSlash/exclude/baz.txt',
+            $dir.'/Include/SubDir/ExcludeFile.txt',
+            $dir.'/Include/SubDir/IncludeFile.txt',
             $dir.'/foo.xml',
         ];