From 19f37dc6fa7b0e5cbe41d50ddb4645c521d8221b Mon Sep 17 00:00:00 2001 From: haszi Date: Sat, 26 Dec 2020 21:20:21 +0100 Subject: [PATCH 1/2] Replaced sort() function calls with ksort() --- ext/standard/tests/array/ksort_basic.phpt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/ksort_basic.phpt index 2e515a0c7da85..3c960cef5936a 100644 --- a/ext/standard/tests/array/ksort_basic.phpt +++ b/ext/standard/tests/array/ksort_basic.phpt @@ -48,17 +48,17 @@ var_dump( $temp_array); echo "\n-- Testing ksort() by supplying string array (case insensitive), 'flag' = SORT_STRING|SORT_FLAG_CASE --\n"; $temp_array = $unsorted_strings; -var_dump( sort($temp_array, SORT_STRING|SORT_FLAG_CASE) ); // expecting : bool(true) +var_dump( ksort($temp_array, SORT_STRING|SORT_FLAG_CASE) ); // expecting : bool(true) var_dump( $temp_array); echo "\n-- Testing ksort() by supplying string array (natural), 'flag' = SORT_NATURAL --\n"; $temp_array = $unsorted_strings; -var_dump( sort($temp_array, SORT_NATURAL) ); // expecting : bool(true) +var_dump( ksort($temp_array, SORT_NATURAL) ); // expecting : bool(true) var_dump( $temp_array); echo "\n-- Testing ksort() by supplying string array (natural, case insensitive), 'flag' = SORT_NATURAL|SORT_FLAG_CASE --\n"; $temp_array = $unsorted_strings; -var_dump( sort($temp_array, SORT_NATURAL|SORT_FLAG_CASE) ); // expecting : bool(true) +var_dump( ksort($temp_array, SORT_NATURAL|SORT_FLAG_CASE) ); // expecting : bool(true) var_dump( $temp_array); echo "\n-- Testing ksort() by supplying numeric array, 'flag' = SORT_NUMERIC --\n"; From bceca0dcf91a4b94b55b07dcd56fe1b731d6f766 Mon Sep 17 00:00:00 2001 From: haszi Date: Sun, 27 Dec 2020 17:03:41 +0100 Subject: [PATCH 2/2] Updated expected test results --- ext/standard/tests/array/ksort_basic.phpt | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/ksort_basic.phpt index 3c960cef5936a..96135981f3bfa 100644 --- a/ext/standard/tests/array/ksort_basic.phpt +++ b/ext/standard/tests/array/ksort_basic.phpt @@ -163,63 +163,63 @@ array(8) { -- Testing ksort() by supplying string array (case insensitive), 'flag' = SORT_STRING|SORT_FLAG_CASE -- bool(true) array(8) { - [0]=> + ["b"]=> string(6) "banana" - [1]=> + ["l"]=> string(5) "lemon" - [2]=> + ["o"]=> string(6) "orange" - [3]=> + ["O"]=> string(6) "Orange" - [4]=> + ["O1"]=> string(7) "Orange1" - [5]=> + ["o2"]=> string(7) "orange2" - [6]=> + ["o20"]=> string(8) "orange20" - [7]=> + ["O3"]=> string(7) "Orange3" } -- Testing ksort() by supplying string array (natural), 'flag' = SORT_NATURAL -- bool(true) array(8) { - [0]=> + ["O"]=> string(6) "Orange" - [1]=> + ["O1"]=> string(7) "Orange1" - [2]=> + ["O3"]=> string(7) "Orange3" - [3]=> + ["b"]=> string(6) "banana" - [4]=> + ["l"]=> string(5) "lemon" - [5]=> + ["o"]=> string(6) "orange" - [6]=> + ["o2"]=> string(7) "orange2" - [7]=> + ["o20"]=> string(8) "orange20" } -- Testing ksort() by supplying string array (natural, case insensitive), 'flag' = SORT_NATURAL|SORT_FLAG_CASE -- bool(true) array(8) { - [0]=> + ["b"]=> string(6) "banana" - [1]=> + ["l"]=> string(5) "lemon" - [2]=> + ["o"]=> string(6) "orange" - [3]=> + ["O"]=> string(6) "Orange" - [4]=> + ["O1"]=> string(7) "Orange1" - [5]=> + ["o2"]=> string(7) "orange2" - [6]=> + ["O3"]=> string(7) "Orange3" - [7]=> + ["o20"]=> string(8) "orange20" }