[php-src] master: iconv: fix test with duplicate SKIPIF from merge up

Author: Gina Peter Banyard (Girgias)
Date: 2026-07-08T19:06:41+01:00

Commit: https://github.com/php/php-src/commit/d0ce868a5a531f701730fd4a184a2ff9cc22d0d7
Raw diff: https://github.com/php/php-src/commit/d0ce868a5a531f701730fd4a184a2ff9cc22d0d7.diff

iconv: fix test with duplicate SKIPIF from merge up

I didn't get a merge conflict here so assumed it was fine.

Changed paths:
  M  ext/iconv/tests/iconv_mime_encode.phpt


Diff:

diff --git a/ext/iconv/tests/iconv_mime_encode.phpt b/ext/iconv/tests/iconv_mime_encode.phpt
index 7f4b9bfb5608..75c9b56e4291 100644
--- a/ext/iconv/tests/iconv_mime_encode.phpt
+++ b/ext/iconv/tests/iconv_mime_encode.phpt
@@ -2,6 +2,8 @@
 iconv_mime_encode()
 --EXTENSIONS--
 iconv
+--INI--
+iconv.internal_charset=iso-8859-1
 --SKIPIF--
 <?php
 // ISO-2022-JP is a stateful encoding, so the right answer is not
@@ -11,11 +13,6 @@ iconv
 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");
 }
@@ -36,7 +33,7 @@ $preference = array(
 for ($line_len= 0; $line_len < 80; ++$line_len) {
     print "-------- line length=$line_len\n";
     $preference["line-length"] = $line_len;
-    $result = iconv_mime_encode("From", "¥µ¥ó¥×¥ëʸ»úÎó¥µ¥ó¥×¥ëʸ»úÎóÆüËܸì¥Æ¥­¥¹¥È", $preference);
+    $result = iconv_mime_encode("From", "����ץ�ʸ���󥵥�ץ�ʸ�������ܸ�ƥ�����", $preference);
     var_dump($result);
     if ($result !== false) {
                 $max = max(array_map("strlen", explode("\n", $result)));