diff options
| author | Tyson Andre <tysonandre775@hotmail.com> | 2017-06-07 21:32:57 -0700 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-06-13 08:46:47 +0200 |
| commit | 5f07a895cc340fea081938731f0c9c3b967f062f (patch) | |
| tree | 28db5acbb9220c8d1e1b521c3d0b7b1b179cfa8e | |
| parent | aea8c6ddc18b9e44dd4baec2c6827bc08f40a0bd (diff) | |
| download | php-git-5f07a895cc340fea081938731f0c9c3b967f062f.tar.gz | |
Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
https://secure.php.net/manual/en/collator.getsortkey.php
| -rw-r--r-- | ext/intl/collator/collator_class.c | 2 | ||||
| -rw-r--r-- | ext/intl/tests/bug74705.phpt | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/ext/intl/collator/collator_class.c b/ext/intl/collator/collator_class.c index 0821cb19d8..26917fd5d7 100644 --- a/ext/intl/collator/collator_class.c +++ b/ext/intl/collator/collator_class.c @@ -119,7 +119,7 @@ zend_function_entry Collator_class_functions[] = { PHP_NAMED_FE( getLocale, ZEND_FN( collator_get_locale ), collator_1_arg ) PHP_NAMED_FE( getErrorCode, ZEND_FN( collator_get_error_code ), collator_0_args ) PHP_NAMED_FE( getErrorMessage, ZEND_FN( collator_get_error_message ), collator_0_args ) - PHP_NAMED_FE( getSortKey, ZEND_FN( collator_get_sort_key ), collator_2_args ) + PHP_NAMED_FE( getSortKey, ZEND_FN( collator_get_sort_key ), collator_1_arg ) PHP_FE_END }; /* }}} */ diff --git a/ext/intl/tests/bug74705.phpt b/ext/intl/tests/bug74705.phpt new file mode 100644 index 0000000000..f26dfe5825 --- /dev/null +++ b/ext/intl/tests/bug74705.phpt @@ -0,0 +1,22 @@ +--TEST-- +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'); +var_dump($rm->getNumberOfParameters()); +var_dump($rm->getNumberOfRequiredParameters()); + +$rf = new ReflectionFunction('collator_get_sort_key'); +var_dump($rf->getNumberOfParameters()); +var_dump($rf->getNumberOfRequiredParameters()); +?> +===DONE=== +--EXPECT-- +int(1) +int(1) +int(2) +int(2) +===DONE=== |