Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  Fix incorrect argument reflection info for array_multisort()
This commit is contained in:
Stanislav Malyshev 2014-11-23 16:40:16 -08:00
commit 704e4fe605

View file

@ -41,11 +41,11 @@ Name: arr1
Is passed by reference: yes Is passed by reference: yes
Can be passed by value: yes Can be passed by value: yes
Name: SORT_ASC_or_SORT_DESC Name: sort_order
Is passed by reference: yes Is passed by reference: yes
Can be passed by value: yes Can be passed by value: yes
Name: SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING Name: sort_flags
Is passed by reference: yes Is passed by reference: yes
Can be passed by value: yes Can be passed by value: yes
@ -53,18 +53,6 @@ Name: arr2
Is passed by reference: yes Is passed by reference: yes
Can be passed by value: 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: => sort:
Name: arg Name: arg