From decccf56d70330aa4e5476b02fb299198903683f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Tue, 26 Jul 2022 09:31:54 +0200
Subject: [PATCH] Fix iconv /w locale conversion

---
 ext/iconv/tests/iconv_basic_001-win32.phpt | 20 -----------------
 ext/iconv/tests/iconv_basic_001.phpt       | 26 +++++++++++++++++-----
 2 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 ext/iconv/tests/iconv_basic_001-win32.phpt

diff --git a/ext/iconv/tests/iconv_basic_001-win32.phpt b/ext/iconv/tests/iconv_basic_001-win32.phpt
deleted file mode 100644
index 19e2c3bb2730b..0000000000000
--- a/ext/iconv/tests/iconv_basic_001-win32.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-Test the basics to function iconv.
---CREDITS--
-Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
---EXTENSIONS--
-iconv
---SKIPIF--
-<?php if(substr(PHP_OS, 0, 3) != 'WIN' ) {die('skip windows only test');} ?>
---FILE--
-<?php
-$in_charset          = 'UTF-8';
-$out_charset 	     = 'ASCII//TRANSLIT';
-$string_to_translate = 'Žluťoučký kůň\n';
-
-$string_out = iconv($in_charset, $out_charset, $string_to_translate);
-
-var_dump($string_out);
-?>
---EXPECT--
-string(16) "Zlutouck'y kun\n"
diff --git a/ext/iconv/tests/iconv_basic_001.phpt b/ext/iconv/tests/iconv_basic_001.phpt
index 518b8a885ba73..e349ec24ceb38 100644
--- a/ext/iconv/tests/iconv_basic_001.phpt
+++ b/ext/iconv/tests/iconv_basic_001.phpt
@@ -4,12 +4,6 @@ Test the basics to function iconv.
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --EXTENSIONS--
 iconv
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) == 'WIN' ) {die('skip not for windows');}
-if (setlocale(LC_ALL, 'invalid') === 'invalid') { die('skip setlocale() is broken /w musl'); }
-if (setlocale(LC_ALL, "en_US.utf8") === false) { die('skip en_US.utf8 locales not available'); }
-?>
 --FILE--
 <?php
 setlocale(LC_ALL, "en_US.utf8");
@@ -19,7 +13,27 @@ $string_to_translate = 'Žluťoučký kůň\n';
 
 $string_out = iconv($in_charset, $out_charset, $string_to_translate);
 
+var_dump($string_out);
+
+setlocale(LC_ALL, "C");
+$in_charset          = 'UTF-8';
+$out_charset 	     = 'ASCII//TRANSLIT';
+$string_to_translate = 'Žluťoučký kůň\n';
+
+$string_out = iconv($in_charset, $out_charset, $string_to_translate);
+
+var_dump($string_out);
+
+setlocale(LC_ALL, "invalid");
+$in_charset          = 'UTF-8';
+$out_charset 	     = 'ASCII//TRANSLIT';
+$string_to_translate = 'Žluťoučký kůň\n';
+
+$string_out = iconv($in_charset, $out_charset, $string_to_translate);
+
 var_dump($string_out);
 ?>
 --EXPECT--
 string(15) "Zlutoucky kun\n"
+string(15) "Zlutoucky kun\n"
+string(15) "Zlutoucky kun\n"