Fix encoding detection on PHP 8.1

come-nc · web-flow · commit 68a1309757e2 · 2022-06-14T09:07:44.000+02:00
Also get rid of deprecated utf8_encode
diff --git a/lib/DAV/StringUtil.php b/lib/DAV/StringUtil.php
@@ -77,10 +77,8 @@ public static function textMatch($haystack, $needle, $collation, $matchType = 'c
      */
     public static function ensureUTF8($input)
     {
-        $encoding = mb_detect_encoding($input, ['UTF-8', 'ISO-8859-1'], true);
-
-        if ('ISO-8859-1' === $encoding) {
-            return utf8_encode($input);
+        if (!mb_check_encoding($input, 'UTF-8') && mb_check_encoding($input, 'ISO-8859-1')) {
+            return mb_convert_encoding($input, 'UTF-8', 'ISO-8859-1');
         } else {
             return $input;
         }

Original file line number	Diff line number	Diff line change
`@@ -77,10 +77,8 @@ public static function textMatch($haystack, $needle, $collation, $matchType = 'c`
`77`	`77`	`*/`
`78`	`78`	`public static function ensureUTF8($input)`
`79`	`79`	`{`
`80`		`- $encoding = mb_detect_encoding($input, ['UTF-8', 'ISO-8859-1'], true);`
`81`		`-`
`82`		`- if ('ISO-8859-1' === $encoding) {`
`83`		`- return utf8_encode($input);`
	`80`	`+ if (!mb_check_encoding($input, 'UTF-8') && mb_check_encoding($input, 'ISO-8859-1')) {`
	`81`	`+ return mb_convert_encoding($input, 'UTF-8', 'ISO-8859-1');`
`84`	`82`	`} else {`
`85`	`83`	`return $input;`
`86`	`84`	`}`