Skip to content

Commit 03251f2

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Replace sort() function calls with ksort() in basic ksort test
2 parents bbae3dd + 57430e6 commit 03251f2

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

ext/standard/tests/array/ksort_basic.phpt

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ var_dump( $temp_array);
4848

4949
echo "\n-- Testing ksort() by supplying string array (case insensitive), 'flag' = SORT_STRING|SORT_FLAG_CASE --\n";
5050
$temp_array = $unsorted_strings;
51-
var_dump( sort($temp_array, SORT_STRING|SORT_FLAG_CASE) ); // expecting : bool(true)
51+
var_dump( ksort($temp_array, SORT_STRING|SORT_FLAG_CASE) ); // expecting : bool(true)
5252
var_dump( $temp_array);
5353

5454
echo "\n-- Testing ksort() by supplying string array (natural), 'flag' = SORT_NATURAL --\n";
5555
$temp_array = $unsorted_strings;
56-
var_dump( sort($temp_array, SORT_NATURAL) ); // expecting : bool(true)
56+
var_dump( ksort($temp_array, SORT_NATURAL) ); // expecting : bool(true)
5757
var_dump( $temp_array);
5858

5959
echo "\n-- Testing ksort() by supplying string array (natural, case insensitive), 'flag' = SORT_NATURAL|SORT_FLAG_CASE --\n";
6060
$temp_array = $unsorted_strings;
61-
var_dump( sort($temp_array, SORT_NATURAL|SORT_FLAG_CASE) ); // expecting : bool(true)
61+
var_dump( ksort($temp_array, SORT_NATURAL|SORT_FLAG_CASE) ); // expecting : bool(true)
6262
var_dump( $temp_array);
6363

6464
echo "\n-- Testing ksort() by supplying numeric array, 'flag' = SORT_NUMERIC --\n";
@@ -163,63 +163,63 @@ array(8) {
163163
-- Testing ksort() by supplying string array (case insensitive), 'flag' = SORT_STRING|SORT_FLAG_CASE --
164164
bool(true)
165165
array(8) {
166-
[0]=>
166+
["b"]=>
167167
string(6) "banana"
168-
[1]=>
168+
["l"]=>
169169
string(5) "lemon"
170-
[2]=>
170+
["o"]=>
171171
string(6) "orange"
172-
[3]=>
172+
["O"]=>
173173
string(6) "Orange"
174-
[4]=>
174+
["O1"]=>
175175
string(7) "Orange1"
176-
[5]=>
176+
["o2"]=>
177177
string(7) "orange2"
178-
[6]=>
178+
["o20"]=>
179179
string(8) "orange20"
180-
[7]=>
180+
["O3"]=>
181181
string(7) "Orange3"
182182
}
183183

184184
-- Testing ksort() by supplying string array (natural), 'flag' = SORT_NATURAL --
185185
bool(true)
186186
array(8) {
187-
[0]=>
187+
["O"]=>
188188
string(6) "Orange"
189-
[1]=>
189+
["O1"]=>
190190
string(7) "Orange1"
191-
[2]=>
191+
["O3"]=>
192192
string(7) "Orange3"
193-
[3]=>
193+
["b"]=>
194194
string(6) "banana"
195-
[4]=>
195+
["l"]=>
196196
string(5) "lemon"
197-
[5]=>
197+
["o"]=>
198198
string(6) "orange"
199-
[6]=>
199+
["o2"]=>
200200
string(7) "orange2"
201-
[7]=>
201+
["o20"]=>
202202
string(8) "orange20"
203203
}
204204

205205
-- Testing ksort() by supplying string array (natural, case insensitive), 'flag' = SORT_NATURAL|SORT_FLAG_CASE --
206206
bool(true)
207207
array(8) {
208-
[0]=>
208+
["b"]=>
209209
string(6) "banana"
210-
[1]=>
210+
["l"]=>
211211
string(5) "lemon"
212-
[2]=>
212+
["o"]=>
213213
string(6) "orange"
214-
[3]=>
214+
["O"]=>
215215
string(6) "Orange"
216-
[4]=>
216+
["O1"]=>
217217
string(7) "Orange1"
218-
[5]=>
218+
["o2"]=>
219219
string(7) "orange2"
220-
[6]=>
220+
["O3"]=>
221221
string(7) "Orange3"
222-
[7]=>
222+
["o20"]=>
223223
string(8) "orange20"
224224
}
225225

0 commit comments

Comments
 (0)