Merge pull request #91 from wp-cli/86-escape-percent

Don't unnecessarily clobber `%` characters passed through colorize

Author: danielbachhuber

lib/cli/Colors.php

@@ -120,7 +120,9 @@ static public function colorize($string, $colored = null) {
 		}
 
 		if (!self::shouldColorize($colored)) {
-			$return = preg_replace('/%((%)|.)/', '$2', $string);
+			$colors = self::getColors();
+			$search = array_keys( $colors );
+			$return = str_replace( $search, '', $string );
 			self::cacheString($passed, $return, $colored);
 			return $return;
 		}

tests/test-table-ascii.php

@@ -127,6 +127,25 @@ public function testTableWithMultibyteStrings() {
 | Schätzen | Apprécier | Оценить | 欣賞    |
 +----------+-----------+---------+---------+
 
+OUT;
+		$this->assertInOutEquals(array($headers, $rows), $output);
+	}
+
+	/**
+	 * Test that % gets escaped correctly.
+	 */
+	public function testTableWithPercentCharacters() {
+		$headers = array( 'Heading', 'Heading2', 'Heading3' );
+		$rows = array(
+			array( '% at start', 'at end %', 'in % middle' )
+		);
+		$output = <<<'OUT'
++------------+----------+-------------+
+| Heading    | Heading2 | Heading3    |
++------------+----------+-------------+
+| % at start | at end % | in % middle |
++------------+----------+-------------+
+
 OUT;
 		$this->assertInOutEquals(array($headers, $rows), $output);
 	}