added arginfo (fixes #45388)

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 7e223cafba0cd403073eee0bddbe43e9bdc69e42..39a07ae724e65729e4563d3b2678282afa29c486 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -167,6 +167,26 @@ static
                ZEND_ARG_PASS_INFO(0)
        ZEND_END_ARG_INFO()
 
+static
+       ZEND_BEGIN_ARG_INFO_EX(mb_parse_str_arginfo, 0, 0, 1)
+               ZEND_ARG_INFO(0, encoded_string)
+               ZEND_ARG_ARRAY_INFO(1, result, 1)
+       ZEND_END_ARG_INFO()
+
+static
+       ZEND_BEGIN_ARG_INFO_EX(mb_convert_variables_arginfo, 1, 0, 3)
+               ZEND_ARG_INFO(0, to_encoding)
+               ZEND_ARG_INFO(0, from_encoding)
+               ZEND_ARG_INFO(1, vars)
+       ZEND_END_ARG_INFO()
+
+static
+       ZEND_BEGIN_ARG_INFO_EX(mb_ereg_arginfo, 0, 0, 2)
+               ZEND_ARG_INFO(0, pattern)
+               ZEND_ARG_INFO(0, string)
+               ZEND_ARG_INFO(1, regs)
+       ZEND_END_ARG_INFO()
+
 /* {{{ mb_overload_def mb_ovld[] */
 static const struct mb_overload_def mb_ovld[] = {
        {MB_OVERLOAD_MAIL, "mail", "mb_send_mail", "mb_orig_mail"},
@@ -204,7 +224,7 @@ const zend_function_entry mbstring_functions[] = {
        PHP_FE(mb_http_output,                  NULL)
        PHP_FE(mb_detect_order,                 NULL)
        PHP_FE(mb_substitute_character, NULL)
-       PHP_FE(mb_parse_str,                    second_arg_force_ref)
+       PHP_FE(mb_parse_str,                    mb_parse_str_arginfo)
        PHP_FE(mb_output_handler,               NULL)
        PHP_FE(mb_preferred_mime_name,  NULL)
        PHP_FE(mb_strlen,                               NULL)
@@ -227,7 +247,7 @@ const zend_function_entry mbstring_functions[] = {
        PHP_FE(mb_convert_kana,                 NULL)
        PHP_FE(mb_encode_mimeheader,    NULL)
        PHP_FE(mb_decode_mimeheader,    NULL)
-       PHP_FE(mb_convert_variables,    third_and_rest_force_ref)
+       PHP_FE(mb_convert_variables,    mb_convert_variables_arginfo)
        PHP_FE(mb_encode_numericentity, NULL)
        PHP_FE(mb_decode_numericentity, NULL)
        PHP_FE(mb_send_mail,                    NULL)

diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h
index 6f980183d2c2b2135f472ea1dd0178335c548562..48e657f26a522db2dbc7fe981d1907fd0d37e2be 100644 (file)
--- a/ext/mbstring/php_mbregex.h
+++ b/ext/mbstring/php_mbregex.h
@@ -45,8 +45,8 @@
 #define PHP_MBREGEX_FUNCTION_ENTRIES \
        PHP_FE(mb_regex_encoding,       NULL) \
        PHP_FE(mb_regex_set_options,    NULL) \
-       PHP_FE(mb_ereg,                 third_arg_force_ref) \
-       PHP_FE(mb_eregi,                        third_arg_force_ref) \
+       PHP_FE(mb_ereg,                 mb_ereg_arginfo) \
+       PHP_FE(mb_eregi,                        mb_ereg_arginfo) \
        PHP_FE(mb_ereg_replace,                 NULL) \
        PHP_FE(mb_eregi_replace,                        NULL) \
        PHP_FE(mb_split,                                        NULL) \