Move terminal colorers classes in their own file

They were originally written for parserTests output and were in
tests/testHelpers.inc since them.  Those classes can be used by most
our maintenance scripts anyway, so here is their new home.

Also make tests/testHelpers.inc a bit shorter which is always welcome.

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index a92f7db..7a1f368 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -885,11 +885,13 @@ $wgAutoloadLocalClasses = array(
        'textStatsOutput' => 'maintenance/language/StatOutputs.php',
        'wikiStatsOutput' => 'maintenance/language/StatOutputs.php',
 
+       # maintenance/term
+       'AnsiTermColorer'  => 'maintenance/term/MWTerm.php',
+       'DummyTermColorer' => 'maintenance/term/MWTerm.php',
+
        # tests
-       'AnsiTermColorer' => 'tests/testHelpers.inc',
        'DbTestPreviewer' => 'tests/testHelpers.inc',
        'DbTestRecorder' => 'tests/testHelpers.inc',
-       'DummyTermColorer' => 'tests/testHelpers.inc',
        'TestFileIterator' => 'tests/testHelpers.inc',
        'TestRecorder' => 'tests/testHelpers.inc',
 

diff --git a/maintenance/term/MWTerm.php b/maintenance/term/MWTerm.php
new file mode 100644 (file)
index 0000000..36fb8ee
--- /dev/null
+++ b/maintenance/term/MWTerm.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @ingroup Testing
+ *
+ * Set of classes to help with test output and such. Right now pretty specific
+ * to the parser tests but could be more useful one day :)
+ *
+ * @todo Fixme: Make this more generic
+ */
+
+class AnsiTermColorer {
+       function __construct() {
+       }
+
+       /**
+        * Return ANSI terminal escape code for changing text attribs/color
+        *
+        * @param $color String: semicolon-separated list of attribute/color codes
+        * @return String
+        */
+       public function color( $color ) {
+               global $wgCommandLineDarkBg;
+
+               $light = $wgCommandLineDarkBg ? "1;" : "0;";
+
+               return "\x1b[{$light}{$color}m";
+       }
+
+       /**
+        * Return ANSI terminal escape code for restoring default text attributes
+        *
+        * @return String
+        */
+       public function reset() {
+               return $this->color( 0 );
+       }
+}
+
+/* A colour-less terminal */
+class DummyTermColorer {
+       public function color( $color ) {
+               return '';
+       }
+
+       public function reset() {
+               return '';
+       }
+}
+

diff --git a/tests/testHelpers.inc b/tests/testHelpers.inc
index 39919cc..9287d53 100644 (file)
--- a/tests/testHelpers.inc
+++ b/tests/testHelpers.inc
@@ -1,53 +1,5 @@
 <?php
 
-/**
- * @ingroup Testing
- *
- * Set of classes to help with test output and such. Right now pretty specific
- * to the parser tests but could be more useful one day :)
- *
- * @todo Fixme: Make this more generic
- */
-
-class AnsiTermColorer {
-       function __construct() {
-       }
-
-       /**
-        * Return ANSI terminal escape code for changing text attribs/color
-        *
-        * @param $color String: semicolon-separated list of attribute/color codes
-        * @return String
-        */
-       public function color( $color ) {
-               global $wgCommandLineDarkBg;
-
-               $light = $wgCommandLineDarkBg ? "1;" : "0;";
-
-               return "\x1b[{$light}{$color}m";
-       }
-
-       /**
-        * Return ANSI terminal escape code for restoring default text attributes
-        *
-        * @return String
-        */
-       public function reset() {
-               return $this->color( 0 );
-       }
-}
-
-/* A colour-less terminal */
-class DummyTermColorer {
-       public function color( $color ) {
-               return '';
-       }
-
-       public function reset() {
-               return '';
-       }
-}
-
 class TestRecorder {
        var $parent;
        var $term;