Merge branch '12.1'

Author: sebastianbergmann

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)