diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:40:16 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:40:16 -0800 |
| commit | 704e4fe60576cc158d30a3b67a1a7646f3feae2b (patch) | |
| tree | e69b47f3b287d5e99f7893604cc6fc2f61ab8b5d | |
| parent | 3f263c44f413f09f32da5256be54b40d66348285 (diff) | |
| parent | de075d172c1fe218e1a7a5c2dbd5fa84f9af0e1d (diff) | |
| download | php-git-704e4fe60576cc158d30a3b67a1a7646f3feae2b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS
Fix incorrect argument reflection info for array_multisort()
| -rw-r--r-- | ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt index 4772f6548d..5655d19972 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
|