Merge pull request #107 from gitlost/issue_102

Add strwidth(), called by safe_str_pad(). Add unicode/regex.php.

Author: schlessera

.gitignore

@@ -1,2 +1,3 @@
 .idea
 vendor
+.*.swp

lib/cli/Colors.php

@@ -176,7 +176,7 @@ static public function cacheString($passed, $colorized, $colored) {
 	 * Return the length of the string without color codes.
 	 *
 	 * @param string  $string  the string to measure
-     * @return string
+     * @return int
 	 */
 	static public function length($string) {
 		if (isset(self::$_string_cache[md5($string)]['decolorized'])) {
@@ -188,6 +188,23 @@ static public function length($string) {
 		return safe_strlen($test_string);
 	}
 
+	/**
+	 * Return the width (length in characters) of the string without color codes.
+	 *
+	 * @param string  $string  the string to measure
+     * @return int
+	 */
+	static public function width($string) {
+		$md5 = md5($string);
+		if (isset(self::$_string_cache[$md5]['decolorized'])) {
+			$test_string = self::$_string_cache[$md5]['decolorized'];
+		} else {
+			$test_string = self::decolorize($string);
+		}
+
+		return strwidth($test_string);
+	}
+
 	/**
 	 * Pad the string to a certain display length.
 	 *

lib/cli/Streams.php

@@ -31,14 +31,16 @@ public static function render( $msg ) {
 		$args = func_get_args();
 
 		// No string replacement is needed
-		if( count( $args ) == 1 ) {
-			return Colors::colorize( $msg );
+		if( count( $args ) == 1 || ( is_string( $args[1] ) && '' === $args[1] ) ) {
+			return Colors::shouldColorize() ? Colors::colorize( $msg ) : $msg;
 		}
 
 		// If the first argument is not an array just pass to sprintf
 		if( !is_array( $args[1] ) ) {
 			// Colorize the message first so sprintf doesn't bitch at us
-			$args[0] = Colors::colorize( $args[0] );
+			if ( Colors::shouldColorize() ) {
+				$args[0] = Colors::colorize( $args[0] );
+			}
 
 			// Escape percent characters for sprintf
 			$args[0] = preg_replace('/(%([^\w]|$))/', "%$1", $args[0]);
@@ -50,7 +52,7 @@ public static function render( $msg ) {
 		foreach( $args[1] as $key => $value ) {
 			$msg = str_replace( '{:' . $key . '}', $value, $msg );
 		}
-		return Colors::colorize( $msg );
+		return Colors::shouldColorize() ? Colors::colorize( $msg ) : $msg;
 	}
 
 	/**

lib/cli/Table.php

@@ -102,7 +102,7 @@ public function setRenderer(Renderer $renderer) {
 	 */
 	protected function checkRow(array $row) {
 		foreach ($row as $column => $str) {
-			$width = Colors::length($str);
+			$width = Colors::shouldColorize() ? Colors::width($str) : strwidth($str);
 			if (!isset($this->_width[$column]) || $width > $this->_width[$column]) {
 				$this->_width[$column] = $width;
 			}

lib/cli/cli.php

@@ -203,15 +203,52 @@ function safe_substr( $str, $start, $length = false ) {
  */
 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', '', $cleaned_string );
-	if ( function_exists( 'mb_strwidth' ) && function_exists( 'mb_detect_encoding' ) ) {
-		$real_length = mb_strwidth( $cleaned_string, mb_detect_encoding( $string ) );
-	} else {
-		$real_length = safe_strlen( $cleaned_string );
-	}
+	$real_length = strwidth( $cleaned_string );
 	$diff = strlen( $string ) - $real_length;
 	$length += $diff;
 
 	return str_pad( $string, $length );
 }
+
+/**
+ * Get width of string, ie length in characters, taking into account multi-byte and mark characters for UTF-8, and multi-byte for non-UTF-8.
+ *
+ * @param string The string to check
+ * @return int The string's width.
+ */
+function strwidth( $string ) {
+	static $eaw_regex; // East Asian Width regex. Characters that count as 2 characters as they're "wide" or "fullwidth". See http://www.unicode.org/reports/tr11/tr11-19.html
+	static $m_regex; // Mark characters regex (Unicode property "M") - mark combining "Mc", mark enclosing "Me" and mark non-spacing "Mn" chars that should be ignored for spacing purposes.
+	if ( null === $eaw_regex ) {
+		// Load both regexs generated from Unicode data.
+		require __DIR__ . '/unicode/regex.php';
+	}
+
+	// Allow for selective testings - "1" bit set tests grapheme_strlen(), "2" preg_match_all( '/\X/u' ), "4" mb_strwidth(), "other" safe_strlen().
+	$test_strwidth = getenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH' );
+
+	// Assume UTF-8 - `grapheme_strlen()` will return null if given non-UTF-8 string.
+	if ( function_exists( 'grapheme_strlen' ) && null !== ( $width = grapheme_strlen( $string ) ) ) {
+		if ( ! $test_strwidth || ( $test_strwidth & 1 ) ) {
+			return $width + preg_match_all( $eaw_regex, $string, $dummy /*needed for PHP 5.3*/ );
+		}
+	}
+	// Assume UTF-8 - `preg_match_all()` will return false if given non-UTF-8 string (or if PCRE UTF-8 mode is unavailable).
+	if ( false !== ( $width = preg_match_all( '/\X/u', $string, $dummy /*needed for PHP 5.3*/ ) ) ) {
+		if ( ! $test_strwidth || ( $test_strwidth & 2 ) ) {
+			return $width + preg_match_all( $eaw_regex, $string, $dummy /*needed for PHP 5.3*/ );
+		}
+	}
+	if ( function_exists( 'mb_strwidth' ) && function_exists( 'mb_detect_encoding' ) ) {
+		$encoding = mb_detect_encoding( $string, null, true /*strict*/ );
+		$width = mb_strwidth( $string, $encoding );
+		if ( 'UTF-8' === $encoding ) {
+			// Subtract combining characters.
+			$width -= preg_match_all( $m_regex, $string, $dummy /*needed for PHP 5.3*/ );
+		}
+		if ( ! $test_strwidth || ( $test_strwidth & 4 ) ) {
+			return $width;
+		}
+	}
+	return safe_strlen( $string );
+}

lib/cli/table/Ascii.php

@@ -133,14 +133,14 @@ public function row( array $row ) {
 				$value = str_replace( PHP_EOL, ' ', $value );
 
 				$col_width = $this->_widths[ $col ];
-				$original_val_width = Colors::length( $value );
+				$original_val_width = Colors::shouldColorize() ? Colors::width( $value ) : \cli\strwidth( $value );
 				if ( $original_val_width > $col_width ) {
 					$row[ $col ] = \cli\safe_substr( $value, 0, $col_width );
 					$value = \cli\safe_substr( $value, $col_width, $original_val_width );
 					$i = 0;
 					do {
 						$extra_value = \cli\safe_substr( $value, 0, $col_width );
-						$val_width = \cli\safe_strlen( $extra_value );
+						$val_width = \cli\strwidth( $extra_value );
 						if ( $val_width ) {
 							$extra_rows[ $col ][] = $extra_value;
 							$value = \cli\safe_substr( $value, $col_width, $original_val_width );

lib/cli/unicode/regex.php

@@ -0,0 +1,6 @@
+<?php
+// Generated by "gen_east_asian_width.php" from "http://www.unicode.org/Public/10.0.0/ucd/EastAsianWidth.txt".
+$eaw_regex = '/\xe1(?:\x84[\x80-\xbf]|\x85[\x80-\x9f])|\xe2(?:\x8c[\x9a\x9b\xa9\xaa]|\x8f[\xa9-\xac\xb0\xb3]|\x97[\xbd\xbe]|\x98[\x94\x95]|\x99[\x88-\x93\xbf]|\x9a[\x93\xa1\xaa\xab\xbd\xbe]|\x9b[\x84\x85\x8e\x94\xaa\xb2\xb3\xb5\xba\xbd]|\x9c[\x85\x8a\x8b\xa8]|\x9d[\x8c\x8e\x93-\x95\x97]|\x9e[\x95-\x97\xb0\xbf]|\xac[\x9b\x9c]|\xad[\x90\x95]|\xba[\x80-\x99\x9b-\xbf]|\xbb[\x80-\xb3]|[\xbc-\xbe][\x80-\xbf]|\xbf[\x80-\x95\xb0-\xbb])|\xe3(?:\x80[\x80-\xbe]|\x81[\x81-\xbf]|\x82[\x80-\x96\x99-\xbf]|\x83[\x80-\xbf]|\x84[\x85-\xae\xb1-\xbf]|\x85[\x80-\xbf]|\x86[\x80-\x8e\x90-\xba]|\x87[\x80-\xa3\xb0-\xbf]|\x88[\x80-\x9e\xa0-\xbf]|\x89[\x80-\x87\x90-\xbf]|\x8a[\x80-\xbf]|\x8b[\x80-\xbe]|[\x8c-\xbf][\x80-\xbf])|\xe4(?:[\x80-\xb6][\x80-\xbf]|[\xb8-\xbf][\x80-\xbf])|[\xe5-\xe9][\x80-\xbf][\x80-\xbf]|\xea(?:[\x80-\x91][\x80-\xbf]|\x92[\x80-\x8c\x90-\xbf]|\x93[\x80-\x86]|\xa5[\xa0-\xbc]|[\xb0-\xbf][\x80-\xbf])|[\xeb\xec][\x80-\xbf][\x80-\xbf]|\xed(?:[\x80-\x9d][\x80-\xbf]|\x9e[\x80-\xa3])|\xef(?:[\xa4-\xab][\x80-\xbf]|\xb8[\x90-\x99\xb0-\xbf]|\xb9[\x80-\x92\x94-\xa6\xa8-\xab]|\xbc[\x81-\xbf]|\xbd[\x80-\xa0]|\xbf[\xa0-\xa6])|\xf0(?:\x96\xbf[\xa0\xa1]|\x97[\x80-\xbf][\x80-\xbf]|\x98(?:[\x80-\x9e][\x80-\xbf]|\x9f[\x80-\xac]|[\xa0-\xaa][\x80-\xbf]|\xab[\x80-\xb2])|\x9b(?:[\x80-\x83][\x80-\xbf]|\x84[\x80-\x9e]|\x85[\xb0-\xbf]|[\x86-\x8a][\x80-\xbf]|\x8b[\x80-\xbb])|\x9f(?:\x80\x84|\x83\x8f|\x86[\x8e\x91-\x9a]|\x88[\x80-\x82\x90-\xbb]|\x89[\x80-\x88\x90\x91\xa0-\xa5]|\x8c[\x80-\xa0\xad-\xb5\xb7-\xbf]|\x8d[\x80-\xbc\xbe\xbf]|\x8e[\x80-\x93\xa0-\xbf]|\x8f[\x80-\x8a\x8f-\x93\xa0-\xb0\xb4\xb8-\xbf]|\x90[\x80-\xbe]|\x91[\x80\x82-\xbf]|\x92[\x80-\xbf]|\x93[\x80-\xbc\xbf]|\x94[\x80-\xbd]|\x95[\x8b-\x8e\x90-\xa7\xba]|\x96[\x95\x96\xa4]|\x97[\xbb-\xbf]|\x98[\x80-\xbf]|\x99[\x80-\x8f]|\x9a[\x80-\xbf]|\x9b[\x80-\x85\x8c\x90-\x92\xab\xac\xb4-\xb8]|\xa4[\x90-\xbe]|\xa5[\x80-\x8c\x90-\xab]|\xa6[\x80-\x97]|\xa7[\x80\x90-\xa6])|[\xa0-\xae][\x80-\xbf][\x80-\xbf]|\xaf(?:[\x80-\xbe][\x80-\xbf]|\xbf[\x80-\xbd])|[\xb0-\xbe][\x80-\xbf][\x80-\xbf]|\xbf(?:[\x80-\xbe][\x80-\xbf]|\xbf[\x80-\xbd]))/'; // 181738 code points.
+
+// Generated by "gen_cat_regex_alts.php" from "http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt".
+$m_regex = '/\xcc[\x80-\xbf]|\xcd[\x80-\xaf]|\xd2[\x83-\x89]|\xd6[\x91-\xbd\xbf]|\xd7[\x81\x82\x84\x85\x87]|\xd8[\x90-\x9a]|\xd9[\x8b-\x9f\xb0]|\xdb[\x96-\x9c\x9f-\xa4\xa7\xa8\xaa-\xad]|\xdc[\x91\xb0-\xbf]|\xdd[\x80-\x8a]|\xde[\xa6-\xb0]|\xdf[\xab-\xb3]|\xe0(?:\xa0[\x96-\x99\x9b-\xa3\xa5-\xa7\xa9-\xad]|\xa1[\x99-\x9b]|\xa3[\x94-\xa1\xa3-\xbf]|\xa4[\x80-\x83\xba-\xbc\xbe\xbf]|\xa5[\x80-\x8f\x91-\x97\xa2\xa3]|\xa6[\x81-\x83\xbc\xbe\xbf]|\xa7[\x80-\x84\x87\x88\x8b-\x8d\x97\xa2\xa3]|\xa8[\x81-\x83\xbc\xbe\xbf]|\xa9[\x80-\x82\x87\x88\x8b-\x8d\x91\xb0\xb1\xb5]|\xaa[\x81-\x83\xbc\xbe\xbf]|\xab[\x80-\x85\x87-\x89\x8b-\x8d\xa2\xa3\xba-\xbf]|\xac[\x81-\x83\xbc\xbe\xbf]|\xad[\x80-\x84\x87\x88\x8b-\x8d\x96\x97\xa2\xa3]|\xae[\x82\xbe\xbf]|\xaf[\x80-\x82\x86-\x88\x8a-\x8d\x97]|\xb0[\x80-\x83\xbe\xbf]|\xb1[\x80-\x84\x86-\x88\x8a-\x8d\x95\x96\xa2\xa3]|\xb2[\x81-\x83\xbc\xbe\xbf]|\xb3[\x80-\x84\x86-\x88\x8a-\x8d\x95\x96\xa2\xa3]|\xb4[\x80-\x83\xbb\xbc\xbe\xbf]|\xb5[\x80-\x84\x86-\x88\x8a-\x8d\x97\xa2\xa3]|\xb6[\x82\x83]|\xb7[\x8a\x8f-\x94\x96\x98-\x9f\xb2\xb3]|\xb8[\xb1\xb4-\xba]|\xb9[\x87-\x8e]|\xba[\xb1\xb4-\xb9\xbb\xbc]|\xbb[\x88-\x8d]|\xbc[\x98\x99\xb5\xb7\xb9\xbe\xbf]|\xbd[\xb1-\xbf]|\xbe[\x80-\x84\x86\x87\x8d-\x97\x99-\xbc]|\xbf\x86)|\xe1(?:\x80[\xab-\xbe]|\x81[\x96-\x99\x9e-\xa0\xa2-\xa4\xa7-\xad\xb1-\xb4]|\x82[\x82-\x8d\x8f\x9a-\x9d]|\x8d[\x9d-\x9f]|\x9c[\x92-\x94\xb2-\xb4]|\x9d[\x92\x93\xb2\xb3]|\x9e[\xb4-\xbf]|\x9f[\x80-\x93\x9d]|\xa0[\x8b-\x8d]|\xa2[\x85\x86\xa9]|\xa4[\xa0-\xab\xb0-\xbb]|\xa8[\x97-\x9b]|\xa9[\x95-\x9e\xa0-\xbc\xbf]|\xaa[\xb0-\xbe]|\xac[\x80-\x84\xb4-\xbf]|\xad[\x80-\x84\xab-\xb3]|\xae[\x80-\x82\xa1-\xad]|\xaf[\xa6-\xb3]|\xb0[\xa4-\xb7]|\xb3[\x90-\x92\x94-\xa8\xad\xb2-\xb4\xb7-\xb9]|\xb7[\x80-\xb9\xbb-\xbf])|\xe2(?:\x83[\x90-\xb0]|\xb3[\xaf-\xb1]|\xb5\xbf|\xb7[\xa0-\xbf])|\xe3(?:\x80[\xaa-\xaf]|\x82[\x99\x9a])|\xea(?:\x99[\xaf-\xb2\xb4-\xbd]|\x9a[\x9e\x9f]|\x9b[\xb0\xb1]|\xa0[\x82\x86\x8b\xa3-\xa7]|\xa2[\x80\x81\xb4-\xbf]|\xa3[\x80-\x85\xa0-\xb1]|\xa4[\xa6-\xad]|\xa5[\x87-\x93]|\xa6[\x80-\x83\xb3-\xbf]|\xa7[\x80\xa5]|\xa8[\xa9-\xb6]|\xa9[\x83\x8c\x8d\xbb-\xbd]|\xaa[\xb0\xb2-\xb4\xb7\xb8\xbe\xbf]|\xab[\x81\xab-\xaf\xb5\xb6]|\xaf[\xa3-\xaa\xac\xad])|\xef(?:\xac\x9e|\xb8[\x80-\x8f\xa0-\xaf])|\xf0(?:\x90(?:\x87\xbd|\x8b\xa0|\x8d[\xb6-\xba]|\xa8[\x81-\x83\x85\x86\x8c-\x8f\xb8-\xba\xbf]|\xab[\xa5\xa6])|\x91(?:\x80[\x80-\x82\xb8-\xbf]|\x81[\x80-\x86\xbf]|\x82[\x80-\x82\xb0-\xba]|\x84[\x80-\x82\xa7-\xb4]|\x85\xb3|\x86[\x80-\x82\xb3-\xbf]|\x87[\x80\x8a-\x8c]|\x88[\xac-\xb7\xbe]|\x8b[\x9f-\xaa]|\x8c[\x80-\x83\xbc\xbe\xbf]|\x8d[\x80-\x84\x87\x88\x8b-\x8d\x97\xa2\xa3\xa6-\xac\xb0-\xb4]|\x90[\xb5-\xbf]|\x91[\x80-\x86]|\x92[\xb0-\xbf]|\x93[\x80-\x83]|\x96[\xaf-\xb5\xb8-\xbf]|\x97[\x80\x9c\x9d]|\x98[\xb0-\xbf]|\x99\x80|\x9a[\xab-\xb7]|\x9c[\x9d-\xab]|\xa8[\x81-\x8a\xb3-\xb9\xbb-\xbe]|\xa9[\x87\x91-\x9b]|\xaa[\x8a-\x99]|\xb0[\xaf-\xb6\xb8-\xbf]|\xb2[\x92-\xa7\xa9-\xb6]|\xb4[\xb1-\xb6\xba\xbc\xbd\xbf]|\xb5[\x80-\x85\x87])|\x96(?:\xab[\xb0-\xb4]|\xac[\xb0-\xb6]|\xbd[\x91-\xbe]|\xbe[\x8f-\x92])|\x9b\xb2[\x9d\x9e]|\x9d(?:\x85[\xa5-\xa9\xad-\xb2\xbb-\xbf]|\x86[\x80-\x82\x85-\x8b\xaa-\xad]|\x89[\x82-\x84]|\xa8[\x80-\xb6\xbb-\xbf]|\xa9[\x80-\xac\xb5]|\xaa[\x84\x9b-\x9f\xa1-\xaf])|\x9e(?:\x80[\x80-\x86\x88-\x98\x9b-\xa1\xa3\xa4\xa6-\xaa]|\xa3[\x90-\x96]|\xa5[\x84-\x8a]))|\xf3\xa0(?:[\x84-\x86][\x80-\xbf]|\x87[\x80-\xaf])/'; // 2177 code points.

tests/test-cli.php

@@ -12,6 +12,12 @@ function setUp() {
 
 	function test_string_length() {
 		$this->assertEquals( \cli\Colors::length( 'x' ), 1 );
+		$this->assertEquals( \cli\Colors::length( '日' ), 1 );
+	}
+
+	function test_string_width() {
+		$this->assertEquals( \cli\Colors::width( 'x' ), 1 );
+		$this->assertEquals( \cli\Colors::width( '日' ), 2 ); // Double-width char.
 	}
 
 	function test_encoded_string_length() {
@@ -22,6 +28,14 @@ function test_encoded_string_length() {
 
 	}
 
+	function test_encoded_string_width() {
+
+		$this->assertEquals( \cli\Colors::width( 'hello' ), 5 );
+		$this->assertEquals( \cli\Colors::width( 'óra' ), 3 );
+		$this->assertEquals( \cli\Colors::width( '日本語' ), 6 ); // 3 double-width chars.
+
+	}
+
 	function test_encoded_string_pad() {
 
 		$this->assertEquals( 6, strlen( \cli\Colors::pad( 'hello', 6 ) ) );
@@ -45,6 +59,12 @@ function test_encoded_substr() {
 
 	function test_colorized_string_length() {
 		$this->assertEquals( \cli\Colors::length( \cli\Colors::colorize( '%Gx%n', true ) ), 1 );
+		$this->assertEquals( \cli\Colors::length( \cli\Colors::colorize( '%G日%n', true ) ), 1 );
+	}
+
+	function test_colorized_string_width() {
+		$this->assertEquals( \cli\Colors::width( \cli\Colors::colorize( '%Gx%n', true ) ), 1 );
+		$this->assertEquals( \cli\Colors::width( \cli\Colors::colorize( '%G日%n', true ) ), 2 ); // Double-width char.
 	}
 
 	function test_colorize_string_is_colored() {
@@ -95,4 +115,94 @@ function test_string_cache() {
 		// Test that the cache value is correctly set
 		$this->assertEquals( $test_cache, $real_cache[ md5( $string_with_color ) ] );
 	}
-}
+
+	function test_strwidth() {
+		// Save.
+		$test_strwidth = getenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH' );
+		if ( function_exists( 'mb_detect_order' ) ) {
+			$mb_detect_order = mb_detect_order();
+		}
+
+		putenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH' );
+
+		// UTF-8.
+
+		// 4 characters, one a double-width Han = 5 spacing chars, with 2 combining chars. Adapted from http://unicode.org/faq/char_combmark.html#7 (combining acute accent added after "a").
+		$str = "a\xCC\x81\xE0\xA4\xA8\xE0\xA4\xBF\xE4\xBA\x9C\xF0\x90\x82\x83";
+
+		if ( function_exists( 'grapheme_strlen' ) ) {
+			$this->assertSame( 5, \cli\strwidth( $str ) ); // Tests grapheme_strlen().
+			putenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH=2' ); // Test preg_match_all( '/\X/u' ).
+			$this->assertSame( 5, \cli\strwidth( $str ) );
+		} else {
+			$this->assertSame( 5, \cli\strwidth( $str ) ); // Tests preg_match_all( '/\X/u' ).
+		}
+
+		if ( function_exists( 'mb_strwidth' ) && function_exists( 'mb_detect_order' ) ) {
+			putenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH=4' ); // Test mb_strwidth().
+			mb_detect_order( array( 'UTF-8', 'ISO-8859-1' ) );
+			$this->assertSame( 5, \cli\strwidth( $str ) );
+		}
+
+		putenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH=8' ); // Test safe_strlen().
+		if ( function_exists( 'mb_strlen' ) && function_exists( 'mb_detect_order' ) ) {
+			$this->assertSame( 6, \cli\strwidth( $str ) ); // mb_strlen() - counts the 2 combining chars but not the double-width Han so out by 1.
+			$this->assertSame( 6, mb_strlen( $str, 'UTF-8' ) );
+		} else {
+			$this->assertSame( 16, \cli\strwidth( $str ) ); // strlen() - no. of bytes.
+			$this->assertSame( 16, strlen( $str ) );
+		}
+
+		// Nepali जस्ट ट॓स्ट गर्दै - 1st word: 3 spacing + 1 combining, 2nd word: 3 spacing + 2 combining, 3rd word: 3 spacing + 2 combining = 9 spacing chars + 2 spaces = 11 chars.
+		$str = "\xe0\xa4\x9c\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\x9f \xe0\xa4\x9f\xe0\xa5\x93\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\x9f \xe0\xa4\x97\xe0\xa4\xb0\xe0\xa5\x8d\xe0\xa4\xa6\xe0\xa5\x88";
+
+		putenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH' );
+
+		if ( function_exists( 'grapheme_strlen' ) ) {
+			$this->assertSame( 11, \cli\strwidth( $str ) ); // Tests grapheme_strlen().
+			putenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH=2' ); // Test preg_match_all( '/\X/u' ).
+			$this->assertSame( 11, \cli\strwidth( $str ) );
+		} else {
+			$this->assertSame( 11, \cli\strwidth( $str ) ); // Tests preg_match_all( '/\X/u' ).
+		}
+
+		if ( function_exists( 'mb_strwidth' ) && function_exists( 'mb_detect_order' ) ) {
+			putenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH=4' ); // Test mb_strwidth().
+			mb_detect_order( array( 'UTF-8' ) );
+			$this->assertSame( 11, \cli\strwidth( $str ) );
+		}
+
+		// Non-UTF-8 - both grapheme_strlen() and preg_match_all( '/\X/u' ) will fail.
+
+		putenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH' );
+
+		if ( function_exists( 'mb_strwidth' ) && function_exists( 'mb_detect_order' ) ) {
+			// Latin-1
+			mb_detect_order( array( 'UTF-8', 'ISO-8859-1' ) );
+			$str = "\xe0b\xe7"; // "àbç" in ISO-8859-1
+			$this->assertSame( 3, \cli\strwidth( $str ) ); // Test mb_strwidth().
+			$this->assertSame( 3, mb_strwidth( $str, 'ISO-8859-1' ) );
+
+			// Shift JIS.
+			mb_detect_order( array( 'UTF-8', 'SJIS' ) );
+			$str = "\x82\xb1\x82\xf1\x82\xc9\x82\xbf\x82\xcd\x90\xa2\x8a\x45!"; // "こャにちは世界!" ("Hello world!") in Shift JIS - 7 double-width chars plus Latin exclamation mark.
+			$this->assertSame( 15, \cli\strwidth( $str ) ); // Test mb_strwidth().
+			$this->assertSame( 15, mb_strwidth( $str, 'SJIS' ) );
+
+			putenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH=8' ); // Test safe_strlen().
+			if ( function_exists( 'mb_strlen' ) && function_exists( 'mb_detect_order' ) ) {
+				$this->assertSame( 8, \cli\strwidth( $str ) ); // mb_strlen() - doesn't allow for double-width.
+				$this->assertSame( 8, mb_strlen( $str, 'SJIS' ) );
+			} else {
+				$this->assertSame( 15, \cli\strwidth( $str ) ); // strlen() - no. of bytes.
+				$this->assertSame( 15, strlen( $str ) );
+			}
+		}
+
+		// Restore.
+		putenv( false == $test_strwidth ? 'PHP_CLI_TOOLS_TEST_STRWIDTH' : "PHP_CLI_TOOLS_TEST_STRWIDTH=$test_strwidth" );
+		if ( function_exists( 'mb_detect_order' ) ) {
+			mb_detect_order( $mb_detect_order );
+		}
+	}
+}

tests/test-table-ascii.php

@@ -88,6 +88,27 @@ public function testDrawOneColumnColoredTable() {
 | $x           |
 +-------------+
 
+OUT;
+		$this->assertInOutEquals(array($headers, $rows), $output);
+	}
+
+	/**
+	 * Check it works with colors disabled.
+	 */
+	public function testDrawOneColumnColorDisabledTable() {
+		Colors::disable( true );
+		$this->assertFalse( Colors::shouldColorize() );
+		$headers = array('Test Header');
+		$rows = array(
+			array('%Gx%n'),
+		);
+		$output = <<<OUT
++-------------+
+| Test Header |
++-------------+
+| %Gx%n       |
++-------------+
+
 OUT;
 		$this->assertInOutEquals(array($headers, $rows), $output);
 	}