Merge branch '8.5' into 9.2

Author: sebastianbergmann

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.8] - 2020-06-22
+
+### Fixed
+
+* [#4312](https://github.com/sebastianbergmann/phpunit/issues/4312): Fix for [#4299](https://github.com/sebastianbergmann/phpunit/issues/4299) breaks backward compatibility
+
 ## [8.5.7] - 2020-06-21
 
 ### Fixed
@@ -71,6 +77,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.8]: https://github.com/sebastianbergmann/phpunit/compare/8.5.7...8.5.8
 [8.5.7]: https://github.com/sebastianbergmann/phpunit/compare/8.5.6...8.5.7
 [8.5.6]: https://github.com/sebastianbergmann/phpunit/compare/8.5.5...8.5.6
 [8.5.5]: https://github.com/sebastianbergmann/phpunit/compare/8.5.4...8.5.5

src/TextUI/TestRunner.php

@@ -772,10 +772,6 @@ public function run(TestSuite $suite, array $arguments = [], array $warnings = [
         }
 
         if ($exit) {
-            if (\count($result) === 0) {
-                exit(self::FAILURE_EXIT);
-            }
-
             if ($result->wasSuccessfulIgnoringWarnings()) {
                 if ($arguments['failOnRisky'] && !$result->allHarmless()) {
                     exit(self::FAILURE_EXIT);