Fix incorrect argument reflection info for array_multisort()

diff --git a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt
index 4772f6548dcaefd7172381fd8a4ba10dbe7242a4..5655d19972a2ed6b72326e2faf25bc67abb1d9d7 100644 (file)
--- 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\r
 Can be passed by value: yes\r
 \r
-Name: SORT_ASC_or_SORT_DESC\r
+Name: sort_order\r
 Is passed by reference: yes\r
 Can be passed by value: yes\r
 \r
-Name: SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING\r
+Name: sort_flags\r
 Is passed by reference: yes\r
 Can be passed by value: yes\r
 \r
@@ -53,18 +53,6 @@ Name: arr2
 Is passed by reference: yes\r
 Can be passed by value: yes\r
 \r
-Name: SORT_ASC_or_SORT_DESC\r
-Is passed by reference: yes\r
-Can be passed by value: yes\r
-\r
-Name: SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING\r
-Is passed by reference: yes\r
-Can be passed by value: yes\r
-\r
-Name: more_array_and_sort_options\r
-Is passed by reference: yes\r
-Can be passed by value: yes\r
-\r
 => sort:\r
 \r
 Name: arg\r

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 694ce5be27f67a785e005f5ab4ba346b3e23ad18..c6fe61dd55f74743ccde4ecccbad4719c801e380 100644 (file)
--- 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)