- Fixed failing mbstring tests after bug fixes

6 files changed, 60 insertions, 93 deletions

diff --git a/ext/mbstring/tests/mb_ereg1.phpt b/ext/mbstring/tests/mb_ereg1.phpt
index e420312da1..57884c0e02 100644
--- a/ext/mbstring/tests/mb_ereg1.phpt
+++ b/ext/mbstring/tests/mb_ereg1.phpt
@@ -17,9 +17,8 @@ foreach ($a as $args) {
 	var_dump(mb_ereg($args[0], $args[1], $args[2]));
 	var_dump($args);
 }
-
-echo "Done\n";
 ?>
+===DONE===
 --EXPECTF--	
 bool(false)
 array(3) {
@@ -30,17 +29,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
@@ -76,4 +74,4 @@ array(3) {
   array(0) {
   }
 }
-Done
+===DONE===
diff --git a/ext/mbstring/tests/mb_strrpos_variation3.phpt b/ext/mbstring/tests/mb_strrpos_variation3.phpt
index fbd0c68aa7..4a52430754 100644
--- a/ext/mbstring/tests/mb_strrpos_variation3.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation3.phpt
@@ -83,9 +83,8 @@ foreach($inputs as $input) {
   var_dump( mb_strrpos($haystack, $needle, $input, $encoding));
   $iterator++;
 };
-
-echo "Done";
 ?>
+===DONE===
 --EXPECTF--
 *** Testing mb_strrpos() : usage variations ***
 
@@ -96,9 +95,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 +111,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 --
@@ -144,4 +149,4 @@ int(8)
 
 -- Iteration 18 --
 int(8)
-Done
\ No newline at end of file
+===DONE===
diff --git a/ext/mbstring/tests/mb_strtolower_error2.phpt b/ext/mbstring/tests/mb_strtolower_error2.phpt
index d048fef70d..9a0aed0f01 100644
--- a/ext/mbstring/tests/mb_strtolower_error2.phpt
+++ b/ext/mbstring/tests/mb_strtolower_error2.phpt
@@ -22,14 +22,11 @@ $sourcestring = 'hello, world';
 $encoding = 'unknown-encoding';
 
 var_dump( mb_strtolower($sourcestring, $encoding) );
-
-echo "Done";
 ?>
+===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
+===DONE===
diff --git a/ext/mbstring/tests/mb_strtolower_variation2.phpt b/ext/mbstring/tests/mb_strtolower_variation2.phpt
index d9eee440e7..fc753b631c 100644
--- a/ext/mbstring/tests/mb_strtolower_variation2.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation2.phpt
@@ -99,114 +99,95 @@ foreach($inputs as $input) {
 };
 
 fclose($fp);
-
-echo "Done";
 ?>
+===DONE===
 --EXPECTF--
 *** Testing mb_strtolower() : usage variations ***
 
 -- 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,13 +202,17 @@ 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 --
 
 Warning: mb_strtolower() 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_strtoupper_error2.phpt b/ext/mbstring/tests/mb_strtoupper_error2.phpt
index 69e4ecdee2..b198fe100a 100644
--- 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 d28c99551b..50387e4cb1 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt
@@ -99,115 +99,95 @@ foreach($inputs as $input) {
 };
 
 fclose($fp);
-
-echo "Done";
 ?>
-
+===DONE===
 --EXPECTF--
 *** Testing mb_strtoupper() : usage variations ***
 
 -- 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,13 +202,17 @@ 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 --
 
 Warning: mb_strtoupper() expects parameter 2 to be string, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+===DONE===