Closes #6138

Author: sebastianbergmann

ChangeLog-11.5.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 11.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [11.5.10] - 2025-MM-DD
+
+### Fixed
+
+* [#6138](https://github.com/sebastianbergmann/phpunit/issues/6138): Test with failed expectation on value passed to mocked method is incorrectly considered risky
+
 ## [11.5.9] - 2025-02-21
 
 ### Fixed
@@ -111,6 +117,7 @@ All notable changes of the PHPUnit 11.5 release series are documented in this fi
 * [#6055](https://github.com/sebastianbergmann/phpunit/issues/6055): `assertNotContainsOnly()` (use `assertContainsNotOnlyArray()`, `assertContainsNotOnlyBool()`, `assertContainsNotOnlyCallable()`, `assertContainsNotOnlyFloat()`, `assertContainsNotOnlyInt()`, `assertContainsNotOnlyIterable()`, `assertContainsNotOnlyNumeric()`, `assertContainsNotOnlyObject()`, `assertContainsNotOnlyResource()`, `assertContainsNotOnlyClosedResource()`, `assertContainsNotOnlyScalar()`, or `assertContainsNotOnlyString()` instead)
 * [#6059](https://github.com/sebastianbergmann/phpunit/issues/6059): `containsOnly()` (use `containsOnlyArray()`, `containsOnlyBool()`, `containsOnlyCallable()`, `containsOnlyFloat()`, `containsOnlyInt()`, `containsOnlyIterable()`, `containsOnlyNumeric()`, `containsOnlyObject()`, `containsOnlyResource()`, `containsOnlyClosedResource()`, `containsOnlyScalar()`, or `containsOnlyString()` instead)
 
+[11.5.10]: https://github.com/sebastianbergmann/phpunit/compare/11.5.9...11.5
 [11.5.9]: https://github.com/sebastianbergmann/phpunit/compare/11.5.8...11.5.9
 [11.5.8]: https://github.com/sebastianbergmann/phpunit/compare/11.5.7...11.5.8
 [11.5.7]: https://github.com/sebastianbergmann/phpunit/compare/11.5.6...11.5.7

src/Framework/TestRunner/TestRunner.php

@@ -182,6 +182,21 @@ public function run(TestCase $test): void
 
         ErrorHandler::instance()->disable();
 
+        /**
+         * Workaround for tests that fail due to mock object expectations
+         * that are verified while the test is running and not after the
+         * test has finished running
+         *
+         * @see https://github.com/sebastianbergmann/phpunit/issues/6138
+         */
+        if ($failure &&
+            !$error &&
+            !$incomplete &&
+            !$skipped &&
+            $test->numberOfAssertionsPerformed() === 0) {
+            $test->addToAssertionCount(1);
+        }
+
         if (!$error &&
             !$incomplete &&
             !$skipped &&

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

@@ -1,7 +1,5 @@
 --TEST--
 https://github.com/sebastianbergmann/phpunit/issues/6138
---XFAIL--
-https://github.com/sebastianbergmann/phpunit/issues/6138
 --FILE--
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';