fixed some failures on test scripts caused by bug fix.

diff --git a/ext/mbstring/tests/bug43301.phpt b/ext/mbstring/tests/bug43301.phpt
index 71b169c12cc8013bdfc304ce90f5034a60e6385a..d0c244e052e4a175fda5f03658ab92b18657575a 100644 (file)
--- a/ext/mbstring/tests/bug43301.phpt
+++ b/ext/mbstring/tests/bug43301.phpt
@@ -15,7 +15,8 @@ echo mb_ereg_replace($ptr,'$1',$txt,'e');
 
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' in %s/bug43301.php(%d) : mbregex replace on line 1
+Parse error: parse error, expecting `T_VARIABLE' or `'$'' in %s(9) : mbregex replace on line %d
 
 Fatal error: mb_ereg_replace(): Failed evaluating code: 
-$1 in %s/bug43301.php on line %d
+$1 in %s on line %d
+

diff --git a/ext/mbstring/tests/mb_ereg1.phpt b/ext/mbstring/tests/mb_ereg1.phpt
index e420312da1d8253b8c234175250510bb78b16a17..663d1b778473a3447cb915fad81b6fc6e3a1efac 100644 (file)
--- a/ext/mbstring/tests/mb_ereg1.phpt
+++ b/ext/mbstring/tests/mb_ereg1.phpt
@@ -30,17 +30,16 @@ array(3) {
   [2]=>
   int(3)
 }
-int(1)
+
+Warning: mb_ereg(): empty pattern in %s on line %d
+bool(false)
 array(3) {
   [0]=>
   string(0) ""
   [1]=>
   string(0) ""
   [2]=>
-  array(1) {
-    [0]=>
-    bool(false)
-  }
+  string(0) ""
 }
 
 Notice: Array to string conversion in %s on line %d

diff --git a/ext/mbstring/tests/mb_strrpos_variation3.phpt b/ext/mbstring/tests/mb_strrpos_variation3.phpt
index fbd0c68aa786220004ce7e7d4cd02295b5e81a45..714ea1693e1dde0645d29b7139648655796d7e33 100644 (file)
--- a/ext/mbstring/tests/mb_strrpos_variation3.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation3.phpt
@@ -96,9 +96,13 @@ int(8)
 int(8)
 
 -- Iteration 3 --
+
+Notice: mb_strrpos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
 
 -- Iteration 4 --
+
+Notice: mb_strrpos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
 
 -- Iteration 5 --
@@ -108,6 +112,8 @@ bool(false)
 bool(false)
 
 -- Iteration 7 --
+
+Notice: mb_strrpos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
 
 -- Iteration 8 --

diff --git a/ext/mbstring/tests/mb_strtolower_error2.phpt b/ext/mbstring/tests/mb_strtolower_error2.phpt
index d048fef70dcf64008289d5bf9cfcae77993dff08..d84026b418e8a542753ad270ad9adee167fd4dde 100644 (file)
--- a/ext/mbstring/tests/mb_strtolower_error2.phpt
+++ b/ext/mbstring/tests/mb_strtolower_error2.phpt
@@ -28,8 +28,6 @@ echo "Done";
 --EXPECTF--
 *** Testing mb_strtolower() : error conditions***
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "unknown-encoding" in %s on line %d
 bool(false)
 Done
\ No newline at end of file

diff --git a/ext/mbstring/tests/mb_strtolower_variation2.phpt b/ext/mbstring/tests/mb_strtolower_variation2.phpt
index d9eee440e7ba4573d073c3bdcd378717ec084156..c9a674f5c6c8dc0a91c4dfa43089a7fc3bacb34a 100644 (file)
--- a/ext/mbstring/tests/mb_strtolower_variation2.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation2.phpt
@@ -107,106 +107,88 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "0" in %s on line %d
 bool(false)
 
 -- Iteration 2 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "1" in %s on line %d
 bool(false)
 
 -- Iteration 3 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "12345" in %s on line %d
 bool(false)
 
 -- Iteration 4 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "-2345" in %s on line %d
 bool(false)
 
 -- Iteration 5 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "10.5" in %s on line %d
 bool(false)
 
 -- Iteration 6 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "-10.5" in %s on line %d
 bool(false)
 
 -- Iteration 7 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "123456789000" in %s on line %d
 bool(false)
 
 -- Iteration 8 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "1.23456789E-9" in %s on line %d
 bool(false)
 
 -- Iteration 9 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "0.5" in %s on line %d
 bool(false)
 
 -- Iteration 10 --
-string(12) "hello, world"
+
+Warning: mb_strtolower(): Unknown encoding "(null)" in %s on line %d
+bool(false)
 
 -- Iteration 11 --
-string(12) "hello, world"
 
--- Iteration 12 --
+Warning: mb_strtolower(): Unknown encoding "(null)" in %s on line %d
+bool(false)
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
+-- Iteration 12 --
 
 Warning: mb_strtolower(): Unknown encoding "1" in %s on line %d
 bool(false)
 
 -- Iteration 13 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-string(12) "hello, world"
+Warning: mb_strtolower(): Unknown encoding "" in %s on line %d
+bool(false)
 
 -- Iteration 14 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtolower(): Unknown encoding "1" in %s on line %d
 bool(false)
 
 -- Iteration 15 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-string(12) "hello, world"
+Warning: mb_strtolower(): Unknown encoding "" in %s on line %d
+bool(false)
 
 -- Iteration 16 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-string(12) "hello, world"
+Warning: mb_strtolower(): Unknown encoding "" in %s on line %d
+bool(false)
 
 -- Iteration 17 --
 
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-string(12) "hello, world"
+Warning: mb_strtolower(): Unknown encoding "" in %s on line %d
+bool(false)
 
 -- Iteration 18 --
 string(12) "hello, world"
@@ -221,10 +203,14 @@ string(12) "hello, world"
 string(12) "hello, world"
 
 -- Iteration 22 --
-string(12) "hello, world"
+
+Warning: mb_strtolower(): Unknown encoding "(null)" in %s on line %d
+bool(false)
 
 -- Iteration 23 --
-string(12) "hello, world"
+
+Warning: mb_strtolower(): Unknown encoding "(null)" in %s on line %d
+bool(false)
 
 -- Iteration 24 --
 

diff --git a/ext/mbstring/tests/mb_strtoupper_error2.phpt b/ext/mbstring/tests/mb_strtoupper_error2.phpt
index 69e4ecdee28add7fcde56399869735647c5aaced..b198fe100a5d8afae900526de82530ec17f76406 100644 (file)
--- a/ext/mbstring/tests/mb_strtoupper_error2.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_error2.phpt
@@ -29,8 +29,6 @@ echo "Done";
 --EXPECTF--
 *** Testing mb_strtoupper() : error conditions ***
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "unknown-encoding" in %s on line %d
 bool(false)
 Done
\ No newline at end of file

diff --git a/ext/mbstring/tests/mb_strtoupper_variation2.phpt b/ext/mbstring/tests/mb_strtoupper_variation2.phpt
index d28c99551b277be4adbd3bf24fc04be724eb7c9c..3291ce71c858bcc49485679fa8109491ddebc2a7 100644 (file)
--- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt
@@ -108,106 +108,88 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "0" in %s on line %d
 bool(false)
 
 -- Iteration 2 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "1" in %s on line %d
 bool(false)
 
 -- Iteration 3 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "12345" in %s on line %d
 bool(false)
 
 -- Iteration 4 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "-2345" in %s on line %d
 bool(false)
 
 -- Iteration 5 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "10.5" in %s on line %d
 bool(false)
 
 -- Iteration 6 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "-10.5" in %s on line %d
 bool(false)
 
 -- Iteration 7 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "123456789000" in %s on line %d
 bool(false)
 
 -- Iteration 8 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "1.23456789E-9" in %s on line %d
 bool(false)
 
 -- Iteration 9 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "0.5" in %s on line %d
 bool(false)
 
 -- Iteration 10 --
-string(12) "HELLO, WORLD"
+
+Warning: mb_strtoupper(): Unknown encoding "(null)" in %s on line %d
+bool(false)
 
 -- Iteration 11 --
-string(12) "HELLO, WORLD"
 
--- Iteration 12 --
+Warning: mb_strtoupper(): Unknown encoding "(null)" in %s on line %d
+bool(false)
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
+-- Iteration 12 --
 
 Warning: mb_strtoupper(): Unknown encoding "1" in %s on line %d
 bool(false)
 
 -- Iteration 13 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-string(12) "HELLO, WORLD"
+Warning: mb_strtoupper(): Unknown encoding "" in %s on line %d
+bool(false)
 
 -- Iteration 14 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-
 Warning: mb_strtoupper(): Unknown encoding "1" in %s on line %d
 bool(false)
 
 -- Iteration 15 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-string(12) "HELLO, WORLD"
+Warning: mb_strtoupper(): Unknown encoding "" in %s on line %d
+bool(false)
 
 -- Iteration 16 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-string(12) "HELLO, WORLD"
+Warning: mb_strtoupper(): Unknown encoding "" in %s on line %d
+bool(false)
 
 -- Iteration 17 --
 
-Warning: mb_strtoupper(): Illegal character encoding specified in %s on line %d
-string(12) "HELLO, WORLD"
+Warning: mb_strtoupper(): Unknown encoding "" in %s on line %d
+bool(false)
 
 -- Iteration 18 --
 string(12) "HELLO, WORLD"
@@ -222,10 +204,14 @@ string(12) "HELLO, WORLD"
 string(12) "HELLO, WORLD"
 
 -- Iteration 22 --
-string(12) "HELLO, WORLD"
+
+Warning: mb_strtoupper(): Unknown encoding "(null)" in %s on line %d
+bool(false)
 
 -- Iteration 23 --
-string(12) "HELLO, WORLD"
+
+Warning: mb_strtoupper(): Unknown encoding "(null)" in %s on line %d
+bool(false)
 
 -- Iteration 24 --