- Fix tests.

65 files changed, 76 insertions, 76 deletions

diff --git a/ext/mbstring/tests/mb_convert_encoding_basic.phpt b/ext/mbstring/tests/mb_convert_encoding_basic.phpt
index d7f194eb20..0060a71808 100644
--- a/ext/mbstring/tests/mb_convert_encoding_basic.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_basic.phpt
@@ -92,4 +92,4 @@ Converted Strings:
 string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
 string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
 string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
index fb0c281661..237f161636 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
@@ -62,4 +62,4 @@ string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9
  =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
  =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
  =?UTF-8?Q?=39=2E?="
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
index f440e1d447..1cde9892a0 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
@@ -183,4 +183,4 @@ string(0) ""
 
 Warning: mb_encode_mimeheader() expects parameter 1 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt
index 855c3b33b4..e765e94388 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt
@@ -221,4 +221,4 @@ bool(false)
 
 Warning: mb_encode_mimeheader() expects parameter 2 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt
index 8c6bf08e76..c2976f5d00 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt
@@ -183,4 +183,4 @@ string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
 
 Warning: mb_encode_mimeheader() expects parameter 3 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt
index 64e236d708..fe050840ef 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt
@@ -184,4 +184,4 @@ string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr
 
 Warning: mb_encode_mimeheader() expects parameter 4 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
index 593b3c15a5..d57bc1061a 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
@@ -212,4 +212,4 @@ string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr
 
 Warning: mb_encode_mimeheader() expects parameter 5 to be long, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
index 20ba5c17d4..668ae8bfea 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
@@ -50,4 +50,4 @@ string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr
 
 -- Iteration 3 --
 string(116) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=--- =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_basic.phpt b/ext/mbstring/tests/mb_ereg_basic.phpt
index 0bdaf74ee3..9ff850ed86 100644
--- a/ext/mbstring/tests/mb_ereg_basic.phpt
+++ b/ext/mbstring/tests/mb_ereg_basic.phpt
@@ -114,4 +114,4 @@ array(3) {
 }
 bool(false)
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt
index a8aa5d8bad..1f4419ddfe 100644
--- a/ext/mbstring/tests/mb_ereg_variation1.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation1.phpt
@@ -162,4 +162,4 @@ NULL
 -- Iteration 16 --
 bool(false)
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt
index 0236e44109..6353601ae6 100644
--- a/ext/mbstring/tests/mb_ereg_variation3.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation3.phpt
@@ -160,4 +160,4 @@ array(1) {
   [0]=>
   string(4) "3b5D"
 }
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt
index 7f7d6dfc93..965e2e7c21 100644
--- a/ext/mbstring/tests/mb_ereg_variation4.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation4.phpt
@@ -146,4 +146,4 @@ array(1) {
   [0]=>
   string(8) "MDEyMzQ="
 }
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_variation5.phpt b/ext/mbstring/tests/mb_ereg_variation5.phpt
index 95bc599191..fe70c296d7 100644
--- a/ext/mbstring/tests/mb_ereg_variation5.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation5.phpt
@@ -79,4 +79,4 @@ array(1) {
   [0]=>
   string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
 }
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt
index 33d2ee571a..1042924b94 100644
--- a/ext/mbstring/tests/mb_ereg_variation6.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation6.phpt
@@ -182,4 +182,4 @@ array(1) {
   [0]=>
   bool(false)
 }
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_variation7.phpt b/ext/mbstring/tests/mb_ereg_variation7.phpt
index 81c9589579..1e2899d0eb 100644
--- a/ext/mbstring/tests/mb_ereg_variation7.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation7.phpt
@@ -91,4 +91,4 @@ array(5) {
   [4]=>
   string(4) "ODk="
 }
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
index 3aa1784b14..94bb0cfd43 100644
--- a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
@@ -214,4 +214,4 @@ bool(false)
 
 Warning: mb_internal_encoding() expects parameter 1 to be string, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
index 3abf2517aa..3d2c547313 100644
--- a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
@@ -371,4 +371,4 @@ string(5) "CP866"
 string(5) "CP866"
 bool(true)
 string(6) "KOI8-R"
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
index 5f60e53707..09b263d751 100644
--- a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
@@ -212,4 +212,4 @@ bool(false)
 
 Warning: mb_regex_encoding() expects parameter 1 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strlen_variation1.phpt b/ext/mbstring/tests/mb_strlen_variation1.phpt
