Merge branch '11.2'

Author: sebastianbergmann

src/Framework/TestSuite.php

@@ -11,7 +11,6 @@
 
 use const PHP_EOL;
 use function array_keys;
-use function array_map;
 use function array_merge;
 use function assert;
 use function call_user_func;
@@ -62,7 +61,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
     private string $name;
 
     /**
-     * @psalm-var array<string,list<Test>>
+     * @psalm-var array<non-empty-string, list<non-empty-string>>
      */
     private array $groups = [];
 
@@ -81,6 +80,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
      */
     private ?array $providedTests    = null;
     private ?Factory $iteratorFilter = null;
+    private bool $wasRun             = false;
 
     /**
      * @psalm-param non-empty-string $name
@@ -160,31 +160,42 @@ public function toString(): string
      */
     public function addTest(Test $test, array $groups = []): void
     {
+        if ($test instanceof self) {
+            $this->tests[] = $test;
+
+            $this->clearCaches();
+
+            return;
+        }
+
+        assert($test instanceof TestCase || $test instanceof PhptTestCase);
+
         $class = new ReflectionClass($test);
 
         if (!$class->isAbstract()) {
             $this->tests[] = $test;
-            $this->clearCaches();
 
-            if ($test instanceof self && empty($groups)) {
-                $groups = $test->groups();
-            }
+            $this->clearCaches();
 
             if ($this->containsOnlyVirtualGroups($groups)) {
                 $groups[] = 'default';
             }
 
+            if ($test instanceof TestCase) {
+                $id = $test->valueObjectForEvents()->id();
+
+                $test->setGroups($groups);
+            } else {
+                $id = $test->valueObjectForEvents()->id();
+            }
+
             foreach ($groups as $group) {
                 if (!isset($this->groups[$group])) {
-                    $this->groups[$group] = [$test];
+                    $this->groups[$group] = [$id];
                 } else {
-                    $this->groups[$group][] = $test;
+                    $this->groups[$group][] = $id;
                 }
             }
-
-            if ($test instanceof TestCase) {
-                $test->setGroups($groups);
-            }
         }
     }
 
@@ -299,16 +310,16 @@ public function name(): string
     /**
      * Returns the test groups of the suite.
      *
-     * @psalm-return list<string>
+     * @psalm-return list<non-empty-string>
      */
     public function groups(): array
     {
-        return array_map(
-            'strval',
-            array_keys($this->groups),
-        );
+        return array_keys($this->groups);
     }
 
+    /**
+     * @psalm-return array<non-empty-string, list<non-empty-string>>
+     */
     public function groupDetails(): array
     {
         return $this->groups;
@@ -346,6 +357,14 @@ public function collect(): array
      */
     public function run(): void
     {
+        if ($this->wasRun) {
+            // @codeCoverageIgnoreStart
+            throw new Exception('The tests aggregated by this TestSuite were already run');
+            // @codeCoverageIgnoreEnd
+        }
+
+        $this->wasRun = true;
+
         if (count($this) === 0) {
             return;
         }
@@ -367,6 +386,14 @@ public function run(): void
             }
 
             $test->run();
+
+            foreach (array_keys($this->tests) as $key) {
+                if ($test === $this->tests[$key]) {
+                    unset($this->tests[$key]);
+
+                    break;
+                }
+            }
         }
 
         $this->invokeMethodsAfterLastTest($emitter);

src/Runner/Filter/ExcludeGroupFilterIterator.php

@@ -17,9 +17,10 @@
 final class ExcludeGroupFilterIterator extends GroupFilterIterator
 {
     /**
-     * @psalm-param list<int> $groupTests
+     * @psalm-param non-empty-string $id
+     * @psalm-param list<non-empty-string> $groupTests
      */
-    protected function doAccept(int $id, array $groupTests): bool
+    protected function doAccept(string $id, array $groupTests): bool
     {
         return !in_array($id, $groupTests, true);
     }

src/Runner/Filter/GroupFilterIterator.php

@@ -9,13 +9,13 @@
  */
 namespace PHPUnit\Runner\Filter;
 
-use function array_map;
+use function array_merge;
 use function array_push;
-use function array_values;
 use function in_array;
-use function spl_object_id;
 use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestSuite;
+use PHPUnit\Runner\PhptTestCase;
 use RecursiveFilterIterator;
 use RecursiveIterator;
 
@@ -25,7 +25,7 @@
 abstract class GroupFilterIterator extends RecursiveFilterIterator
 {
     /**
-     * @psalm-var list<int>
+     * @psalm-var list<non-empty-string>
      */
     private readonly array $groupTests;
 
@@ -40,17 +40,14 @@ public function __construct(RecursiveIterator $iterator, array $groups, TestSuit
         $groupTests = [];
 
         foreach ($suite->groupDetails() as $group => $tests) {
-            if (in_array((string) $group, $groups, true)) {
-                $testHashes = array_map(
-                    'spl_object_id',
-                    $tests,
-                );
+            if (in_array($group, $groups, true)) {
+                $groupTests = array_merge($groupTests, $tests);
 
-                array_push($groupTests, ...$testHashes);
+                array_push($groupTests, ...$groupTests);
             }
         }
 
-        $this->groupTests = array_values($groupTests);
+        $this->groupTests = $groupTests;
     }
 
     public function accept(): bool
@@ -61,11 +58,16 @@ public function accept(): bool
             return true;
         }
 
-        return $this->doAccept(spl_object_id($test), $this->groupTests);
+        if ($test instanceof TestCase || $test instanceof PhptTestCase) {
+            return $this->doAccept($test->valueObjectForEvents()->id(), $this->groupTests);
+        }
+
+        return true;
     }
 
     /**
-     * @psalm-param list<int> $groupTests
+     * @psalm-param non-empty-string $id
+     * @psalm-param list<non-empty-string> $groupTests
      */
-    abstract protected function doAccept(int $id, array $groupTests): bool;
+    abstract protected function doAccept(string $id, array $groupTests): bool;
 }

src/Runner/Filter/IncludeGroupFilterIterator.php

@@ -17,9 +17,10 @@
 final class IncludeGroupFilterIterator extends GroupFilterIterator
 {
     /**
-     * @psalm-param list<int> $groupTests
+     * @psalm-param non-empty-string $id
+     * @psalm-param list<non-empty-string> $groupTests
      */
-    protected function doAccept(int $id, array $groupTests): bool
+    protected function doAccept(string $id, array $groupTests): bool
     {
         return in_array($id, $groupTests, true);
     }