Merge branch '7.4'

sebastianbergmann · Oct 19, 2018 · 28b87fc · 28b87fc
2 parents 55ae34d + 5c7dc35
commit 28b87fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ChangeLog-7.4.md b/ChangeLog-7.4.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 7.4 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [7.4.2] - 2018-MM-DD
+
+### Fixed
+
+* Fixed [#3354](https://github.com/sebastianbergmann/phpunit/pull/3354): Regression when `columns="max"` is used
+
 ## [7.4.1] - 2018-10-18
 
 ### Fixed
@@ -19,6 +25,7 @@ All notable changes of the PHPUnit 7.4 release series are documented in this fil
 * Implemented [#3284](https://github.com/sebastianbergmann/phpunit/issues/3284): Ability to reorder tests based on execution time
 * Implemented [#3290](https://github.com/sebastianbergmann/phpunit/issues/3290): Ability to load a PHP script before any code of PHPUnit itself is loaded
 
+[7.4.2]: https://github.com/sebastianbergmann/phpunit/compare/7.4.1...7.4.2
 [7.4.1]: https://github.com/sebastianbergmann/phpunit/compare/7.4.0...7.4.1
 [7.4.0]: https://github.com/sebastianbergmann/phpunit/compare/7.3...7.4.0
 
diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -158,7 +158,7 @@ public function doRun(Test $suite, array $arguments = [], bool $exit = true): Te
 
         $this->handleConfiguration($arguments);
 
-        if ($arguments['columns'] < 16) {
+        if (\is_int($arguments['columns']) && $arguments['columns'] < 16) {
             $arguments['columns']   = 16;
             $tooFewColumnsRequested = true;
         }