index a64fad17e5..8424130b2e 100644
--- a/ext/mbstring/tests/mb_strlen_variation1.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation1.phpt
@@ -177,4 +177,4 @@ int(0)
 
 Warning: mb_strlen() expects parameter 1 to be string, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strlen_variation2.phpt b/ext/mbstring/tests/mb_strlen_variation2.phpt
index d34f3cfcbd..8504bbc5a0 100644
--- a/ext/mbstring/tests/mb_strlen_variation2.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation2.phpt
@@ -217,4 +217,4 @@ bool(false)
 
 Warning: mb_strlen() expects parameter 2 to be string, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strlen_variation3.phpt b/ext/mbstring/tests/mb_strlen_variation3.phpt
index 13dc909938..efa11ad47e 100644
--- a/ext/mbstring/tests/mb_strlen_variation3.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation3.phpt
@@ -442,4 +442,4 @@ Encoding CP866 recognised
 Encoding KOI8-R recognised
 -- Multibyte String --
 Encoding KOI8-R recognised
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strpos_basic.phpt b/ext/mbstring/tests/mb_strpos_basic.phpt
index 4284ab805e..70321c016f 100644
--- a/ext/mbstring/tests/mb_strpos_basic.phpt
+++ b/ext/mbstring/tests/mb_strpos_basic.phpt
@@ -54,4 +54,4 @@ int(0)
 
 -- Multibyte string 2 --
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strpos_variation1.phpt b/ext/mbstring/tests/mb_strpos_variation1.phpt
index 61f534791c..d665f8f7ef 100644
--- a/ext/mbstring/tests/mb_strpos_variation1.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation1.phpt
@@ -179,4 +179,4 @@ bool(false)
 
 Warning: mb_strpos() expects parameter 1 to be string, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strpos_variation2.phpt b/ext/mbstring/tests/mb_strpos_variation2.phpt
index ed62ea8aa3..df6043492e 100644
--- a/ext/mbstring/tests/mb_strpos_variation2.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation2.phpt
@@ -195,4 +195,4 @@ bool(false)
 
 Warning: mb_strpos() expects parameter 2 to be string, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strpos_variation3.phpt b/ext/mbstring/tests/mb_strpos_variation3.phpt
index 8f8540ee85..38a4820d0c 100644
--- a/ext/mbstring/tests/mb_strpos_variation3.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation3.phpt
@@ -199,4 +199,4 @@ int(8)
 
 Warning: mb_strpos() expects parameter 3 to be long, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strpos_variation4.phpt b/ext/mbstring/tests/mb_strpos_variation4.phpt
index ac818c6610..116d8e77bd 100644
--- a/ext/mbstring/tests/mb_strpos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation4.phpt
@@ -219,4 +219,4 @@ bool(false)
 
 Warning: mb_strpos() expects parameter 4 to be string, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strrpos_error1.phpt b/ext/mbstring/tests/mb_strrpos_error1.phpt
index 727ef569f5..15228fec81 100644
--- a/ext/mbstring/tests/mb_strrpos_error1.phpt
+++ b/ext/mbstring/tests/mb_strrpos_error1.phpt
@@ -47,4 +47,4 @@ bool(false)
 
 Warning: mb_strrpos() expects at least 2 parameters, 1 given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strrpos_error2.phpt b/ext/mbstring/tests/mb_strrpos_error2.phpt
index 8247d370d5..fa3719509c 100644
--- a/ext/mbstring/tests/mb_strrpos_error2.phpt
+++ b/ext/mbstring/tests/mb_strrpos_error2.phpt
@@ -32,4 +32,4 @@ echo "Done";
 
 Warning: mb_strrpos(): Unknown encoding "unknown-encoding" in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strrpos_variation1.phpt b/ext/mbstring/tests/mb_strrpos_variation1.phpt
index 922cb73fdd..880fac6d88 100644
--- a/ext/mbstring/tests/mb_strrpos_variation1.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation1.phpt
@@ -178,4 +178,4 @@ bool(false)
 
 Warning: mb_strrpos() expects parameter 1 to be string, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strrpos_variation2.phpt b/ext/mbstring/tests/mb_strrpos_variation2.phpt
