Merge pull request #93 from wp-cli/placeholder-character-colorize

Use a more impossible placeholder pattern in `Colors::colorize()`

lib/cli/Colors.php

@@ -127,13 +127,13 @@ static public function colorize($string, $colored = null) {
 			return $return;
 		}
 
-		$string = str_replace('%%', '% ', $string);
+		$string = str_replace('%%', '%¾', $string);
 
 		foreach (self::getColors() as $key => $value) {
 			$string = str_replace($key, self::color($value), $string);
 		}
 
-		$string = str_replace('% ', '%', $string);
+		$string = str_replace('%¾', '%', $string);
 		self::cacheString($passed, $string, $colored);
 
 		return $string;

tests/test-table-ascii.php

@@ -146,6 +146,35 @@ public function testTableWithPercentCharacters() {
 | % at start | at end % | in % middle |
 +------------+----------+-------------+
 
+OUT;
+		$this->assertInOutEquals(array($headers, $rows), $output);
+	}
+
+	/**
+	 * Test that a % is appropriately padded in the table
+	 */
+	public function testTablePaddingWithPercentCharacters() {
+		$headers = array( 'ID', 'post_title', 'post_name' );
+		$rows = array(
+			array(
+				3,
+				'10%',
+				''
+			),
+			array(
+				1,
+				'Hello world!',
+				'hello-world'
+			),
+		);
+		$output = <<<'OUT'
++----+--------------+-------------+
+| ID | post_title   | post_name   |
++----+--------------+-------------+
+| 3  | 10%          |             |
+| 1  | Hello world! | hello-world |
++----+--------------+-------------+
+
 OUT;
 		$this->assertInOutEquals(array($headers, $rows), $output);
 	}