Skip to content

Commit 5f07a89

Browse files
TysonAndreremicollet
authored andcommitted
Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
https://secure.php.net/manual/en/collator.getsortkey.php
1 parent aea8c6d commit 5f07a89

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

ext/intl/collator/collator_class.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ zend_function_entry Collator_class_functions[] = {
119119
PHP_NAMED_FE( getLocale, ZEND_FN( collator_get_locale ), collator_1_arg )
120120
PHP_NAMED_FE( getErrorCode, ZEND_FN( collator_get_error_code ), collator_0_args )
121121
PHP_NAMED_FE( getErrorMessage, ZEND_FN( collator_get_error_message ), collator_0_args )
122-
PHP_NAMED_FE( getSortKey, ZEND_FN( collator_get_sort_key ), collator_2_args )
122+
PHP_NAMED_FE( getSortKey, ZEND_FN( collator_get_sort_key ), collator_1_arg )
123123
PHP_FE_END
124124
};
125125
/* }}} */

ext/intl/tests/bug74705.phpt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--TEST--
2+
Bug #74705 Wrong reflection on Collator::getSortKey
3+
--SKIPIF--
4+
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
6+
--FILE--
7+
<?php
8+
$rm = new ReflectionMethod(Collator::class, 'getSortKey');
9+
var_dump($rm->getNumberOfParameters());
10+
var_dump($rm->getNumberOfRequiredParameters());
11+
12+
$rf = new ReflectionFunction('collator_get_sort_key');
13+
var_dump($rf->getNumberOfParameters());
14+
var_dump($rf->getNumberOfRequiredParameters());
15+
?>
16+
===DONE===
17+
--EXPECT--
18+
int(1)
19+
int(1)
20+
int(2)
21+
int(2)
22+
===DONE===

0 commit comments

Comments
 (0)