Closes #6583

Author: sebastianbergmann

ChangeLog-12.5.md

@@ -10,6 +10,7 @@ All notable changes of the PHPUnit 12.5 release series are documented in this fi
 * [#4975](https://github.com/sebastianbergmann/phpunit/issues/4975): `--filter` does not work when filter string starts with `#`
 * [#5354](https://github.com/sebastianbergmann/phpunit/issues/5354): JUnit XML logger does not handle `TestSuiteSkipped` event
 * [#6276](https://github.com/sebastianbergmann/phpunit/issues/6276): Exit with non-zero exit code when explicit test selection (`--filter`, `--group`, `--testsuite`) yields no tests
+* [#6583](https://github.com/sebastianbergmann/phpunit/issues/6583): Failing output expectation skips `tearDown()` and handler restoration, causing subsequent tests to be marked as risky
 
 ## [12.5.17] - 2026-04-08
 

src/Framework/TestCase.php

@@ -599,7 +599,10 @@ final public function runBare(): void
             $this->stopOutputBuffering()) {
             $outputBufferingStopped = true;
 
-            $this->performAssertionsOnOutput();
+            try {
+                $this->performAssertionsOnOutput();
+            } catch (ExpectationFailedException $e) {
+            }
         }
 
         try {

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

@@ -0,0 +1,31 @@
+--TEST--
+GH-5842: Failing output expectation must not skip tearDown and handler restoration
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/5842/Issue5842Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+.F.                                                                 3 / 3 (100%)
+
+Time: %s, Memory: %s
+
+There was 1 failure:
+
+1) PHPUnit\TestFixture\Issue5842Test::testFailingOutputExpectation
+Failed asserting that two strings are identical.
+--- Expected
++++ Actual
+@@ @@
+-'expected output'
++'actual output'
+
+FAILURES!
+Tests: 3, Assertions: 3, Failures: 1.

tests/end-to-end/regression/5842/Issue5842Test.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture;
+
+use PHPUnit\Framework\TestCase;
+
+class Issue5842Test extends TestCase
+{
+    public function testBeforeFailingOutputExpectation(): void
+    {
+        $this->assertTrue(true);
+    }
+
+    public function testFailingOutputExpectation(): void
+    {
+        print 'actual output';
+        $this->expectOutputString('expected output');
+    }
+
+    public function testAfterFailingOutputExpectation(): void
+    {
+        $this->assertTrue(true);
+    }
+}