Merge branch '11.5'

sebastianbergmann · Jan 9, 2025 · 787af79 · 787af79
2 parents 90d23c7 + 6093ee5
commit 787af79
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -62,6 +62,7 @@
 use PHPUnit\Framework\MockObject\Rule\InvokedAtLeastCount as InvokedAtLeastCountMatcher;
 use PHPUnit\Framework\MockObject\Rule\InvokedAtLeastOnce as InvokedAtLeastOnceMatcher;
 use PHPUnit\Framework\MockObject\Rule\InvokedAtMostCount as InvokedAtMostCountMatcher;
+use PHPUnit\Framework\MockObject\Rule\InvokedCount;
 use PHPUnit\Framework\MockObject\Rule\InvokedCount as InvokedCountMatcher;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\MockObject\Stub\Exception as ExceptionStub;
@@ -503,6 +504,8 @@ final public function runBare(): void
                 $e->getMessage(),
             );
         } catch (AssertionError|AssertionFailedError $e) {
+            $this->handleExceptionFromInvokedCountMockObjectRule($e);
+
             if (!$this->wasPrepared) {
                 $this->wasPrepared = true;
 
@@ -2137,6 +2140,22 @@ private function requirementsNotSatisfied(): bool
         return (new Requirements)->requirementsNotSatisfiedFor(static::class, $this->methodName) !== [];
     }
 
+    /**
+     * @see https://github.com/sebastianbergmann/phpunit/issues/6095
+     */
+    private function handleExceptionFromInvokedCountMockObjectRule(Throwable $t): void
+    {
+        if (!$t instanceof ExpectationFailedException) {
+            return;
+        }
+
+        $trace = $t->getTrace();
+
+        if (isset($trace[0]['class']) && $trace[0]['class'] === InvokedCount::class) {
+            $this->numberOfAssertionsPerformed++;
+        }
+    }
+
     /**
      * Creates a test stub for the specified interface or class.
      *

diff --git a/tests/end-to-end/regression/6095.phpt b/tests/end-to-end/regression/6095.phpt
@@ -1,7 +1,5 @@
 --TEST--
 https://github.com/sebastianbergmann/phpunit/issues/6095
---XFAIL--
-https://github.com/sebastianbergmann/phpunit/issues/6095
 --FILE--
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
@@ -23,7 +21,7 @@ Time: %s, Memory: %s
 There was 1 failure:
 
 1) PHPUnit\TestFixture\Issue6095\Issue6095Test::testOne
-PHPUnit\TestFixture\MockObject\AnInterface::doSomething() was not expected to be called more than once.
+PHPUnit\TestFixture\MockObject\AnInterface::doSomething(): bool was not expected to be called more than once.
 
 %sIssue6095Test.php:26