From 42690adf6a2612109dcd1e8f49363ccab7ab5f39 Mon Sep 17 00:00:00 2001
From: jcm <juan.carlos.morales@tradebyte.com>
Date: Fri, 17 Jun 2022 15:32:37 +0200
Subject: [PATCH 1/5] test coverage - iconv_strpos() internal encoding error

---
 ext/iconv/tests/iconv_strpos_error_001.phpt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 ext/iconv/tests/iconv_strpos_error_001.phpt

diff --git a/ext/iconv/tests/iconv_strpos_error_001.phpt b/ext/iconv/tests/iconv_strpos_error_001.phpt
new file mode 100644
index 0000000000000..43ce371015c36
--- /dev/null
+++ b/ext/iconv/tests/iconv_strpos_error_001.phpt
@@ -0,0 +1,17 @@
+--TEST--
+iconv_strpos() - test against PHP's defaults internal encoding.
+--EXTENSIONS--
+iconv
+--FILE--
+<?php
+$large_enconding = str_repeat("X", 256);
+ini_set("default_charset", $large_enconding);
+var_dump(iconv_strpos('Hello, world', 'world', -2));
+?>
+--EXPECTF--
+Warning: ini_set(): Unknown encoding %s
+
+Warning: ini_set(): INI setting contains invalid encoding %s
+
+Warning: iconv_strpos(): Wrong encoding, conversion from %s
+bool(false)

From 22174119002d888a9ad8a83b086fd31ed5fdd0d5 Mon Sep 17 00:00:00 2001
From: jcm <juan.carlos.morales@tradebyte.com>
Date: Sat, 18 Jun 2022 20:06:16 +0200
Subject: [PATCH 2/5] Added test for windows systems only

---
 .../tests/iconv_strpos_error_001-windows.phpt | 19 +++++++++++++++++++
 ext/iconv/tests/iconv_strpos_error_001.phpt   |  8 +++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 ext/iconv/tests/iconv_strpos_error_001-windows.phpt

diff --git a/ext/iconv/tests/iconv_strpos_error_001-windows.phpt b/ext/iconv/tests/iconv_strpos_error_001-windows.phpt
new file mode 100644
index 0000000000000..173f3dc96d4b9
--- /dev/null
+++ b/ext/iconv/tests/iconv_strpos_error_001-windows.phpt
@@ -0,0 +1,19 @@
+--TEST--
+iconv_strpos() - test against PHP's defaults internal encoding. Windows systems only.
+--EXTENSIONS--
+iconv
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) !== "WIN" ) {
+    die("skip test is for windows systems only");
+}
+?>
+--FILE--
+<?php
+$large_enconding = str_repeat("X", 256);
+ini_set("default_charset", $large_enconding);
+var_dump(iconv_strpos('Hello, world', 'world', -2));
+?>
+--EXPECTF--
+Warning: iconv_strpos(): Wrong encoding, conversion from %s
+bool(false)
diff --git a/ext/iconv/tests/iconv_strpos_error_001.phpt b/ext/iconv/tests/iconv_strpos_error_001.phpt
index 43ce371015c36..c9d7fa7a3b755 100644
--- a/ext/iconv/tests/iconv_strpos_error_001.phpt
+++ b/ext/iconv/tests/iconv_strpos_error_001.phpt
@@ -1,7 +1,13 @@
 --TEST--
-iconv_strpos() - test against PHP's defaults internal encoding.
+iconv_strpos() - test against PHP's defaults internal encoding. Non windows systems.
 --EXTENSIONS--
 iconv
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == "WIN" ) {
+    die("skip test is not for windows systems only");
+}
+?>
 --FILE--
 <?php
 $large_enconding = str_repeat("X", 256);

From f684bc01afb5ffe7280cce301709eec254198acb Mon Sep 17 00:00:00 2001
From: Juan Morales <jcmargentina@gmail.com>
Date: Mon, 20 Jun 2022 22:20:44 +0200
Subject: [PATCH 3/5] Delete iconv_strpos_error_001-windows.phpt

---
 .../tests/iconv_strpos_error_001-windows.phpt | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 ext/iconv/tests/iconv_strpos_error_001-windows.phpt

diff --git a/ext/iconv/tests/iconv_strpos_error_001-windows.phpt b/ext/iconv/tests/iconv_strpos_error_001-windows.phpt
deleted file mode 100644
index 173f3dc96d4b9..0000000000000
--- a/ext/iconv/tests/iconv_strpos_error_001-windows.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-iconv_strpos() - test against PHP's defaults internal encoding. Windows systems only.
---EXTENSIONS--
-iconv
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) !== "WIN" ) {
-    die("skip test is for windows systems only");
-}
-?>
---FILE--
-<?php
-$large_enconding = str_repeat("X", 256);
-ini_set("default_charset", $large_enconding);
-var_dump(iconv_strpos('Hello, world', 'world', -2));
-?>
---EXPECTF--
-Warning: iconv_strpos(): Wrong encoding, conversion from %s
-bool(false)

From 7973bb1a341909505fd714a7832d6451f16c8435 Mon Sep 17 00:00:00 2001
From: Juan Morales <jcmargentina@gmail.com>
Date: Mon, 20 Jun 2022 22:22:22 +0200
Subject: [PATCH 4/5] Change expected output in original test

---
 ext/iconv/tests/iconv_strpos_error_001.phpt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ext/iconv/tests/iconv_strpos_error_001.phpt b/ext/iconv/tests/iconv_strpos_error_001.phpt
index c9d7fa7a3b755..5c54a5f214aef 100644
--- a/ext/iconv/tests/iconv_strpos_error_001.phpt
+++ b/ext/iconv/tests/iconv_strpos_error_001.phpt
@@ -15,9 +15,6 @@ ini_set("default_charset", $large_enconding);
 var_dump(iconv_strpos('Hello, world', 'world', -2));
 ?>
 --EXPECTF--
-Warning: ini_set(): Unknown encoding %s
-
-Warning: ini_set(): INI setting contains invalid encoding %s
-
+%A
 Warning: iconv_strpos(): Wrong encoding, conversion from %s
 bool(false)

From 9714c65c3e17240a5627c523be69b3fe6ddf8473 Mon Sep 17 00:00:00 2001
From: Juan Morales <jcmargentina@gmail.com>
Date: Tue, 21 Jun 2022 12:36:03 +0200
Subject: [PATCH 5/5] Update ext/iconv/tests/iconv_strpos_error_001.phpt

Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>
---
 ext/iconv/tests/iconv_strpos_error_001.phpt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ext/iconv/tests/iconv_strpos_error_001.phpt b/ext/iconv/tests/iconv_strpos_error_001.phpt
index 5c54a5f214aef..a96035b9f45b7 100644
--- a/ext/iconv/tests/iconv_strpos_error_001.phpt
+++ b/ext/iconv/tests/iconv_strpos_error_001.phpt
@@ -2,12 +2,6 @@
 iconv_strpos() - test against PHP's defaults internal encoding. Non windows systems.
 --EXTENSIONS--
 iconv
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) == "WIN" ) {
-    die("skip test is not for windows systems only");
-}
-?>
 --FILE--
 <?php
 $large_enconding = str_repeat("X", 256);