Merge branch '8.5' into 9.5

sebastianbergmann · Feb 21, 2022 · 5e34d61 · 5e34d61
2 parents eef449e + 5ceeed4
commit 5e34d61
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md
@@ -8,6 +8,10 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 
 * [#4874](https://github.com/sebastianbergmann/phpunit/pull/4874): `PHP_FLOAT_EPSILON` is now used instead of hardcoded `0.0000000001` in `PHPUnit\Framework\Constraint\IsIdentical`
 
+### Fixed
+
+* When the HTML code coverage report's configured low upper bound is larger than the high lower bound then the default values are used instead
+
 ## [8.5.23] - 2022-01-21
 
 ### Fixed

diff --git a/ChangeLog-9.5.md b/ChangeLog-9.5.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 9.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [9.5.15] - 2022-MM-DD
+
+### Fixed
+
+* When the HTML code coverage report's configured low upper bound is larger than the high lower bound then the default values are used instead
+
 ## [9.5.14] - 2022-02-18
 
 ### Changed
@@ -122,6 +128,7 @@ All notable changes of the PHPUnit 9.5 release series are documented in this fil
 
 * [#4535](https://github.com/sebastianbergmann/phpunit/issues/4535): `getMockFromWsdl()` does not handle methods that do not have parameters correctly
 
+[9.5.15]: https://github.com/sebastianbergmann/phpunit/compare/9.5.14...9.5
 [9.5.14]: https://github.com/sebastianbergmann/phpunit/compare/9.5.13...9.5.14
 [9.5.13]: https://github.com/sebastianbergmann/phpunit/compare/9.5.12...9.5.13
 [9.5.12]: https://github.com/sebastianbergmann/phpunit/compare/9.5.11...9.5.12

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -93,11 +93,6 @@ final class TestRunner extends BaseTestRunner
 
     public const EXCEPTION_EXIT = 2;
 
-    /**
-     * @var bool
-     */
-    private static $versionStringPrinted = false;
-
     /**
      * @var CodeCoverageFilter
      */
@@ -334,8 +329,6 @@ public function run(TestSuite $suite, array $arguments = [], array $warnings = [
             Version::getVersionString() . "\n"
         );
 
-        self::$versionStringPrinted = true;
-
         foreach ($arguments['listeners'] as $listener) {
             $result->addListener($listener);
         }
@@ -1142,6 +1135,11 @@ private function handleConfiguration(array &$arguments): void
         $arguments['timeoutForMediumTests']                           = $arguments['timeoutForMediumTests'] ?? 10;
         $arguments['timeoutForSmallTests']                            = $arguments['timeoutForSmallTests'] ?? 1;
         $arguments['verbose']                                         = $arguments['verbose'] ?? false;
+
+        if ($arguments['reportLowUpperBound'] > $arguments['reportHighLowerBound']) {
+            $arguments['reportLowUpperBound']  = 50;
+            $arguments['reportHighLowerBound'] = 90;
+        }
     }
 
     private function processSuiteFilters(TestSuite $suite, array $arguments): void