Commit 03f9ac86 by Carsten Brandt

Merge pull request #3367 from MethyleneGaming/master

HHVM compatibility Fixes for Yii 2 Console Application
parents 6d2a371f 6099e851
...@@ -49,7 +49,7 @@ class Controller extends \yii\base\Controller ...@@ -49,7 +49,7 @@ class Controller extends \yii\base\Controller
* @param resource $stream the stream to check. * @param resource $stream the stream to check.
* @return boolean Whether to enable ANSI style in output. * @return boolean Whether to enable ANSI style in output.
*/ */
public function isColorEnabled($stream = STDOUT) public function isColorEnabled($stream = \STDOUT)
{ {
return $this->color === null ? Console::streamSupportsAnsiColors($stream) : $this->color; return $this->color === null ? Console::streamSupportsAnsiColors($stream) : $this->color;
} }
...@@ -192,13 +192,13 @@ class Controller extends \yii\base\Controller ...@@ -192,13 +192,13 @@ class Controller extends \yii\base\Controller
*/ */
public function stderr($string) public function stderr($string)
{ {
if ($this->isColorEnabled(STDERR)) { if ($this->isColorEnabled(\STDERR)) {
$args = func_get_args(); $args = func_get_args();
array_shift($args); array_shift($args);
$string = Console::ansiFormat($string, $args); $string = Console::ansiFormat($string, $args);
} }
return fwrite(STDERR, $string); return fwrite(\STDERR, $string);
} }
/** /**
......
...@@ -64,7 +64,7 @@ class ErrorHandler extends \yii\base\ErrorHandler ...@@ -64,7 +64,7 @@ class ErrorHandler extends \yii\base\ErrorHandler
*/ */
protected function formatMessage($message, $format = [Console::FG_RED, Console::BOLD]) protected function formatMessage($message, $format = [Console::FG_RED, Console::BOLD])
{ {
$stream = (PHP_SAPI === 'cli') ? STDERR : STDOUT; $stream = (PHP_SAPI === 'cli') ? \STDERR : \STDOUT;
// try controller first to allow check for --color switch // try controller first to allow check for --color switch
if (Yii::$app->controller instanceof \yii\console\Controller && Yii::$app->controller->isColorEnabled($stream) if (Yii::$app->controller instanceof \yii\console\Controller && Yii::$app->controller->isColorEnabled($stream)
|| Yii::$app instanceof \yii\console\Application && Console::streamSupportsAnsiColors($stream)) { || Yii::$app instanceof \yii\console\Application && Console::streamSupportsAnsiColors($stream)) {
......
...@@ -628,7 +628,7 @@ class BaseConsole ...@@ -628,7 +628,7 @@ class BaseConsole
*/ */
public static function stdin($raw = false) public static function stdin($raw = false)
{ {
return $raw ? fgets(STDIN) : rtrim(fgets(STDIN), PHP_EOL); return $raw ? fgets(\STDIN) : rtrim(fgets(\STDIN), PHP_EOL);
} }
/** /**
...@@ -639,7 +639,7 @@ class BaseConsole ...@@ -639,7 +639,7 @@ class BaseConsole
*/ */
public static function stdout($string) public static function stdout($string)
{ {
return fwrite(STDOUT, $string); return fwrite(\STDOUT, $string);
} }
/** /**
...@@ -650,7 +650,7 @@ class BaseConsole ...@@ -650,7 +650,7 @@ class BaseConsole
*/ */
public static function stderr($string) public static function stderr($string)
{ {
return fwrite(STDERR, $string); return fwrite(\STDERR, $string);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment