Pake fixes

Author: gertvdb

includes/pakeFunction.php

@@ -377,7 +377,7 @@ function pake_echo_comment($text)
 {
   if (pakeApp::get_instance()->get_verbose())
   {
-    echo sprintf(pakeColor::colorize('   # %s', 'COMMENT'), $text, pake_STDOUT())."\n";
+      echo sprintf(pakeColor::colorize('   # %s', 'COMMENT', pake_STDOUT()), $text)."\n";
   }
 }
 
@@ -424,9 +424,9 @@ function pake_STDERR() {
 
    // close the streams on script termination
    register_shutdown_function(function () {
-       fclose(STDIN);
-       fclose(STDOUT);
-       fclose(STDERR);
+       fclose(pake_STDIN());
+       fclose(pake_STDOUT());
+       fclose(pake_STDERR());
        return true;
    });
 }

lib/vendor/pake/pakeColor.php

@@ -29,7 +29,7 @@ static function style($name, $options = array())
     self::$styles[$name] = $options;
   }
 
-  static function colorize($text = '', $parameters = array(), $stream)
+  static function colorize($text, $parameters, $stream)
   {
       $stream = $stream ?: pake_STDOUT();
     // disable colors if not supported (windows or non tty console)

lib/vendor/pake/tasks/pakePhingTask.php

@@ -42,7 +42,7 @@ public static function call_phing($task, $target, $build_file = '', $options = a
       $args[] = $target;
     }
 
-    if (DIRECTORY_SEPARATOR != '\\' && (function_exists('posix_isatty') && @posix_isatty(STDOUT)))
+    if (DIRECTORY_SEPARATOR != '\\' && (function_exists('posix_isatty') && @posix_isatty(pake_STDOUT())))
     {
       $args[] = '-logger';
       $args[] = 'phing.listener.AnsiColorLogger';

lib/vendor/phing/system/io/ConsoleReader.php

@@ -16,47 +16,47 @@
  *
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
+ * <http://phing.info>.
  */
- 
+
 include_once 'phing/system/io/Reader.php';
 
 /**
  * Convenience class for reading console input.
- * 
+ *
  * @author Hans Lellelid <[email protected]>
  * @author Matthew Hershberger <[email protected]>
  * @version $Revision: 1.4 $
  * @package phing.system.io
  */
 class ConsoleReader extends Reader {
-    
+
     function readLine() {
-        
-        $out = fgets(STDIN); // note: default maxlen is 1kb
+
+        $out = fgets(pake_STDIN()); // note: default maxlen is 1kb
         $out = rtrim($out);
 
         return $out;
     }
-    
+
     /**
-     * 
+     *
      * @param int $len Num chars to read.
      * @return string chars read or -1 if eof.
      */
     function read($len = null) {
-        
-        $out = fread(STDIN, $len);
-        
-        
+
+        $out = fread(pake_STDIN(), $len);
+
+
         return $out;
         // FIXME
         // read by chars doesn't work (yet?) with PHP stdin.  Maybe
         // this is just a language feature, maybe there's a way to get
         // ability to read chars w/o <enter> ?
-        
-    }   
-        
+
+    }
+
     function close() {
 		// STDIN is always open
     }
@@ -70,9 +70,9 @@ function open() {
      * @return boolean
      */
     function eof() {
-        return feof(STDIN);
-    }        
-    
+        return feof(pake_STDIN());
+    }
+
     /**
      * Returns path to file we are reading.
      * @return string