Skip to content

Commit 51eec50

Browse files
cmb69cmb69
committed
Run mb_send_mail tests on Windows, too
We use the run-tests.php `{MAIL}` abstraction instead of `cat`. Closes GH-7908.
1 parent c6bb747 commit 51eec50

8 files changed

+56
-32
lines changed

‎ext/mbstring/tests/bug52681.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@ Bug #52681 (mb_send_mail() appends an extra MIME-Version header)
44
mbstring
55
--SKIPIF--
66
<?php
7-
if (substr(PHP_OS, 0, 3) == 'WIN') {
8-
die('skip.. Not valid for Windows');
9-
}
107
if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
118
die("skip mb_send_mail() not available");
129
}
1310
?>
1411
--INI--
15-
sendmail_path=/bin/cat
12+
sendmail_path={MAIL:{PWD}/bug52681.eml}
1613
mail.add_x_header=off
1714
--FILE--
1815
<?php
1916
$to = 'example@example.com';
2017
$headers = 'MIME-Version: 2.0';
2118

2219
mb_send_mail($to, mb_language(), "test", $headers);
20+
21+
readfile(__DIR__ . "/bug52681.eml");
22+
?>
23+
--CLEAN--
24+
<?php
25+
@unlink(__DIR__ . "/bug52681.eml");
2326
?>
2427
--EXPECTF--
2528
To: example@example.com

‎ext/mbstring/tests/mb_send_mail01.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,32 @@ mb_send_mail() test 1 (lang=neutral)
44
mbstring
55
--SKIPIF--
66
<?php
7-
if (substr(PHP_OS, 0, 3) == 'WIN') {
8-
die('skip.. Not valid for Windows');
9-
}
107
if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
118
die("skip mb_send_mail() not available");
129
}
1310
?>
1411
--INI--
15-
sendmail_path=/bin/cat
12+
sendmail_path={MAIL:{PWD}/mb_send_mail01.eml}
1613
mail.add_x_header=off
1714
--FILE--
1815
<?php
1916
$to = 'example@example.com';
2017

2118
/* default setting */
2219
mb_send_mail($to, mb_language(), "test");
20+
readfile(__DIR__ . "/mb_send_mail01.eml");
2321

2422
/* neutral (UTF-8) */
2523
if (mb_language("neutral")) {
2624
mb_internal_encoding("UTF-8");
2725
mb_send_mail($to, "test ".mb_language(), "test");
26+
readfile(__DIR__ . "/mb_send_mail01.eml");
2827
}
2928
?>
29+
--CLEAN--
30+
<?php
31+
@unlink(__DIR__ . "/mb_send_mail01.eml");
32+
?>
3033
--EXPECTF--
3134
To: example@example.com
3235
Subject: %s

‎ext/mbstring/tests/mb_send_mail02.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,32 @@ mb_send_mail() test 2 (lang=Japanese)
44
mbstring
55
--SKIPIF--
66
<?php
7-
if (substr(PHP_OS, 0, 3) == 'WIN') {
8-
die('skip.. Not valid for Windows');
9-
}
107
if (!function_exists("mb_send_mail") || !mb_language("japanese")) {
118
die("skip mb_send_mail() not available");
129
}
1310
?>
1411
--INI--
15-
sendmail_path=/bin/cat
12+
sendmail_path={MAIL:{PWD}/mb_send_mail02.eml}
1613
mail.add_x_header=off
1714
--FILE--
1815
<?php
1916
$to = 'example@example.com';
2017

2118
/* default setting */
2219
mb_send_mail($to, mb_language(), "test");
20+
readfile(__DIR__ . "/mb_send_mail02.eml");
2321

2422
/* Japanese (EUC-JP) */
2523
if (mb_language("japanese")) {
2624
mb_internal_encoding('EUC-JP');
2725
mb_send_mail($to, "������ ".mb_language(), "������");
26+
readfile(__DIR__ . "/mb_send_mail02.eml");
2827
}
2928
?>
29+
--CLEAN--
30+
<?php
31+
@unlink(__DIR__ . "/mb_send_mail02.eml");
32+
?>
3033
--EXPECTF--
3134
To: example@example.com
3235
Subject: %s

