From a5aae1b66cc11433a8b55cb04a9e9857a98a6b62 Mon Sep 17 00:00:00 2001 From: Alexander Lisachenko Date: Fri, 14 Nov 2014 15:36:56 +0300 Subject: [PATCH 1/2] Fix incorrect argument reflection info for array_multisort() --- .../ReflectionParameter_canBePassedByValue.phpt | 16 ++-------------- ext/standard/basic_functions.c | 9 +++------ 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt index 4772f6548dc..5655d19972a 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 694ce5be27f..c6fe61dd55f 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) From de075d172c1fe218e1a7a5c2dbd5fa84f9af0e1d Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 23 Nov 2014 16:39:52 -0800 Subject: [PATCH 2/2] update NEWS --- NEWS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 3f888916896..90c67fe29f5 100644 --- a/NEWS +++ b/NEWS @@ -7,10 +7,13 @@ PHP NEWS (Adam) . Fixed bug #68104 (Segfault while pre-evaluating a disabled function). (Laruence) - . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly triggered). (Julien) + . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly + triggered). (Julien) . Fixed bug #68355 (Inconsistency in example php.ini comments). (Chris McCafferty) . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence) + . Fixed bug #68422 (Incorrect argument reflection info for array_multisort()). + (Alexander Lisachenko) . Fixed bug #68446 (Array constant not accepted for array parameter default). (Bob) - FPM: