Merge branch '11.5' into 12.2

sebastianbergmann · sebastianbergmann · commit 85c2d0b430cb · 2025-06-20T11:26:45.000+02:00
diff --git a/ChangeLog-12.2.md b/ChangeLog-12.2.md
@@ -14,6 +14,10 @@ All notable changes of the PHPUnit 12.2 release series are documented in this fi
 
 * `--dont-report-useless-tests` CLI option (use `--do-not-report-useless-tests` instead)
 
+### Fixed
+
+* [#6243](https://github.com/sebastianbergmann/phpunit/issues/6243): Constraints cannot be implemented without using internal class `ExpectationFailedException`
+
 ## [12.2.2] - 2025-06-13
 
 ### Fixed
diff --git a/src/Framework/Exception/ExpectationFailedException.php b/src/Framework/Exception/ExpectationFailedException.php
@@ -20,8 +20,6 @@
  * generate diff output of the failed expectations.
  *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
- *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
 final class ExpectationFailedException extends AssertionFailedError
 {

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`* generate diff output of the failed expectations.`
`21`	`21`	`*`
`22`	`22`	`* @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit`
`23`		`- *`
`24`		`- * @internal This class is not covered by the backward compatibility promise for PHPUnit`
`25`	`23`	`*/`
`26`	`24`	`final class ExpectationFailedException extends AssertionFailedError`
`27`	`25`	`{`