‎ext/mbstring/tests/mb_send_mail03.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,32 @@ mb_send_mail() test 3 (lang=English)
44
mbstring
55
--SKIPIF--
66
<?php
7-
if (substr(PHP_OS, 0, 3) == 'WIN') {
8-
die('skip.. Not valid for Windows');
9-
}
107
if (!function_exists("mb_send_mail") || !mb_language("english")) {
118
die("skip mb_send_mail() not available");
129
}
1310
?>
1411
--INI--
15-
sendmail_path=/bin/cat
12+
sendmail_path={MAIL:{PWD}/mb_send_mail03.eml}
1613
mail.add_x_header=off
1714
--FILE--
1815
<?php
1916
$to = 'example@example.com';
2017

2118
/* default setting */
2219
mb_send_mail($to, mb_language(), "test");
20+
readfile(__DIR__ . "/mb_send_mail03.eml");
2321

2422
/* English (iso-8859-1) */
2523
if (mb_language("english")) {
2624
mb_internal_encoding("ISO-8859-1");
2725
mb_send_mail($to, "test ".mb_language(), "test");
26+
readfile(__DIR__ . "/mb_send_mail03.eml");
2827
}
2928
?>
29+
--CLEAN--
30+
<?php
31+
@unlink(__DIR__ . "/mb_send_mail03.eml");
32+
?>
3033
--EXPECTF--
3134
To: example@example.com
3235
Subject: %s

‎ext/mbstring/tests/mb_send_mail04.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,32 @@ mb_send_mail() test 4 (lang=German)
44
mbstring
55
--SKIPIF--
66
<?php
7-
if (substr(PHP_OS, 0, 3) == 'WIN') {
8-
die('skip.. Not valid for Windows');
9-
}
107
if (!function_exists("mb_send_mail") || !mb_language("german")) {
118
die("skip mb_send_mail() not available");
129
}
1310
?>
1411
--INI--
15-
sendmail_path=/bin/cat
12+
sendmail_path={MAIL:{PWD}/mb_send_mail04.eml}
1613
mail.add_x_header=off
1714
--FILE--
1815
<?php
1916
$to = 'example@example.com';
2017

2118
/* default setting */
2219
mb_send_mail($to, mb_language(), "test");
20+
readfile(__DIR__ . "/mb_send_mail04.eml");
2321

2422
/* German (iso-8859-15) */
2523
if (mb_language("german")) {
2624
mb_internal_encoding("ISO-8859-15");
2725
mb_send_mail($to, "Pr"."\xfc"."fung ".mb_language(), "Pr"."\xfc"."fung");
26+
readfile(__DIR__ . "/mb_send_mail04.eml");
2827
}
2928
?>
29+
--CLEAN--
30+
<?php
31+
@unlink(__DIR__ . "/mb_send_mail04.eml");
32+
?>
3033
--EXPECTF--
3134
To: example@example.com
3235
Subject: %s

‎ext/mbstring/tests/mb_send_mail05.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ mb_send_mail() test 5 (lang=Simplified Chinese)
44
mbstring
55
--SKIPIF--
66
<?php
7-
if (substr(PHP_OS, 0, 3) == 'WIN') {
8-
die('skip.. Not valid for Windows');
9-
}
107
if (!function_exists("mb_send_mail") || !mb_language("Simplified Chinese")) {
118
die("skip mb_send_mail() not available");
129
}
@@ -15,21 +12,27 @@ if (!@mb_internal_encoding('GB2312')) {
1512
}
1613
?>
1714
--INI--
18-
sendmail_path=/bin/cat
15+
sendmail_path={MAIL:{PWD}/mb_send_mail05.eml}
1916
mail.add_x_header=off
2017
--FILE--
2118
<?php
2219
$to = 'example@example.com';
2320

