From 1a0c9ecaeee10b76895f6d67166187891777de8f Mon Sep 17 00:00:00 2001
From: Anatoliy Belsky <ab@php.net>
Date: Tue, 10 Apr 2012 11:47:18 +0200
Subject: [PATCH] Fixed bug #61631 mbstring mail related tests fail

---
 ext/mbstring/tests/bug52861.phpt       | 4 ++--
 ext/mbstring/tests/mb_send_mail01.phpt | 4 ++--
 ext/mbstring/tests/mb_send_mail02.phpt | 4 ++--
 ext/mbstring/tests/mb_send_mail03.phpt | 4 ++--
 ext/mbstring/tests/mb_send_mail04.phpt | 4 ++--
 ext/mbstring/tests/mb_send_mail05.phpt | 4 ++--
 ext/mbstring/tests/mb_send_mail06.phpt | 4 ++--
 ext/mbstring/tests/mb_send_mail07.phpt | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ext/mbstring/tests/bug52861.phpt b/ext/mbstring/tests/bug52861.phpt
index dedd6eb2d0..dc1914d118 100644
--- a/ext/mbstring/tests/bug52861.phpt
+++ b/ext/mbstring/tests/bug52861.phpt
@@ -2,8 +2,8 @@
 Bug #52681 (mb_send_mail() appends an extra MIME-Version header)
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN") {
-  die("skip Won't run on Windows");
+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");
diff --git a/ext/mbstring/tests/mb_send_mail01.phpt b/ext/mbstring/tests/mb_send_mail01.phpt
index 45ca0e6055..8ed9ea9721 100644
--- a/ext/mbstring/tests/mb_send_mail01.phpt
+++ b/ext/mbstring/tests/mb_send_mail01.phpt
@@ -2,8 +2,8 @@
 mb_send_mail() test 1 (lang=neutral)
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN") {
-  die("skip Won't run on Windows");
+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");
diff --git a/ext/mbstring/tests/mb_send_mail02.phpt b/ext/mbstring/tests/mb_send_mail02.phpt
index 0eb1e368b6..923f571486 100644
--- a/ext/mbstring/tests/mb_send_mail02.phpt
+++ b/ext/mbstring/tests/mb_send_mail02.phpt
@@ -2,8 +2,8 @@
 mb_send_mail() test 2 (lang=Japanese)
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN") {
-  die("skip Won't run on Windows");
+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");
diff --git a/ext/mbstring/tests/mb_send_mail03.phpt b/ext/mbstring/tests/mb_send_mail03.phpt
index ca66fee6dc..1b16529450 100644
--- a/ext/mbstring/tests/mb_send_mail03.phpt
+++ b/ext/mbstring/tests/mb_send_mail03.phpt
@@ -2,8 +2,8 @@
 mb_send_mail() test 3 (lang=English)
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN") {
-  die("skip Won't run on Windows");
+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");
diff --git a/ext/mbstring/tests/mb_send_mail04.phpt b/ext/mbstring/tests/mb_send_mail04.phpt
index a4170ffbe0..fbff4cd616 100644
--- a/ext/mbstring/tests/mb_send_mail04.phpt
+++ b/ext/mbstring/tests/mb_send_mail04.phpt
@@ -2,8 +2,8 @@
 mb_send_mail() test 4 (lang=German)
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN") {
-  die("skip Won't run on Windows");
+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");
diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt
index 9870a0036a..aa68ab8c82 100644
--- a/ext/mbstring/tests/mb_send_mail05.phpt
+++ b/ext/mbstring/tests/mb_send_mail05.phpt
@@ -2,8 +2,8 @@
 mb_send_mail() test 5 (lang=Simplified Chinese)
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN") {
-  die("skip Won't run on Windows");
+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");
diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt
index 9a9e5731b6..df3f065136 100644
--- a/ext/mbstring/tests/mb_send_mail06.phpt
+++ b/ext/mbstring/tests/mb_send_mail06.phpt
@@ -2,8 +2,8 @@
 mb_send_mail() test 6 (lang=Traditional Chinese)
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN") {
-  die("skip Won't run on Windows");
+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");
diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt
index 192f89a9ee..f62eccb8b2 100644
--- a/ext/mbstring/tests/mb_send_mail07.phpt
+++ b/ext/mbstring/tests/mb_send_mail07.phpt
@@ -2,8 +2,8 @@
 mb_send_mail() test 7 (lang=Korean)
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == "WIN") {
-  die("skip Won't run on Windows");
+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");
-- 
2.50.1