Fix missing 3rd argument for colorize

Author: gertvdb

data/bin/symfony

@@ -38,7 +38,13 @@ $argc = $_SERVER['argc'];
 // trap -V before pake
 if (in_array('-V', $argv) || in_array('--version', $argv))
 {
-    printf("symfony version %s\n", pakeColor::colorize(trim(file_get_contents($sf_symfony_lib_dir.'/VERSION')), 'INFO'));
+    printf("symfony version %s\n",
+        pakeColor::colorize(
+            trim(file_get_contents($sf_symfony_lib_dir.'/VERSION')),
+            'INFO',
+            pake_STDOUT()
+        )
+    );
     exit(0);
 }
 

data/tasks/sfPakePlugins.php

@@ -101,7 +101,7 @@ function run_plugin_list($task, $args)
     foreach ($packages as $package)
     {
       $pobj = $registry->getPackage(isset($package['package']) ? $package['package'] : $package['name'], $channel);
-      pake_echo(sprintf(" %-40s %10s-%-6s %s", pakeColor::colorize($pobj->getPackage(), 'INFO'), $pobj->getVersion(), $pobj->getState() ? $pobj->getState() : null, pakeColor::colorize(sprintf('# %s (%s)', $channel, $registry->getChannel($channel)->getAlias()), 'COMMENT')));
+      pake_echo(sprintf(" %-40s %10s-%-6s %s", pakeColor::colorize($pobj->getPackage(), 'INFO', pake_STDOUT()), $pobj->getVersion(), $pobj->getState() ? $pobj->getState() : null, pakeColor::colorize(sprintf('# %s (%s)', $channel, $registry->getChannel($channel)->getAlias()), 'COMMENT', pake_STDOUT())));
     }
   }
 }

data/tasks/sfPakeUpgrade.php

@@ -82,7 +82,7 @@ function run_upgrade_1_0($task, $args)
   foreach ($apps as $app_module_dir)
   {
     $app = str_replace(DIRECTORY_SEPARATOR.sfConfig::get('sf_app_module_dir_name'), '', $app_module_dir);
-    pake_echo_action('upgrade 1.0', pakeColor::colorize(sprintf('upgrading application "%s"', $app), array('fg' => 'cyan')));
+    pake_echo_action('upgrade 1.0', pakeColor::colorize(sprintf('upgrading application "%s"', $app), array('fg' => 'cyan'), pake_STDOUT()));
 
     $app_dir = sfConfig::get('sf_apps_dir_name').'/'.$app;
 

includes/pakeFunction.php

@@ -347,8 +347,8 @@ function pake_format_action($section, $text, $size = null)
 {
   if (pakeApp::get_instance()->get_verbose())
   {
-    $width = 9 + strlen(pakeColor::colorize('', 'INFO'));
-    return sprintf('>> %-'.$width.'s %s', pakeColor::colorize($section, 'INFO'), pakeApp::excerpt($text, $size))."\n";
+    $width = 9 + strlen(pakeColor::colorize('', 'INFO', pake_STDOUT()));
+    return sprintf('>> %-'.$width.'s %s', pakeColor::colorize($section, 'INFO', pake_STDOUT()), pakeApp::excerpt($text, $size))."\n";
   }
 }
 
@@ -377,7 +377,7 @@ function pake_echo_comment($text)
 {
   if (pakeApp::get_instance()->get_verbose())
   {
-    echo sprintf(pakeColor::colorize('   # %s', 'COMMENT'), $text)."\n";
+    echo sprintf(pakeColor::colorize('   # %s', 'COMMENT'), $text, pake_STDOUT())."\n";
   }
 }
 

lib/vendor/pake/pakeApp.php

@@ -245,7 +245,7 @@ public function do_option($opt, $value)
         $this->verbose = true;
         break;
       case 'version':
-        echo sprintf('pake version %s', pakeColor::colorize(pakeApp::VERSION, 'INFO'))."\n";
+        echo sprintf('pake version %s', pakeColor::colorize(pakeApp::VERSION, 'INFO', pake_STDOUT()))."\n";
         exit();
       default:
         throw new pakeException(sprintf("Unknown option: %s", $opt));
@@ -255,7 +255,7 @@ public function do_option($opt, $value)
   // Display the program usage line.
   public function usage()
   {
-    echo "pake [-f pakefile] {options} targets...\n".pakeColor::colorize("Try pake -H for more information", 'INFO')."\n";
+    echo "pake [-f pakefile] {options} targets...\n".pakeColor::colorize("Try pake -H for more information", 'INFO', pake_STDOUT())."\n";
   }
 
   // Display the rake command line help.
@@ -274,7 +274,7 @@ public function help()
         if (preg_match('/\b([A-Z]{2,})\b/', $comment, $match))
           $long .= '='.$match[1];
       }
-      printf("  %-20s (%s)\n", pakeColor::colorize($long, 'INFO'), pakeColor::colorize($short, 'INFO'));
+      printf("  %-20s (%s)\n", pakeColor::colorize($long, 'INFO', pake_STDOUT()), pakeColor::colorize($short, 'INFO', pake_STDOUT()));
       printf("      %s\n", $comment);
     }
   }
@@ -289,7 +289,7 @@ public function display_tasks_and_comments()
       $w = strlen(pakeTask::get_mini_task_name($name));
       if ($w > $width) $width = $w;
     }
-    $width += strlen(pakeColor::colorize(' ', 'INFO'));
+    $width += strlen(pakeColor::colorize(' ', 'INFO', pake_STDOUT()));
 
     echo "available pake tasks:\n";
 
@@ -306,7 +306,7 @@ public function display_tasks_and_comments()
       if (!$task->get_alias() && $task->get_comment())
       {
         $mini_name = pakeTask::get_mini_task_name($name);
-        printf('  %-'.$width.'s > %s'."\n", pakeColor::colorize($mini_name, 'INFO'), $task->get_comment().($mini_name != $name ? ' ['.$name.']' : ''));
+        printf('  %-'.$width.'s > %s'."\n", pakeColor::colorize($mini_name, 'INFO', pake_STDOUT()), $task->get_comment().($mini_name != $name ? ' ['.$name.']' : ''));
       }
     }
 
@@ -320,7 +320,7 @@ public function display_tasks_and_comments()
         if ($task->get_alias())
         {
           $mini_name = pakeTask::get_mini_task_name($name);
-          printf('  %-'.$width.'s = pake %s'."\n", pakeColor::colorize(pakeTask::get_mini_task_name($name), 'INFO'), $task->get_alias().($mini_name != $name ? ' ['.$name.']' : ''));
+          printf('  %-'.$width.'s = pake %s'."\n", pakeColor::colorize(pakeTask::get_mini_task_name($name), 'INFO', pake_STDOUT()), $task->get_alias().($mini_name != $name ? ' ['.$name.']' : ''));
         }
       }
     }
@@ -386,7 +386,7 @@ public static function excerpt($text, $size = null)
 
     $subsize = floor(($size - 3) / 2);
 
-    return substr($text, 0, $subsize).pakeColor::colorize('...', 'INFO').substr($text, -$subsize);
+    return substr($text, 0, $subsize).pakeColor::colorize('...', 'INFO', pake_STDOUT()).substr($text, -$subsize);
   }
 
   /* see perl Text::Abbrev module */