Closes #5593

sebastianbergmann · Dec 1, 2023 · 23a9e6a · 23a9e6a
1 parent 80cab18
commit 23a9e6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -378,7 +378,7 @@
       <code><![CDATA[(new ReflectionClass($stubClassName))->newInstanceWithoutConstructor()]]></code>
     </LessSpecificReturnStatement>
     <MoreSpecificReturnType>
-      <code>MockObject</code>
+      <code>Stub</code>
     </MoreSpecificReturnType>
   </file>
   <file src="src/Framework/MockObject/Runtime/Rule/Parameters.php">

diff --git a/ChangeLog-10.5.md b/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.1] - 2023-MM-DD
+
+### Fixed
+
+* [#5593](https://github.com/sebastianbergmann/phpunit/issues/5593): Return Value Generator fails to correctly create test stub for method with `static` return type declaration when used recursively
+
 ## [10.5.0] - 2023-12-01
 
 ### Added
@@ -18,4 +24,5 @@ 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.1]: https://github.com/sebastianbergmann/phpunit/compare/10.5.0...10.5
 [10.5.0]: https://github.com/sebastianbergmann/phpunit/compare/10.4.2...10.5.0
diff --git a/src/Framework/MockObject/Runtime/ReturnValueGenerator.php b/src/Framework/MockObject/Runtime/ReturnValueGenerator.php
@@ -178,7 +178,7 @@ private function onlyInterfaces(array $types): bool
      *
      * @throws RuntimeException
      */
-    private function newInstanceOf(string $stubClassName, string $className, string $methodName): MockObject
+    private function newInstanceOf(string $stubClassName, string $className, string $methodName): Stub
     {
         try {
             return (new ReflectionClass($stubClassName))->newInstanceWithoutConstructor();