Merge branch '10.5' into 11.2

sebastianbergmann · Jun 20, 2024 · a663ff7 · a663ff7
2 parents 0991687 + 46e02a3
commit a663ff7
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -12,7 +12,8 @@
 use const PHP_EOL;
 use function array_keys;
 use function array_merge;
-use function array_shift;
+use function array_pop;
+use function array_reverse;
 use function assert;
 use function call_user_func;
 use function class_exists;
@@ -128,7 +129,7 @@ public static function fromClassReflector(ReflectionClass $class, array $groups
             $testSuite->addTestMethod($class, $method, $groups);
         }
 
-        if (count($testSuite) === 0) {
+        if ($testSuite->isEmpty()) {
             Event\Facade::emitter()->testRunnerTriggeredWarning(
                 sprintf(
                     'No tests found in class "%s".',
@@ -297,7 +298,13 @@ public function count(): int
 
     public function isEmpty(): bool
     {
-        return empty($this->tests);
+        foreach ($this as $test) {
+            if (count($test) !== 0) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     /**
@@ -366,7 +373,7 @@ public function run(): void
 
         $this->wasRun = true;
 
-        if (count($this) === 0) {
+        if ($this->isEmpty()) {
             return;
         }
 
@@ -386,10 +393,12 @@ public function run(): void
             $tests[] = $test;
         }
 
+        $tests = array_reverse($tests);
+
         $this->tests  = [];
         $this->groups = [];
 
-        while ($test = array_shift($tests)) {
+        while (($test = array_pop($tests)) !== null) {
             if (TestResultFacade::shouldStop()) {
                 $emitter->testRunnerExecutionAborted();