fix theiconic#36 make InitialMapper multibyte proof

scribbr · Nov 26, 2019 · 5a32bd3 · 5a32bd3
1 parent 9a54a71
commit 5a32bd3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,8 @@
         }
     ],
     "require": {
-        "php": ">=7.1"
+        "php": ">=7.1",
+        "ext-mbstring": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0",

diff --git a/src/Mapper/InitialMapper.php b/src/Mapper/InitialMapper.php
@@ -43,10 +43,11 @@ public function map(array $parts): array
 
             if (strtoupper($part) === $part) {
                 $stripped = str_replace('.', '', $part);
-                $length = strlen($stripped);
+                $length = mb_strlen($stripped);
 
                 if (1 < $length && $length <= $this->combinedMax) {
-                    array_splice($parts, $k, 1, str_split($stripped));
+                    $charactersAsArray = preg_split('//u', $stripped, null, PREG_SPLIT_NO_EMPTY);
+                    array_splice($parts, $k, 1, $charactersAsArray);
                     $last = count($parts) - 1;
                     $part = $parts[$k];
                 }
@@ -66,12 +67,12 @@ public function map(array $parts): array
      */
     protected function isInitial(string $part): bool
     {
-        $length = strlen($part);
+        $length = mb_strlen($part);
 
         if (1 === $length) {
             return true;
         }
 
-        return ($length === 2 && substr($part, -1) ===  '.');
+        return ($length === 2 && mb_substr($part, -1) ===  '.');
     }
 }