Change some warnings to ValueErrors in MBString extension

ext/mbstring/php_mbregex.c

@@ -855,8 +855,8 @@ PHP_FUNCTION(mb_regex_encoding)
 		mbctype = _php_mb_regex_name2mbctype(encoding);
 
 		if (mbctype == ONIG_ENCODING_UNDEF) {
-			php_error_docref(NULL, E_WARNING, "Unknown encoding \"%s\"", encoding);
-			RETURN_FALSE;
+			zend_value_error("Unknown encoding \"%s\"", encoding);
+			return;
 		}
 
 		MBREX(current_mbctype) = mbctype;
@@ -922,9 +922,8 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase)
 	}
 
 	if (arg_pattern_len == 0) {
-		php_error_docref(NULL, E_WARNING, "Empty pattern");
-		RETVAL_FALSE;
-		goto out;
+		zend_value_error("Empty pattern");
+		return;
 	}
 
 	re = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, options, MBREX(current_mbctype), MBREX(regex_default_syntax));
@@ -1429,13 +1428,13 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
 	}
 
 	if (MBREX(search_re) == NULL) {
-		php_error_docref(NULL, E_WARNING, "No regex given");
-		RETURN_FALSE;
+		zend_value_error("No regex given");
+		return;
 	}
 
 	if (str == NULL) {
-		php_error_docref(NULL, E_WARNING, "No string given");
-		RETURN_FALSE;
+		zend_value_error("No string given");
+		return;
 	}
 
 	MBREX(search_regs) = onig_region_new();
@@ -1539,8 +1538,8 @@ PHP_FUNCTION(mb_ereg_search_init)
 	}
 
 	if (argc > 1 && arg_pattern_len == 0) {
-		php_error_docref(NULL, E_WARNING, "Empty pattern");
-		RETURN_FALSE;
+		zend_value_error("Empty pattern");
+		return;
 	}
 
 	option = MBREX(regex_default_options);
@@ -1654,9 +1653,8 @@ PHP_FUNCTION(mb_ereg_search_setpos)
 	}
 
 	if (position < 0 || (!Z_ISUNDEF(MBREX(search_str)) && Z_TYPE(MBREX(search_str)) == IS_STRING && (size_t)position > Z_STRLEN(MBREX(search_str)))) {
-		php_error_docref(NULL, E_WARNING, "Position is out of range");
-		MBREX(search_pos) = 0;
-		RETURN_FALSE;
+		zend_value_error("Position is out of range");
+		return;
 	}
 
 	MBREX(search_pos) = position;

ext/mbstring/tests/bug43994.phpt

