changing Shell to use ConsoleLog

cakephp · May 11, 2012 · bb090c5 · bb090c5
1 parent d107277
commit bb090c5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php
@@ -165,9 +165,19 @@ public function __construct($stdout = null, $stderr = null, $stdin = null) {
 		if ($this->stdout == null) {
 			$this->stdout = new ConsoleOutput('php://stdout');
 		}
+		CakeLog::config('stdout', array(
+			'engine' => 'ConsoleLog',
+			'types' => array('notice', 'info'),
+			'stream' => $this->stdout,
+		));
 		if ($this->stderr == null) {
 			$this->stderr = new ConsoleOutput('php://stderr');
 		}
+		CakeLog::config('stderr', array(
+			'engine' => 'ConsoleLog',
+			'types' => array('error', 'warning'),
+			'stream' => $this->stderr,
+		));
 		if ($this->stdin == null) {
 			$this->stdin = new ConsoleInput('php://stdin');
 		}

diff --git a/lib/Cake/Test/Case/BasicsTest.php b/lib/Cake/Test/Case/BasicsTest.php
@@ -596,9 +596,14 @@ public function testTranslateDomainCategoryPlural() {
 	public function testLogError() {
 		@unlink(LOGS . 'error.log');
 
+		// disable stderr output for this test
+		CakeLog::disable('stderr');
+
 		LogError('Testing LogError() basic function');
 		LogError("Testing with\nmulti-line\nstring");
 
+		CakeLog::enable('stderr');
+
 		$result = file_get_contents(LOGS . 'error.log');
 		$this->assertRegExp('/Error: Testing LogError\(\) basic function/', $result);
 		$this->assertNotRegExp("/Error: Testing with\nmulti-line\nstring/", $result);