mirror of
https://github.com/yiisoft/yii2.git
synced 2025-11-02 21:41:19 +08:00
HHVM compatibility Fixes for Yii 2 Console Application
This commit is contained in:
@ -49,7 +49,7 @@ class Controller extends \yii\base\Controller
|
||||
* @param resource $stream the stream to check.
|
||||
* @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;
|
||||
}
|
||||
@ -192,13 +192,13 @@ class Controller extends \yii\base\Controller
|
||||
*/
|
||||
public function stderr($string)
|
||||
{
|
||||
if ($this->isColorEnabled(STDERR)) {
|
||||
if ($this->isColorEnabled(\STDERR)) {
|
||||
$args = func_get_args();
|
||||
array_shift($args);
|
||||
$string = Console::ansiFormat($string, $args);
|
||||
}
|
||||
|
||||
return fwrite(STDERR, $string);
|
||||
return fwrite(\STDERR, $string);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -64,7 +64,7 @@ class ErrorHandler extends \yii\base\ErrorHandler
|
||||
*/
|
||||
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
|
||||
if (Yii::$app->controller instanceof \yii\console\Controller && Yii::$app->controller->isColorEnabled($stream)
|
||||
|| Yii::$app instanceof \yii\console\Application && Console::streamSupportsAnsiColors($stream)) {
|
||||
|
||||
Reference in New Issue
Block a user