From 7fb3c0bc732a0fe593d17759e8d8074d3543b95a Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Fri, 7 Jan 2022 19:05:59 +0100
Subject: [PATCH] Run mb_send_mail tests on Windows, too

We use the run-tests.php `{MAIL}` abstraction instead of `cat`.
---
 ext/mbstring/tests/bug52681.phpt       | 11 +++++++----
 ext/mbstring/tests/mb_send_mail01.phpt | 11 +++++++----
 ext/mbstring/tests/mb_send_mail02.phpt | 11 +++++++----
 ext/mbstring/tests/mb_send_mail03.phpt | 11 +++++++----
 ext/mbstring/tests/mb_send_mail04.phpt | 11 +++++++----
 ext/mbstring/tests/mb_send_mail05.phpt | 11 +++++++----
 ext/mbstring/tests/mb_send_mail06.phpt | 11 +++++++----
 ext/mbstring/tests/mb_send_mail07.phpt | 11 +++++++----
 8 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/ext/mbstring/tests/bug52681.phpt b/ext/mbstring/tests/bug52681.phpt
index 2086051e9412d..86295d3385dcd 100644
--- a/ext/mbstring/tests/bug52681.phpt
+++ b/ext/mbstring/tests/bug52681.phpt
@@ -4,15 +4,12 @@ Bug #52681 (mb_send_mail() appends an extra MIME-Version header)
 mbstring
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. Not valid for Windows');
-}
 if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
     die("skip mb_send_mail() not available");
 }
 ?>
 --INI--
-sendmail_path=/bin/cat
+sendmail_path={MAIL:{PWD}/bug52681.eml}
 mail.add_x_header=off
 --FILE--
 <?php
@@ -20,6 +17,12 @@ $to = 'example@example.com';
 $headers = 'MIME-Version: 2.0';
 
 mb_send_mail($to, mb_language(), "test", $headers);
+
+readfile(__DIR__ . "/bug52681.eml");
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/bug52681.eml");
 ?>
 --EXPECTF--
 To: example@example.com
diff --git a/ext/mbstring/tests/mb_send_mail01.phpt b/ext/mbstring/tests/mb_send_mail01.phpt
index a71e212543624..4387d9f817433 100644
--- a/ext/mbstring/tests/mb_send_mail01.phpt
+++ b/ext/mbstring/tests/mb_send_mail01.phpt
@@ -4,15 +4,12 @@ mb_send_mail() test 1 (lang=neutral)
 mbstring
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. Not valid for Windows');
-}
 if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
     die("skip mb_send_mail() not available");
 }
 ?>
 --INI--
-sendmail_path=/bin/cat
+sendmail_path={MAIL:{PWD}/mb_send_mail01.eml}
 mail.add_x_header=off
 --FILE--
 <?php
@@ -20,13 +17,19 @@ $to = 'example@example.com';
 
 /* default setting */
 mb_send_mail($to, mb_language(), "test");
+readfile(__DIR__ . "/mb_send_mail01.eml");
 
 /* neutral (UTF-8) */
 if (mb_language("neutral")) {
     mb_internal_encoding("UTF-8");
     mb_send_mail($to, "test ".mb_language(), "test");
+    readfile(__DIR__ . "/mb_send_mail01.eml");
 }
 ?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/mb_send_mail01.eml");
+?>
 --EXPECTF--
 To: example@example.com
 Subject: %s
diff --git a/ext/mbstring/tests/mb_send_mail02.phpt b/ext/mbstring/tests/mb_send_mail02.phpt
index 13f9dd0974775..edc4093825af6 100644
--- a/ext/mbstring/tests/mb_send_mail02.phpt
+++ b/ext/mbstring/tests/mb_send_mail02.phpt
@@ -4,15 +4,12 @@ mb_send_mail() test 2 (lang=Japanese)
 mbstring
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. Not valid for Windows');
-}
 if (!function_exists("mb_send_mail") || !mb_language("japanese")) {
     die("skip mb_send_mail() not available");
 }
 ?>
 --INI--
