Merge pull request #53 from wp-cli/fix-53

Fix table padding for accented characters

Author: danielbachhuber

lib/cli/Colors.php

@@ -167,7 +167,7 @@ static public function colorize($string, $colored = null) {
      * @return string
 	 */
 	static public function length($string) {
-		return strlen(self::colorize($string, false));
+		return safe_strlen(self::colorize($string, false));
 	}
 
 	/**
@@ -178,9 +178,10 @@ static public function length($string) {
      * @return string
 	 */
 	static public function pad($string, $length) {
-		$real_length = strlen($string);
+		$real_length = safe_strlen($string);
 		$show_length = self::length($string);
-		$length  += $real_length - $show_length;
+		$diff = strlen( $string ) - safe_strlen( $string );
+		$length  += $real_length - $show_length + $diff;
 
 		return str_pad($string, $length);
 	}

lib/cli/cli.php

@@ -150,3 +150,13 @@ function confirm( $question, $default = false ) {
 function menu( $items, $default = null, $title = 'Choose an item' ) {
 	return Streams::menu( $items, $default, $title );
 }
+
+/**
+ * An encoding-safe way of getting string length.
+ *
+ * @param string The string to check
+ * @return int Numeric value that represents the string's length
+ */
+function safe_strlen( $str ) {
+	return mb_strlen( $str, mb_detect_encoding( $str ) );
+}

phpunit.xml

@@ -0,0 +1,10 @@
+<phpunit
+	bootstrap="tests/bootstrap.php"
+	colors="true"
+	>
+	<testsuites>
+		<testsuite>
+			<directory prefix="test-" suffix=".php">tests/</directory>
+		</testsuite>
+	</testsuites>
+</phpunit>

tests/bootstrap.php

@@ -0,0 +1,23 @@
+<?php
+
+require dirname( dirname( __FILE__ ) ) . '/lib/cli/cli.php';
+
+function cli_autoload( $className ) {
+	$className = ltrim($className, '\\');
+	$fileName  = '';
+	$namespace = '';
+	if ($lastNsPos = strrpos($className, '\\')) {
+		$namespace = substr($className, 0, $lastNsPos);
+		$className = substr($className, $lastNsPos + 1);
+		$fileName  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+	}
+	$fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+
+	if ( 'cli' !== substr( $fileName, 0, 3 ) ) {
+		return;
+	}
+
+	require dirname( dirname( __FILE__ ) ) . '/lib/' . $fileName;
+}
+
+spl_autoload_register( 'cli_autoload' );

tests/test-cli.php

@@ -0,0 +1,15 @@
+<?php
+
+class testsCli extends PHPUnit_Framework_TestCase {
+
+	function test_encoded_string_length() {
+
+		$this->assertEquals( \cli\Colors::length( 'hello' ), 5 );
+		$this->assertEquals( \cli\Colors::length( 'óra' ), 3 );
+
+		$this->assertEquals( \cli\safe_strlen( \cli\Colors::pad( 'hello', 6 ) ), 6 );
+		$this->assertEquals( \cli\safe_strlen( \cli\Colors::pad( 'óra', 6 ) ), 6 );
+
+	}
+
+}