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

Encoding-safe string padding

Author: danielbachhuber

lib/cli/Colors.php

@@ -178,11 +178,6 @@ static public function length($string) {
      * @return string
 	 */
 	static public function pad($string, $length) {
-		$real_length = safe_strlen($string);
-		$show_length = self::length($string);
-		$diff = strlen( $string ) - safe_strlen( $string );
-		$length  += $real_length - $show_length + $diff;
-
-		return str_pad($string, $length);
+		return safe_str_pad( $string, $length );
 	}
 }

lib/cli/cli.php

@@ -160,3 +160,19 @@ function menu( $items, $default = null, $title = 'Choose an item' ) {
 function safe_strlen( $str ) {
 	return mb_strlen( $str, mb_detect_encoding( $str ) );
 }
+
+/**
+ * An encoding-safe way of padding string length
+ *
+ * @param string $string The string to pad
+ * @param int $length The length to pad it to
+ * @return string
+ */
+function safe_str_pad( $string, $length ) {
+	$real_length = safe_strlen($string);
+	$show_length = Colors::length($string);
+	$diff = strlen( $string ) - safe_strlen( $string );
+	$length += $real_length - $show_length + $diff;
+
+	return str_pad($string, $length);
+}