diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:32:57 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:32:57 -0800 |
| commit | 3f263c44f413f09f32da5256be54b40d66348285 (patch) | |
| tree | c0ff4dffb40456a471a6fe7e6b1c0fef74dd82c3 | |
| parent | 7daa97a3831f4b21eaee656415784538e686ba04 (diff) | |
| parent | a023e032b952ad464bc994f3a68b6273ff26bf28 (diff) | |
| download | php-git-3f263c44f413f09f32da5256be54b40d66348285.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix incorrect argument reflection info for array_multisort()
| -rw-r--r-- | ext/standard/basic_functions.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index f6b9f93fba..9ffe0fe14e 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -549,12 +549,9 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_multisort, 0, 0, 1) ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arr1) /* ARRAY_INFO(0, arg1, 0) */ - ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, SORT_ASC_or_SORT_DESC) - ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING) - ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arr2) - ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, SORT_ASC_or_SORT_DESC) - ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING) - ZEND_ARG_VARIADIC_INFO(ZEND_SEND_PREFER_REF, more_array_and_sort_options) + ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, sort_order) + ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, sort_flags) + ZEND_ARG_VARIADIC_INFO(ZEND_SEND_PREFER_REF, arr2) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_rand, 0, 0, 1) |