Merge branch '11.5' into 12.3

Author: sebastianbergmann

ChangeLog-12.3.md

@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 12.3 release series are documented in this fi
 ### Fixed
 
 * [#6279](https://github.com/sebastianbergmann/phpunit/issues/6279): Deprecation triggered in data provider method affects all test methods using that data provider method
+* [#6281](https://github.com/sebastianbergmann/phpunit/issues/6281): Exceptions raised in after-test method are not reported for skipped tests
 
 ## [12.3.3] - 2025-08-11
 

src/Framework/TestCase.php

@@ -619,7 +619,7 @@ final public function runBare(): void
                 Event\Code\ComparisonFailureBuilder::from($e),
             );
         } catch (Throwable $exceptionRaisedDuringTearDown) {
-            if (!isset($e)) {
+            if (!isset($e) || $e instanceof SkippedWithMessageException) {
                 $this->status = TestStatus::error($exceptionRaisedDuringTearDown->getMessage());
                 $e            = $exceptionRaisedDuringTearDown;
 

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

@@ -0,0 +1,38 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/6281
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = __DIR__ . '/6281/Issue6281Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit Started (PHPUnit %s using %s)
+Test Runner Configured
+Event Facade Sealed
+Test Suite Loaded (1 test)
+Test Runner Started
+Test Suite Sorted
+Test Runner Execution Started (1 test)
+Test Suite Started (PHPUnit\TestFixture\Issue6281\Issue6281Test, 1 test)
+Test Preparation Started (PHPUnit\TestFixture\Issue6281\Issue6281Test::testOne)
+Before Test Method Called (PHPUnit\TestFixture\Issue6281\Issue6281Test::setUp)
+Before Test Method Finished:
+- PHPUnit\TestFixture\Issue6281\Issue6281Test::setUp
+Test Skipped (PHPUnit\TestFixture\Issue6281\Issue6281Test::testOne)
+skip message
+After Test Method Called (PHPUnit\TestFixture\Issue6281\Issue6281Test::tearDown)
+After Test Method Errored (PHPUnit\TestFixture\Issue6281\Issue6281Test::tearDown)
+exception message
+After Test Method Finished:
+- PHPUnit\TestFixture\Issue6281\Issue6281Test::tearDown
+Test Errored (PHPUnit\TestFixture\Issue6281\Issue6281Test::testOne)
+exception message
+Test Suite Finished (PHPUnit\TestFixture\Issue6281\Issue6281Test, 1 test)
+Test Runner Execution Finished
+Test Runner Finished
+PHPUnit Finished (Shell Exit Code: 2)

tests/end-to-end/regression/6281/Issue6281Test.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6281;
+
+use Exception;
+use PHPUnit\Framework\TestCase;
+
+final class Issue6281Test extends TestCase
+{
+    protected function setUp(): void
+    {
+        $this->markTestSkipped('skip message');
+    }
+
+    protected function tearDown(): void
+    {
+        throw new Exception('exception message');
+    }
+
+    public function testOne(): void
+    {
+        $this->assertTrue(true);
+    }
+}