Merge branch '9.6' into 10.5

Author: sebastianbergmann

ChangeLog-10.5.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 10.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [10.5.8] - 2024-MM-DD
+
+### Fixed
+
+* [#5673](https://github.com/sebastianbergmann/phpunit/issues/5673): Confusing error message when migration of a configuration is requested that does not need to be migrated
+
 ## [10.5.7] - 2024-01-14
 
 ### Fixed
@@ -85,6 +91,7 @@ All notable changes of the PHPUnit 10.5 release series are documented in this fi
 
 * [#5563](https://github.com/sebastianbergmann/phpunit/issues/5563): `createMockForIntersectionOfInterfaces()` does not automatically register mock object for expectation verification
 
+[10.5.8]: https://github.com/sebastianbergmann/phpunit/compare/10.5.7...10.5
 [10.5.7]: https://github.com/sebastianbergmann/phpunit/compare/10.5.6...10.5.7
 [10.5.6]: https://github.com/sebastianbergmann/phpunit/compare/10.5.5...10.5.6
 [10.5.5]: https://github.com/sebastianbergmann/phpunit/compare/10.5.4...10.5.5