Merge branch '8.5' into 9.4

sebastianbergmann · Dec 3, 2020 · 10b10af · 10b10af
2 parents 6f47be0 + 075d8ee
commit 10b10af
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 8.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [8.5.14] - 2020-MM-DD
+
+### Fixed
+
+* [#4535](https://github.com/sebastianbergmann/phpunit/issues/4535): `getMockFromWsdl()` does not handle methods that do not have parameters correctly
+
 ## [8.5.13] - 2020-12-01
 
 ### Fixed
@@ -116,6 +122,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 * [#3967](https://github.com/sebastianbergmann/phpunit/issues/3967): Cannot double interface that extends interface that extends `\Throwable`
 * [#3968](https://github.com/sebastianbergmann/phpunit/pull/3968): Test class run in a separate PHP process are passing when `exit` called inside
 
+[8.5.14]: https://github.com/sebastianbergmann/phpunit/compare/8.5.13...8.5
 [8.5.13]: https://github.com/sebastianbergmann/phpunit/compare/8.5.12...8.5.13
 [8.5.12]: https://github.com/sebastianbergmann/phpunit/compare/8.5.11...8.5.12
 [8.5.11]: https://github.com/sebastianbergmann/phpunit/compare/8.5.10...8.5.11

diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
@@ -413,7 +413,13 @@ public function generateClassFromWsdl(string $wsdlFile, string $className, array
                 );
 
                 foreach (range(0, count($args) - 1) as $i) {
-                    $args[$i] = substr($args[$i], strpos($args[$i], '$'));
+                    $parameterStart = strpos($args[$i], '$');
+
+                    if (!$parameterStart) {
+                        continue;
+                    }
+
+                    $args[$i] = substr($args[$i], $parameterStart);
                 }
 
                 $methodTemplate->setVar(