Merge branch '11.5' into 12.0

Author: sebastianbergmann

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.5] - 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
+
 ## [12.0.4] - 2025-02-21
 
 ### Fixed
@@ -80,6 +86,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.5]: https://github.com/sebastianbergmann/phpunit/compare/12.0.4...12.0
 [12.0.4]: https://github.com/sebastianbergmann/phpunit/compare/12.0.3...12.0.4
 [12.0.3]: https://github.com/sebastianbergmann/phpunit/compare/12.0.2...12.0.3
 [12.0.2]: https://github.com/sebastianbergmann/phpunit/compare/12.0.1...12.0.2

src/Framework/MockObject/Runtime/Rule/Parameters.php

@@ -41,7 +41,7 @@ final class Parameters implements ParametersRule
     public function __construct(array $parameters)
     {
         foreach ($parameters as $parameter) {
-            if (!($parameter instanceof Constraint)) {
+            if (!$parameter instanceof Constraint) {
                 $parameter = new IsEqual(
                     $parameter,
                 );
@@ -116,6 +116,7 @@ private function doVerify(): bool
             } else {
                 $other = $this->invocation->parameters()[$i];
             }
+
             $parameter->evaluate(
                 $other,
                 sprintf(

src/Framework/TestRunner/TestRunner.php

@@ -177,6 +177,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';