-sendmail_path=/bin/cat
+sendmail_path={MAIL:{PWD}/mb_send_mail02.eml}
 mail.add_x_header=off
 --FILE--
 <?php
@@ -20,13 +17,19 @@ $to = 'example@example.com';
 
 /* default setting */
 mb_send_mail($to, mb_language(), "test");
+readfile(__DIR__ . "/mb_send_mail02.eml");
 
 /* Japanese (EUC-JP) */
 if (mb_language("japanese")) {
     mb_internal_encoding('EUC-JP');
     mb_send_mail($to, "テスト ".mb_language(), "テスト");
+    readfile(__DIR__ . "/mb_send_mail02.eml");
 }
 ?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/mb_send_mail02.eml");
+?>
 --EXPECTF--
 To: example@example.com
 Subject: %s
diff --git a/ext/mbstring/tests/mb_send_mail03.phpt b/ext/mbstring/tests/mb_send_mail03.phpt
index 124c94834e6cb..53cbf00a60f19 100644
--- a/ext/mbstring/tests/mb_send_mail03.phpt
+++ b/ext/mbstring/tests/mb_send_mail03.phpt
@@ -4,15 +4,12 @@ mb_send_mail() test 3 (lang=English)
 mbstring
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. Not valid for Windows');
-}
 if (!function_exists("mb_send_mail") || !mb_language("english")) {
     die("skip mb_send_mail() not available");
 }
 ?>
 --INI--
-sendmail_path=/bin/cat
+sendmail_path={MAIL:{PWD}/mb_send_mail03.eml}
 mail.add_x_header=off
 --FILE--
 <?php
@@ -20,13 +17,19 @@ $to = 'example@example.com';
 
 /* default setting */
 mb_send_mail($to, mb_language(), "test");
+readfile(__DIR__ . "/mb_send_mail03.eml");
 
 /* English (iso-8859-1) */
 if (mb_language("english")) {
     mb_internal_encoding("ISO-8859-1");
     mb_send_mail($to, "test ".mb_language(), "test");
+    readfile(__DIR__ . "/mb_send_mail03.eml");
 }
 ?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/mb_send_mail03.eml");
+?>
 --EXPECTF--
 To: example@example.com
 Subject: %s
diff --git a/ext/mbstring/tests/mb_send_mail04.phpt b/ext/mbstring/tests/mb_send_mail04.phpt
index bf5bfef578bd0..2251771469e16 100644
--- a/ext/mbstring/tests/mb_send_mail04.phpt
+++ b/ext/mbstring/tests/mb_send_mail04.phpt
@@ -4,15 +4,12 @@ mb_send_mail() test 4 (lang=German)
 mbstring
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. Not valid for Windows');
-}
 if (!function_exists("mb_send_mail") || !mb_language("german")) {
     die("skip mb_send_mail() not available");
 }
 ?>
 --INI--
-sendmail_path=/bin/cat
+sendmail_path={MAIL:{PWD}/mb_send_mail04.eml}
 mail.add_x_header=off
 --FILE--
 <?php
@@ -20,13 +17,19 @@ $to = 'example@example.com';
 
 /* default setting */
 mb_send_mail($to, mb_language(), "test");
+readfile(__DIR__ . "/mb_send_mail04.eml");
 
 /* German (iso-8859-15) */
 if (mb_language("german")) {
     mb_internal_encoding("ISO-8859-15");
     mb_send_mail($to, "Pr"."\xfc"."fung ".mb_language(), "Pr"."\xfc"."fung");
+    readfile(__DIR__ . "/mb_send_mail04.eml");
 }
 ?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/mb_send_mail04.eml");
+?>
 --EXPECTF--
 To: example@example.com
 Subject: %s
diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt
index b03ce8748e61f..251b918bdb85b 100644
--- a/ext/mbstring/tests/mb_send_mail05.phpt
+++ b/ext/mbstring/tests/mb_send_mail05.phpt
@@ -4,9 +4,6 @@ mb_send_mail() test 5 (lang=Simplified Chinese)
 mbstring
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. Not valid for Windows');
-}
 if (!function_exists("mb_send_mail") || !mb_language("Simplified Chinese")) {
     die("skip mb_send_mail() not available");
 }
