fix tests

diff --git a/ext/mbstring/tests/common.inc b/ext/mbstring/tests/common.inc
index e8fb411b013643e39fb397cf71fe00ca699e7443..b1a48ce72eed349a7bcbead3edb27e02c0b98b34 100644 (file)
--- a/ext/mbstring/tests/common.inc
+++ b/ext/mbstring/tests/common.inc
@@ -18,7 +18,8 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
                                128 => "Compile Warning",       // E_COMPILE_WARNING
                                256 => "User Error",            // E_USER_ERROR
                                512 => "User Warning",          // E_USER_WARMING
-                               1024=> "User Notice"            // E_USER_NOTICE
+                               1024=> "User Notice",           // E_USER_NOTICE
+                               4096=> "Catchable fatal error"          // E_RECOVERABLE_ERROR
                                );
        
        if (!empty($debug)) {
@@ -50,4 +51,4 @@ class tc
 
 $t_obj = new tc;
 
-?>
\ No newline at end of file
+?>

diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt
index 6a71b4158011462f577d00e159d02ebcadd1eb47..683fb528973f69a62489289c9838f5f9b85cde4b 100644 (file)
--- a/ext/mbstring/tests/mb_strlen.phpt
+++ b/ext/mbstring/tests/mb_strlen.phpt
@@ -60,18 +60,17 @@ echo "== WRONG PARAMETERS ==\n";
 // Note: PHP Notice, but returns some value
 $r = strlen($t_ary);
 echo $r."\n";
+
 // Object
-// Note: PHP Notice, but returns some value
+// Note: PHP Catchable error
 $r = strlen($t_obj);
 echo $r."\n";
+
 // Wrong encoding
 mb_internal_encoding('EUC-JP');
 $r = strlen($euc_jp, 'BAD_NAME');
 echo $r."\n";
 
-
-
-
 ?>
 
 --EXPECT--
@@ -98,9 +97,7 @@ ERR: Warning
 == WRONG PARAMETERS ==
 ERR: Notice
 5
+ERR: Catchable fatal error
 ERR: Notice
 6
 ERR: Warning
-
-
-