Merge branch '11.5' into 12.1

Author: sebastianbergmann

ChangeLog-12.1.md

@@ -13,6 +13,7 @@ All notable changes of the PHPUnit 12.1 release series are documented in this fi
 ### Fixed
 
 * [#6173](https://github.com/sebastianbergmann/phpunit/issues/6173): Output from `error_log()` is not displayed when test fails
+* A "Before Test Method Errored" event is no longer emitted when a test is skipped in a "before test" method
 
 ## [12.1.2] - 2025-04-08
 

src/Framework/TestCase.php

@@ -2097,7 +2097,7 @@ private function invokeHookMethods(HookMethodCollection $hookMethods, Event\Emit
 
             $methodsInvoked[] = $methodInvoked;
 
-            if (isset($t)) {
+            if (isset($t) && !$t instanceof SkippedTest) {
                 /** @phpstan-ignore method.dynamicName */
                 $emitter->{$erroredMethod}(
                     $test,

tests/end-to-end/event/test-skipped-in-setup.phpt

@@ -21,7 +21,6 @@ Test Runner Execution Started (1 test)
 Test Suite Started (PHPUnit\TestFixture\Event\SkippedInSetupTest, 1 test)
 Test Preparation Started (PHPUnit\TestFixture\Event\SkippedInSetupTest::testOne)
 Before Test Method Called (PHPUnit\TestFixture\Event\SkippedInSetupTest::setUp)
-Before Test Method Errored (PHPUnit\TestFixture\Event\SkippedInSetupTest::setUp)
 Before Test Method Finished:
 - PHPUnit\TestFixture\Event\SkippedInSetupTest::setUp
 Test Skipped (PHPUnit\TestFixture\Event\SkippedInSetupTest::testOne)