Initial work on #6519

Author: sebastianbergmann

composer.json

@@ -20,6 +20,7 @@
         "issues": "https://github.com/sebastianbergmann/phpunit/issues",
         "security": "https://github.com/sebastianbergmann/phpunit/security/policy"
     },
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
         "php": ">=8.4.1",
@@ -42,6 +43,7 @@
         "sebastian/diff": "^8.0.0",
         "sebastian/environment": "^9.0.0",
         "sebastian/exporter": "^8.0.0",
+        "sebastian/file-filter": "^1.0@dev",
         "sebastian/global-state": "^9.0.0",
         "sebastian/object-enumerator": "^8.0.0",
         "sebastian/recursion-context": "^8.0.0",

composer.lock

@@ -0,0 +1,63 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TextUI\Configuration;
+
+use SebastianBergmann\FileFilter\Builder as FilterBuilder;
+use SebastianBergmann\FileFilter\Filter as FileFilter;
+
+/**
+ * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class FileFilterMapper
+{
+    public function map(Source $source): FileFilter
+    {
+        return (new FilterBuilder)->build(
+            $this->directories($source->includeDirectories()),
+            $this->files($source->includeFiles()),
+            $this->directories($source->excludeDirectories()),
+            $this->files($source->excludeFiles()),
+        );
+    }
+
+    /**
+     * @return list<array{path: non-empty-string, prefix: string, suffix: string}>
+     */
+    private function directories(FilterDirectoryCollection $directories): array
+    {
+        $result = [];
+
+        foreach ($directories as $directory) {
+            $result[] = [
+                'path'   => $directory->path(),
+                'prefix' => $directory->prefix(),
+                'suffix' => $directory->suffix(),
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return list<non-empty-string>
+     */
+    private function files(FileCollection $files): array
+    {
+        $result = [];
+
+        foreach ($files as $file) {
+            $result[] = $file->path();
+        }
+
+        return $result;
+    }
+}

src/TextUI/Configuration/FileFilterMapper.php

@@ -9,6 +9,8 @@
  */
 namespace PHPUnit\TextUI\Configuration;
 
+use SebastianBergmann\FileFilter\Filter;
+
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
@@ -17,38 +19,33 @@
 final class SourceFilter
 {
     private static ?self $instance = null;
-
-    /**
-     * @var array<non-empty-string, true>
-     */
-    private readonly array $map;
+    private readonly Filter $filter;
 
     public static function instance(): self
     {
-        if (self::$instance === null) {
-            self::$instance = new self(
-                (new SourceMapper)->map(
-                    Registry::get()->source(),
-                ),
-            );
+        if (self::$instance !== null) {
+            return self::$instance;
         }
 
+        self::$instance = new self(
+            (new FileFilterMapper)->map(
+                Registry::get()->source(),
+            ),
+        );
+
         return self::$instance;
     }
 
-    /**
-     * @param array<non-empty-string, true> $map
-     */
-    public function __construct(array $map)
+    public function __construct(Filter $filter)
     {
-        $this->map = $map;
+        $this->filter = $filter;
     }
 
     /**
      * @param non-empty-string $path
      */
     public function includes(string $path): bool
     {
-        return isset($this->map[$path]);
+        return $this->filter->accepts($path);
     }
 }

src/TextUI/Configuration/SourceFilter.php

@@ -17,6 +17,7 @@
 use PHPUnit\Framework\Attributes\Small;
 
 #[CoversClass(SourceFilter::class)]
+#[CoversClass(FileFilterMapper::class)]
 #[Small]
 #[Group('textui')]
 #[Group('textui/configuration')]
@@ -425,7 +426,7 @@ public function testDeterminesWhetherFileIsIncluded(array $expectations, Source
             $this->assertFileExists($file);
             $this->assertSame(
                 $shouldInclude,
-                new SourceFilter((new SourceMapper)->map($source))->includes($file),
+                new SourceFilter((new FileFilterMapper)->map($source))->includes($file),
                 sprintf('expected match to return %s for: %s', json_encode($shouldInclude), $file),
             );
         }