Merge branch '10.5' into 11.2

Author: sebastianbergmann

src/Framework/TestSuite.php

@@ -81,6 +81,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
@@ -346,6 +347,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 +376,30 @@ public function run(): void
             }
 
             $test->run();
+
+            foreach (array_keys($this->tests) as $key) {
+                if ($test === $this->tests[$key]) {
+                    unset($this->tests[$key]);
+
+                    break;
+                }
+            }
+
+            if ($test instanceof TestCase || $test instanceof self) {
+                foreach ($test->groups() as $group) {
+                    if (!isset($this->groups[$group])) {
+                        continue;
+                    }
+
+                    foreach (array_keys($this->groups[$group]) as $key) {
+                        if ($test === $this->groups[$group][$key]) {
+                            unset($this->groups[$group][$key]);
+
+                            break;
+                        }
+                    }
+                }
+            }
         }
 
         $this->invokeMethodsAfterLastTest($emitter);