From f696e82fa9c585d19eb411e83933aac7b637368b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 25 Oct 2014 10:12:58 +0200 Subject: php-phpunit-environment: more upstream fix --- environment-upstream.patch | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/environment-upstream.patch b/environment-upstream.patch index 450b630..c52005f 100644 --- a/environment-upstream.patch +++ b/environment-upstream.patch @@ -80,3 +80,36 @@ index 84fc94a..ac1b1a3 100644 + return function_exists('posix_isatty') && @posix_isatty($fd); } } +From 6e6c71d918088c251b181ba8b3088af4ac336dd7 Mon Sep 17 00:00:00 2001 +From: Sebastian Bergmann +Date: Sat, 25 Oct 2014 10:00:45 +0200 +Subject: [PATCH] Make sure we have STDIN and STDOUT before using them + +--- + src/Console.php | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/Console.php b/src/Console.php +index ac1b1a3..13a9672 100644 +--- a/src/Console.php ++++ b/src/Console.php +@@ -66,6 +66,10 @@ public function hasColorSupport() + return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI'); + } + ++ if (!defined('STDOUT')) { ++ return false; ++ } ++ + return $this->isTty(STDOUT); + } + +@@ -82,7 +86,7 @@ public function getNumberOfColumns() + return 79; + } + +- if (!$this->isTty(STDIN)) { ++ if (!defined('STDIN') || !$this->isTty(STDIN)) { + return 80; + } + -- cgit