Merge branch 'PHP-8.5'

* PHP-8.5:
  ext/iconv/tests/iconv_mime_encode.phpt: skip for "unknown" iconv
  ext/iconv/tests/eucjp2iso2022jp.phpt: skip for "unknown" iconv

Author: Girgias

ext/iconv/tests/eucjp2iso2022jp.phpt

@@ -7,6 +7,13 @@ iconv
 if (PHP_OS_FAMILY === 'Solaris') {
     die("skip Solaris iconv behaves differently");
 }
+// ISO-2022-JP is a stateful encoding, so the right answer is not
+// unique. In particular, musl (type "unknown") is known to have an
+// inefficient encoding for it that does not agree with the expected
+// output below.
+if (ICONV_IMPL == "unknown") {
+    die("skip byte-comparison of stateful encoding with unknown iconv");
+}
 ?>
 --INI--
 error_reporting=2039
@@ -22,8 +29,8 @@ function hexdump($str) {
     print "\n";
 }
 
-$str = str_repeat("日本語テキストと English text", 30);
-$str .= "日本語";
+$str = str_repeat("���ܸ�ƥ����Ȥ� English text", 30);
+$str .= "���ܸ�";
 
 echo hexdump(iconv("EUC-JP", "ISO-2022-JP", $str));
 ?>

ext/iconv/tests/iconv_mime_encode.phpt

@@ -2,6 +2,16 @@
 iconv_mime_encode()
 --EXTENSIONS--
 iconv
+--SKIPIF--
+<?php
+// ISO-2022-JP is a stateful encoding, so the right answer is not
+// unique. In particular, musl (type "unknown") is known to have an
+// inefficient encoding for it that does not agree with the expected
+// output below.
+if (ICONV_IMPL == "unknown") {
+    die("skip byte-comparison of stateful encoding with unknown iconv");
+}
+?>
 --INI--
 iconv.internal_charset=iso-8859-1
 --SKIPIF--