Merge branch '11.5' into 12.0

sebastianbergmann · sebastianbergmann · commit 86415deee6ce · 2025-02-10T16:52:31.000+01:00
diff --git a/ChangeLog-12.0.md b/ChangeLog-12.0.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 12.0 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [12.0.3] - 2025-MM-DD
+
+### Fixed
+
+* 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
+
 ## [12.0.2] - 2025-02-08
 
 ### Changed
@@ -60,6 +66,7 @@ All notable changes of the PHPUnit 12.0 release series are documented in this fi
 * [#5801](https://github.com/sebastianbergmann/phpunit/issues/5801): Support for targeting traits with `#[CoversClass]` and `#[UsesClass]` attributes
 * [#5978](https://github.com/sebastianbergmann/phpunit/issues/5978): Support for PHP 8.2
 
+[12.0.3]: https://github.com/sebastianbergmann/phpunit/compare/12.0.2...12.0
 [12.0.2]: https://github.com/sebastianbergmann/phpunit/compare/12.0.1...12.0.2
 [12.0.1]: https://github.com/sebastianbergmann/phpunit/compare/12.0.0...12.0.1
 [12.0.0]: https://github.com/sebastianbergmann/phpunit/compare/11.5...12.0.0
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -553,27 +553,14 @@ final public function runBare(): void
             $this->performAssertionsOnOutput();
         }
 
-        if ($this->status->isSuccess()) {
-            $emitter->testPassed(
-                $this->valueObjectForEvents(),
-            );
-
-            if (!$this->usesDataProvider()) {
-                PassedTests::instance()->testMethodPassed(
-                    $this->valueObjectForEvents(),
-                    $this->testResult,
-                );
-            }
-        }
-
         try {
             $this->mockObjects = [];
 
             /** @phpstan-ignore catch.neverThrown */
-        } catch (Throwable $t) {
+        } catch (Throwable $e) {
             Event\Facade::emitter()->testErrored(
                 $this->valueObjectForEvents(),
-                Event\Code\ThrowableBuilder::from($t),
+                Event\Code\ThrowableBuilder::from($e),
             );
         }
 
@@ -609,6 +596,19 @@ final public function runBare(): void
             }
         }
 
+        if (!isset($e) && !isset($_e)) {
+            $emitter->testPassed(
+                $this->valueObjectForEvents(),
+            );
+
+            if (!$this->usesDataProvider()) {
+                PassedTests::instance()->testMethodPassed(
+                    $this->valueObjectForEvents(),
+                    $this->testResult,
+                );
+            }
+        }
+
         if (!$outputBufferingStopped) {
             $this->stopOutputBuffering();
         }
diff --git a/tests/end-to-end/event/assertion-failure-in-after-test-method.phpt b/tests/end-to-end/event/assertion-failure-in-after-test-method.phpt
@@ -21,7 +21,6 @@ Test Runner Execution Started (1 test)
 Test Suite Started (PHPUnit\TestFixture\Event\AssertionFailureInTearDownTest, 1 test)
 Test Preparation Started (PHPUnit\TestFixture\Event\AssertionFailureInTearDownTest::testOne)
 Test Prepared (PHPUnit\TestFixture\Event\AssertionFailureInTearDownTest::testOne)
-Test Passed (PHPUnit\TestFixture\Event\AssertionFailureInTearDownTest::testOne)
 After Test Method Called (PHPUnit\TestFixture\Event\AssertionFailureInTearDownTest::afterTest)
 After Test Method Errored (PHPUnit\TestFixture\Event\AssertionFailureInTearDownTest::afterTest)
 Failed asserting that false is true.
diff --git a/tests/end-to-end/event/exception-in-after-test-method.phpt b/tests/end-to-end/event/exception-in-after-test-method.phpt
@@ -21,7 +21,6 @@ Test Runner Execution Started (1 test)
 Test Suite Started (PHPUnit\TestFixture\Event\ExceptionInTearDownTest, 1 test)
 Test Preparation Started (PHPUnit\TestFixture\Event\ExceptionInTearDownTest::testOne)
 Test Prepared (PHPUnit\TestFixture\Event\ExceptionInTearDownTest::testOne)
