Inplementing the file matcher

Author: dantleech

src/TextUI/Configuration/SourceFilter.php

@@ -9,6 +9,10 @@
  */
 namespace PHPUnit\TextUI\Configuration;
 
+use PHPUnit\Util\FileMatcher;
+use PHPUnit\Util\FileMatcherRegex;
+
+
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
@@ -18,19 +22,23 @@ final class SourceFilter
 {
     private static ?self $instance = null;
 
+    private Source $source;
+
     /**
-     * @var array<non-empty-string, true>
+     * @var list<FileMatcherRegex>
      */
-    private readonly array $map;
+    private array $includeDirectoryRegexes;
+
+    /**
+     * @var list<FileMatcherRegex>
+     */
+    private array $excludeDirectoryRegexes;
 
     public static function instance(): self
     {
         if (self::$instance === null) {
-            self::$instance = new self(
-                (new SourceMapper)->map(
-                    Registry::get()->source(),
-                ),
-            );
+            $source = Registry::get()->source();
+            return new self($source);
         }
 
         return self::$instance;
@@ -39,13 +47,21 @@ public static function instance(): self
     /**
      * @param array<non-empty-string, true> $map
      */
-    public function __construct(array $map)
+    public function __construct(Source $source)
     {
-        $this->map = $map;
+        $this->source = $source;
+        $this->includeDirectoryRegexes = array_map(function (FilterDirectory $directory) {
+            return FileMatcher::toRegEx($directory->path());
+        }, $source->includeDirectories()->asArray());
+        $this->excludeDirectoryRegexes = array_map(function (FilterDirectory $directory) {
+            return FileMatcher::toRegEx($directory->path());
+        }, $source->excludeDirectories()->asArray());
     }
 
     public function includes(string $path): bool
     {
+        foreach ($this->source->includeDirectories() as $directory) {
+        }
         return isset($this->map[$path]);
     }
 }

src/Util/FileMatcher.php

@@ -68,7 +68,7 @@ public static function toRegEx(string $glob): FileMatcherRegex
     /**
      * @param list<token> $tokens
      */
-    public static function mapToRegex(array $tokens): FileMatcherRegex
+    private static function mapToRegex(array $tokens): FileMatcherRegex
     {
         $regex = '';
 

tests/unit/TextUI/SourceFilterTest.php

@@ -265,6 +265,6 @@ public static function provider(): array
     #[DataProvider('provider')]
     public function testDeterminesWhetherFileIsIncluded(bool $expected, string $file, Source $source): void
     {
-        $this->assertSame($expected, (new SourceFilter((new SourceMapper)->map($source)))->includes($file));
+        $this->assertSame($expected, (new SourceFilter($source))->includes($file));
     }
 }