[String] add missing encoding when calling mb_ord()

nicolas-grekas · nicolas-grekas · commit 759e20e6d332 · 2020-01-14T18:54:59.000+01:00
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/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/src/Symfony/Component/String/CodePointString.php b/src/Symfony/Component/String/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

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function codePointsAt(int $offset): array`
`79`	`79`	`{`
`80`	`80`	`$str = $offset ? $this->slice($offset, 1) : $this;`
`81`	`81`
`82`		`- return '' === $str->string ? [] : [mb_ord($str->string)];`
	`82`	`+ return '' === $str->string ? [] : [mb_ord($str->string, 'UTF-8')];`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public function endsWith($suffix): bool`