2421
/* default setting */
2522
mb_send_mail($to, mb_language(), "test");
23+
readfile(__DIR__ . "/mb_send_mail05.eml");
2624

2725
/* Simplified Chinese (HK-GB-2312) */
2826
if (mb_language("simplified chinese")) {
2927
mb_internal_encoding('GB2312');
3028
mb_send_mail($to, "²âÑé ".mb_language(), "²âÑé");
29+
readfile(__DIR__ . "/mb_send_mail05.eml");
3130
}
3231
?>
32+
--CLEAN--
33+
<?php
34+
@unlink(__DIR__ . "/mb_send_mail05.eml");
35+
?>
3336
--EXPECTF--
3437
To: example@example.com
3538
Subject: %s

‎ext/mbstring/tests/mb_send_mail06.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ mb_send_mail() test 6 (lang=Traditional Chinese)
44
mbstring
55
--SKIPIF--
66
<?php
7-
if (substr(PHP_OS, 0, 3) == 'WIN') {
8-
die('skip.. Not valid for Windows');
9-
}
107
if (!function_exists("mb_send_mail") || !mb_language("Traditional Chinese")) {
118
die("skip mb_send_mail() not available");
129
}
@@ -15,21 +12,27 @@ if (!@mb_internal_encoding('BIG5')) {
1512
}
1613
?>
1714
--INI--
18-
sendmail_path=/bin/cat
15+
sendmail_path={MAIL:{PWD}/mb_send_mail06.eml}
1916
mail.add_x_header=off
2017
--FILE--
2118
<?php
2219
$to = 'example@example.com';
2320

2421
/* default setting */
2522
mb_send_mail($to, mb_language(), "test");
23+
readfile(__DIR__ . "/mb_send_mail06.eml");
2624

2725
/* Traditional Chinese () */
2826
if (mb_language("traditional chinese")) {
2927
mb_internal_encoding('BIG5');
3028
mb_send_mail($to, "´úÅç ".mb_language(), "´úÅç");
29+
readfile(__DIR__ . "/mb_send_mail06.eml");
3130
}
3231
?>
32+
--CLEAN--
33+
<?php
34+
@unlink(__DIR__ . "/mb_send_mail06.eml");
35+
?>
3336
--EXPECTF--
3437
To: example@example.com
3538
Subject: %s

‎ext/mbstring/tests/mb_send_mail07.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ mb_send_mail() test 7 (lang=Korean)
44
mbstring
55
--SKIPIF--
66
<?php
7-
if (substr(PHP_OS, 0, 3) == 'WIN') {
8-
die('skip.. Not valid for Windows');
9-
}
107
if (!function_exists("mb_send_mail") || !mb_language("Korean")) {
118
die("skip mb_send_mail() not available");
129
}
@@ -15,21 +12,27 @@ if (!@mb_internal_encoding('ISO-2022-KR')) {
1512
}
1613
?>
1714
--INI--
18-
sendmail_path=/bin/cat
15+
sendmail_path={MAIL:{PWD}/mb_send_mail07.eml}
1916
mail.add_x_header=off
2017
--FILE--
2118
<?php
2219
$to = 'example@example.com';
2320

2421
/* default setting */
2522
mb_send_mail($to, mb_language(), "test");
23+
readfile(__DIR__ . "/mb_send_mail07.eml");
2624

2725
/* Korean */
2826
if (mb_language("korean")) {
2927
mb_internal_encoding('EUC-KR');
3028
mb_send_mail($to, "�׽�Ʈ ".mb_language(), "�׽�Ʈ");
29+
readfile(__DIR__ . "/mb_send_mail07.eml");
3130
}
3231
?>
32+
--CLEAN--
33+
<?php
34+
@unlink(__DIR__ . "/mb_send_mail07.eml");
35+
?>
3336
--EXPECTF--
3437
To: example@example.com
3538
Subject: %s

0 commit comments

Comments
 (0)