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

unify other log types as well

Browse source
This commit is contained in:
euromark 2013-06-21 16:43:01 +02:00
parent 24506dcc2c
commit 8141dd2d5d
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Console/Shell.php
View file

@ -878,12 +878,12 @@ class Shell extends Object {
return; return;
} }
CakeLog::config('stdout', array( CakeLog::config('stdout', array(
'engine' => 'ConsoleLog', 'engine' => 'Console',
'types' => array('notice', 'info'), 'types' => array('notice', 'info'),
'stream' => $this->stdout, 'stream' => $this->stdout,
)); ));
CakeLog::config('stderr', array( CakeLog::config('stderr', array(
'engine' => 'ConsoleLog', 'engine' => 'Console',
'types' => array('emergency', 'alert', 'critical', 'error', 'warning', 'debug'), 'types' => array('emergency', 'alert', 'critical', 'error', 'warning', 'debug'),
'stream' => $this->stderr, 'stream' => $this->stderr,
)); ));

2
lib/Cake/Log/Engine/SyslogLog.php
View file

@ -45,7 +45,7 @@ class SyslogLog extends BaseLog {
* *
* {{{ * {{{
* CakeLog::config('error', array( * CakeLog::config('error', array(
* 'engine' => 'SyslogLog', * 'engine' => 'Syslog',
* 'types' => array('emergency', 'alert', 'critical', 'error'), * 'types' => array('emergency', 'alert', 'critical', 'error'),
* 'format' => "%s: My-App - %s", * 'format' => "%s: My-App - %s",
* 'prefix' => 'Web Server 01' * 'prefix' => 'Web Server 01'

2
lib/Cake/Test/Case/Console/ShellTest.php
View file

@ -855,7 +855,7 @@ TEXT;
array('types' => 'error'), array('types' => 'error'),
)); ));
TestCakeLog::config('console', array( TestCakeLog::config('console', array(
'engine' => 'ConsoleLog', 'engine' => 'Console',
'stream' => 'php://stderr', 'stream' => 'php://stderr',
)); ));
TestCakeLog::replace('console', $mock); TestCakeLog::replace('console', $mock);

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

@ -78,7 +78,7 @@ class ConsoleLogTest extends CakeTestCase {
*/ */
public function testConsoleOutputWrites() { public function testConsoleOutputWrites() {
TestCakeLog::config('test_console_log', array( TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsoleLog', 'engine' => 'TestConsole',
)); ));
$mock = $this->getMock('TestConsoleLog', array('write'), array( $mock = $this->getMock('TestConsoleLog', array('write'), array(
@ -97,7 +97,7 @@ class ConsoleLogTest extends CakeTestCase {
*/ */
public function testCombinedLogWriting() { public function testCombinedLogWriting() {
TestCakeLog::config('test_console_log', array( TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsoleLog', 'engine' => 'TestConsole',
)); ));
$mock = $this->getMock('TestConsoleLog', array('write'), array( $mock = $this->getMock('TestConsoleLog', array('write'), array(
array('types' => 'error'), array('types' => 'error'),
@ -133,7 +133,7 @@ class ConsoleLogTest extends CakeTestCase {
*/ */
public function testDefaultOutputAs() { public function testDefaultOutputAs() {
TestCakeLog::config('test_console_log', array( TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsoleLog', 'engine' => 'TestConsole',
)); ));
if (DS === '\\' && !(bool)env('ANSICON')) { if (DS === '\\' && !(bool)env('ANSICON')) {
$expected = ConsoleOutput::PLAIN; $expected = ConsoleOutput::PLAIN;