tableformatter: correctly pad multibyte strings

Author: splitbrain

src/TableFormatter.php

@@ -198,7 +198,7 @@ public function format($columns, $texts, $colors = array())
  } else {
  $val = '';
  }
- $chunk = sprintf('%-' . $width . 's', $val);
+ $chunk = $this->pad($val, $width);
  if (isset($colors[$col]) && $colors[$col]) {
  $chunk = $this->colors->wrap($chunk, $colors[$col]);
  }
@@ -215,6 +215,22 @@ public function format($columns, $texts, $colors = array())
 
  }
 
+ /**
+ * Pad the given string to the correct length
+ *
+ * @param string $string
+ * @param int $len
+ * @return string
+ */
+ protected function pad($string, $len)
+ {
+ $strlen = $this->strlen($string);
+ if ($strlen > $len) return $string;
+
+ $pad = $len - $strlen;
+ return $string . str_pad('', $pad, ' ');
+ }
+
  /**
  * Measures char length in UTF-8 when possible
  *

tests/TableFormatterTest.php

@@ -95,4 +95,15 @@ public function test_wrap()
 
  }
 
+ public function test_lenght()
+ {
+ $text = "this is häppy ☺";
+ $expect = "this is häppy ☺ |test";
+
+ $tf = new TableFormatter();
+ $tf->setBorder('|');
+ $result = $tf->format([20, '*'], [$text, 'test']);
+
+ $this->assertEquals($expect, trim($result));
+ }
 }