summaryrefslogtreecommitdiffstats
path: root/3355.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-10-18 16:34:37 +0200
committerRemi Collet <remi@remirepo.net>2018-10-18 16:34:37 +0200
commit72e52cfa39010f7d5fb81c7054b4ef609b43dec4 (patch)
treeb787ae564eb4d345fb230e30ac901f211ee739f5 /3355.patch
parentf024463bfd96d093dc0862be01673c8d4293ab83 (diff)
add patch for https://github.com/sebastianbergmann/phpunit/issues/3354
from https://github.com/sebastianbergmann/phpunit/pull/3355
Diffstat (limited to '3355.patch')
-rw-r--r--3355.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/3355.patch b/3355.patch
new file mode 100644
index 0000000..9cfaa05
--- /dev/null
+++ b/3355.patch
@@ -0,0 +1,24 @@
+Adapted for 7.4.1 from
+
+From 03e86defca1096cfbbf9962c1151773ac8767fcb Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 18 Oct 2018 14:58:51 +0200
+Subject: [PATCH] Fix #3354
+
+---
+ src/TextUI/TestRunner.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
+index 00c2fcf860..bc167dd14e 100644
+--- a/src/TextUI/TestRunner.php
++++ b/src/TextUI/TestRunner.php
+@@ -158,7 +158,7 @@ class TestRunner extends BaseTestRunner
+
+ $this->handleConfiguration($arguments);
+
+- if ($arguments['columns'] < 16) {
++ if (\is_int($arguments['columns']) && $arguments['columns'] < 16) {
+ $arguments['columns'] = 16;
+ $tooFewColumnsRequested = true;
+ }