]> granicus.if.org Git - php/commitdiff
Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
authorTyson Andre <tysonandre775@hotmail.com>
Thu, 8 Jun 2017 04:32:57 +0000 (21:32 -0700)
committerRemi Collet <remi@php.net>
Tue, 13 Jun 2017 06:46:47 +0000 (08:46 +0200)
https://secure.php.net/manual/en/collator.getsortkey.php

ext/intl/collator/collator_class.c
ext/intl/tests/bug74705.phpt [new file with mode: 0644]

index 0821cb19d8f6bb6ceaf5548b74b175643958fa0a..26917fd5d7eb1047015630d9c4875e95d44b3b86 100644 (file)
@@ -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 (file)
index 0000000..f26dfe5
--- /dev/null
@@ -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===