diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-05-02 06:21:17 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-05-02 06:21:54 +0100 |
| commit | 2735318c7b8a464488e9bfe6c4f88921186b3fe2 (patch) | |
| tree | cdf950d888e99c3d0f93b327caadafb25e9b3f7d /ext/intl/php_intl.c | |
| parent | 023cbdb2ca0dd9fc0d86c95a0d7f97cf30d36818 (diff) | |
| parent | f50df1d0e33aaf5007670966ca067318e064df82 (diff) | |
| download | php-git-2735318c7b8a464488e9bfe6c4f88921186b3fe2.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #74468 wrong reflection on Collator::sortWithSortKeys
Diffstat (limited to 'ext/intl/php_intl.c')
| -rw-r--r-- | ext/intl/php_intl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 1f20e42191..69e62ca301 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -154,6 +154,11 @@ ZEND_BEGIN_ARG_INFO_EX(collator_sort_args, 0, 0, 2) ZEND_ARG_INFO(0, sort_flags) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(collator_sort_with_sort_keys_args, 0, 0, 2) + ZEND_ARG_OBJ_INFO(0, coll, Collator, 0) + ZEND_ARG_ARRAY_INFO(1, arr, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(numfmt_parse_arginfo, 0, 0, 2) ZEND_ARG_INFO(0, formatter) ZEND_ARG_INFO(0, string) @@ -629,7 +634,7 @@ zend_function_entry intl_functions[] = { PHP_FE( collator_get_strength, collator_0_args ) PHP_FE( collator_set_strength, collator_1_arg ) PHP_FE( collator_sort, collator_sort_args ) - PHP_FE( collator_sort_with_sort_keys, collator_sort_args ) + PHP_FE( collator_sort_with_sort_keys, collator_sort_with_sort_keys_args ) PHP_FE( collator_asort, collator_sort_args ) PHP_FE( collator_get_locale, collator_1_arg ) PHP_FE( collator_get_error_code, collator_0_args ) |