Skip to content

Commit 5c4ef9a

Browse files
committed
Fix ksort tests to make expected results consistent with php8 comparison rules
1 parent 10c2160 commit 5c4ef9a

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

ext/standard/tests/array/002.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,8 @@ array(8) {
276276
-- Testing krsort() --
277277
No second argument:
278278
array(8) {
279+
["test"]=>
280+
int(27)
279281
[16777216]=>
280282
float(-0.3333333333333333)
281283
[1001]=>
@@ -288,8 +290,6 @@ array(8) {
288290
string(4) "Test"
289291
[0]=>
290292
string(3) "PHP"
291-
["test"]=>
292-
int(27)
293293
[-1000]=>
294294
array(2) {
295295
[0]=>
@@ -300,6 +300,8 @@ array(8) {
300300
}
301301
Using SORT_REGULAR:
302302
array(8) {
303+
["test"]=>
304+
int(27)
303305
[16777216]=>
304306
float(-0.3333333333333333)
305307
[1001]=>
@@ -312,8 +314,6 @@ array(8) {
312314
string(4) "Test"
313315
[0]=>
314316
string(3) "PHP"
315-
["test"]=>
316-
int(27)
317317
[-1000]=>
318318
array(2) {
319319
[0]=>
@@ -334,10 +334,10 @@ array(8) {
334334
string(27) "PHP: Hypertext Preprocessor"
335335
[5]=>
336336
string(4) "Test"
337-
[0]=>
338-
string(3) "PHP"
339337
["test"]=>
340338
int(27)
339+
[0]=>
340+
string(3) "PHP"
341341
[-1000]=>
342342
array(2) {
343343
[0]=>
@@ -383,8 +383,6 @@ array(8) {
383383
}
384384
[0]=>
385385
string(3) "PHP"
386-
["test"]=>
387-
int(27)
388386
[5]=>
389387
string(4) "Test"
390388
[17]=>
@@ -395,6 +393,8 @@ array(8) {
395393
string(6) "monkey"
396394
[16777216]=>
397395
float(-0.3333333333333333)
396+
["test"]=>
397+
int(27)
398398
}
399399
Using SORT_REGULAR:
400400
array(8) {
@@ -407,8 +407,6 @@ array(8) {
407407
}
408408
[0]=>
409409
string(3) "PHP"
410-
["test"]=>
411-
int(27)
412410
[5]=>
413411
string(4) "Test"
414412
[17]=>
@@ -419,6 +417,8 @@ array(8) {
419417
string(6) "monkey"
420418
[16777216]=>
421419
float(-0.3333333333333333)
420+
["test"]=>
421+
int(27)
422422
}
423423
Using SORT_NUMERIC:
424424
array(8) {
0 Bytes
Binary file not shown.

ext/standard/tests/array/krsort_variation9.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,22 @@ array(5) {
8282
- With default sort flag -
8383
bool(true)
8484
array(3) {
85+
["c"]=>
86+
string(5) "apple"
8587
["a"]=>
8688
string(6) "orange"
8789
[0]=>
8890
string(6) "banana"
89-
["c"]=>
90-
string(5) "apple"
9191
}
9292
- Sort flag = SORT_REGULAR -
9393
bool(true)
9494
array(3) {
95+
["c"]=>
96+
string(5) "apple"
9597
["a"]=>
9698
string(6) "orange"
9799
[0]=>
98100
string(6) "banana"
99-
["c"]=>
100-
string(5) "apple"
101101
}
102102

103103
-- Iteration 3 --
0 Bytes
Binary file not shown.

ext/standard/tests/array/ksort_variation9.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,20 @@ array(5) {
8181
- With default sort flag -
8282
bool(true)
8383
array(3) {
84-
["a"]=>
85-
string(6) "orange"
8684
[0]=>
8785
string(6) "banana"
86+
["a"]=>
87+
string(6) "orange"
8888
["c"]=>
8989
string(5) "apple"
9090
}
9191
- Sort flag = SORT_REGULAR -
9292
bool(true)
9393
array(3) {
94-
["a"]=>
95-
string(6) "orange"
9694
[0]=>
9795
string(6) "banana"
96+
["a"]=>
97+
string(6) "orange"
9898
["c"]=>
9999
string(5) "apple"
100100
}

0 commit comments

Comments
 (0)