iliaa Thu Nov 7 12:49:11 2002 EDT
Modified files:
/php4/ext/standard/tests/array 001.phpt 002.phpt 003.phpt data.inc
Log:
This makes the output of the tests consistent on 32bit and 64 bit platforms.
The old test relied on the 32 bit behaviour, which caused them to always fail
on 64 bit platforms.
Index: php4/ext/standard/tests/array/001.phpt
diff -u php4/ext/standard/tests/array/001.phpt:1.4
php4/ext/standard/tests/array/001.phpt:1.5
--- php4/ext/standard/tests/array/001.phpt:1.4 Tue Aug 20 21:22:01 2002
+++ php4/ext/standard/tests/array/001.phpt Thu Nov 7 12:49:11 2002
@@ -46,7 +46,7 @@
?>
--EXPECT--
-array(10) {
+array(11) {
[0]=>
string(3) "PHP"
[1]=>
@@ -57,7 +57,7 @@
int(27)
[3]=>
string(4) "test"
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -65,8 +65,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 @@
}
}
}
- [6]=>
+ [7]=>
array(1) {
[0]=>
array(1) {
@@ -88,7 +90,7 @@
}
}
}
- [7]=>
+ [8]=>
array(1) {
[0]=>
array(1) {
@@ -111,7 +113,7 @@
int(27)
int(3)
string(4) "test"
-string(11) "-2147483648"
+string(11) "-2147483647"
array(2) {
[0]=>
string(6) "banana"
@@ -119,8 +121,10 @@
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 @@
}
}
}
-int(6)
+int(7)
array(1) {
[0]=>
array(1) {
@@ -142,7 +146,7 @@
}
}
}
-int(7)
+int(8)
array(1) {
[0]=>
array(1) {
@@ -152,4 +156,4 @@
int(0)
}
}
-}
\ No newline at end of file
+}
Index: php4/ext/standard/tests/array/002.phpt
diff -u php4/ext/standard/tests/array/002.phpt:1.2
php4/ext/standard/tests/array/002.phpt:1.3
--- php4/ext/standard/tests/array/002.phpt:1.2 Tue Aug 20 21:22:02 2002
+++ php4/ext/standard/tests/array/002.phpt Thu Nov 7 12:49:11 2002
@@ -30,11 +30,10 @@
?>
--EXPECT--
-
- -- Testing arsort() --
+-- Testing arsort() --
No second argument:
-array(7) {
- ["-2147483648"]=>
+array(8) {
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -45,18 +44,20 @@
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 @@
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 @@
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 @@
}
["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 @@
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 @@
}
}
Using SORT_REGULAR:
-array(7) {
- [-2147483648]=>
+array(8) {
+ [16777216]=>
float(-0.33333333333333)
[0]=>
string(3) "PHP"
@@ -154,11 +163,13 @@
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 @@
}
}
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 @@
string(27) "PHP: Hypertext Preprocessor"
[0]=>
string(3) "PHP"
- ["-2147483648"]=>
+ ["-2147483647"]=>
array(2) {
[0]=>
string(6) "banana"
@@ -189,12 +202,12 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
-- Testing rsort() --
No second argument:
-array(7) {
+array(8) {
[0]=>
array(2) {
[0]=>
@@ -406,16 +437,18 @@
[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 @@
[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 @@
[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 @@
[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 @@
}
}
Using SORT_REGULAR:
-array(7) {
+array(8) {
[0]=>
float(-0.33333333333333)
[1]=>
@@ -515,10 +556,12 @@
[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 @@
}
}
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 @@
[5]=>
string(4) "Test"
[6]=>
+ string(6) "monkey"
+ [7]=>
string(4) "test"
}
Index: php4/ext/standard/tests/array/003.phpt
diff -u php4/ext/standard/tests/array/003.phpt:1.3
php4/ext/standard/tests/array/003.phpt:1.4
--- php4/ext/standard/tests/array/003.phpt:1.3 Wed Aug 21 06:42:55 2002
+++ php4/ext/standard/tests/array/003.phpt Thu Nov 7 12:49:11 2002
@@ -30,11 +30,11 @@
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 @@
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 @@
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 @@
}
-- Testing usort() --
-array(7) {
+array(8) {
[0]=>
float(-0.33333333333333)
[1]=>
@@ -96,5 +100,7 @@
[5]=>
string(4) "Test"
[6]=>
+ string(6) "monkey"
+ [7]=>
string(4) "test"
}
Index: php4/ext/standard/tests/array/data.inc
diff -u php4/ext/standard/tests/array/data.inc:1.1
php4/ext/standard/tests/array/data.inc:1.2
--- php4/ext/standard/tests/array/data.inc:1.1 Tue Mar 26 13:17:38 2002
+++ php4/ext/standard/tests/array/data.inc Thu Nov 7 12:49:11 2002
@@ -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
);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