@@ -25,111 +25,88 @@ $inputs = array(NULL, null, false, FALSE, "", '', @$undefined_var,
 
 $iterator = 1;
 foreach($inputs as $input) {
-    if(@is_array($mb_regs)){
-        $mb_regs = '';
+	if(@is_array($mb_regs)){
+		$mb_regs = '';
+	}
+	echo "\n-- Iteration $iterator --\n";
+	echo "Without \$regs arg:\n";
+    try {
+	    var_dump( mb_ereg($input, 'hello, world') );
+    } catch (\ValueError $e) {
+        echo $e->getMessage() . \PHP_EOL;
     }
-    echo "\n-- Iteration $iterator --\n";
-    echo "Without \$regs arg:\n";
-    var_dump( mb_ereg($input, 'hello, world') );
-    echo "With \$regs arg:\n";
-    var_dump(mb_ereg($input, 'hello, world', $mb_regs));
-    var_dump($mb_regs);
-    $iterator++;
+
+	echo "With \$regs arg:\n";
+    try {
+	    var_dump(mb_ereg($input, 'hello, world', $mb_regs));
+    } catch (\ValueError $e) {
+        echo $e->getMessage() . \PHP_EOL;
+    }
+	var_dump($mb_regs);
+	$iterator++;
 };
 ?>
---EXPECTF--
+--EXPECT--
 -- Iteration 1 --
 Without $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 With $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 array(0) {
 }
 
 -- Iteration 2 --
 Without $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 With $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 array(0) {
 }
 
 -- Iteration 3 --
 Without $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 With $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 array(0) {
 }
 
 -- Iteration 4 --
 Without $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 With $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 array(0) {
 }
 
 -- Iteration 5 --
 Without $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 With $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 array(0) {
 }
 
 -- Iteration 6 --
 Without $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 With $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 array(0) {
 }
 
 -- Iteration 7 --
 Without $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 With $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 array(0) {
 }
 
 -- Iteration 8 --
 Without $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 With $regs arg:
-
-Warning: mb_ereg(): Empty pattern in %s on line %d
-bool(false)
+Empty pattern
 array(0) {
 }

ext/mbstring/tests/bug43998.phpt

@@ -22,49 +22,37 @@ $sourcestring = 'Hello, World';
 $inputs = array(12345, 12.3456789000E-10, true, false, "");
 $iterator = 1;
 foreach($inputs as $input) {
-  echo "\n-- Iteration $iterator --\n";
-  var_dump( mb_strtolower($sourcestring, $input) );
-  var_dump( mb_strtoupper($sourcestring, $input) );
-  $iterator++;
+    echo "\n-- Iteration $iterator --\n";
+	try {
+        var_dump( mb_strtolower($sourcestring, $input) );
+	} catch (\ValueError $e) {
+	    echo $e->getMessage() . \PHP_EOL;
+	}
+    try {
+        var_dump( mb_strtoupper($sourcestring, $input) );
+	} catch (\ValueError $e) {
+	    echo $e->getMessage() . \PHP_EOL;
+	}
+    $iterator++;
 };
 ?>
---EXPECTF--
+--EXPECT--
 -- Iteration 1 --
-
-Warning: mb_strtolower(): Unknown encoding "12345" in %s on line %d
-bool(false)
-
-Warning: mb_strtoupper(): Unknown encoding "12345" in %s on line %d
-bool(false)
+Unknown encoding "12345"
+Unknown encoding "12345"
 
 -- Iteration 2 --
-
-Warning: mb_strtolower(): Unknown encoding "1.23456789E-9" in %s on line %d
-bool(false)
-
-Warning: mb_strtoupper(): Unknown encoding "1.23456789E-9" in %s on line %d
-bool(false)
+Unknown encoding "1.23456789E-9"
+Unknown encoding "1.23456789E-9"
 
 -- Iteration 3 --
-
-Warning: mb_strtolower(): Unknown encoding "1" in %s on line %d
-bool(false)
-
-Warning: mb_strtoupper(): Unknown encoding "1" in %s on line %d
-bool(false)
+Unknown encoding "1"
+Unknown encoding "1"
 
 -- Iteration 4 --
-
-Warning: mb_strtolower(): Unknown encoding "" in %s on line %d
-bool(false)
-
-Warning: mb_strtoupper(): Unknown encoding "" in %s on line %d
-bool(false)
+Unknown encoding ""
+Unknown encoding ""
 
 -- Iteration 5 --
-
-Warning: mb_strtolower(): Unknown encoding "" in %s on line %d
-bool(false)
-
-Warning: mb_strtoupper(): Unknown encoding "" in %s on line %d
-bool(false)
+Unknown encoding ""
+Unknown encoding ""

ext/mbstring/tests/bug45923.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #45923 (mb_st[r]ripos() offset not handled correctly)
+Bug #45%d23 (mb_st[r]ripos() offset not handled correctly)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--

ext/mbstring/tests/bug66964.phpt

@@ -5,8 +5,18 @@ Bug #66964 (mb_convert_variables() cannot detect recursion)
 --FILE--
 <?php
 $a[] = &$a;
-var_dump(mb_convert_variables('utf-8', 'auto', $a));
-var_dump(mb_convert_variables('utf-8', 'utf-8', $a));
+
+try {
+    var_dump(mb_convert_variables('utf-8', 'auto', $a));
+} catch (\Error $e) {
+    echo get_class($e) . ': ' . $e->getMessage() . \PHP_EOL;
+}
+
+try {
+    var_dump(mb_convert_variables('utf-8', 'utf-8', $a));
+} catch (\Error $e) {
+    echo get_class($e) . ': ' . $e->getMessage() . \PHP_EOL;
+}
 
 unset($a);
 $a[] = '日本語テキスト';
@@ -16,15 +26,17 @@ $a[] = '日本語テキスト';
 var_dump(mb_convert_variables('utf-8', 'utf-8', $a), $a);
 
 $a[] = &$a;
-var_dump(mb_convert_variables('utf-8', 'utf-8', $a), $a);
 
-?>
---EXPECTF--
-Warning: mb_convert_variables(): %s on line %d
-bool(false)
+try {
+    var_dump(mb_convert_variables('utf-8', 'utf-8', $a), $a);
+} catch (\Error $e) {
+    echo get_class($e) . ': ' . $e->getMessage() . \PHP_EOL;
+}
 
-Warning: mb_convert_variables(): %s on line %d
-bool(false)
+?>
+--EXPECT--
+Error: Cannot handle recursive references
+Error: Cannot handle recursive references
 string(5) "UTF-8"
 array(4) {
   [0]=>
@@ -36,18 +48,4 @@ array(4) {
   [3]=>
   string(21) "日本語テキスト"
 }
-
-Warning: mb_convert_variables(): %s on line %d
-bool(false)
-array(5) {
-  [0]=>
-  string(21) "日本語テキスト"
-  [1]=>
-  string(21) "日本語テキスト"
-  [2]=>
-  string(21) "日本語テキスト"
-  [3]=>
-  string(21) "日本語テキスト"
-  [4]=>
-  *RECURSION*
-}
+Error: Cannot handle recursive references