Skip to content

Commit 0f04e96

Browse files
Merge branch '9.4' into master
2 parents 60890a4 + 6e892c7 commit 0f04e96

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

ChangeLog-8.5.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes of the PHPUnit 8.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
44

5+
## [8.5.14] - 2020-MM-DD
6+
7+
### Fixed
8+
9+
* [#4535](https://github.com/sebastianbergmann/phpunit/issues/4535): `getMockFromWsdl()` does not handle methods that do not have parameters correctly
10+
511
## [8.5.13] - 2020-12-01
612

713
### Fixed
@@ -116,6 +122,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
116122
* [#3967](https://github.com/sebastianbergmann/phpunit/issues/3967): Cannot double interface that extends interface that extends `\Throwable`
117123
* [#3968](https://github.com/sebastianbergmann/phpunit/pull/3968): Test class run in a separate PHP process are passing when `exit` called inside
118124

125+
[8.5.14]: https://github.com/sebastianbergmann/phpunit/compare/8.5.13...8.5
119126
[8.5.13]: https://github.com/sebastianbergmann/phpunit/compare/8.5.12...8.5.13
120127
[8.5.12]: https://github.com/sebastianbergmann/phpunit/compare/8.5.11...8.5.12
121128
[8.5.11]: https://github.com/sebastianbergmann/phpunit/compare/8.5.10...8.5.11

ChangeLog-9.4.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes of the PHPUnit 9.4 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
44

5+
## [9.4.5] - 2020-MM-DD
6+
7+
### Fixed
8+
9+
* [#4535](https://github.com/sebastianbergmann/phpunit/issues/4535): `getMockFromWsdl()` does not handle methods that do not have parameters correctly
10+
511
## [9.4.4] - 2020-12-01
612

713
### Fixed
@@ -45,6 +51,7 @@ All notable changes of the PHPUnit 9.4 release series are documented in this fil
4551

4652
* The PHPUnit XML configuration generator (that is invoked using the `--generate-configuration` CLI option) now asks for a cache directory (default: `.phpunit.cache`)
4753

54+
[9.4.5]: https://github.com/sebastianbergmann/phpunit/compare/9.4.4...9.4
4855
[9.4.4]: https://github.com/sebastianbergmann/phpunit/compare/9.4.3...9.4.4
4956
[9.4.3]: https://github.com/sebastianbergmann/phpunit/compare/9.4.2...9.4.3
5057
[9.4.2]: https://github.com/sebastianbergmann/phpunit/compare/9.4.1...9.4.2

src/Framework/MockObject/Generator.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,13 @@ public function generateClassFromWsdl(string $wsdlFile, string $className, array
410410
);
411411

412412
foreach (range(0, count($args) - 1) as $i) {
413-
$args[$i] = substr($args[$i], strpos($args[$i], '$'));
413+
$parameterStart = strpos($args[$i], '$');
414+
415+
if (!$parameterStart) {
416+
continue;
417+
}
418+
419+
$args[$i] = substr($args[$i], $parameterStart);
414420
}
415421

416422
$methodTemplate->setVar(

0 commit comments

Comments
 (0)