summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2017-10-06 16:45:07 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2017-10-06 16:45:07 +0200
commitec3d864784aa14187ca20a7644ee78c813d8b744 (patch)
tree6ea90e5d49d93679aa2e8aa99e65fd30ea865e12
parent6b9ccda936bb863f9c9830f0aebef672a405a786 (diff)
downloadphp-git-ec3d864784aa14187ca20a7644ee78c813d8b744.tar.gz
Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
Of course, reflection has to know that as well.
-rw-r--r--NEWS4
-rw-r--r--ext/intl/converter/converter.c2
-rw-r--r--ext/intl/tests/bug75318.phpt15
3 files changed, 20 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b68ad96388..7079d817c0 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,10 @@ PHP NEWS
. Fixed bug #75311 (error: 'zend_hash_key' has no member named 'arKey' in
apache2handler). (mcarbonneaux)
+- Intl:
+ . Fixed bug #75318 (The parameter of UConverter::getAliases() is not
+ optional). (cmb)
+
- OCI8:
. Fixed incorrect reference counting. (Dmitry, Tianfang Yang)
diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c
index 5653b46365..2b5cf98ae8 100644
--- a/ext/intl/converter/converter.c
+++ b/ext/intl/converter/converter.c
@@ -897,7 +897,7 @@ static PHP_METHOD(UConverter, getAvailable) {
/* }}} */
/* {{{ proto array UConverter::getAliases(string name) */
-ZEND_BEGIN_ARG_INFO_EX(php_converter_getaliases_arginfo, 0, ZEND_RETURN_VALUE, 0)
+ZEND_BEGIN_ARG_INFO_EX(php_converter_getaliases_arginfo, 0, ZEND_RETURN_VALUE, 1)
ZEND_ARG_INFO(0, name)
ZEND_END_ARG_INFO();
static PHP_METHOD(UConverter, getAliases) {
diff --git a/ext/intl/tests/bug75318.phpt b/ext/intl/tests/bug75318.phpt
new file mode 100644
index 0000000000..7235846ea3
--- /dev/null
+++ b/ext/intl/tests/bug75318.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #75318 (The parameter of UConverter::getAliases() is not optional)
+--SKIP--
+<?php
+if (!extension_loaded('intl')) die('skip intl extension is not available');
+?>
+--FILE--
+<?php
+$rm = new ReflectionMethod('UConverter', 'getAliases');
+var_dump($rm->getNumberOfRequiredParameters());
+?>
+===DONE===
+--EXPECT--
+int(1)
+===DONE===