From: Felipe Pena <felipe@php.net>
Date: Mon, 18 Aug 2008 00:36:03 +0000 (+0000)
Subject: - New parameter parsing API
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~676
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41834e6090b4915839faef94646cdb938af8ec4a;p=php

- New parameter parsing API
- Fixed tests
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index e29f01bc1a..5b10afe5a9 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -3466,37 +3466,30 @@ PHP_FUNCTION(mb_convert_kana)
 
 #define PHP_MBSTR_STACK_BLOCK_SIZE 32
 
-/* {{{ proto string mb_convert_variables(string to-encoding, mixed from-encoding [, mixed ...])
+/* {{{ proto string mb_convert_variables(string to-encoding, mixed from-encoding, mixed vars [, ...])
    Converts the string resource in variables to desired encoding */
 PHP_FUNCTION(mb_convert_variables)
 {
-	zval ***args, ***stack, **var, **hash_entry;
+	zval ***args, ***stack, **var, **hash_entry, **zfrom_enc;
 	HashTable *target_hash;
 	mbfl_string string, result, *ret;
 	enum mbfl_no_encoding from_encoding, to_encoding;
 	mbfl_encoding_detector *identd;
 	mbfl_buffer_converter *convd;
-	int n, argc, stack_level, stack_max, elistsz;
+	int n, to_enc_len, argc, stack_level, stack_max, elistsz;
 	enum mbfl_no_encoding *elist;
-	char *name;
+	char *name, *to_enc;
 	void *ptmp;
 
-	argc = ZEND_NUM_ARGS();
-	if (argc < 3) {
-		WRONG_PARAM_COUNT;
-	}
-	args = (zval ***)ecalloc(argc, sizeof(zval **));
-	if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
-		efree((void *)args);
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sZ+", &to_enc, &to_enc_len, &zfrom_enc, &args, &argc) == FAILURE) {
+		return;
 	}
 
 	/* new encoding */
-	convert_to_string_ex(args[0]);
-	to_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(args[0]));
+	to_encoding = mbfl_name2no_encoding(to_enc);
 	if (to_encoding == mbfl_no_encoding_invalid) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(args[0]));
-		efree((void *)args);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", to_enc);
+		efree(args);
 		RETURN_FALSE;
 	}
 
@@ -3510,13 +3503,13 @@ PHP_FUNCTION(mb_convert_variables)
 	/* pre-conversion encoding */
 	elist = NULL;
 	elistsz = 0;
