com php-src: Fix incorrect argument reflection info for array_multisort(): ext/reflection/tests/ReflectionPar ameter_canBePassedByValue.phpt
ext/standard/basic_funct ions.c

Commit: a5aae1b66cc11433a8b55cb04a9e9857a98a6b62 Author: Alexander Lisachenko <lisachenko.it@gmail.com> Fri, 14 Nov 2014 15:36:56 +0300 Committer: Stanislav Malyshev <stas@php.net> Sun, 23 Nov 2014 16:38:30 -0800 Parents: 5a3e236bd5f40d17812b4da23ef19a4f4f67abc6 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a5aae1b66cc11433a8b55cb04a9e9857a98a6b62 Log: Fix incorrect argument reflection info for array_multisort() Changed paths: M ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt M ext/standard/basic_functions.c Diff: diff --git a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt index 4772f65..5655d19 100644 --- a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt +++ b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt @@ -41,11 +41,11 @@ Name: arr1 Is passed by reference: yes Can be passed by value: yes -Name: SORT_ASC_or_SORT_DESC +Name: sort_order Is passed by reference: yes Can be passed by value: yes -Name: SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING +Name: sort_flags Is passed by reference: yes Can be passed by value: yes @@ -53,18 +53,6 @@ Name: arr2 Is passed by reference: yes Can be passed by value: yes -Name: SORT_ASC_or_SORT_DESC -Is passed by reference: yes -Can be passed by value: yes - -Name: SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING -Is passed by reference: yes -Can be passed by value: yes - -Name: more_array_and_sort_options -Is passed by reference: yes -Can be passed by value: yes - => sort: Name: arg diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 694ce5b..c6fe61d 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)