index 4986096c70..1566b5cb5f 100644
--- a/ext/mbstring/tests/mb_strrpos_variation2.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation2.phpt
@@ -180,4 +180,4 @@ bool(false)
 
 Warning: mb_strrpos() expects parameter 2 to be string, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strrpos_variation4.phpt b/ext/mbstring/tests/mb_strrpos_variation4.phpt
index e3d3d43c08..adf62672af 100644
--- a/ext/mbstring/tests/mb_strrpos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation4.phpt
@@ -219,4 +219,4 @@ bool(false)
 
 Warning: mb_strrpos() expects parameter 4 to be string, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strrpos_variation5.phpt b/ext/mbstring/tests/mb_strrpos_variation5.phpt
index 8fdd40da39..cb5089679b 100644
--- a/ext/mbstring/tests/mb_strrpos_variation5.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation5.phpt
@@ -58,4 +58,4 @@ int(20)
 int(20)
 -- Without fourth encoding argument --
 int(20)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtolower_basic.phpt b/ext/mbstring/tests/mb_strtolower_basic.phpt
index b1d31e2bc1..6d9cba72fe 100644
--- a/ext/mbstring/tests/mb_strtolower_basic.phpt
+++ b/ext/mbstring/tests/mb_strtolower_basic.phpt
@@ -55,4 +55,4 @@ Correctly converted
 -- Multibyte String --
 string(64) "zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J"
 Correctly converted
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtolower_error1.phpt b/ext/mbstring/tests/mb_strtolower_error1.phpt
index 13cdd3ce72..20200aae8e 100644
--- a/ext/mbstring/tests/mb_strtolower_error1.phpt
+++ b/ext/mbstring/tests/mb_strtolower_error1.phpt
@@ -43,4 +43,4 @@ NULL
 
 Warning: mb_strtolower() expects at least 1 parameter, 0 given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtolower_variation1.phpt b/ext/mbstring/tests/mb_strtolower_variation1.phpt
index ac468ca0d9..fc8166e8ee 100644
--- a/ext/mbstring/tests/mb_strtolower_variation1.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation1.phpt
@@ -177,4 +177,4 @@ string(0) ""
 
 Warning: mb_strtolower() expects parameter 1 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtolower_variation3.phpt b/ext/mbstring/tests/mb_strtolower_variation3.phpt
index 7ff3cee33e..08b3467853 100644
--- a/ext/mbstring/tests/mb_strtolower_variation3.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation3.phpt
@@ -54,4 +54,4 @@ Correctly Converted
 -- Multibyte Only String--
 string(40) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC"
 Correctly Converted
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt
index f08b508798..e736f1133d 100644
--- a/ext/mbstring/tests/mb_strtolower_variation4.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt
@@ -53,4 +53,4 @@ Correctly Converted
 -- Russian --
 string(24) "0LDQsdCy0LPQtNC10LbQtw=="
 Correctly Converted
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtoupper_basic.phpt b/ext/mbstring/tests/mb_strtoupper_basic.phpt
index b282647f8c..2d9db90875 100644
--- a/ext/mbstring/tests/mb_strtoupper_basic.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_basic.phpt
@@ -57,4 +57,4 @@ Correctly converted
 -- Multibyte String --
 string(64) "zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p"
 Correctly converted
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtoupper_error1.phpt b/ext/mbstring/tests/mb_strtoupper_error1.phpt
index d61c389c18..c14d2f1b5c 100644
--- a/ext/mbstring/tests/mb_strtoupper_error1.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_error1.phpt
@@ -44,4 +44,4 @@ NULL
 
 Warning: mb_strtoupper() expects at least 1 parameter, 0 given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtoupper_error2.phpt b/ext/mbstring/tests/mb_strtoupper_error2.phpt
index b198fe100a..cf42926577 100644
--- a/ext/mbstring/tests/mb_strtoupper_error2.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_error2.phpt
@@ -31,4 +31,4 @@ echo "Done";
 
 Warning: mb_strtoupper(): Unknown encoding "unknown-encoding" in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtoupper_variation1.phpt b/ext/mbstring/tests/mb_strtoupper_variation1.phpt
index b602f696b4..c5df73f565 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation1.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation1.phpt
@@ -179,4 +179,4 @@ string(0) ""
 
 Warning: mb_strtoupper() expects parameter 1 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtoupper_variation3.phpt b/ext/mbstring/tests/mb_strtoupper_variation3.phpt
