Enhancement: Extract IncludeNameFilter

src/Runner/Filter/ExcludeNameFilterIterator.php

@@ -9,13 +9,42 @@
  */
 namespace PHPUnit\Runner\Filter;
 
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestSuite;
+use PHPUnit\Runner\PhptTestCase;
+use RecursiveFilterIterator;
+use RecursiveIterator;
+
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class ExcludeNameFilterIterator extends NameFilterIterator
+final class ExcludeNameFilterIterator extends RecursiveFilterIterator
 {
-    protected function doAccept(bool $result): bool
+    private IncludeNameFilter $includeNameFilter;
+
+    /**
+     * @psalm-param RecursiveIterator<int, Test> $iterator
+     * @psalm-param non-empty-string $filter
+     */
+    public function __construct(RecursiveIterator $iterator, string $filter)
     {
-        return !$result;
+        parent::__construct($iterator);
+
+        $this->includeNameFilter = new IncludeNameFilter($filter);
+    }
+
+    public function accept(): bool
+    {
+        $test = $this->getInnerIterator()->current();
+
+        if ($test instanceof TestSuite) {
+            return true;
+        }
+
+        if ($test instanceof PhptTestCase) {
+            return false;
+        }
+
+        return !$this->includeNameFilter->filter($test);
     }
 }

src/Runner/Filter/NameFilterIterator.php → src/Runner/Filter/IncludeNameFilter.php

@@ -9,20 +9,19 @@
  */
 namespace PHPUnit\Runner\Filter;
 
+use function assert;
 use function end;
 use function preg_match;
 use function sprintf;
 use function str_replace;
 use PHPUnit\Framework\Test;
-use PHPUnit\Framework\TestSuite;
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Runner\PhptTestCase;
-use RecursiveFilterIterator;
-use RecursiveIterator;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-abstract class NameFilterIterator extends RecursiveFilterIterator
+final class IncludeNameFilter
 {
     /**
      * @psalm-var non-empty-string
@@ -40,31 +39,23 @@ abstract class NameFilterIterator extends RecursiveFilterIterator
     private readonly ?int $dataSetMaximum;
 
     /**
-     * @psalm-param RecursiveIterator<int, Test> $iterator
      * @psalm-param non-empty-string $filter
      */
-    public function __construct(RecursiveIterator $iterator, string $filter)
+    public function __construct(string $filter)
     {
-        parent::__construct($iterator);
-
         $preparedFilter = $this->prepareFilter($filter);
 
         $this->regularExpression = $preparedFilter['regularExpression'];
         $this->dataSetMinimum    = $preparedFilter['dataSetMinimum'];
         $this->dataSetMaximum    = $preparedFilter['dataSetMaximum'];
     }
 
-    public function accept(): bool
+    /**
+     * @param PhptTestCase|TestCase $test
+     */
+    public function filter(Test $test): bool
     {
-        $test = $this->getInnerIterator()->current();
-
-        if ($test instanceof TestSuite) {
-            return true;
-        }
-
-        if ($test instanceof PhptTestCase) {
-            return false;
-        }
+        assert($test instanceof PhptTestCase || $test instanceof TestCase);
 
         $name = $test::class . '::' . $test->nameWithDataSet();
 
@@ -75,11 +66,9 @@ public function accept(): bool
             $accepted = $set >= $this->dataSetMinimum && $set <= $this->dataSetMaximum;
         }
 
-        return $this->doAccept($accepted);
+        return $accepted;
     }
 
-    abstract protected function doAccept(bool $result): bool;
-
     /**
      * @psalm-param non-empty-string $filter
      *

src/Runner/Filter/IncludeNameFilterIterator.php

@@ -9,13 +9,42 @@
  */
 namespace PHPUnit\Runner\Filter;
 
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestSuite;
+use PHPUnit\Runner\PhptTestCase;
+use RecursiveFilterIterator;
+use RecursiveIterator;
+
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class IncludeNameFilterIterator extends NameFilterIterator
+final class IncludeNameFilterIterator extends RecursiveFilterIterator
 {
-    protected function doAccept(bool $result): bool
+    private IncludeNameFilter $includeNameFilter;
+
+    /**
+     * @psalm-param RecursiveIterator<int, Test> $iterator
+     * @psalm-param non-empty-string $filter
+     */
+    public function __construct(RecursiveIterator $iterator, string $filter)
     {
-        return $result;
+        parent::__construct($iterator);
+
+        $this->includeNameFilter = new IncludeNameFilter($filter);
+    }
+
+    public function accept(): bool
+    {
+        $test = $this->getInnerIterator()->current();
+
+        if ($test instanceof TestSuite) {
+            return true;
+        }
+
+        if ($test instanceof PhptTestCase) {
+            return false;
+        }
+
+        return $this->includeNameFilter->filter($test);
     }
 }