diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2017-10-06 16:56:46 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2017-10-06 16:57:20 +0200 |
| commit | d0146c25062f6eaa7687cd74756dba6558ec941a (patch) | |
| tree | 99e495ef94640e8e5498102c125ac329c9fb5402 | |
| parent | 0e8ccb179d436246fe41f9fcd25db0074093fb1d (diff) | |
| parent | 0f551385330b0b9709ffca83a87e3ed03706b37d (diff) | |
| download | php-git-d0146c25062f6eaa7687cd74756dba6558ec941a.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
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
@@ -18,6 +18,10 @@ PHP NEWS - Hash: . Fixed Bug #75284 (sha3 is not supported on bigendian machine). (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 f3201c7e46..8d597c1c34 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=== |