-	switch (Z_TYPE_PP(args[1])) {
+	switch (Z_TYPE_PP(zfrom_enc)) {
 	case IS_ARRAY:
-		php_mb_parse_encoding_array(*args[1], &elist, &elistsz, 0 TSRMLS_CC);
+		php_mb_parse_encoding_array(*zfrom_enc, &elist, &elistsz, 0 TSRMLS_CC);
 		break;
 	default:
-		convert_to_string_ex(args[1]);
-		php_mb_parse_encoding_list(Z_STRVAL_PP(args[1]), Z_STRLEN_PP(args[1]), &elist, &elistsz, 0 TSRMLS_CC);
+		convert_to_string_ex(zfrom_enc);
+		php_mb_parse_encoding_list(Z_STRVAL_PP(zfrom_enc), Z_STRLEN_PP(zfrom_enc), &elist, &elistsz, 0 TSRMLS_CC);
 		break;
 	}
 	if (elistsz <= 0) {
@@ -3531,7 +3524,7 @@ PHP_FUNCTION(mb_convert_variables)
 		stack_level = 0;
 		identd = mbfl_encoding_detector_new(elist, elistsz, MBSTRG(strict_detection));
 		if (identd != NULL) {
-			n = 2;
+			n = 0;
 			while (n < argc || stack_level > 0) {
 				if (stack_level <= 0) {
 					var = args[n++];
@@ -3612,7 +3605,7 @@ detect_end:
 		stack_max = PHP_MBSTR_STACK_BLOCK_SIZE;
 		stack = (zval ***)safe_emalloc(stack_max, sizeof(zval **), 0);
 		stack_level = 0;
-		n = 2;
+		n = 0;
 		while (n < argc || stack_level > 0) {
 			if (stack_level <= 0) {
 				var = args[n++];
@@ -3678,7 +3671,7 @@ detect_end:
 		mbfl_buffer_converter_delete(convd);
 	}
 
-	efree((void *)args);
+	efree(args);
 
 	name = (char *)mbfl_no_encoding2name(from_encoding);
 	if (name != NULL) {
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index 6509079fa5..d98503e18c 100644
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -653,29 +653,33 @@ _php_mb_regex_init_options(const char *parg, int narg, OnigOptionType *option, O
    Returns the current encoding for regex as a string. */
 PHP_FUNCTION(mb_regex_encoding)
 {
-	zval **arg1;
+	size_t argc = ZEND_NUM_ARGS();
+	char *encoding;
+	int encoding_len;
 	OnigEncoding mbctype;
 
-	if (ZEND_NUM_ARGS() == 0) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &encoding, &encoding_len) == FAILURE) {
+		return;
+	}
+
+	if (argc == 0) {
 		const char *retval = _php_mb_regex_mbctype2name(MBREX(current_mbctype));
-		if ( retval != NULL ) {
-			RETVAL_STRING((char *)retval, 1);
-		} else {
-			RETVAL_FALSE;
+
+		if (retval == NULL) {
+			RETURN_FALSE;
 		}
-	} else if (ZEND_NUM_ARGS() == 1 &&
-	           zend_get_parameters_ex(1, &arg1) != FAILURE) {
-		convert_to_string_ex(arg1);
-		mbctype = _php_mb_regex_name2mbctype(Z_STRVAL_PP(arg1));
+
+		RETURN_STRING((char *)retval, 1);
+	} else if (argc == 1) {
+		mbctype = _php_mb_regex_name2mbctype(encoding);
+
 		if (mbctype == ONIG_ENCODING_UNDEF) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg1));
-			RETVAL_FALSE;
-		} else {
-			MBREX(current_mbctype) = mbctype;
-			RETVAL_TRUE;
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", encoding);
+			RETURN_FALSE;
 		}
-	} else {
-		WRONG_PARAM_COUNT;
+
+		MBREX(current_mbctype) = mbctype;
+		RETURN_TRUE;
 	}
 }
 /* }}} */
@@ -1104,38 +1108,28 @@ PHP_FUNCTION(mb_ereg_match)
 static void
 _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
-	zval **arg_pattern, **arg_options;
+	size_t argc = ZEND_NUM_ARGS();
+	char *arg_pattern, *arg_options;
+	int arg_pattern_len, arg_options_len;
 	int n, i, err, pos, len, beg, end;
 	OnigOptionType option;
 	OnigUChar *str;
 	OnigSyntaxType *syntax;
 
+	if (zend_parse_parameters(argc TSRMLS_CC, "|ss", &arg_pattern, &arg_pattern_len, &arg_options, &arg_options_len) == FAILURE) {
+		return;
+	}
+
 	option = MBREX(regex_default_options);
-	switch (ZEND_NUM_ARGS()) {
-	case 0:
-		break;
-	case 1:
-		if (zend_get_parameters_ex(1, &arg_pattern) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-		break;
-	case 2:
-		if (zend_get_parameters_ex(2, &arg_pattern, &arg_options) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-		convert_to_string_ex(arg_options);
+
+	if (argc == 2) {
 		option = 0;
-		_php_mb_regex_init_options(Z_STRVAL_PP(arg_options), Z_STRLEN_PP(arg_options), &option, &syntax, NULL);
-		break;
-	default:
-		WRONG_PARAM_COUNT;
-		break;
+		_php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax, NULL);
 	}
-	if (ZEND_NUM_ARGS() > 0) {
-		/* create regex pattern buffer */
-		convert_to_string_ex(arg_pattern);
 
-		if ((MBREX(search_re) = php_mbregex_compile_pattern(Z_STRVAL_PP(arg_pattern), Z_STRLEN_PP(arg_pattern), option, MBREX(current_mbctype), MBREX(regex_default_syntax) TSRMLS_CC)) == NULL) {
+	if (argc > 0) {
+		/* create regex pattern buffer */
+		if ((MBREX(search_re) = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, MBREX(current_mbctype), MBREX(regex_default_syntax) TSRMLS_CC)) == NULL) {
 			RETURN_FALSE;
 		}
 	}
@@ -1244,41 +1238,28 @@ PHP_FUNCTION(mb_ereg_search_regs)
    Initialize string and regular expression for search. */
 PHP_FUNCTION(mb_ereg_search_init)
 {
-	zval **arg_str, **arg_pattern, **arg_options;
+	size_t argc = ZEND_NUM_ARGS();
+	zval *arg_str;
+	char *arg_pattern, *arg_options;
+	int arg_pattern_len, arg_options_len;
 	OnigSyntaxType *syntax = NULL;
 	OnigOptionType option;
 
+	if (zend_parse_parameters(argc TSRMLS_CC, "z|ss", &arg_str, &arg_pattern, &arg_pattern_len, &arg_options, &arg_options_len) == FAILURE) {
+		return;
+	}
+
 	option = MBREX(regex_default_options);
 	syntax = MBREX(regex_default_syntax);
-	switch (ZEND_NUM_ARGS()) {
-	case 1:
-		if (zend_get_parameters_ex(1, &arg_str) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-		break;
-	case 2:
-		if (zend_get_parameters_ex(2, &arg_str, &arg_pattern) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-		break;
-	case 3:
-		if (zend_get_parameters_ex(3, &arg_str, &arg_pattern, &arg_options) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-		convert_to_string_ex(arg_options);
+
+	if (argc == 3) {
 		option = 0;
-		_php_mb_regex_init_options(Z_STRVAL_PP(arg_options), Z_STRLEN_PP(arg_options), &option, &syntax, NULL);
-		break;
-	default:
-		WRONG_PARAM_COUNT;
-		break;
-	}
-	convert_to_string_ex(arg_str);
-	if (ZEND_NUM_ARGS() > 1) {
-		/* create regex pattern buffer */
-		convert_to_string_ex(arg_pattern);
+		_php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax, NULL);
+	}
 
-		if ((MBREX(search_re) = php_mbregex_compile_pattern(Z_STRVAL_PP(arg_pattern), Z_STRLEN_PP(arg_pattern), option, MBREX(current_mbctype), syntax TSRMLS_CC)) == NULL) {
+	if (argc > 1) {
+		/* create regex pattern buffer */
+		if ((MBREX(search_re) = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, MBREX(current_mbctype), syntax TSRMLS_CC)) == NULL) {
 			RETURN_FALSE;
 		}
 	}
@@ -1288,7 +1269,7 @@ PHP_FUNCTION(mb_ereg_search_init)
 		MBREX(search_str) = (zval *)NULL;
 	}
 
-	MBREX(search_str) = *arg_str;
+	MBREX(search_str) = arg_str;
 	Z_ADDREF_P(MBREX(search_str));
 	SEPARATE_ZVAL_IF_NOT_REF(&MBREX(search_str));
 
@@ -1343,22 +1324,20 @@ PHP_FUNCTION(mb_ereg_search_getpos)
    Set search start position */
 PHP_FUNCTION(mb_ereg_search_setpos)
 {
-	zval **arg_pos;
-	int n;
+	long position;
 
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_pos) == FAILURE) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &position) == FAILURE) {
+		return;
 	}
-	convert_to_long_ex(arg_pos);
-	n = Z_LVAL_PP(arg_pos);
-	if (n < 0 || (MBREX(search_str) != NULL && Z_TYPE_P(MBREX(search_str)) == IS_STRING && n >= Z_STRLEN_P(MBREX(search_str)))) {
+
+	if (position < 0 || (MBREX(search_str) != NULL && Z_TYPE_P(MBREX(search_str)) == IS_STRING && position >= Z_STRLEN_P(MBREX(search_str)))) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Position is out of range");
 		MBREX(search_pos) = 0;
-		RETVAL_FALSE;
-	} else {
-		MBREX(search_pos) = n;
-		RETVAL_TRUE;
+		RETURN_FALSE;
 	}
+
+	MBREX(search_pos) = position;
+	RETURN_TRUE;
 }
 /* }}} */
 
diff --git a/ext/mbstring/tests/ini_language.phpt b/ext/mbstring/tests/ini_language.phpt
index 1dc94141fa..c07e38214d 100644
--- a/ext/mbstring/tests/ini_language.phpt
+++ b/ext/mbstring/tests/ini_language.phpt
@@ -11,5 +11,5 @@ var_dump(ini_get('mbstring.internal_encoding'));
 var_dump(mb_internal_encoding());
 ?>
 --EXPECT--
-string(9) "Shift_JIS"
+unicode(9) "Shift_JIS"
 string(4) "SJIS"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-01.phpt b/ext/mbstring/tests/mb_output_handler_pattern-01.phpt
index 791146c356..ac9a5910fb 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-01.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-01.phpt
@@ -15,4 +15,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-02.phpt b/ext/mbstring/tests/mb_output_handler_pattern-02.phpt
index 7ae96f5e04..ce6092d14d 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-02.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-02.phpt
@@ -15,4 +15,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-03.phpt b/ext/mbstring/tests/mb_output_handler_pattern-03.phpt
index f596f020cb..e53a0f568f 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-03.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-03.phpt
@@ -15,4 +15,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-04.phpt b/ext/mbstring/tests/mb_output_handler_pattern-04.phpt
index f2fe9bccbf..b3e9951bc2 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-04.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-04.phpt
@@ -15,4 +15,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(18) "e38386e382b9e38388"
+unicode(18) "e38386e382b9e38388"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-05.phpt b/ext/mbstring/tests/mb_output_handler_pattern-05.phpt
index ea98939bb7..159578e5f5 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-05.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-05.phpt
@@ -14,4 +14,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-06.phpt b/ext/mbstring/tests/mb_output_handler_pattern-06.phpt
index 791146c356..ac9a5910fb 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-06.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-06.phpt
@@ -15,4 +15,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-07.phpt b/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
index dc244b72aa..af907fb94d 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
@@ -16,4 +16,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-08.phpt b/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
index 1e835c2c67..ce31ba29ca 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
@@ -16,4 +16,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(18) "e38386e382b9e38388"
+unicode(18) "e38386e382b9e38388"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-09.phpt b/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
index f941ceb66b..94aebc7415 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
@@ -16,4 +16,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-10.phpt b/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
index d4dbdd6d58..ebc5d07c31 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
@@ -16,4 +16,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(18) "e38386e382b9e38388"
+unicode(18) "e38386e382b9e38388"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-11.phpt b/ext/mbstring/tests/mb_output_handler_pattern-11.phpt
index ea98939bb7..159578e5f5 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-11.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-11.phpt
@@ -14,4 +14,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-12.phpt b/ext/mbstring/tests/mb_output_handler_pattern-12.phpt
index 791146c356..ac9a5910fb 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-12.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-12.phpt
@@ -15,4 +15,4 @@ ob_end_flush();
 var_dump(bin2hex(ob_get_clean()));
 ?>
 --EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"
diff --git a/ext/mbstring/tests/mb_parse_str.phpt b/ext/mbstring/tests/mb_parse_str.phpt
index fcfbbd9fe4..048909b450 100644
--- a/ext/mbstring/tests/mb_parse_str.phpt
+++ b/ext/mbstring/tests/mb_parse_str.phpt
@@ -28,27 +28,27 @@ foreach ($queries as $query) {
 ?>
 --EXPECT--
 array(2) {
-  ["foo"]=>
+  [u"foo"]=>
   string(3) "abc"
-  ["bar"]=>
+  [u"bar"]=>
   string(3) "def"
 }
-string(0) ""
-string(0) ""
-string(3) "abc"
-string(3) "def"
+unicode(0) ""
+unicode(0) ""
+unicode(3) "abc"
+unicode(3) "def"
 array(2) {
-  ["+foo"]=>
+  [u"+foo"]=>
   string(3) "def"
-  ["-bar"]=>
+  [u"-bar"]=>
   string(3) "jkl"
 }
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
 array(2) {
-  ["foo"]=>
+  [u"foo"]=>
   array(3) {
     [0]=>
     string(3) "abc"
@@ -57,14 +57,14 @@ array(2) {
     [2]=>
     string(3) "ghi"
   }
-  ["bar"]=>
+  [u"bar"]=>
   array(1) {
     [0]=>
     string(3) "jkl"
   }
 }
-string(0) ""
-string(0) ""
+unicode(0) ""
+unicode(0) ""
 array(3) {
   [0]=>
   string(3) "abc"
diff --git a/ext/mbstring/tests/mb_regex_encoding_error1.phpt b/ext/mbstring/tests/mb_regex_encoding_error1.phpt
index 6fe19aa9de..4c5456d36c 100644
--- a/ext/mbstring/tests/mb_regex_encoding_error1.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_error1.phpt
@@ -31,6 +31,6 @@ echo "Done";
 
 -- Testing mb_regex_encoding() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for mb_regex_encoding() in %s on line %d
+Warning: mb_regex_encoding() expects at most 1 parameter, 2 given in %s on line %d
 NULL
 Done
diff --git a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
index 0d2ff99ac4..12b78ab7c4 100644
--- a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
@@ -210,6 +210,6 @@ bool(false)
 
 -- Iteration 24 --
 
-Warning: mb_regex_encoding(): Unknown encoding "Resource id #%d" in %s on line %d
-bool(false)
-Done
\ No newline at end of file
+Warning: mb_regex_encoding() expects parameter 1 to be binary string, resource given in %s on line %d
+NULL
+Done
diff --git a/ext/mbstring/tests/mb_strtolower_basic.phpt b/ext/mbstring/tests/mb_strtolower_basic.phpt
index 8881247885..b2824d9fe9 100644
--- a/ext/mbstring/tests/mb_strtolower_basic.phpt
+++ b/ext/mbstring/tests/mb_strtolower_basic.phpt
@@ -16,7 +16,7 @@ function_exists('mb_strtolower') or die("skip mb_strtolower() is not available i
  * Test basic functionality of mb_strtolower
  */
 
-echo "*** Testing mb_strtolower() : basic functionality***\n";
+echo "**** Testing mb_strtolower() : basic functionality****\n";
 
 $ascii_lower = 'abcdefghijklmnopqrstuvwxyz';
 $ascii_upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
diff --git a/ext/mbstring/tests/mb_substr_error1.phpt b/ext/mbstring/tests/mb_substr_error1.phpt
index c2007c93b6..e48b3193b3 100644
--- a/ext/mbstring/tests/mb_substr_error1.phpt
+++ b/ext/mbstring/tests/mb_substr_error1.phpt
@@ -39,11 +39,11 @@ echo "Done";
 
 -- Testing mb_substr() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for mb_substr() in %s on line %d
+Warning: mb_substr() expects at most 4 parameters, 5 given in %s on line %d
 NULL
 
 -- Testing mb_substr() function with less than expected no. of arguments --
 
-Warning: Wrong parameter count for mb_substr() in %s on line %d
+Warning: mb_substr() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 Done
diff --git a/ext/mbstring/tests/mb_substr_variation1.phpt b/ext/mbstring/tests/mb_substr_variation1.phpt
index cc517b9bf2..1bcdbb5bfe 100644
--- a/ext/mbstring/tests/mb_substr_variation1.phpt
+++ b/ext/mbstring/tests/mb_substr_variation1.phpt
@@ -175,5 +175,7 @@ string(0) ""
 string(0) ""
 
 -- Iteration 24 --
-string(5) "Resou"
+
+Warning: mb_substr() expects parameter 1 to be binary string, resource given in %s on line %d
+NULL
 Done
diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt
index 900afc01fe..853baa64f1 100644
--- a/ext/mbstring/tests/mb_substr_variation2.phpt
+++ b/ext/mbstring/tests/mb_substr_variation2.phpt
@@ -215,6 +215,6 @@ bool(false)
 
 -- Iteration 24 --
 
-Warning: mb_substr(): Unknown encoding "Resource id #%d" in %s on line %d
-bool(false)
+Warning: mb_substr() expects parameter 4 to be binary string, resource given in %s on line %d
+NULL
 Done