Changeset 18730

Timestamp:

05/28/09 14:42:24 (4 years ago)

Author:

fabien

Message:

[lime] deprecated lime_output_color

The lime_output_color class is now deprecated. The class still exists for BC and just extends lime_output.

The lime_output constructor now takes an argument to force coloring output.

Files:

• tools/lime/trunk/lib/lime.php (modified) (5 diffs)

tools/lime/trunk/lib/lime.php

@@ -415 +415 @@
-class lime_output
-{
-  public function diag()
-  {
-    $messages = func_get_args();
-    foreach ($messages as $message)
-    {
-      array_map(array($this, 'comment'), (array) $message);
-    }
-  }
-
-  public function comment($message)
-  {
-    echo "# $message\n";
-  }
-
-  public function info($message)
-  {
-    echo "> $message\n";
-  }
-
-  public function error($message)
-  {
-    echo "> $message\n";
-  }
-
-  public function echoln($message)
-  {
-    echo "$message\n";
-  }
-
-  public function green_bar($message)
-  {
-    echo "$message\n";
-  }
-
-  public function red_bar($message)
-  {
-    echo "$message\n";
-  }
-}
-
-class lime_output_color extends lime_output
-{
-  public $colorizer = null;
-
-
-
-
+$force_colors = false
+
+$force_colors
-  }
-
@@ -509 +467 @@
-}
-
+class lime_output_color extends lime_output
+{
+}
+
-class lime_colorizer
-{
-  static public $styles = array();
-
+  protected $force_colors = false;
+
+  public function __construct($force_colors = false)
+  {
+    $this->force_colors = $force_colors;
+  }
+
-  public static function style($name, $options = array())
-  {
@@ -518 +487 @@
-  }
-
-static 
+
-  {
-    // disable colors if not supported (windows or non tty console)
-DIRECTORY_SEPARATOR == '\\' || !function_exists('posix_isatty') || !@posix_isatty(STDOUT
+!$this->force_colors && (DIRECTORY_SEPARATOR == '\\' || !function_exists('posix_isatty') || !@posix_isatty(STDOUT)
-    {
-      return $text;
@@ -655 +624 @@
-        if ($delta > 0)
-        {
-lorizer->colorize(sprintf('# Looks like you planned %d tests but only ran %d.', $this->stats[$file]['plan'], $this->stats[$file]['nb_tests']), 'COMMENT'
+mment(sprintf('# Looks like you planned %d tests but only ran %d.', $this->stats[$file]['plan'], $this->stats[$file]['nb_tests'])
-          $this->stats[$file]['status'] = 'dubious';
-          $this->stats[$file]['status_code'] = 255;
@@ -666 +635 @@
-        else if ($delta < 0)
-        {
-lorizer->colorize(sprintf('# Looks like you planned %s test but ran %s extra.', $this->stats[$file]['plan'], $this->stats[$file]['nb_tests'] - $this->stats[$file]['plan']), 'COMMENT'
+mment(sprintf('# Looks like you planned %s test but ran %s extra.', $this->stats[$file]['plan'], $this->stats[$file]['nb_tests'] - $this->stats[$file]['plan'])
-          $this->stats[$file]['status'] = 'dubious';
-          $this->stats[$file]['status_code'] = 255;