@@ -15,7 +12,7 @@ if (!@mb_internal_encoding('GB2312')) {
 }
 ?>
 --INI--
-sendmail_path=/bin/cat
+sendmail_path={MAIL:{PWD}/mb_send_mail05.eml}
 mail.add_x_header=off
 --FILE--
 <?php
@@ -23,13 +20,19 @@ $to = 'example@example.com';
 
 /* default setting */
 mb_send_mail($to, mb_language(), "test");
+readfile(__DIR__ . "/mb_send_mail05.eml");
 
 /* Simplified Chinese (HK-GB-2312) */
 if (mb_language("simplified chinese")) {
     mb_internal_encoding('GB2312');
     mb_send_mail($to, "霞刮 ".mb_language(), "霞刮");
+    readfile(__DIR__ . "/mb_send_mail05.eml");
 }
 ?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/mb_send_mail05.eml");
+?>
 --EXPECTF--
 To: example@example.com
 Subject: %s
diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt
index 2a81a4a482115..d2fd7a9bbf3ab 100644
--- a/ext/mbstring/tests/mb_send_mail06.phpt
+++ b/ext/mbstring/tests/mb_send_mail06.phpt
@@ -4,9 +4,6 @@ mb_send_mail() test 6 (lang=Traditional Chinese)
 mbstring
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. Not valid for Windows');
-}
 if (!function_exists("mb_send_mail") || !mb_language("Traditional Chinese")) {
     die("skip mb_send_mail() not available");
 }
@@ -15,7 +12,7 @@ if (!@mb_internal_encoding('BIG5')) {
 }
 ?>
 --INI--
-sendmail_path=/bin/cat
+sendmail_path={MAIL:{PWD}/mb_send_mail06.eml}
 mail.add_x_header=off
 --FILE--
 <?php
@@ -23,13 +20,19 @@ $to = 'example@example.com';
 
 /* default setting */
 mb_send_mail($to, mb_language(), "test");
+readfile(__DIR__ . "/mb_send_mail06.eml");
 
 /* Traditional Chinese () */
 if (mb_language("traditional chinese")) {
     mb_internal_encoding('BIG5');
     mb_send_mail($to, "旗島 ".mb_language(), "旗島");
+    readfile(__DIR__ . "/mb_send_mail06.eml");
 }
 ?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/mb_send_mail06.eml");
+?>
 --EXPECTF--
 To: example@example.com
 Subject: %s
diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt
index 56368942cfd13..662426a47d833 100644
--- a/ext/mbstring/tests/mb_send_mail07.phpt
+++ b/ext/mbstring/tests/mb_send_mail07.phpt
@@ -4,9 +4,6 @@ mb_send_mail() test 7 (lang=Korean)
 mbstring
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. Not valid for Windows');
-}
 if (!function_exists("mb_send_mail") || !mb_language("Korean")) {
     die("skip mb_send_mail() not available");
 }
@@ -15,7 +12,7 @@ if (!@mb_internal_encoding('ISO-2022-KR')) {
 }
 ?>
 --INI--
-sendmail_path=/bin/cat
+sendmail_path={MAIL:{PWD}/mb_send_mail07.eml}
 mail.add_x_header=off
 --FILE--
 <?php
@@ -23,13 +20,19 @@ $to = 'example@example.com';
 
 /* default setting */
 mb_send_mail($to, mb_language(), "test");
+readfile(__DIR__ . "/mb_send_mail07.eml");
 
 /* Korean */
 if (mb_language("korean")) {
     mb_internal_encoding('EUC-KR');
     mb_send_mail($to, "砺什闘 ".mb_language(), "砺什闘");
+    readfile(__DIR__ . "/mb_send_mail07.eml");
 }
 ?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/mb_send_mail07.eml");
+?>
 --EXPECTF--
 To: example@example.com
 Subject: %s