diff options
| author | Remi Collet <remi@php.net> | 2017-06-13 08:48:17 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-06-13 08:48:17 +0200 |
| commit | 78970d5338e443eb19b6e589a4f6c449ca0a3d02 (patch) | |
| tree | e7bfca84e6fb6761d4a2707ad75636621b68d2ef | |
| parent | 5f07a895cc340fea081938731f0c9c3b967f062f (diff) | |
| download | php-git-78970d5338e443eb19b6e589a4f6c449ca0a3d02.tar.gz | |
Fix bug #74705 for collator_get_sort_key
| -rw-r--r-- | ext/intl/php_intl.c | 2 | ||||
| -rw-r--r-- | ext/intl/tests/bug74705.phpt | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 787cb48fcc..9584be76cd 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -655,7 +655,7 @@ zend_function_entry intl_functions[] = { PHP_FE( collator_get_locale, collator_1_arg ) PHP_FE( collator_get_error_code, collator_0_args ) PHP_FE( collator_get_error_message, collator_0_args ) - PHP_FE( collator_get_sort_key, collator_2_args ) + PHP_FE( collator_get_sort_key, collator_1_arg ) /* formatter functions */ PHP_FE( numfmt_create, arginfo_numfmt_create ) diff --git a/ext/intl/tests/bug74705.phpt b/ext/intl/tests/bug74705.phpt index f26dfe5825..63a85845a0 100644 --- a/ext/intl/tests/bug74705.phpt +++ b/ext/intl/tests/bug74705.phpt @@ -2,7 +2,6 @@ Bug #74705 Wrong reflection on Collator::getSortKey --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> -<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?> --FILE-- <?php $rm = new ReflectionMethod(Collator::class, 'getSortKey'); |