Set length to safe_strlen() if null for cross PHP compat. Explicitly enable Colors in tests.

Author: gitlost

lib/cli/cli.php

@@ -183,6 +183,10 @@ function safe_strlen( $str ) {
  * @return string               Substring of string specified by start and length parameters
  */
 function safe_substr( $str, $start, $length = false, $width = false ) {
+	// PHP 5.3 substr takes false as full length, PHP > 5.3 takes null - for compat. do strlen.
+	if ( null === $length || false === $length ) {
+		$length = safe_strlen( $str );
+	}
 	if ( function_exists( 'mb_substr' ) && function_exists( 'mb_detect_encoding' ) ) {
 		$encoding = mb_detect_encoding( $str );
 		if ( false !== $width && 'UTF-8' === $encoding ) {
@@ -191,11 +195,13 @@ function safe_substr( $str, $start, $length = false, $width = false ) {
 				// Load both regexs generated from Unicode data.
 				require __DIR__ . '/unicode/regex.php';
 			}
-			$cnt = preg_match_all( '/[\x00-\x7f\xc2-\xf4][^\x00-\x7f\xc2-\xf4]*/', $str, $matches );
-			$width = $length;
+			if ( preg_match( $eaw_regex, $str ) ) {
+				$cnt = preg_match_all( '/[\x00-\x7f\xc2-\xf4][^\x00-\x7f\xc2-\xf4]*/', $str, $matches );
+				$width = $length;
 
-			for ( $length = 0; $length < $cnt && $width > 0; $length++ ) {
-				$width -= preg_match( $eaw_regex, $matches[0][ $length ] ) ? 2 : 1;
+				for ( $length = 0; $length < $cnt && $width > 0; $length++ ) {
+					$width -= preg_match( $eaw_regex, $matches[0][ $length ] ) ? 2 : 1;
+				}
 			}
 		}
 		$substr = mb_substr( $str, $start, $length, $encoding );

tests/test-cli.php

@@ -46,6 +46,7 @@ function test_encoded_string_pad() {
 
 	function test_colorized_string_pad() {
 		// Colors enabled.
+		\cli\Colors::enable( true );
 
 		$colorized = \cli\Colors::colorize( '%Gx%n', true ); // colorized `x` string
 		$this->assertSame( 22, strlen( \cli\Colors::pad( $colorized, 11 ) ) );
@@ -86,6 +87,7 @@ function test_colorized_string_length() {
 
 	function test_colorized_string_width() {
 		// Colors enabled.
+		\cli\Colors::enable( true );
 
 		$colorized = \cli\Colors::colorize( '%Gx%n', true );
 		$this->assertSame( 1, \cli\Colors::width( $colorized ) );

tests/test-table.php

@@ -82,7 +82,6 @@ public function test_ascii_pre_colorized_widths() {
 		$table->setRows( $items );
 
 		$out = $table->getDisplayLines();
-		error_log( "out=" . print_r( $out, true ) );
 
 		// "+ 4" accommodates 3 borders and header.
 		$this->assertSame( 4 + 4, count( $out ) );