updated correctIndexOffset() to use mb_substr with encoding instead o…

…f just substr, added test to cover bug
cmgmyr · Nov 2, 2015 · 979a164 · 979a164
1 parent 606ab7e
commit 979a164
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/TextFormatter.php b/src/TextFormatter.php
@@ -170,7 +170,7 @@ protected function getWordIndex($word, $offset)
      */
     protected function correctIndexOffset($index)
     {
-        return mb_strlen(substr($this->title, 0, $index), $this->encoding);
+        return mb_strlen(mb_substr($this->title, 0, $index, $this->encoding), $this->encoding);
     }
 
     /**

diff --git a/tests/TextFormatterTest.php b/tests/TextFormatterTest.php
@@ -105,6 +105,11 @@ class TextFormatterTest extends TestCase
             'title' => 'test',
             'correct' => 'Test'
         ],
+        [
+            // tests for a bug with special characters
+            'title' => 'get up and dance — 7 reasons why you should be… moving your feet to the beat',
+            'correct' => 'Get Up and Dance — 7 Reasons Why You Should Be… Moving Your Feet to the Beat'
+        ],
     ];
 
     /** @test */
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,7 +170,7 @@ protected function getWordIndex($word, $offset) @@
          */
         protected function correctIndexOffset($index)
         {
-            return mb_strlen(substr($this->title, 0, $index), $this->encoding);
+            return mb_strlen(mb_substr($this->title, 0, $index, $this->encoding), $this->encoding);
         }
         /**
@@ Expand Down @@