Initial integration of ConsoleOutput into cake console tools.

cakephp · Oct 14, 2010 · ce4fe64 · ce4fe64
1 parent 5c55c28
commit ce4fe64
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/cake/console/console_output.php b/cake/console/console_output.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ConsoleOutput  file. 
+ * ConsoleOutput file.
  *
  * PHP 5
  *

diff --git a/cake/console/shell_dispatcher.php b/cake/console/shell_dispatcher.php
@@ -17,6 +17,8 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+require_once 'console_output.php';
+
 /**
  * Shell dispatcher handles dispatching cli commands.
  *
@@ -174,8 +176,8 @@ function __initConstants() {
  */
 	protected function _initEnvironment() {
 		$this->stdin = fopen('php://stdin', 'r');
-		$this->stdout = fopen('php://stdout', 'w');
-		$this->stderr = fopen('php://stderr', 'w');
+		$this->stdout = new ConsoleOutput('php://stdout');
+		$this->stderr = new ConsoleOutput('php://stderr');
 
 		if (!$this->__bootstrap()) {
 			$this->stderr("\nCakePHP Console: ");
@@ -454,11 +456,7 @@ public function getInput($prompt, $options = null, $default = null) {
  * @return integer Returns the number of bytes output to stdout.
  */
 	public function stdout($string, $newline = true) {
-		if ($newline) {
-			return fwrite($this->stdout, $string . "\n");
-		} else {
-			return fwrite($this->stdout, $string);
-		}
+		return $this->stdout->write($string, $newline);
 	}
 
 /**
@@ -467,7 +465,7 @@ public function stdout($string, $newline = true) {
  * @param string $string Error text to output.
  */
 	public function stderr($string) {
-		fwrite($this->stderr, $string);
+		$this->stderr->write($string, false);
 	}
 
 /**