index 9b2956976a..a4bf3b128f 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation3.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation3.phpt
@@ -55,4 +55,4 @@ Correctly Converted
 -- Multibyte Only String--
 string(40) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC"
 Correctly Converted
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt
index 8f5abe7269..3717560ecc 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt
@@ -54,4 +54,4 @@ Correctly Converted
 -- Russian --
 string(24) "0JDQkdCS0JPQlNCV0JbQlw=="
 Correctly Converted
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_basic.phpt b/ext/mbstring/tests/mb_substr_basic.phpt
index a43cf15bb5..b575e58ca9 100644
--- a/ext/mbstring/tests/mb_substr_basic.phpt
+++ b/ext/mbstring/tests/mb_substr_basic.phpt
@@ -52,4 +52,4 @@ string(12) "peacrOiqng=="
 
 -- Multibyte string 2 --
 string(28) "6Kqe44OG44Kt44K544OI44Gn44GZ"
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_count_basic.phpt b/ext/mbstring/tests/mb_substr_count_basic.phpt
index 4b8756741c..c4d1d7830a 100644
--- a/ext/mbstring/tests/mb_substr_count_basic.phpt
+++ b/ext/mbstring/tests/mb_substr_count_basic.phpt
@@ -44,4 +44,4 @@ int(0)
 -- Multibyte String --
 int(2)
 int(0)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_count_error1.phpt b/ext/mbstring/tests/mb_substr_count_error1.phpt
index 8ddcaa6d63..881ca0c22e 100644
--- a/ext/mbstring/tests/mb_substr_count_error1.phpt
+++ b/ext/mbstring/tests/mb_substr_count_error1.phpt
@@ -46,4 +46,4 @@ NULL
 
 Warning: mb_substr_count() expects at least 2 parameters, 1 given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_count_error2.phpt b/ext/mbstring/tests/mb_substr_count_error2.phpt
index e2572b028e..aefb2c05c8 100644
--- a/ext/mbstring/tests/mb_substr_count_error2.phpt
+++ b/ext/mbstring/tests/mb_substr_count_error2.phpt
@@ -34,4 +34,4 @@ echo "Done";
 
 Warning: mb_substr_count(): Unknown encoding "unknown-encoding" in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_count_variation2.phpt b/ext/mbstring/tests/mb_substr_count_variation2.phpt
index dac48b55a7..e39e492454 100644
--- a/ext/mbstring/tests/mb_substr_count_variation2.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation2.phpt
@@ -194,4 +194,4 @@ bool(false)
 
 Warning: mb_substr_count() expects parameter 2 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt
index d2e7a60566..61b82488df 100644
--- a/ext/mbstring/tests/mb_substr_count_variation3.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt
@@ -217,4 +217,4 @@ bool(false)
 
 Warning: mb_substr_count() expects parameter 3 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_variation1.phpt b/ext/mbstring/tests/mb_substr_variation1.phpt
index 8ea518deff..19ce78f873 100644
--- a/ext/mbstring/tests/mb_substr_variation1.phpt
+++ b/ext/mbstring/tests/mb_substr_variation1.phpt
@@ -178,4 +178,4 @@ string(0) ""
 
 Warning: mb_substr() expects parameter 1 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt
index 4acc1a9e54..d3b188a2b1 100644
--- a/ext/mbstring/tests/mb_substr_variation2.phpt
+++ b/ext/mbstring/tests/mb_substr_variation2.phpt
@@ -217,4 +217,4 @@ bool(false)
 
 Warning: mb_substr() expects parameter 4 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_variation3.phpt b/ext/mbstring/tests/mb_substr_variation3.phpt
index bb930b4b9a..f0ba2bc0a2 100644
--- a/ext/mbstring/tests/mb_substr_variation3.phpt
+++ b/ext/mbstring/tests/mb_substr_variation3.phpt
@@ -442,4 +442,4 @@ Encoding CP866 recognised
 Encoding KOI8-R recognised
 -- Multibyte String --
 Encoding KOI8-R recognised
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt
index d2c4de3ce8..345baa2327 100644
--- a/ext/mbstring/tests/mb_substr_variation4.phpt
+++ b/ext/mbstring/tests/mb_substr_variation4.phpt
@@ -128,4 +128,4 @@ string(0) ""
 string(0) ""
 --Multibyte String --
 string(0) ""
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt
index 02ea6d3aa8..4aa3c833d6 100644
--- a/ext/mbstring/tests/mb_substr_variation5.phpt
+++ b/ext/mbstring/tests/mb_substr_variation5.phpt
@@ -131,4 +131,4 @@ string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=
 string(20) "Is an English string"
 --Multibyte String --
 string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
