diff --git a/ChangeLog-6.5.md b/ChangeLog-6.5.md index 6a78b4b32f3..a0e7b6708b7 100644 --- a/ChangeLog-6.5.md +++ b/ChangeLog-6.5.md @@ -2,6 +2,12 @@ All notable changes of the PHPUnit 6.5 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [6.5.10] - 2018-MM-DD + +### Fixed + +* Fixed [#3209](https://github.com/sebastianbergmann/phpunit/issues/3209): `Test::run()` and `TestCase::run()` interface contradiction + ## [6.5.9] - 2018-07-03 ### Fixed @@ -68,6 +74,7 @@ All notable changes of the PHPUnit 6.5 release series are documented in this fil * Fixed [#2654](https://github.com/sebastianbergmann/phpunit/issues/2654): Problems with `assertJsonStringEqualsJsonString()` * Fixed [#2810](https://github.com/sebastianbergmann/phpunit/pull/2810): Code Coverage for PHPT tests does not work +[6.5.10]: https://github.com/sebastianbergmann/phpunit/compare/6.5.9...6.5.10 [6.5.9]: https://github.com/sebastianbergmann/phpunit/compare/6.5.8...6.5.9 [6.5.8]: https://github.com/sebastianbergmann/phpunit/compare/6.5.7...6.5.8 [6.5.7]: https://github.com/sebastianbergmann/phpunit/compare/6.5.6...6.5.7 diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php index 938ff4b79e5..6c1e462ebec 100644 --- a/src/Framework/TestCase.php +++ b/src/Framework/TestCase.php @@ -755,7 +755,7 @@ public function hasFailed() * * @param TestResult $result * - * @return TestResult|null + * @return TestResult * * @throws Exception */ @@ -778,7 +778,7 @@ public function run(TestResult $result = null) if (!$this instanceof WarningTestCase && !$this instanceof SkippedTestCase && !$this->handleDependencies()) { - return; + return $result; } $runEntireClass = $this->runClassInSeparateProcess && !$this->runTestInSeparateProcess;