Merge pull request wp-cli#94 from wp-cli/decolorize-safe-str-pad

Only decolorize in `cli\safe_str_pad()` when colorizing

Author: danielbachhuber

lib/cli/cli.php

@@ -202,8 +202,9 @@ function safe_substr( $str, $start, $length = false ) {
  * @return string
  */
 function safe_str_pad( $string, $length ) {
+	$cleaned_string = Colors::shouldColorize() ? Colors::decolorize( $string ) : $string;
 	// Hebrew vowel characters
-	$cleaned_string = preg_replace( '#[\x{591}-\x{5C7}]+#u', '', Colors::decolorize( $string ) );
+	$cleaned_string = preg_replace( '#[\x{591}-\x{5C7}]+#u', '', $cleaned_string );
 	if ( function_exists( 'mb_strwidth' ) && function_exists( 'mb_detect_encoding' ) ) {
 		$real_length = mb_strwidth( $cleaned_string, mb_detect_encoding( $string ) );
 	} else {

tests/test-table-ascii.php

@@ -74,6 +74,7 @@ public function testDrawOneColumnTable() {
 	 * At the same time it checks that `green` defined in `cli\Colors` really looks as `green`.
 	 */
 	public function testDrawOneColumnColoredTable() {
+		Colors::enable( true );
 		$headers = array('Test Header');
 		$rows = array(
 			array(Colors::colorize('%Gx%n', true)),