diff -Nru phpunit-7.5.5/ChangeLog-7.5.md phpunit-7.5.6/ChangeLog-7.5.md --- phpunit-7.5.5/ChangeLog-7.5.md 2019-02-15 14:00:34.000000000 +0000 +++ phpunit-7.5.6/ChangeLog-7.5.md 2019-02-18 09:24:50.000000000 +0000 @@ -2,6 +2,14 @@ All notable changes of the PHPUnit 7.5 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [7.5.6] - 2019-02-18 + +### Fixed + +* Fixed [#3530](https://github.com/sebastianbergmann/phpunit/issues/3530): `generateClassFromWsdl()` does not handle methods with multiple output values +* Fixed [#3531](https://github.com/sebastianbergmann/phpunit/issues/3531): Test suite fails on warning +* Fixed [#3534](https://github.com/sebastianbergmann/phpunit/pull/3534): Wrong message in `ConstraintTestCase` + ## [7.5.5] - 2019-02-15 ### Fixed @@ -66,6 +74,7 @@ * Fixed [#3429](https://github.com/sebastianbergmann/phpunit/pull/3429): Inefficient loop in `getHookMethods()` * Fixed [#3437](https://github.com/sebastianbergmann/phpunit/pull/3437): JUnit logger skips PHPT tests +[7.5.6]: https://github.com/sebastianbergmann/phpunit/compare/7.5.5...7.5.6 [7.5.5]: https://github.com/sebastianbergmann/phpunit/compare/7.5.4...7.5.5 [7.5.4]: https://github.com/sebastianbergmann/phpunit/compare/7.5.3...7.5.4 [7.5.3]: https://github.com/sebastianbergmann/phpunit/compare/7.5.2...7.5.3 diff -Nru phpunit-7.5.5/debian/changelog phpunit-7.5.6/debian/changelog --- phpunit-7.5.5/debian/changelog 2019-02-16 08:18:59.000000000 +0000 +++ phpunit-7.5.6/debian/changelog 2019-02-18 16:51:25.000000000 +0000 @@ -1,3 +1,12 @@ +phpunit (7.5.6-1) unstable; urgency=medium + + * Team upload + + [ Sebastian Bergmann ] + * Prepare release + + -- David Prévot Mon, 18 Feb 2019 06:51:25 -1000 + phpunit (7.5.5-1) unstable; urgency=medium * Team upload diff -Nru phpunit-7.5.5/src/Framework/MockObject/Generator.php phpunit-7.5.6/src/Framework/MockObject/Generator.php --- phpunit-7.5.5/src/Framework/MockObject/Generator.php 2019-02-15 14:00:34.000000000 +0000 +++ phpunit-7.5.6/src/Framework/MockObject/Generator.php 2019-02-18 09:24:50.000000000 +0000 @@ -458,18 +458,16 @@ $methodsBuffer = ''; foreach ($_methods as $method) { - $nameStart = \strpos($method, ' ') + 1; - $nameEnd = \strpos($method, '('); - $name = \substr($method, $nameStart, $nameEnd - $nameStart); + \preg_match_all('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\(/', $method, $matches, \PREG_OFFSET_CAPTURE); + $lastFunction = \array_pop($matches[0]); + $nameStart = $lastFunction[1]; + $nameEnd = $nameStart + \strlen($lastFunction[0]) - 1; + $name = \str_replace('(', '', $lastFunction[0]); if (empty($methods) || \in_array($name, $methods, true)) { - $args = \explode( + $args = \explode( ',', - \substr( - $method, - $nameEnd + 1, - \strpos($method, ')') - $nameEnd - 1 - ) + \str_replace(')', '', \substr($method, $nameEnd + 1)) ); foreach (\range(0, \count($args) - 1) as $i) { diff -Nru phpunit-7.5.5/src/Framework/TestResult.php phpunit-7.5.6/src/Framework/TestResult.php --- phpunit-7.5.5/src/Framework/TestResult.php 2019-02-15 14:00:34.000000000 +0000 +++ phpunit-7.5.6/src/Framework/TestResult.php 2019-02-18 09:24:50.000000000 +0000 @@ -1080,7 +1080,12 @@ */ public function wasSuccessful(): bool { - return empty($this->errors) && empty($this->failures) && empty($this->warnings); + return $this->wasSuccessfulIgnoringWarnings() && empty($this->warnings); + } + + public function wasSuccessfulIgnoringWarnings(): bool + { + return empty($this->errors) && empty($this->failures); } /** diff -Nru phpunit-7.5.5/src/Runner/Version.php phpunit-7.5.6/src/Runner/Version.php --- phpunit-7.5.5/src/Runner/Version.php 2019-02-15 14:00:34.000000000 +0000 +++ phpunit-7.5.6/src/Runner/Version.php 2019-02-18 09:24:50.000000000 +0000 @@ -30,7 +30,7 @@ } if (self::$version === null) { - $version = new VersionId('7.5.5', \dirname(__DIR__, 2)); + $version = new VersionId('7.5.6', \dirname(__DIR__, 2)); self::$version = $version->getVersion(); } diff -Nru phpunit-7.5.5/src/TextUI/TestRunner.php phpunit-7.5.6/src/TextUI/TestRunner.php --- phpunit-7.5.5/src/TextUI/TestRunner.php 2019-02-15 14:00:34.000000000 +0000 +++ phpunit-7.5.6/src/TextUI/TestRunner.php 2019-02-18 09:24:50.000000000 +0000 @@ -774,7 +774,7 @@ } if ($exit) { - if ($result->wasSuccessful()) { + if ($result->wasSuccessfulIgnoringWarnings()) { if ($arguments['failOnRisky'] && !$result->allHarmless()) { exit(self::FAILURE_EXIT); } diff -Nru phpunit-7.5.5/tests/end-to-end/mock-objects/generator/3530.phpt phpunit-7.5.6/tests/end-to-end/mock-objects/generator/3530.phpt --- phpunit-7.5.5/tests/end-to-end/mock-objects/generator/3530.phpt 1970-01-01 00:00:00.000000000 +0000 +++ phpunit-7.5.6/tests/end-to-end/mock-objects/generator/3530.phpt 2019-02-18 09:24:50.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +\PHPUnit\Framework\MockObject\Generator::generateClassFromWsdl('3530.wsdl', 'Test') +--SKIPIF-- +generateClassFromWsdl( + __DIR__ . '/../../../_files/3530.wsdl', + 'Test' +); +--EXPECTF-- +class Test extends \SoapClient +{ + public function __construct($wsdl, array $options) + { + parent::__construct('%s/3530.wsdl', $options); + } + + public function Contact_Information($Contact_Id) + { + } +} diff -Nru phpunit-7.5.5/tests/_files/3530.wsdl phpunit-7.5.6/tests/_files/3530.wsdl --- phpunit-7.5.5/tests/_files/3530.wsdl 1970-01-01 00:00:00.000000000 +0000 +++ phpunit-7.5.6/tests/_files/3530.wsdl 2019-02-18 09:24:50.000000000 +0000 @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru phpunit-7.5.5/tests/unit/Framework/Constraint/ConstraintTestCase.php phpunit-7.5.6/tests/unit/Framework/Constraint/ConstraintTestCase.php --- phpunit-7.5.5/tests/unit/Framework/Constraint/ConstraintTestCase.php 2019-02-15 14:00:34.000000000 +0000 +++ phpunit-7.5.6/tests/unit/Framework/Constraint/ConstraintTestCase.php 2019-02-18 09:24:50.000000000 +0000 @@ -36,7 +36,7 @@ $this->assertTrue($reflection->implementsInterface(SelfDescribing::class), \sprintf( 'Failed to assert that "%s" implements "%s".', $className, - \Countable::class + SelfDescribing::class )); }