-Done
\ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt
index aaae8f1aff..c613a722b5 100644
--- a/ext/mbstring/tests/zend_multibyte-02.phpt
+++ b/ext/mbstring/tests/zend_multibyte-02.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (2)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --INI--
diff --git a/ext/mbstring/tests/zend_multibyte-03.phpt b/ext/mbstring/tests/zend_multibyte-03.phpt
index ed11c172be..02baaa8d70 100644
--- a/ext/mbstring/tests/zend_multibyte-03.phpt
+++ b/ext/mbstring/tests/zend_multibyte-03.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (3)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --INI--
diff --git a/ext/mbstring/tests/zend_multibyte-04.phpt b/ext/mbstring/tests/zend_multibyte-04.phpt
index a89858e983..1ae8dfea94 100644
--- a/ext/mbstring/tests/zend_multibyte-04.phpt
+++ b/ext/mbstring/tests/zend_multibyte-04.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (4)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --INI--
diff --git a/ext/mbstring/tests/zend_multibyte-05.phpt b/ext/mbstring/tests/zend_multibyte-05.phpt
index 4b1d84df9a..b61bd05902 100644
--- a/ext/mbstring/tests/zend_multibyte-05.phpt
+++ b/ext/mbstring/tests/zend_multibyte-05.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (5)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --INI--
diff --git a/ext/mbstring/tests/zend_multibyte-06.phpt b/ext/mbstring/tests/zend_multibyte-06.phpt
index 2816817ede..a6f4bbbf77 100644
--- a/ext/mbstring/tests/zend_multibyte-06.phpt
+++ b/ext/mbstring/tests/zend_multibyte-06.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (6)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --INI--
diff --git a/ext/mbstring/tests/zend_multibyte-07.phpt b/ext/mbstring/tests/zend_multibyte-07.phpt
index 21589c19cd..9055d23f03 100644
--- a/ext/mbstring/tests/zend_multibyte-07.phpt
+++ b/ext/mbstring/tests/zend_multibyte-07.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (7)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --INI--
diff --git a/ext/mbstring/tests/zend_multibyte-08.phpt b/ext/mbstring/tests/zend_multibyte-08.phpt
index 75728fad54..f865f6b5b3 100644
--- a/ext/mbstring/tests/zend_multibyte-08.phpt
+++ b/ext/mbstring/tests/zend_multibyte-08.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (8)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --INI--
diff --git a/ext/mbstring/tests/zend_multibyte-09.phpt b/ext/mbstring/tests/zend_multibyte-09.phpt
index a90ed93bf4..a1544f3388 100644
--- a/ext/mbstring/tests/zend_multibyte-09.phpt
+++ b/ext/mbstring/tests/zend_multibyte-09.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (9)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --INI--
diff --git a/ext/mbstring/tests/zend_multibyte-10.phpt b/ext/mbstring/tests/zend_multibyte-10.phpt
index cfa948dc07..6e860d76f6 100644
--- a/ext/mbstring/tests/zend_multibyte-10.phpt
+++ b/ext/mbstring/tests/zend_multibyte-10.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (10)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/zend_multibyte-11.phpt b/ext/mbstring/tests/zend_multibyte-11.phpt
index 6409615b9b..d525c01e25 100644
--- a/ext/mbstring/tests/zend_multibyte-11.phpt
+++ b/ext/mbstring/tests/zend_multibyte-11.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (11)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/zend_multibyte-12.phpt b/ext/mbstring/tests/zend_multibyte-12.phpt
index 4af5284003..6bc43248e3 100644
--- a/ext/mbstring/tests/zend_multibyte-12.phpt
+++ b/ext/mbstring/tests/zend_multibyte-12.phpt
@@ -1,9 +1,9 @@
 --TEST--
 zend multibyte (12)
---SKIP--
+--SKIPIF--
 <?php
 ini_set("mbstring.script_encoding", "SJIS");
-ini_set("mbstring.script_encoding", "***") != "SJIS" or
+ini_set("mbstring.script_encoding", "***") != "SJIS" and
 	die("skip zend-multibyte is not available");
 ?>
 --FILE--