diff options
| author | Sara Golemon <pollita@php.net> | 2017-07-26 17:59:29 -0400 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-07-26 18:55:23 -0400 |
| commit | c7aa8ba0eed1c227ba4e41a28b8ca125b99b80f9 (patch) | |
| tree | b87e3dc470f702459be799fbb31743e8ec4a49fa /ext/intl/php_intl.c | |
| parent | 3306b3aa60a2be8aa64ecd2c8bcd68c438b70628 (diff) | |
| download | php-git-c7aa8ba0eed1c227ba4e41a28b8ca125b99b80f9.tar.gz | |
Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
Diffstat (limited to 'ext/intl/php_intl.c')
| -rw-r--r-- | ext/intl/php_intl.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 9584be76cd..b05e746ac5 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -178,29 +178,29 @@ ZEND_BEGIN_ARG_INFO_EX(numfmt_parse_currency_arginfo, 0, 0, 3) ZEND_ARG_INFO(1, position) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(locale_0_args, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX( locale_get_loc_in_loc_args, 0, ZEND_RETURN_VALUE, 1 ) + ZEND_ARG_INFO(0, locale) + ZEND_ARG_INFO(0, in_locale) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(locale_1_arg, 0, 0, 1) - ZEND_ARG_INFO(0, arg1) +ZEND_BEGIN_ARG_INFO_EX( locale_filter_matches_args, 0, ZEND_RETURN_VALUE, 2 ) + ZEND_ARG_INFO(0, langtag) + ZEND_ARG_INFO(0, locale) + ZEND_ARG_INFO(0, canonicalize) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(locale_2_args, 0, 0, 2) - ZEND_ARG_INFO(0, arg1) - ZEND_ARG_INFO(0, arg2) +ZEND_BEGIN_ARG_INFO_EX( locale_lookup_args, 0, ZEND_RETURN_VALUE, 2 ) + ZEND_ARG_INFO(0, langtag) + ZEND_ARG_INFO(0, locale) + ZEND_ARG_INFO(0, canonicalize) + ZEND_ARG_INFO(0, def) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(locale_3_args, 0, 0, 3) - ZEND_ARG_INFO(0, arg1) - ZEND_ARG_INFO(0, arg2) - ZEND_ARG_INFO(0, arg3) +ZEND_BEGIN_ARG_INFO_EX(locale_0_args, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(locale_4_args, 0, 0, 4) +ZEND_BEGIN_ARG_INFO_EX(locale_1_arg, 0, 0, 1) ZEND_ARG_INFO(0, arg1) - ZEND_ARG_INFO(0, arg2) - ZEND_ARG_INFO(0, arg3) - ZEND_ARG_INFO(0, arg4) ZEND_END_ARG_INFO() #define intl_0_args collator_static_0_args @@ -686,17 +686,17 @@ zend_function_entry intl_functions[] = { PHP_FE( locale_get_script, locale_1_arg ) PHP_FE( locale_get_region, locale_1_arg ) PHP_FE( locale_get_keywords, locale_1_arg ) - PHP_FE( locale_get_display_script, locale_2_args ) - PHP_FE( locale_get_display_region, locale_2_args ) - PHP_FE( locale_get_display_name, locale_2_args ) - PHP_FE( locale_get_display_language, locale_2_args) - PHP_FE( locale_get_display_variant, locale_2_args ) + PHP_FE( locale_get_display_script, locale_get_loc_in_loc_args ) + PHP_FE( locale_get_display_region, locale_get_loc_in_loc_args ) + PHP_FE( locale_get_display_name, locale_get_loc_in_loc_args ) + PHP_FE( locale_get_display_language, locale_get_loc_in_loc_args) + PHP_FE( locale_get_display_variant, locale_get_loc_in_loc_args ) PHP_FE( locale_compose, locale_1_arg ) PHP_FE( locale_parse, locale_1_arg ) PHP_FE( locale_get_all_variants, locale_1_arg ) - PHP_FE( locale_filter_matches, locale_3_args ) + PHP_FE( locale_filter_matches, locale_filter_matches_args ) PHP_FE( locale_canonicalize, locale_1_arg ) - PHP_FE( locale_lookup, locale_4_args ) + PHP_FE( locale_lookup, locale_lookup_args ) PHP_FE( locale_accept_from_http, locale_1_arg ) /* MessageFormatter functions */ |