From c7aa8ba0eed1c227ba4e41a28b8ca125b99b80f9 Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Wed, 26 Jul 2017 17:59:29 -0400 Subject: [PATCH] Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods --- NEWS | 3 ++ ext/intl/php_intl.c | 50 ++++++++++---------- ext/intl/tests/locale/bug74993.phpt | 73 +++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+), 25 deletions(-) create mode 100644 ext/intl/tests/locale/bug74993.phpt diff --git a/NEWS b/NEWS index 4a059537c7a..36121bd2905 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,9 @@ PHP NEWS . Fixed bug #74125 (Fixed finding CURL on systems with multiarch support). (cebe) +- Intl: + . Fixed bug #74993 (Wrong reflection on some locale_* functions). (Sara) + - Mbstring: . Fixed bug #71606 (Segmentation fault mb_strcut with HTML-ENTITIES encoding). (cmb) diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 9584be76cd9..b05e746ac50 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -178,6 +178,24 @@ 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_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_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_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_0_args, 0, 0, 0) ZEND_END_ARG_INFO() @@ -185,24 +203,6 @@ ZEND_BEGIN_ARG_INFO_EX(locale_1_arg, 0, 0, 1) ZEND_ARG_INFO(0, arg1) 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_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_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(locale_4_args, 0, 0, 4) - 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 #define intl_1_arg collator_static_1_arg @@ -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 */ diff --git a/ext/intl/tests/locale/bug74993.phpt b/ext/intl/tests/locale/bug74993.phpt new file mode 100644 index 00000000000..85d97ec78e4 --- /dev/null +++ b/ext/intl/tests/locale/bug74993.phpt @@ -0,0 +1,73 @@ +--TEST-- +Bug #74993 Wrong reflection on some locale_* functions +--SKIPIF-- + function locale_get_display_language ] { + + - Parameters [2] { + Parameter #0 [ $locale ] + Parameter #1 [ $in_locale ] + } +} +Function [ function locale_get_display_name ] { + + - Parameters [2] { + Parameter #0 [ $locale ] + Parameter #1 [ $in_locale ] + } +} +Function [ function locale_get_display_region ] { + + - Parameters [2] { + Parameter #0 [ $locale ] + Parameter #1 [ $in_locale ] + } +} +Function [ function locale_get_display_script ] { + + - Parameters [2] { + Parameter #0 [ $locale ] + Parameter #1 [ $in_locale ] + } +} +Function [ function locale_get_display_variant ] { + + - Parameters [2] { + Parameter #0 [ $locale ] + Parameter #1 [ $in_locale ] + } +} +Function [ function locale_filter_matches ] { + + - Parameters [3] { + Parameter #0 [ $langtag ] + Parameter #1 [ $locale ] + Parameter #2 [ $canonicalize ] + } +} +Function [ function locale_lookup ] { + + - Parameters [4] { + Parameter #0 [ $langtag ] + Parameter #1 [ $locale ] + Parameter #2 [ $canonicalize ] + Parameter #3 [ $def ] + } +}