Merge branch '11.5' into 12.0

Author: sebastianbergmann

ChangeLog-12.0.md

@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 12.0 release series are documented in this fi
 ### Fixed
 
 * [#5951](https://github.com/sebastianbergmann/phpunit/issues/5951#issuecomment-2656364815): Restore the `includeUncoveredFiles` configuration option
+* A `Test\PreparationFailed` event is now emitted in addition to a `Test\Errored` event when an unexpected exception is triggered in a before-test method
 * A `Test\Passed` event is no longer emitted in addition to a `Test\Failed` or `Test\Errored` event when an assertion failure or an unexpected exception is triggered in an after-test method
 * A `TestSuite\Finished` event is now emitted when a before-first-test method errors
 

src/Framework/TestCase.php

@@ -536,6 +536,12 @@ final public function runBare(): void
 
                 $this->status = TestStatus::error($e->getMessage());
 
+                if (!$this->wasPrepared) {
+                    $emitter->testPreparationFailed(
+                        $this->valueObjectForEvents(),
+                    );
+                }
+
                 $emitter->testErrored(
                     $this->valueObjectForEvents(),
                     Event\Code\ThrowableBuilder::from($e),

tests/end-to-end/event/exception-in-before-test-method.phpt

@@ -24,6 +24,7 @@ Before Test Method Called (PHPUnit\TestFixture\Event\ExceptionInSetUpTest::setUp
 Before Test Method Errored (PHPUnit\TestFixture\Event\ExceptionInSetUpTest::setUp)
 Before Test Method Finished:
 - PHPUnit\TestFixture\Event\ExceptionInSetUpTest::setUp
+Test Preparation Failed (PHPUnit\TestFixture\Event\ExceptionInSetUpTest::testOne)
 Test Errored (PHPUnit\TestFixture\Event\ExceptionInSetUpTest::testOne)
 Test Suite Finished (PHPUnit\TestFixture\Event\ExceptionInSetUpTest, 1 test)
 Test Runner Execution Finished