[String] add missing encoding when calling mb_ord()

symfony · Jan 14, 2020 · 978261d · 978261d
1 parent 4a1bd8a
commit 978261d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/AbstractUnicodeString.php b/AbstractUnicodeString.php
@@ -172,7 +172,17 @@ public function codePointsAt(int $offset): array
     {
         $str = $this->slice($offset, 1);
 
-        return '' === $str->string ? [] : array_map('mb_ord', preg_split('//u', $str->string, -1, PREG_SPLIT_NO_EMPTY));
+        if ('' === $str->string) {
+            return [];
+        }
+
+        $codePoints = [];
+
+        foreach (preg_split('//u', $str->string, -1, PREG_SPLIT_NO_EMPTY) as $c) {
+            $codePoints[] = mb_ord($c, 'UTF-8');
+        }
+
+        return $codePoints;
     }
 
     public function folded(bool $compat = true): parent

diff --git a/CodePointString.php b/CodePointString.php
@@ -79,7 +79,7 @@ public function codePointsAt(int $offset): array
     {
         $str = $offset ? $this->slice($offset, 1) : $this;
 
-        return '' === $str->string ? [] : [mb_ord($str->string)];
+        return '' === $str->string ? [] : [mb_ord($str->string, 'UTF-8')];
     }
 
     public function endsWith($suffix): bool