do not count colors in strlengths

splitbrain · splitbrain · commit d31a3590fd87 · 2017-10-27T18:14:25.000+02:00
diff --git a/src/TableFormatter.php b/src/TableFormatter.php
@@ -239,6 +239,9 @@ protected function pad($string, $len)
      */
     protected function strlen($string)
     {
+        // don't count color codes
+        $string = preg_replace("/\33\\[\\d+(;\\d+)?m/", '', $string);
+
         if (function_exists('mb_strlen')) {
             return mb_strlen($string, 'utf-8');
         }
diff --git a/tests/TableFormatterTest.php b/tests/TableFormatterTest.php
@@ -2,6 +2,8 @@
 
 namespace splitbrain\phpcli\tests;
 
+use splitbrain\phpcli\Colors;
+
 class TableFormatter extends \splitbrain\phpcli\TableFormatter
 {
     public function calculateColLengths($columns)
@@ -95,15 +97,28 @@ public function test_wrap()
 
     }
 
-    public function test_lenght()
+    public function test_length()
     {
         $text = "this is häppy ☺";
-        $expect = "this is häppy ☺     |test";
+        $expect = "$text     |test";
 
         $tf = new TableFormatter();
         $tf->setBorder('|');
         $result = $tf->format([20, '*'], [$text, 'test']);
 
         $this->assertEquals($expect, trim($result));
     }
+
+    public function test_colorlength(){
+        $color = new Colors();
+
+        $text = 'this is '.$color->wrap('green', Colors::C_GREEN);
+        $expect = "$text       |test";
+
+        $tf = new TableFormatter();
+        $tf->setBorder('|');
+        $result = $tf->format([20, '*'], [$text, 'test']);
+
+        $this->assertEquals($expect, trim($result));
+        }
 }

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,9 @@ protected function pad($string, $len)`
`239`	`239`	`*/`
`240`	`240`	`protected function strlen($string)`
`241`	`241`	`{`
	`242`	`+ // don't count color codes`
	`243`	`+ $string = preg_replace("/\33\\[\\d+(;\\d+)?m/", '', $string);`
	`244`	`+`
`242`	`245`	`if (function_exists('mb_strlen')) {`
`243`	`246`	`return mb_strlen($string, 'utf-8');`
`244`	`247`	`}`