From: Tyson Andre <tysonandre775@hotmail.com>
Date: Thu, 8 Jun 2017 04:32:57 +0000 (-0700)
Subject: Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
X-Git-Tag: php-7.0.21RC1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f07a895cc340fea081938731f0c9c3b967f062f;p=php

Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()

https://secure.php.net/manual/en/collator.getsortkey.php
---

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===