Merge branch '11.0'

Author: sebastianbergmann

.psalm/baseline.xml

@@ -446,6 +446,7 @@
     </PossiblyNullArgument>
     <RedundantCondition>
       <code><![CDATA[assert($test instanceof TestMethod)]]></code>
+      <code><![CDATA[assert($test instanceof TestMethod)]]></code>
     </RedundantCondition>
   </file>
   <file src="src/Metadata/Api/CodeCoverage.php">

src/Logging/TestDox/TestResult/TestResultCollector.php

@@ -54,6 +54,7 @@ final class TestResultCollector
     private array $tests          = [];
     private ?TestStatus $status   = null;
     private ?Throwable $throwable = null;
+    private bool $prepared        = false;
 
     /**
      * @throws EventFacadeIsSealedException
@@ -136,6 +137,7 @@ public function testPrepared(Prepared $event): void
 
         $this->status    = TestStatus::unknown();
         $this->throwable = null;
+        $this->prepared  = true;
     }
 
     public function testErrored(Errored $event): void
@@ -146,6 +148,14 @@ public function testErrored(Errored $event): void
 
         $this->status    = TestStatus::error($event->throwable()->message());
         $this->throwable = $event->throwable();
+
+        if (!$this->prepared) {
+            $test = $event->test();
+
+            assert($test instanceof TestMethod);
+
+            $this->process($test);
+        }
     }
 
     public function testFailed(Failed $event): void
@@ -290,18 +300,11 @@ public function testFinished(Finished $event): void
 
         assert($test instanceof TestMethod);
 
-        if (!isset($this->tests[$test->testDox()->prettifiedClassName()])) {
-            $this->tests[$test->testDox()->prettifiedClassName()] = [];
-        }
-
-        $this->tests[$test->testDox()->prettifiedClassName()][] = new TestDoxTestMethod(
-            $test,
-            $this->status,
-            $this->throwable,
-        );
+        $this->process($test);
 
         $this->status    = null;
         $this->throwable = null;
+        $this->prepared  = false;
     }
 
     /**
@@ -340,4 +343,17 @@ private function updateTestStatus(TestStatus $status): void
 
         $this->status = $status;
     }
+
+    private function process(TestMethod $test): void
+    {
+        if (!isset($this->tests[$test->testDox()->prettifiedClassName()])) {
+            $this->tests[$test->testDox()->prettifiedClassName()] = [];
+        }
+
+        $this->tests[$test->testDox()->prettifiedClassName()][] = new TestDoxTestMethod(
+            $test,
+            $this->status,
+            $this->throwable,
+        );
+    }
 }

tests/end-to-end/regression/5760.phpt

@@ -1,7 +1,5 @@
 --TEST--
 https://github.com/sebastianbergmann/phpunit/issues/5760
---XFAIL--
-https://github.com/sebastianbergmann/phpunit/issues/5760
 --FILE--
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';