diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-04-13 15:36:15 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-04-13 15:36:15 +0200 |
| commit | 9993304da4559a936246e118cfefa1bcedaa84a5 (patch) | |
| tree | c995aa9e68fd0dfcce90544043b74789c5f59762 | |
| parent | 7c65345e184d318af13e29e5f42aca57db0bdc6b (diff) | |
| parent | 3770c2e46344a33acc23638ff929e87900a476f7 (diff) | |
| download | php-git-9993304da4559a936246e118cfefa1bcedaa84a5.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix arginfo for array_replace(_recursive) and array_merge(_recursive)
| -rw-r--r-- | ext/standard/array.c | 8 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 4bc363bd19..8f5556f393 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -3902,7 +3902,7 @@ static inline void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETE } /* }}} */ -/* {{{ proto array array_merge(array arr1, array arr2 [, array ...]) +/* {{{ proto array array_merge(array arr1 [, array ...]) Merges elements from passed arrays into one array */ PHP_FUNCTION(array_merge) { @@ -3910,7 +3910,7 @@ PHP_FUNCTION(array_merge) } /* }}} */ -/* {{{ proto array array_merge_recursive(array arr1, array arr2 [, array ...]) +/* {{{ proto array array_merge_recursive(array arr1 [, array ...]) Recursively merges elements from passed arrays into one array */ PHP_FUNCTION(array_merge_recursive) { @@ -3918,7 +3918,7 @@ PHP_FUNCTION(array_merge_recursive) } /* }}} */ -/* {{{ proto array array_replace(array arr1, array arr2 [, array ...]) +/* {{{ proto array array_replace(array arr1 [, array ...]) Replaces elements from passed arrays into one array */ PHP_FUNCTION(array_replace) { @@ -3926,7 +3926,7 @@ PHP_FUNCTION(array_replace) } /* }}} */ -/* {{{ proto array array_replace_recursive(array arr1, array arr2 [, array ...]) +/* {{{ proto array array_replace_recursive(array arr1 [, array ...]) Recursively replaces elements from passed arrays into one array */ PHP_FUNCTION(array_replace_recursive) { diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index e1a08f4d75..740e7333ed 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -392,22 +392,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() |