summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/standard/tests/array/001.phpt24
-rw-r--r--ext/standard/tests/array/002.phpt223
-rw-r--r--ext/standard/tests/array/003.phpt22
-rw-r--r--ext/standard/tests/array/data.inc4
4 files changed, 165 insertions, 108 deletions
diff --git a/ext/standard/tests/array/001.phpt b/ext/standard/tests/array/001.phpt
index 9efb8003b1..181122708e 100644
--- a/ext/standard/tests/array/001.phpt
+++ b/ext/standard/tests/array/001.phpt
@@ -46,7 +46,7 @@ array_walk ($data, 'echo_kv');
?>
--EXPECT--
-array(10) {
+array(11) {
[0]=>
string(3) "PHP"
[1]=>
@@ -57,7 +57,7 @@ array(10) {
int(27)
[3]=>
string(4) "test"
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -65,8 +65,10 @@ array(10) {
string(6) "orange"
}
[4]=>
- float(-0.33333333333333)
+ string(6) "monkey"
[5]=>
+ float(-0.33333333333333)
+ [6]=>
array(1) {
[0]=>
array(1) {
@@ -77,7 +79,7 @@ array(10) {
}
}
}
- [6]=>
+ [7]=>
array(1) {
[0]=>
array(1) {
@@ -88,7 +90,7 @@ array(10) {
}
}
}
- [7]=>
+ [8]=>
array(1) {
[0]=>
array(1) {
@@ -111,7 +113,7 @@ string(4) "test"
int(27)
int(3)
string(4) "test"
-string(11) "-2147483648"
+string(11) "-2147483647"
array(2) {
[0]=>
string(6) "banana"
@@ -119,8 +121,10 @@ array(2) {
string(6) "orange"
}
int(4)
-float(-0.33333333333333)
+string(6) "monkey"
int(5)
+float(-0.33333333333333)
+int(6)
array(1) {
[0]=>
array(1) {
@@ -131,7 +135,7 @@ array(1) {
}
}
}
-int(6)
+int(7)
array(1) {
[0]=>
array(1) {
@@ -142,7 +146,7 @@ array(1) {
}
}
}
-int(7)
+int(8)
array(1) {
[0]=>
array(1) {
@@ -152,4 +156,4 @@ array(1) {
int(0)
}
}
-} \ No newline at end of file
+}
diff --git a/ext/standard/tests/array/002.phpt b/ext/standard/tests/array/002.phpt
index 4c263ef625..548c3bc9fe 100644
--- a/ext/standard/tests/array/002.phpt
+++ b/ext/standard/tests/array/002.phpt
@@ -30,11 +30,10 @@ foreach (array ('arsort', 'asort', 'krsort', 'ksort', 'rsort', 'sort') as $test_
?>
--EXPECT--
-
- -- Testing arsort() --
+-- Testing arsort() --
No second argument:
-array(7) {
- ["-2147483648"]=>
+array(8) {
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -45,18 +44,20 @@ array(7) {
int(27)
[2147483647]=>
string(4) "test"
+ [-2147483648]=>
+ string(6) "monkey"
[5]=>
string(4) "Test"
[17]=>
string(27) "PHP: Hypertext Preprocessor"
[0]=>
string(3) "PHP"
- [-2147483648]=>
+ [16777216]=>
float(-0.33333333333333)
}
Using SORT_REGULAR:
-array(7) {
- ["-2147483648"]=>
+array(8) {
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -67,20 +68,22 @@ array(7) {
int(27)
[2147483647]=>
string(4) "test"
+ [-2147483648]=>
+ string(6) "monkey"
[5]=>
string(4) "Test"
[17]=>
string(27) "PHP: Hypertext Preprocessor"
[0]=>
string(3) "PHP"
- [-2147483648]=>
+ [16777216]=>
float(-0.33333333333333)
}
Using SORT_NUMERIC:
-array(7) {
+array(8) {
["test"]=>
int(27)
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -91,24 +94,28 @@ array(7) {
string(3) "PHP"
[17]=>
string(27) "PHP: Hypertext Preprocessor"
+ [-2147483648]=>
+ string(6) "monkey"
[5]=>
string(4) "Test"
[2147483647]=>
string(4) "test"
- [-2147483648]=>
+ [16777216]=>
float(-0.33333333333333)
}
Using SORT_STRING
-array(7) {
+array(8) {
[2147483647]=>
string(4) "test"
+ [-2147483648]=>
+ string(6) "monkey"
[5]=>
string(4) "Test"
[17]=>
string(27) "PHP: Hypertext Preprocessor"
[0]=>
string(3) "PHP"
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -117,14 +124,14 @@ array(7) {
}
["test"]=>
int(27)
- [-2147483648]=>
+ [16777216]=>
float(-0.33333333333333)
}
-- Testing asort() --
No second argument:
-array(7) {
- [-2147483648]=>
+array(8) {
+ [16777216]=>
float(-0.33333333333333)
[0]=>
string(3) "PHP"
@@ -132,11 +139,13 @@ array(7) {
string(27) "PHP: Hypertext Preprocessor"
[5]=>
string(4) "Test"
+ [-2147483648]=>
+ string(6) "monkey"
[2147483647]=>
string(4) "test"
["test"]=>
int(27)
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -145,8 +154,8 @@ array(7) {
}
}
Using SORT_REGULAR:
-array(7) {
- [-2147483648]=>
+array(8) {
+ [16777216]=>
float(-0.33333333333333)
[0]=>
string(3) "PHP"
@@ -154,11 +163,13 @@ array(7) {
string(27) "PHP: Hypertext Preprocessor"
[5]=>
string(4) "Test"
+ [-2147483648]=>
+ string(6) "monkey"
[2147483647]=>
string(4) "test"
["test"]=>
int(27)
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -167,9 +178,11 @@ array(7) {
}
}
Using SORT_NUMERIC:
-array(7) {
- [-2147483648]=>
+array(8) {
+ [16777216]=>
float(-0.33333333333333)
+ [-2147483648]=>
+ string(6) "monkey"
[2147483647]=>
string(4) "test"
[5]=>
@@ -178,7 +191,7 @@ array(7) {
string(27) "PHP: Hypertext Preprocessor"
[0]=>
string(3) "PHP"
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -189,12 +202,12 @@ array(7) {
int(27)
}
Using SORT_STRING
-array(7) {
- [-2147483648]=>
+array(8) {
+ [16777216]=>
float(-0.33333333333333)
["test"]=>
int(27)
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -207,15 +220,19 @@ array(7) {
string(27) "PHP: Hypertext Preprocessor"
[5]=>
string(4) "Test"
+ [-2147483648]=>
+ string(6) "monkey"
[2147483647]=>
string(4) "test"
}
-- Testing krsort() --
No second argument:
-array(7) {
+array(8) {
[2147483647]=>
string(4) "test"
+ [16777216]=>
+ float(-0.33333333333333)
[17]=>
string(27) "PHP: Hypertext Preprocessor"
[5]=>
@@ -224,29 +241,31 @@ array(7) {
int(27)
[0]=>
string(3) "PHP"
- [-2147483648]=>
- float(-0.33333333333333)
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
[1]=>
string(6) "orange"
}
+ [-2147483648]=>
+ string(6) "monkey"
}
Using SORT_REGULAR:
-array(7) {
+array(8) {
[2147483647]=>
string(4) "test"
+ [16777216]=>
+ float(-0.33333333333333)
[17]=>
string(27) "PHP: Hypertext Preprocessor"
[5]=>
string(4) "Test"
- [0]=>
- string(3) "PHP"
["test"]=>
int(27)
- ["-2147483648"]=>
+ [0]=>
+ string(3) "PHP"
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -254,12 +273,14 @@ array(7) {
string(6) "orange"
}
[-2147483648]=>
- float(-0.33333333333333)
+ string(6) "monkey"
}
Using SORT_NUMERIC:
-array(7) {
+array(8) {
[2147483647]=>
string(4) "test"
+ [16777216]=>
+ float(-0.33333333333333)
[17]=>
string(27) "PHP: Hypertext Preprocessor"
[5]=>
@@ -268,18 +289,18 @@ array(7) {
int(27)
[0]=>
string(3) "PHP"
- [-2147483648]=>
- float(-0.33333333333333)
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
[1]=>
string(6) "orange"
}
+ [-2147483648]=>
+ string(6) "monkey"
}
Using SORT_STRING
-array(7) {
+array(8) {
["test"]=>
int(27)
[5]=>
@@ -288,31 +309,33 @@ array(7) {
string(4) "test"
[17]=>
string(27) "PHP: Hypertext Preprocessor"
+ [16777216]=>
+ float(-0.33333333333333)
[0]=>
string(3) "PHP"
- ["-2147483648"]=>
+ [-2147483648]=>
+ string(6) "monkey"
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
[1]=>
string(6) "orange"
}
- [-2147483648]=>
- float(-0.33333333333333)
}
-- Testing ksort() --
No second argument:
-array(7) {
- ["-2147483648"]=>
+array(8) {
+ [-2147483648]=>
+ string(6) "monkey"
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
[1]=>
string(6) "orange"
}
- [-2147483648]=>
- float(-0.33333333333333)
[0]=>
string(3) "PHP"
["test"]=>
@@ -321,14 +344,16 @@ array(7) {
string(4) "Test"
[17]=>
string(27) "PHP: Hypertext Preprocessor"
+ [16777216]=>
+ float(-0.33333333333333)
[2147483647]=>
string(4) "test"
}
Using SORT_REGULAR:
-array(7) {
+array(8) {
[-2147483648]=>
- float(-0.33333333333333)
- ["-2147483648"]=>
+ string(6) "monkey"
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -343,20 +368,22 @@ array(7) {
string(4) "Test"
[17]=>
string(27) "PHP: Hypertext Preprocessor"
+ [16777216]=>
+ float(-0.33333333333333)
[2147483647]=>
string(4) "test"
}
Using SORT_NUMERIC:
-array(7) {
- ["-2147483648"]=>
+array(8) {
+ [-2147483648]=>
+ string(6) "monkey"
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
[1]=>
string(6) "orange"
}
- [-2147483648]=>
- float(-0.33333333333333)
[0]=>
string(3) "PHP"
["test"]=>
@@ -365,22 +392,26 @@ array(7) {
string(4) "Test"
[17]=>
string(27) "PHP: Hypertext Preprocessor"
+ [16777216]=>
+ float(-0.33333333333333)
[2147483647]=>
string(4) "test"
}
Using SORT_STRING
-array(7) {
- [-2147483648]=>
- float(-0.33333333333333)
- ["-2147483648"]=>
+array(8) {
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
[1]=>
string(6) "orange"
}
+ [-2147483648]=>
+ string(6) "monkey"
[0]=>
string(3) "PHP"
+ [16777216]=>
+ float(-0.33333333333333)
[17]=>
string(27) "PHP: Hypertext Preprocessor"
[2147483647]=>
@@ -393,7 +424,7 @@ array(7) {
-- Testing rsort() --
No second argument:
-array(7) {
+array(8) {
[0]=>
array(2) {
[0]=>
@@ -406,16 +437,18 @@ array(7) {
[2]=>
string(4) "test"
[3]=>
- string(4) "Test"
+ string(6) "monkey"
[4]=>
- string(27) "PHP: Hypertext Preprocessor"
+ string(4) "Test"
[5]=>
- string(3) "PHP"
+ string(27) "PHP: Hypertext Preprocessor"
[6]=>
+ string(3) "PHP"
+ [7]=>
float(-0.33333333333333)
}
Using SORT_REGULAR:
-array(7) {
+array(8) {
[0]=>
array(2) {
[0]=>
@@ -428,16 +461,18 @@ array(7) {
[2]=>
string(4) "test"
[3]=>
- string(4) "Test"
+ string(6) "monkey"
[4]=>
- string(27) "PHP: Hypertext Preprocessor"
+ string(4) "Test"
[5]=>
- string(3) "PHP"
+ string(27) "PHP: Hypertext Preprocessor"
[6]=>
+ string(3) "PHP"
+ [7]=>
float(-0.33333333333333)
}
Using SORT_NUMERIC:
-array(7) {
+array(8) {
[0]=>
int(27)
[1]=>
@@ -452,38 +487,42 @@ array(7) {
[3]=>
string(27) "PHP: Hypertext Preprocessor"
[4]=>
- string(4) "Test"
+ string(6) "monkey"
[5]=>
- string(4) "test"
+ string(4) "Test"
[6]=>
+ string(4) "test"
+ [7]=>
float(-0.33333333333333)
}
Using SORT_STRING
-array(7) {
+array(8) {
[0]=>
string(4) "test"
[1]=>
- string(4) "Test"
+ string(6) "monkey"
[2]=>
- string(27) "PHP: Hypertext Preprocessor"
+ string(4) "Test"
[3]=>
- string(3) "PHP"
+ string(27) "PHP: Hypertext Preprocessor"
[4]=>
+ string(3) "PHP"
+ [5]=>
array(2) {
[0]=>
string(6) "banana"
[1]=>
string(6) "orange"
}
- [5]=>
- int(27)
[6]=>
+ int(27)
+ [7]=>
float(-0.33333333333333)
}
-- Testing sort() --
No second argument:
-array(7) {
+array(8) {
[0]=>
float(-0.33333333333333)
[1]=>
@@ -493,10 +532,12 @@ array(7) {
[3]=>
string(4) "Test"
[4]=>
- string(4) "test"
+ string(6) "monkey"
[5]=>
- int(27)
+ string(4) "test"
[6]=>
+ int(27)
+ [7]=>
array(2) {
[0]=>
string(6) "banana"
@@ -505,7 +546,7 @@ array(7) {
}
}
Using SORT_REGULAR:
-array(7) {
+array(8) {
[0]=>
float(-0.33333333333333)
[1]=>
@@ -515,10 +556,12 @@ array(7) {
[3]=>
string(4) "Test"
[4]=>
- string(4) "test"
+ string(6) "monkey"
[5]=>
- int(27)
+ string(4) "test"
[6]=>
+ int(27)
+ [7]=>
array(2) {
[0]=>
string(6) "banana"
@@ -527,29 +570,31 @@ array(7) {
}
}
Using SORT_NUMERIC:
-array(7) {
+array(8) {
[0]=>
float(-0.33333333333333)
[1]=>
- string(4) "test"
+ string(6) "monkey"
[2]=>
- string(4) "Test"
+ string(4) "test"
[3]=>
- string(27) "PHP: Hypertext Preprocessor"
+ string(4) "Test"
[4]=>
- string(3) "PHP"
+ string(27) "PHP: Hypertext Preprocessor"
[5]=>
+ string(3) "PHP"
+ [6]=>
array(2) {
[0]=>
string(6) "banana"
[1]=>
string(6) "orange"
}
- [6]=>
+ [7]=>
int(27)
}
Using SORT_STRING
-array(7) {
+array(8) {
[0]=>
float(-0.33333333333333)
[1]=>
@@ -568,5 +613,7 @@ array(7) {
[5]=>
string(4) "Test"
[6]=>
+ string(6) "monkey"
+ [7]=>
string(4) "test"
}
diff --git a/ext/standard/tests/array/003.phpt b/ext/standard/tests/array/003.phpt
index 2d24cc7f02..addaa0e418 100644
--- a/ext/standard/tests/array/003.phpt
+++ b/ext/standard/tests/array/003.phpt
@@ -30,11 +30,11 @@ usort ($data, 'cmp');
var_dump ($data);
?>
--EXPECT--
- -- Testing uasort() --
-array(7) {
- [-2147483648]=>
+-- Testing uasort() --
+array(8) {
+ [16777216]=>
float(-0.33333333333333)
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -49,13 +49,15 @@ array(7) {
string(27) "PHP: Hypertext Preprocessor"
[5]=>
string(4) "Test"
+ [-2147483648]=>
+ string(6) "monkey"
[2147483647]=>
string(4) "test"
}
-- Testing uksort() --
-array(7) {
- ["-2147483648"]=>
+array(8) {
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -63,9 +65,11 @@ array(7) {
string(6) "orange"
}
[-2147483648]=>
- float(-0.33333333333333)
+ string(6) "monkey"
[0]=>
string(3) "PHP"
+ [16777216]=>
+ float(-0.33333333333333)
[17]=>
string(27) "PHP: Hypertext Preprocessor"
[2147483647]=>
@@ -77,7 +81,7 @@ array(7) {
}
-- Testing usort() --
-array(7) {
+array(8) {
[0]=>
float(-0.33333333333333)
[1]=>
@@ -96,5 +100,7 @@ array(7) {
[5]=>
string(4) "Test"
[6]=>
+ string(6) "monkey"
+ [7]=>
string(4) "test"
}
diff --git a/ext/standard/tests/array/data.inc b/ext/standard/tests/array/data.inc
index b700a701a9..641c1d54c0 100644
--- a/ext/standard/tests/array/data.inc
+++ b/ext/standard/tests/array/data.inc
@@ -1,12 +1,12 @@
<?php
-$tmp = pow(2,64);
+$tmp = pow(2,24);
$data = array(
'PHP',
17=>'PHP: Hypertext Preprocessor',
5=>'Test',
'test'=>27,
2147483647=>'test',
- "-2147483648"=>array('banana', 'orange'),
+ "-2147483647"=>array('banana', 'orange'),
'monkey',
$tmp=>-1/3
);
View Lorry Controller Status