From ec3d864784aa14187ca20a7644ee78c813d8b744 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Fri, 6 Oct 2017 16:45:07 +0200 Subject: [PATCH] Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional) Of course, reflection has to know that as well. --- NEWS | 4 ++++ ext/intl/converter/converter.c | 2 +- ext/intl/tests/bug75318.phpt | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ext/intl/tests/bug75318.phpt diff --git a/NEWS b/NEWS index b68ad963884..7079d817c0d 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 5653b463659..2b5cf98ae87 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 00000000000..7235846ea3a --- /dev/null +++ b/ext/intl/tests/bug75318.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #75318 (The parameter of UConverter::getAliases() is not optional) +--SKIP-- + +--FILE-- +getNumberOfRequiredParameters()); +?> +===DONE=== +--EXPECT-- +int(1) +===DONE===