adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: windows console may not have ansi color support

Browse source
This commit is contained in:
Rachman Chavik 2012-07-02 21:19:02 +07:00
parent 31033239bd
commit 86a74e3887
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Cake/Log/Engine/ConsoleLog.php
View file

@ -49,11 +49,16 @@ class ConsoleLog extends BaseLog {
*/ */
public function __construct($config = array()) { public function __construct($config = array()) {
parent::__construct($config); parent::__construct($config);
if (DS == '\\' && !(bool)env('ANSICON')) {
$outputAs = ConsoleOutput::PLAIN;
} else {
$outputAs = ConsoleOutput::COLOR;
}
$config = Hash::merge(array( $config = Hash::merge(array(
'stream' => 'php://stderr', 'stream' => 'php://stderr',
'types' => null, 'types' => null,
'scopes' => array(), 'scopes' => array(),
'outputAs' => ConsoleOutput::COLOR, 'outputAs' => $outputAs,
), $this->_config); ), $this->_config);
$config = $this->config($config); $config = $this->config($config);
if ($config['stream'] instanceof ConsoleOutput) { if ($config['stream'] instanceof ConsoleOutput) {

17
lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
View file

@ -116,4 +116,21 @@ class ConsoleLogTest extends CakeTestCase {
$this->assertContains($message, $logOutput); $this->assertContains($message, $logOutput);
} }
/**
* test default value of stream 'outputAs'
*/
public function testDefaultOutputAs() {
TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsoleLog',
));
if (DS == '\\' && !(bool)env('ANSICON')) {
$expected = ConsoleOutput::PLAIN;
} else {
$expected = ConsoleOutput::COLOR;
}
$stream = TestCakeLog::stream('test_console_log');
$config = $stream->config();
$this->assertEquals($expected, $config['outputAs']);
}
} }