diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-03-25 14:53:57 -0300 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-04-13 15:27:16 +0200 |
| commit | bb79e5764b2dd0671016a53ff567c8303dd184f1 (patch) | |
| tree | 864bc2dfb9915011a12c3b5a4a1f750d5970462b /ext/standard/basic_functions.c | |
| parent | 5fe6d2134b45818222248b8e20694f407bb52d63 (diff) | |
| download | php-git-bb79e5764b2dd0671016a53ff567c8303dd184f1.tar.gz | |
Fix arginfo for array_replace(_recursive) and array_merge(_recursive)
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 2dc6207c90..dac101109a 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -393,22 +393,22 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_slice, 0, 0, 2) ZEND_ARG_INFO(0, preserve_keys) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge, 0, 0, 1) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge_recursive, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge_recursive, 0, 0, 1) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_array_replace, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_array_replace, 0, 0, 1) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_array_replace_recursive, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_array_replace_recursive, 0, 0, 1) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() @@ -4042,7 +4042,7 @@ PHP_FUNCTION(long2ip) ********************/ /* {{{ proto string getenv(string varname[, bool local_only] - Get the value of an environment variable or every available environment variable + Get the value of an environment variable or every available environment variable if no varname is present */ PHP_FUNCTION(getenv) { |