diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2017-10-06 16:46:22 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2017-10-06 16:46:51 +0200 |
| commit | 0f551385330b0b9709ffca83a87e3ed03706b37d (patch) | |
| tree | cf9f118d5f3f2a151539bd9c27d6e3b816f86c11 | |
| parent | d34c8fa802fede44f092e055f50f7fca12eeff3b (diff) | |
| parent | ec3d864784aa14187ca20a7644ee78c813d8b744 (diff) | |
| download | php-git-0f551385330b0b9709ffca83a87e3ed03706b37d.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/intl/converter/converter.c | 2 | ||||
| -rw-r--r-- | ext/intl/tests/bug75318.phpt | 15 |
3 files changed, 20 insertions, 1 deletions
@@ -20,6 +20,10 @@ PHP NEWS - Hash: . Fixed bug #75303 (sha3 hangs on bigendian). (Remi) +- Intl: + . Fixed bug #75318 (The parameter of UConverter::getAliases() is not + optional). (cmb) + - litespeed: . Fixed bug #75248 (Binary directory doesn't get created when building only litespeed SAPI). (petk) diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c index ede61fc80a..138d3635b1 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=== |