-Test Passed (PHPUnit\TestFixture\Event\ExceptionInTearDownTest::testOne)
 After Test Method Called (PHPUnit\TestFixture\Event\ExceptionInTearDownTest::tearDown)
 After Test Method Errored (PHPUnit\TestFixture\Event\ExceptionInTearDownTest::tearDown)
 After Test Method Finished:
diff --git a/tests/end-to-end/event/template-methods-isolation.phpt b/tests/end-to-end/event/template-methods-isolation.phpt
@@ -38,13 +38,13 @@ Test Prepared (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 Post Condition Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions)
 Post Condition Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions
-Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 After Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown)
 After Test Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown
 After Last Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDownAfterClass)
 After Last Test Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDownAfterClass
+Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 Test Finished (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 Child Process Finished
 Child Process Started
@@ -62,13 +62,13 @@ Test Prepared (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 Post Condition Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions)
 Post Condition Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions
-Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 After Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown)
 After Test Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown
 After Last Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDownAfterClass)
 After Last Test Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDownAfterClass
+Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 Test Finished (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 Child Process Finished
 After Last Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDownAfterClass)
diff --git a/tests/end-to-end/event/template-methods.phpt b/tests/end-to-end/event/template-methods.phpt
@@ -33,10 +33,10 @@ Test Prepared (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 Post Condition Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions)
 Post Condition Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions
-Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 After Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown)
 After Test Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown
+Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 Test Finished (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 Test Preparation Started (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 Before Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::setUp)
@@ -49,10 +49,10 @@ Test Prepared (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 Post Condition Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions)
 Post Condition Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions
-Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 After Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown)
 After Test Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown
+Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 Test Finished (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 After Last Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDownAfterClass)
 After Last Test Method Finished:
diff --git a/tests/end-to-end/metadata/hook-methods-order.phpt b/tests/end-to-end/metadata/hook-methods-order.phpt
@@ -37,7 +37,6 @@ Before Test Method Finished:
 - PHPUnit\TestFixture\HookMethodsOrderTest::beforeSecond
 - PHPUnit\TestFixture\HookMethodsOrderTest::setUp
 Test Prepared (PHPUnit\TestFixture\HookMethodsOrderTest::testOne)
-Test Passed (PHPUnit\TestFixture\HookMethodsOrderTest::testOne)
 After Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::afterWithPriority)
 After Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::afterWithPriorityInParent)
 After Test Method Called (PHPUnit\TestFixture\HookMethodsOrderTest::tearDown)
@@ -51,6 +50,7 @@ After Test Method Finished:
 - PHPUnit\TestFixture\HookMethodsOrderTest::afterFirst
 - PHPUnit\TestFixture\HookMethodsOrderTest::afterSecond
 - PHPUnit\TestFixture\HookMethodsOrderTest::afterInParent
+Test Passed (PHPUnit\TestFixture\HookMethodsOrderTest::testOne)
 Test Finished (PHPUnit\TestFixture\HookMethodsOrderTest::testOne)
 Test Suite Finished (PHPUnit\TestFixture\HookMethodsOrderTest, 1 test)
 Test Runner Execution Finished
diff --git a/tests/end-to-end/regression/5498.phpt b/tests/end-to-end/regression/5498.phpt
@@ -30,12 +30,12 @@ Before Test Method Finished:
 - PHPUnit\TestFixture\Issue5498\Test::parentBefore
 - PHPUnit\TestFixture\Issue5498\Test::before
 Test Prepared (PHPUnit\TestFixture\Issue5498\Test::testOne)
-Test Passed (PHPUnit\TestFixture\Issue5498\Test::testOne)
 After Test Method Called (PHPUnit\TestFixture\Issue5498\Test::after)
 After Test Method Called (PHPUnit\TestFixture\Issue5498\Test::parentAfter)
 After Test Method Finished:
 - PHPUnit\TestFixture\Issue5498\Test::after
 - PHPUnit\TestFixture\Issue5498\Test::parentAfter
+Test Passed (PHPUnit\TestFixture\Issue5498\Test::testOne)
 Test Finished (PHPUnit\TestFixture\Issue5498\Test::testOne)
 Test Suite Finished (PHPUnit\TestFixture\Issue5498\Test, 1 test)
 Test Suite Finished (CLI Arguments, 1 test)
