From 13108fbdc068c28c23123e4b60bc554424f3a596 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Wed, 17 Jan 2007 21:24:41 +0000
Subject: [PATCH] * Fix hardcoded background color in parserTests.php *
 AnsiTermColorer::reset() now calls color(0) * parserTests.php : remove
 'light' option for --color switch

---
 RELEASE-NOTES                |  9 +++++++++
 includes/DefaultSettings.php |  2 ++
 maintenance/Makefile         |  3 ---
 maintenance/parserTests.inc  | 22 ++++++----------------
 maintenance/parserTests.php  |  4 ++--
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0a8d9861ad..50b9f52732 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -20,6 +20,12 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
 == Configuration changes ==
 
+=== $wgCommandLineDarkBg ==
+
+A new switch used by maintenance scripts (parserTests.php). It lets you specify
+if your terminal use a dark background, the colorized output will be made
+lighter making things easier to read.
+
 == Major new features ==
 
 == Changes since 1.9 ==
@@ -106,6 +112,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 8641) Fix order of updates to ipblocks table
 * (bug 8678) Fix detection of self-links for numeric titles in Parser
 * (bug 6171) Magically close tags in tables when not using Tidy.
+* Fix hardcoded background color in parserTests.php
+* parserTests.php : removed the 'light' option for --color argument, replacing
+  it with a new global switch : $wgCommandLineDarkBg
 
 == Languages updated ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 02568a4f38..98d8666712 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1518,6 +1518,8 @@ if( !isset( $wgCommandLineMode ) ) {
 	$wgCommandLineMode = false;
 }
 
+/** For colorized maintenance script output, is your terminal background dark ? */
+$wgCommandLineDarkBg = false;
 
 #
 # Recent changes settings
diff --git a/maintenance/Makefile b/maintenance/Makefile
index 97f8b60bfa..8fa50cc2ef 100644
--- a/maintenance/Makefile
+++ b/maintenance/Makefile
@@ -7,9 +7,6 @@ help:
 test:
 	php parserTests.php
 
-test-light:
-	php parserTests.php --color=light
-
 doc:
 	php mwdocgen.php -all
 	echo 'Doc generation done. Look at ./docs/html/'
diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index e18178a0fc..3559b98346 100644
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -47,12 +47,6 @@ class ParserTest {
 	 */
 	var $color;
 
-	/**
-	 * boolean $lightcolor whereas output should use light colors
-	 * @private
-	 */
-	var $lightcolor;
-
 	/**
 	 * boolean $showOutput Show test output
 	 */
@@ -68,7 +62,6 @@ class ParserTest {
 		global $options;
 
 		# Only colorize output if stdout is a terminal.
-		$this->lightcolor = false;
 		$this->color = !wfIsWindows() && posix_isatty(1);
 
 		if( isset( $options['color'] ) ) {
@@ -76,9 +69,6 @@ class ParserTest {
 			case 'no':
 				$this->color = false;
 				break;
-			case 'light':
-				$this->lightcolor = true;
-				# Fall through
 			case 'yes':
 			default:
 				$this->color = true;
@@ -86,7 +76,7 @@ class ParserTest {
 			}
 		}
 		$this->term = $this->color
-			? new AnsiTermColorer( $this->lightcolor )
+			? new AnsiTermColorer()
 			: new DummyTermColorer();
 
 		$this->showDiffs = !isset( $options['quick'] );
@@ -682,7 +672,7 @@ class ParserTest {
 				# test, in case it succeeded. Show it now:
 				$this->showTesting( $desc );
 			}
-			print $this->term->color( '1;31' ) . 'FAILED!' . $this->term->reset() . "\n";
+			print $this->term->color( '31' ) . 'FAILED!' . $this->term->reset() . "\n";
 			if ( $this->showOutput ) {
 				print "--- Expected ---\n$result\n--- Actual ---\n$html\n";
 			}
@@ -873,8 +863,7 @@ class ParserTest {
 }
 
 class AnsiTermColorer {
-	function __construct( $light ) {
-		$this->light = $light;
+	function __construct() {
 	}
 
 	/**
@@ -885,7 +874,8 @@ class AnsiTermColorer {
 	 * @private
 	 */
 	function color( $color ) {
-		$light = $this->light ? "1;" : "";
+		global $wgCommandLineDarkBg;
+		$light = $wgCommandLineDarkBg ? "1;" : "0;";
 		return "\x1b[{$light}{$color}m";
 	}
 
@@ -896,7 +886,7 @@ class AnsiTermColorer {
 	 * @private
 	 */
 	function reset() {
-		return "\x1b[0m";
+		return $this->color( 0 );
 	}
 }
 
diff --git a/maintenance/parserTests.php b/maintenance/parserTests.php
index 0a11a73fb7..efdd07c425 100644
--- a/maintenance/parserTests.php
+++ b/maintenance/parserTests.php
@@ -29,7 +29,7 @@ if( isset( $options['help'] ) ) {
     echo <<<ENDS
 MediaWiki $wgVersion parser test suite
 Usage: php parserTests.php [--quick] [--quiet] [--show-output]
-                           [--color[=(yes|no|light)]]
+                           [--color[=(yes|no)]]
                            [--regex=<expression>] [--file=<testfile>]
                            [--record]
                            [--help]
@@ -38,7 +38,7 @@ Options:
   --quiet          Suppress notification of passed tests (shows only failed tests)
   --show-output    Show expected and actual output
   --color          Override terminal detection and force color output on or off
-                   'light' option is similar to 'yes' but with color for dark backgrounds
+                   use wgCommandLineDarkBg = true; if your term is dark 
   --regex          Only run tests whose descriptions which match given regex
   --file           Run test cases from a custom file instead of parserTests.txt
   --record         Record tests in database
-- 
2.20.1