Merge branch '11.0'

Author: sebastianbergmann

src/TextUI/TestRunner.php

@@ -12,7 +12,6 @@
 use function mt_srand;
 use PHPUnit\Event;
 use PHPUnit\Framework\TestSuite;
-use PHPUnit\Runner\Filter\Factory;
 use PHPUnit\Runner\ResultCache\ResultCache;
 use PHPUnit\Runner\TestSuiteSorter;
 use PHPUnit\TextUI\Configuration\Configuration;
@@ -54,7 +53,7 @@ public function run(Configuration $configuration, ResultCache $resultCache, Test
                 );
             }
 
-            (new TestSuiteFilterProcessor(new Factory))->process($configuration, $suite);
+            (new TestSuiteFilterProcessor)->process($configuration, $suite);
 
             Event\Facade::emitter()->testRunnerExecutionStarted(
                 Event\TestSuite\TestSuiteBuilder::from($suite),

src/TextUI/TestSuiteFilterProcessor.php

@@ -21,19 +21,14 @@
  */
 final readonly class TestSuiteFilterProcessor
 {
-    private Factory $filterFactory;
-
-    public function __construct(Factory $factory = new Factory)
-    {
-        $this->filterFactory = $factory;
-    }
-
     /**
      * @throws Event\RuntimeException
      * @throws FilterNotConfiguredException
      */
     public function process(Configuration $configuration, TestSuite $suite): void
     {
+        $factory = new Factory;
+
         if (!$configuration->hasFilter() &&
             !$configuration->hasGroups() &&
             !$configuration->hasExcludeGroups() &&
@@ -44,19 +39,19 @@ public function process(Configuration $configuration, TestSuite $suite): void
         }
 
         if ($configuration->hasExcludeGroups()) {
-            $this->filterFactory->addExcludeGroupFilter(
+            $factory->addExcludeGroupFilter(
                 $configuration->excludeGroups(),
             );
         }
 
         if ($configuration->hasGroups()) {
-            $this->filterFactory->addIncludeGroupFilter(
+            $factory->addIncludeGroupFilter(
                 $configuration->groups(),
             );
         }
 
         if ($configuration->hasTestsCovering()) {
-            $this->filterFactory->addIncludeGroupFilter(
+            $factory->addIncludeGroupFilter(
                 array_map(
                     static fn (string $name): string => '__phpunit_covers_' . $name,
                     $configuration->testsCovering(),
@@ -65,7 +60,7 @@ public function process(Configuration $configuration, TestSuite $suite): void
         }
 
         if ($configuration->hasTestsUsing()) {
-            $this->filterFactory->addIncludeGroupFilter(
+            $factory->addIncludeGroupFilter(
                 array_map(
                     static fn (string $name): string => '__phpunit_uses_' . $name,
                     $configuration->testsUsing(),
@@ -74,18 +69,18 @@ public function process(Configuration $configuration, TestSuite $suite): void
         }
 
         if ($configuration->hasExcludeFilter()) {
-            $this->filterFactory->addExcludeNameFilter(
+            $factory->addExcludeNameFilter(
                 $configuration->excludeFilter(),
             );
         }
 
         if ($configuration->hasFilter()) {
-            $this->filterFactory->addIncludeNameFilter(
+            $factory->addIncludeNameFilter(
                 $configuration->filter(),
             );
         }
 
-        $suite->injectFilter($this->filterFactory);
+        $suite->injectFilter($factory);
 
         Event\Facade::emitter()->testSuiteFiltered(
             Event\TestSuite\TestSuiteBuilder::from($suite),