Commit d4f4f4f88cf for php.net

commit d4f4f4f88cf5c1515e47e08c67371d3cc49bfa5d
Merge: 39675b651f1 a8a2eb6cc0c
Author: Gina Peter Banyard <girgias@php.net>
Date:   Wed Jul 8 18:38:17 2026 +0100

    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

diff --cc ext/iconv/tests/eucjp2iso2022jp.phpt
index 490e772c80c,c3260c370f0..db48ea62714
--- a/ext/iconv/tests/eucjp2iso2022jp.phpt
+++ b/ext/iconv/tests/eucjp2iso2022jp.phpt
@@@ -4,9 -4,13 +4,16 @@@ EUC-JP to ISO-2022-J
  iconv
  --SKIPIF--
  <?php
 +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 -26,8 +29,8 @@@ function hexdump($str)
      print "\n";
  }



++$str = str_repeat("���ܸ�ƥ����Ȥ� English text", 30);
++$str .= "���ܸ�";

  echo hexdump(iconv("EUC-JP", "ISO-2022-JP", $str));
  ?>
diff --cc ext/iconv/tests/iconv_mime_encode.phpt
index 9cf906a73e6,c6f41c56ad9..7f4b9bfb560
--- a/ext/iconv/tests/iconv_mime_encode.phpt
+++ b/ext/iconv/tests/iconv_mime_encode.phpt
@@@ -2,14 -2,18 +2,24 @@@
  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--
 +<?php
 +if (PHP_OS_FAMILY === 'Solaris') {
 +    die("skip Solaris native iconv does not support MIME encoding");
 +}
 +?>
  --FILE--
  <?php
  function my_error_handler($errno, $errmsg, $filename, $linenum)