From 9061bf39bd0b5e9a554200e2d2f67e15e2d5729c Mon Sep 17 00:00:00 2001 From: Matt Wilmas Date: Thu, 4 Jun 2009 18:24:09 +0000 Subject: [PATCH] Updated tests after double->long conversion change (basically to match 5.2) # Let me know about other failing tests I missed --- Zend/tests/bug39018.phpt | 2 +- Zend/tests/int_overflow_64bit.phpt | 6 +- Zend/tests/int_underflow_32bit.phpt | 8 +- ext/date/tests/date_sunrise_variation9.phpt | 12 +- ext/date/tests/date_sunset_variation9.phpt | 12 +- ext/date/tests/getdate_variation7.phpt | 34 +-- ext/date/tests/gmdate_variation14.phpt | 4 +- ext/date/tests/gmstrftime_variation2.phpt | 4 +- ext/date/tests/idate_variation3.phpt | 4 +- ext/date/tests/localtime_variation3.phpt | 56 ++--- ext/date/tests/strftime_variation23.phpt | 4 +- ext/ereg/tests/split_variation_004.phpt | 12 +- ext/ereg/tests/spliti_variation_004.phpt | 12 +- .../tests/array/array_fill_variation1.phpt | 4 +- .../tests/array/array_slice_variation2.phpt | 10 +- .../tests/array/array_slice_variation3.phpt | 6 +- .../gettype_settype_variation2.phpt | 12 +- .../tests/math/decbin_variation1.phpt | 4 +- .../tests/math/decbin_variation1_64bit.phpt | 2 +- .../tests/math/dechex_variation1.phpt | 4 +- .../tests/math/dechex_variation1_64bit.phpt | 2 +- .../tests/math/decoct_variation1.phpt | 4 +- .../tests/math/decoct_variation1_64bit.phpt | 2 +- .../tests/strings/chunk_split_variation2.phpt | 4 +- .../htmlspecialchars_decode_variation2.phpt | 2 +- ext/standard/tests/strings/pack.phpt | 10 +- .../tests/strings/sprintf_variation35.phpt | 20 +- .../tests/strings/sprintf_variation4.phpt | 18 +- .../tests/strings/sprintf_variation41.phpt | 18 +- .../tests/strings/vfprintf_variation15.phpt | 4 +- .../tests/strings/vfprintf_variation16.phpt | 4 +- .../tests/strings/vfprintf_variation4.phpt | 2 +- .../tests/strings/vprintf_variation15.phpt | 4 +- .../strings/vprintf_variation15_64bit.phpt | 4 +- .../tests/strings/vprintf_variation16.phpt | 4 +- .../tests/strings/vprintf_variation4.phpt | 4 +- .../tests/strings/vsprintf_variation15.phpt | 2 +- .../strings/vsprintf_variation15_64bit.phpt | 2 +- .../tests/strings/vsprintf_variation16.phpt | 4 +- .../tests/strings/vsprintf_variation4.phpt | 4 +- .../url/parse_url_variation_002_32bit.phpt | 205 ++++++++++++++++++ ...hpt => parse_url_variation_002_64bit.phpt} | 2 + 42 files changed, 367 insertions(+), 170 deletions(-) create mode 100644 ext/standard/tests/url/parse_url_variation_002_32bit.phpt rename ext/standard/tests/url/{parse_url_variation_002.phpt => parse_url_variation_002_64bit.phpt} (97%) diff --git a/Zend/tests/bug39018.phpt b/Zend/tests/bug39018.phpt index 1bc23d3bab..6de9092c9f 100644 --- a/Zend/tests/bug39018.phpt +++ b/Zend/tests/bug39018.phpt @@ -65,7 +65,7 @@ print "\nDone\n"; Notice: Uninitialized string offset: 0 in %s on line 12 -Notice: Uninitialized string offset: -%d in %s on line 16 +Notice: Uninitialized string offset: %i in %s on line 16 Notice: Uninitialized string offset: 4 in %s on line 28 diff --git a/Zend/tests/int_overflow_64bit.phpt b/Zend/tests/int_overflow_64bit.phpt index 0cb9ea9f81..7c54125020 100644 --- a/Zend/tests/int_overflow_64bit.phpt +++ b/Zend/tests/int_overflow_64bit.phpt @@ -24,9 +24,9 @@ echo "Done\n"; ?> --EXPECT-- int(9223372036854775807) -int(9223372036854775807) -int(9223372036854775807) -int(9223372036854775807) +int(-9223372036854775808) +int(-9223372036854775808) +int(0) int(-9223372036854775808) int(-9223372036854775808) int(-9223372036854775808) diff --git a/Zend/tests/int_underflow_32bit.phpt b/Zend/tests/int_underflow_32bit.phpt index 68e3576242..79a949aac5 100644 --- a/Zend/tests/int_underflow_32bit.phpt +++ b/Zend/tests/int_underflow_32bit.phpt @@ -22,8 +22,8 @@ echo "Done\n"; ?> --EXPECT-- int(-2147483648) -int(-2147483648) -int(-2147483648) -int(-2147483648) -int(-2147483648) +int(2147483647) +int(2147483638) +int(2147483548) +int(2147482648) Done diff --git a/ext/date/tests/date_sunrise_variation9.phpt b/ext/date/tests/date_sunrise_variation9.phpt index c320655137..63794bf20e 100644 --- a/ext/date/tests/date_sunrise_variation9.phpt +++ b/ext/date/tests/date_sunrise_variation9.phpt @@ -36,12 +36,12 @@ var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $ze \*\*\* Testing date_sunrise\(\) : usage variation \*\*\* -- Testing date_sunrise\(\) function by passing float 12.3456789000e10 value to time -- -unicode\(5\) "(08:53|07:49)" -float\((8.883[0-9]*|8.883[0-9]*|7.821[0-9]*)\) -int\((-2147466915|123456811756)\) +unicode\(5\) "(07:34|07:49)" +float\((7.566[0-9]*|7.821[0-9]*)\) +int\((-1097256359|123456811756)\) -- Testing date_sunrise\(\) function by passing float -12.3456789000e10 value to time -- -unicode\(5\) "(08:48|08:04)" -float\((8.810[0-9]*|8.074[0-9]*)\) -int\((-2147443882|-123456761731)\) +unicode\(5\) "(07:42|08:48|08:04)" +float\((7.713[0-9]*|8.810[0-9]*|8.074[0-9]*)\) +int\((1097304168|-2147443882|-123456761731)\) ===DONE=== diff --git a/ext/date/tests/date_sunset_variation9.phpt b/ext/date/tests/date_sunset_variation9.phpt index f7481224f5..4f02452cb2 100644 --- a/ext/date/tests/date_sunset_variation9.phpt +++ b/ext/date/tests/date_sunset_variation9.phpt @@ -36,12 +36,12 @@ var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $zen \*\*\* Testing date_sunset\(\) : usage variation \*\*\* -- Testing date_sunset\(\) function by passing float 12.3456789000e10 value to time -- -unicode\(5\) "(18:40|19:28)" -float\((18.676[0-9]*|18.6762[0-9]*|19.480[0-9]*)\) -int\((-2147431662|123456853728)\) +unicode\(5\) "(19:49|19:28)" +float\((19.830[0-9]*|19.830[0-9]*|19.480[0-9]*)\) +int\((-1097212211|123456853728)\) -- Testing date_sunset\(\) function by passing float -12.3456789000e10 value to time -- -unicode\(5\) "(18:12|18:48)" -float\((18.213[0-9]*|18.808[0-9]*)\) -int\((-2147410031|-123456723090)\) +unicode\(5\) "(19:03|18:12|18:48)" +float\((19.056[0-9]*|18.213[0-9]*|18.808[0-9]*)\) +int\((1097345002|-2147410031|-123456723090)\) ===DONE=== diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt index b64579e324..6e4a34601b 100644 --- a/ext/date/tests/getdate_variation7.phpt +++ b/ext/date/tests/getdate_variation7.phpt @@ -27,52 +27,52 @@ var_dump( getdate($timestamp) ); -- Testing getdate\(\) function by passing float 12.3456789000e10 value to timestamp -- array\(11\) { \[u"seconds"\]=> - int\((7|0)\) + int\((36|0)\) \[u"minutes"\]=> - int\((44|0)\) + int\((43|0)\) \[u"hours"\]=> - int\((8|6)\) + int\((10|6)\) \[u"mday"\]=> - int\((19|11)\) + int\((26|11)\) \[u"wday"\]=> int\((2|6)\) \[u"mon"\]=> - int\((1|3)\) + int\(3\) \[u"year"\]=> - int\((2038|5882)\) + int\((1935|5882)\) \[u"yday"\]=> - int\((18|69)\) + int\((84|69)\) \[u"weekday"\]=> unicode\((7|8)\) "(Tuesday|Saturday)" \[u"month"\]=> - unicode\((7|5)\) "(January|March)" + unicode\(5\) "March" \[0\]=> - int\((2147483647|123456789000)\) + int\((-1097262584|123456789000)\) } -- Testing getdate\(\) function by passing float -12.3456789000e10 value to timestamp -- array\(11\) { \[u"seconds"\]=> - int\((12|20)\) + int\((44|12|20)\) \[u"minutes"\]=> int\((39|23)\) \[u"hours"\]=> - int\((2|5)\) + int\((0|2|5)\) \[u"mday"\]=> - int\((14|23)\) + int\((9|14|23)\) \[u"wday"\]=> int\((6|-4)\) \[u"mon"\]=> - int\((12|10)\) + int\((10|12)\) \[u"year"\]=> - int\((1901|-1943)\) + int\((2004|1901|-1943)\) \[u"yday"\]=> - int\((347|295)\) + int\((282|347|295)\) \[u"weekday"\]=> unicode\((8|7)\) "(Saturday|Unknown)" \[u"month"\]=> - unicode\((8|7)\) "(December|October)" + unicode\((7|8)\) "(October|December)" \[0\]=> - int\((-2147483648|-123456789000)\) + int\((1097262584|-2147483648|-123456789000)\) } ===DONE=== diff --git a/ext/date/tests/gmdate_variation14.phpt b/ext/date/tests/gmdate_variation14.phpt index f1eedfe28d..4b1f993623 100644 --- a/ext/date/tests/gmdate_variation14.phpt +++ b/ext/date/tests/gmdate_variation14.phpt @@ -27,8 +27,8 @@ var_dump( gmdate($format, $timestamp) ); \*\*\* Testing gmdate\(\) : usage variation \*\*\* -- Testing gmdate\(\) function with float 12.3456789000e10 to timestamp -- -unicode\((24|25)\) "(2038-01-19T03:14:07\+0000|5882-03-11T00:30:00\+0000)" +unicode\((24|25)\) "(1935-03-26T04:50:16\+0000|5882-03-11T00:30:00\+0000)" -- Testing gmdate\(\) function with float -12.3456789000e10 to timestamp -- -unicode\((24|25)\) "(1901-12-13T20:45:52\+0000|-1943-10-22T23:30:00\+0000)" +unicode\((24|25)\) "(2004-10-08T19:09:44\+0000|1901-12-13T20:45:52\+0000|-1943-10-22T23:30:00\+0000)" ===DONE=== \ No newline at end of file diff --git a/ext/date/tests/gmstrftime_variation2.phpt b/ext/date/tests/gmstrftime_variation2.phpt index f40ce4e216..b89ff0f14b 100644 --- a/ext/date/tests/gmstrftime_variation2.phpt +++ b/ext/date/tests/gmstrftime_variation2.phpt @@ -112,10 +112,10 @@ unicode(20) "Jan 01 1970 00:00:10" unicode(20) "Dec 31 1969 23:59:50" --float 12.3456789000e10-- -unicode(20) "Jan 19 2038 03:14:07" +unicode(20) "Mar 26 1935 04:50:16" --float -12.3456789000e10-- -unicode(20) "Dec 13 1901 20:45:52" +unicode(20) "Oct 08 2004 19:09:44" --float .5-- unicode(20) "Jan 01 1970 00:00:00" diff --git a/ext/date/tests/idate_variation3.phpt b/ext/date/tests/idate_variation3.phpt index 0546ff219a..1a2ee1ffd5 100644 --- a/ext/date/tests/idate_variation3.phpt +++ b/ext/date/tests/idate_variation3.phpt @@ -28,8 +28,8 @@ var_dump( idate($format, $timestamp) ); \*\*\* Testing idate\(\) : usage variation \*\*\* -- Testing idate\(\) function with float 12.3456789000e10 to timestamp -- -int\((2038|5882)\) +int\((1935|5882)\) -- Testing idate\(\) function with float -12.3456789000e10 to timestamp -- -int\((1901|-1943)\) +int\((2004|1901|-1943)\) ===DONE=== diff --git a/ext/date/tests/localtime_variation3.phpt b/ext/date/tests/localtime_variation3.phpt index c9d792472b..c0907a714f 100644 --- a/ext/date/tests/localtime_variation3.phpt +++ b/ext/date/tests/localtime_variation3.phpt @@ -33,41 +33,41 @@ var_dump( localtime($timestamp, $is_associative) ); -- Testing localtime\(\) function with 'float 12.3456789000e10' to timestamp -- array\(9\) { \[0\]=> - int\((7|0)\) + int\((16|0)\) \[1\]=> - int\((14|30)\) + int\((50|30)\) \[2\]=> - int\((3|0)\) + int\((4|0)\) \[3\]=> - int\((19|11)\) + int\((26|11)\) \[4\]=> - int\((0|2)\) + int\(2\) \[5\]=> - int\((138|3982)\) + int\((35|3982)\) \[6\]=> int\((2|6)\) \[7\]=> - int\((18|69)\) + int\((84|69)\) \[8\]=> int\(0\) } array\(9\) { \[u"tm_sec"\]=> - int\((7|0)\) + int\((16|0)\) \[u"tm_min"\]=> - int\((14|30)\) + int\((50|30)\) \[u"tm_hour"\]=> - int\((3|0)\) + int\((4|0)\) \[u"tm_mday"\]=> - int\((19|11)\) + int\((26|11)\) \[u"tm_mon"\]=> - int\((0|2)\) + int\(2\) \[u"tm_year"\]=> - int\((138|3982)\) + int\((35|3982)\) \[u"tm_wday"\]=> int\((2|6)\) \[u"tm_yday"\]=> - int\((18|69)\) + int\((84|69)\) \[u"tm_isdst"\]=> int\(0\) } @@ -75,41 +75,41 @@ array\(9\) { -- Testing localtime\(\) function with 'float -12.3456789000e10' to timestamp -- array\(9\) { \[0\]=> - int\((52|0)\) + int\((44|52|0)\) \[1\]=> - int\((45|30)\) + int\((9|45|30)\) \[2\]=> - int\((20|23)\) + int\((19|20|23)\) \[3\]=> - int\((13|22)\) + int\((8|13|22)\) \[4\]=> - int\((11|9)\) + int\((9|11)\) \[5\]=> - int\((1|-3843)\) + int\((104|1|-3843)\) \[6\]=> int\((5|-5)\) \[7\]=> - int\((346|294)\) + int\((281|346|294)\) \[8\]=> int\(0\) } array\(9\) { \[u"tm_sec"\]=> - int\((52|0)\) + int\((44|52|0)\) \[u"tm_min"\]=> - int\((45|30)\) + int\((9|45|30)\) \[u"tm_hour"\]=> - int\((20|23)\) + int\((19|20|23)\) \[u"tm_mday"\]=> - int\((13|22)\) + int\((8|13|22)\) \[u"tm_mon"\]=> - int\((11|9)\) + int\((9|11)\) \[u"tm_year"\]=> - int\((1|-3843)\) + int\((104|1|-3843)\) \[u"tm_wday"\]=> int\((5|-5)\) \[u"tm_yday"\]=> - int\((346|294)\) + int\((281|346|294)\) \[u"tm_isdst"\]=> int\(0\) } diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt index e897160aa8..6d17abd7fe 100644 --- a/ext/date/tests/strftime_variation23.phpt +++ b/ext/date/tests/strftime_variation23.phpt @@ -29,8 +29,8 @@ var_dump( strftime($format, $timestamp) ); \*\*\* Testing strftime\(\) : usage variation \*\*\* -- Testing strftime\(\) function with float 12.3456789000e10 to timestamp -- -unicode\(\d*\)\s"(Jan|Mar)\s(19|11)\s(2038|5882)\s(03|00):(14|30):(07|00)" +unicode\(\d*\)\s"Mar\s(26|11)\s(1935|5882)\s(04|00):(50|30):(16|00)" -- Testing strftime\(\) function with float -12.3456789000e10 to timestamp -- -unicode\(\d*\)\s"(Dec|Oct)\s(13|22)\s(1901|-1943)\s(20|23):(45|30):(52|00)" +unicode\(\d*\)\s"(Oct|Dec)\s(08|13|22)\s(2004|1901|-1943)\s(19|20|23):(09|45|30):(44|52|00)" ===DONE=== diff --git a/ext/ereg/tests/split_variation_004.phpt b/ext/ereg/tests/split_variation_004.phpt index fbd76277ae..5370709084 100644 --- a/ext/ereg/tests/split_variation_004.phpt +++ b/ext/ereg/tests/split_variation_004.phpt @@ -33,16 +33,8 @@ array(1) { [0]=> string(9) "1 2 3 4 5" } -array(5) { +array(1) { [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - [4]=> - string(1) "5" + string(9) "1 2 3 4 5" } Done \ No newline at end of file diff --git a/ext/ereg/tests/spliti_variation_004.phpt b/ext/ereg/tests/spliti_variation_004.phpt index 7a331be367..e6c8e3c21f 100644 --- a/ext/ereg/tests/spliti_variation_004.phpt +++ b/ext/ereg/tests/spliti_variation_004.phpt @@ -33,16 +33,8 @@ array(1) { [0]=> string(9) "1 2 3 4 5" } -array(5) { +array(1) { [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - [4]=> - string(1) "5" + string(9) "1 2 3 4 5" } Done \ No newline at end of file diff --git a/ext/standard/tests/array/array_fill_variation1.phpt b/ext/standard/tests/array/array_fill_variation1.phpt index acce998455..1345f3d1aa 100644 --- a/ext/standard/tests/array/array_fill_variation1.phpt +++ b/ext/standard/tests/array/array_fill_variation1.phpt @@ -125,9 +125,9 @@ array(2) { } -- Iteration 3 -- array(2) { - [2147483647]=> + [-1097262584]=> int(100) - [-2147483648]=> + [0]=> int(100) } -- Iteration 4 -- diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt index d944c5b4c0..e5c84ea0b3 100644 --- a/ext/standard/tests/array/array_slice_variation2.phpt +++ b/ext/standard/tests/array/array_slice_variation2.phpt @@ -150,7 +150,15 @@ array(4) { } -- Iteration 7 -- -array(0) { +array(4) { + [u"one"]=> + int(1) + [0]=> + int(2) + [u"three"]=> + int(3) + [1]=> + int(4) } -- Iteration 8 -- diff --git a/ext/standard/tests/array/array_slice_variation3.phpt b/ext/standard/tests/array/array_slice_variation3.phpt index c2296c7de9..135ca15e53 100644 --- a/ext/standard/tests/array/array_slice_variation3.phpt +++ b/ext/standard/tests/array/array_slice_variation3.phpt @@ -118,11 +118,7 @@ array(0) { } -- Iteration 7 -- -array(2) { - [u"three"]=> - int(3) - [0]=> - int(4) +array(0) { } -- Iteration 8 -- diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index 8a02c34bf9..319af1fe0d 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -460,7 +460,7 @@ unicode(7) "integer" -- Iteration 51 -- unicode(6) "double" bool(true) -int(2147483647) +int(-508130303) unicode(7) "integer" -- Iteration 52 -- unicode(7) "integer" @@ -470,7 +470,7 @@ unicode(7) "integer" -- Iteration 53 -- unicode(6) "double" bool(true) -int(2147483647) +int(1952002105) unicode(7) "integer" -- Iteration 54 -- unicode(7) "integer" @@ -490,7 +490,7 @@ unicode(7) "integer" -- Iteration 57 -- unicode(6) "double" bool(true) -int(2147483647) +int(343000682) unicode(7) "integer" -- Iteration 58 -- unicode(6) "double" @@ -920,7 +920,7 @@ unicode(7) "integer" -- Iteration 51 -- unicode(6) "double" bool(true) -int(2147483647) +int(-508130303) unicode(7) "integer" -- Iteration 52 -- unicode(7) "integer" @@ -930,7 +930,7 @@ unicode(7) "integer" -- Iteration 53 -- unicode(6) "double" bool(true) -int(2147483647) +int(1952002105) unicode(7) "integer" -- Iteration 54 -- unicode(7) "integer" @@ -950,7 +950,7 @@ unicode(7) "integer" -- Iteration 57 -- unicode(6) "double" bool(true) -int(2147483647) +int(343000682) unicode(7) "integer" -- Iteration 58 -- unicode(6) "double" diff --git a/ext/standard/tests/math/decbin_variation1.phpt b/ext/standard/tests/math/decbin_variation1.phpt index d1e3f08e79..ba1192f6db 100644 --- a/ext/standard/tests/math/decbin_variation1.phpt +++ b/ext/standard/tests/math/decbin_variation1.phpt @@ -110,7 +110,7 @@ unicode(32) "11111111111111111111011011010111" unicode(32) "11111111111111111111111111111111" -- Iteration 6 -- -unicode(31) "1111111111111111111111111111111" +unicode(1) "0" -- Iteration 7 -- unicode(4) "1010" @@ -119,7 +119,7 @@ unicode(4) "1010" unicode(32) "11111111111111111111111111110110" -- Iteration 9 -- -unicode(31) "1111111111111111111111111111111" +unicode(32) "10111110100110010001101000001000" -- Iteration 10 -- unicode(1) "0" diff --git a/ext/standard/tests/math/decbin_variation1_64bit.phpt b/ext/standard/tests/math/decbin_variation1_64bit.phpt index 09a96d1d9c..5811fca598 100644 --- a/ext/standard/tests/math/decbin_variation1_64bit.phpt +++ b/ext/standard/tests/math/decbin_variation1_64bit.phpt @@ -110,7 +110,7 @@ unicode(64) "1111111111111111111111111111111111111111111111111111011011010111" unicode(63) "111111111111111111111111111111111111111111111111111111111111111" -- Iteration 6 -- -unicode(63) "111111111111111111111111111111111111111111111111111111111111111" +unicode(1) "0" -- Iteration 7 -- unicode(4) "1010" diff --git a/ext/standard/tests/math/dechex_variation1.phpt b/ext/standard/tests/math/dechex_variation1.phpt index 54080b0bf2..79b90d3a0d 100644 --- a/ext/standard/tests/math/dechex_variation1.phpt +++ b/ext/standard/tests/math/dechex_variation1.phpt @@ -110,7 +110,7 @@ unicode(8) "fffff6d7" unicode(8) "ffffffff" -- Iteration 6 -- -unicode(8) "7fffffff" +unicode(1) "0" -- Iteration 7 -- unicode(1) "a" @@ -119,7 +119,7 @@ unicode(1) "a" unicode(8) "fffffff6" -- Iteration 9 -- -unicode(8) "7fffffff" +unicode(8) "be991a08" -- Iteration 10 -- unicode(1) "0" diff --git a/ext/standard/tests/math/dechex_variation1_64bit.phpt b/ext/standard/tests/math/dechex_variation1_64bit.phpt index 929e759f58..0b2303dfd8 100644 --- a/ext/standard/tests/math/dechex_variation1_64bit.phpt +++ b/ext/standard/tests/math/dechex_variation1_64bit.phpt @@ -110,7 +110,7 @@ unicode(16) "fffffffffffff6d7" unicode(16) "7fffffffffffffff" -- Iteration 6 -- -unicode(16) "7fffffffffffffff" +unicode(1) "0" -- Iteration 7 -- unicode(1) "a" diff --git a/ext/standard/tests/math/decoct_variation1.phpt b/ext/standard/tests/math/decoct_variation1.phpt index 69982da290..e37a2b701a 100644 --- a/ext/standard/tests/math/decoct_variation1.phpt +++ b/ext/standard/tests/math/decoct_variation1.phpt @@ -111,7 +111,7 @@ unicode(11) "37777773327" unicode(11) "37777777777" -- Iteration 6 -- -unicode(11) "17777777777" +unicode(1) "0" -- Iteration 7 -- unicode(2) "12" @@ -120,7 +120,7 @@ unicode(2) "12" unicode(11) "37777777766" -- Iteration 9 -- -unicode(11) "17777777777" +unicode(11) "27646215010" -- Iteration 10 -- unicode(1) "0" diff --git a/ext/standard/tests/math/decoct_variation1_64bit.phpt b/ext/standard/tests/math/decoct_variation1_64bit.phpt index 40eca6c9bf..d51540da09 100644 --- a/ext/standard/tests/math/decoct_variation1_64bit.phpt +++ b/ext/standard/tests/math/decoct_variation1_64bit.phpt @@ -111,7 +111,7 @@ unicode(22) "1777777777777777773327" unicode(21) "777777777777777777777" -- Iteration 6 -- -unicode(21) "777777777777777777777" +unicode(1) "0" -- Iteration 7 -- unicode(2) "12" diff --git a/ext/standard/tests/strings/chunk_split_variation2.phpt b/ext/standard/tests/strings/chunk_split_variation2.phpt index 005e4df86d..4ceb4ea4f0 100644 --- a/ext/standard/tests/strings/chunk_split_variation2.phpt +++ b/ext/standard/tests/strings/chunk_split_variation2.phpt @@ -98,7 +98,9 @@ unicode(28) "This is ch*uklen vari*ation*" Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 3 -- -unicode(26) "This is chuklen variation*" + +Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d +bool(false) -- Iteration 4 -- Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt index 25a2cbf073..a7dce08aa0 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt @@ -102,7 +102,7 @@ unicode(104) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 unicode(104) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string "" -- Iteration 3 -- -unicode(94) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string "" +unicode(114) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string "" -- Iteration 4 -- unicode(114) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string "" diff --git a/ext/standard/tests/strings/pack.phpt b/ext/standard/tests/strings/pack.phpt index 886519945f..97a6a687c5 100644 --- a/ext/standard/tests/strings/pack.phpt +++ b/ext/standard/tests/strings/pack.phpt @@ -145,11 +145,11 @@ Array ) Array ( - [1] => 2147483647 + [1] => 0 ) Array ( - [1] => -2147483648 + [1] => 0 ) Array ( @@ -185,7 +185,7 @@ Array ) Array ( - [1] => 2147483647 + [1] => 0 ) Array ( @@ -233,7 +233,7 @@ Array ) Array ( - [1] => 2147483647 + [1] => 0 ) Array ( @@ -305,7 +305,7 @@ Array ) Array ( - [1] => 2147483647 + [1] => 0 ) Array ( diff --git a/ext/standard/tests/strings/sprintf_variation35.phpt b/ext/standard/tests/strings/sprintf_variation35.phpt index abf2b067a1..bb5508282e 100644 --- a/ext/standard/tests/strings/sprintf_variation35.phpt +++ b/ext/standard/tests/strings/sprintf_variation35.phpt @@ -67,17 +67,17 @@ unicode(10) "0-9A-Fa-f]" unicode(1) "x" -- Iteration 2 -- -unicode(8) "7fffffff" -unicode(9) "7fffffffx" -unicode(8) "7fffffff" +unicode(1) "1" +unicode(2) "1x" +unicode(1) "1" unicode(1) "x" -unicode(9) " 7fffffff" -unicode(9) "7fffffff " -unicode(9) " 7fffffff" -unicode(9) " -7fffffff" -unicode(8) "7fffffff" -unicode(30) " 7fffffff" +unicode(2) " 1" +unicode(2) "1 " +unicode(2) " 1" +unicode(2) " +1" +unicode(4) " 1" +unicode(30) " 1" unicode(10) "0-9A-Fa-f]" unicode(1) "x" diff --git a/ext/standard/tests/strings/sprintf_variation4.phpt b/ext/standard/tests/strings/sprintf_variation4.phpt index dbfdb9f318..467ef60154 100644 --- a/ext/standard/tests/strings/sprintf_variation4.phpt +++ b/ext/standard/tests/strings/sprintf_variation4.phpt @@ -67,17 +67,17 @@ unicode(4) "0-9]" unicode(1) "d" -- Iteration 2 -- -unicode(10) "2147483647" +unicode(1) "1" unicode(1) "d" -unicode(10) "2147483647" +unicode(1) "1" unicode(1) "d" -unicode(11) " 2147483647" -unicode(11) "2147483647 " -unicode(11) " 2147483647" -unicode(11) " -2147483647" -unicode(10) "2147483647" -unicode(30) " 2147483647" +unicode(2) " 1" +unicode(2) "1 " +unicode(2) " 1" +unicode(2) " +1" +unicode(4) " 1" +unicode(30) " 1" unicode(4) "0-9]" unicode(1) "d" diff --git a/ext/standard/tests/strings/sprintf_variation41.phpt b/ext/standard/tests/strings/sprintf_variation41.phpt index 62ca7dcc83..ee1cb13728 100644 --- a/ext/standard/tests/strings/sprintf_variation41.phpt +++ b/ext/standard/tests/strings/sprintf_variation41.phpt @@ -71,17 +71,17 @@ unicode(4) "0-9]" unicode(1) "u" -- Iteration 2 -- -unicode(10) "2147483647" +unicode(1) "1" unicode(1) "u" -unicode(10) "2147483647" +unicode(1) "1" unicode(1) "u" -unicode(11) " 2147483647" -unicode(11) "2147483647 " -unicode(11) " 2147483647" -unicode(11) " -2147483647" -unicode(10) "2147483647" -unicode(30) " 2147483647" +unicode(2) " 1" +unicode(2) "1 " +unicode(2) " 1" +unicode(2) " +1" +unicode(4) " 1" +unicode(30) " 1" unicode(4) "0-9]" unicode(1) "u" diff --git a/ext/standard/tests/strings/vfprintf_variation15.phpt b/ext/standard/tests/strings/vfprintf_variation15.phpt index a4046951dd..95667b5a81 100644 --- a/ext/standard/tests/strings/vfprintf_variation15.phpt +++ b/ext/standard/tests/strings/vfprintf_variation15.phpt @@ -65,9 +65,9 @@ unlink($data_file); -- Iteration 1 -- 1234567 342391 0 -- Iteration 2 -- -2147483647 u 1234 12345 +3755744308 u 1234 12345 -- Iteration 3 -- - 1234000 2147483647 120 + 1234000 2450319192 120 -- Iteration 4 -- #1 0 $0 10 -- Iteration 5 -- diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt index 8be18ce5a9..21630521b8 100644 --- a/ext/standard/tests/strings/vfprintf_variation16.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16.phpt @@ -87,8 +87,8 @@ unlink($data_file); -- Iteration 1 -- 2 0 10 - 123456 u 1234 2147483647 - 2147483647 2147483647 12345 + 123456 u 1234 2820130816 + 2840207360 1177509888 12345 12 4294967284 4294843840 _3 10 123456 2 0 -- Iteration 2 -- diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt index bdef534639..72ca9fe3b9 100644 --- a/ext/standard/tests/strings/vfprintf_variation4.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4.phpt @@ -89,7 +89,7 @@ unlink($data_file); -- Iteration 1 -- 2 +0 10 123456 d -1234 1234 - 2147483647 200000 4000 22000000 + -1474836480 200000 4000 22000000 12345 12 -12 -123456 10 123456 2 0 -- Iteration 2 -- diff --git a/ext/standard/tests/strings/vprintf_variation15.phpt b/ext/standard/tests/strings/vprintf_variation15.phpt index a812ff6b8f..97b1bc5c64 100644 --- a/ext/standard/tests/strings/vprintf_variation15.phpt +++ b/ext/standard/tests/strings/vprintf_variation15.phpt @@ -58,11 +58,11 @@ foreach($formats as $format) { int(16) -- Iteration 2 -- -2147483647 u 1234 12345 +3755744308 u 1234 12345 int(23) -- Iteration 3 -- - 1234000 2147483647 120 + 1234000 2450319192 120 int(25) -- Iteration 4 -- diff --git a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt index 666865c7c6..226f17572b 100644 --- a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt @@ -62,8 +62,8 @@ int(16) int(24) -- Iteration 3 -- - 1234000 9223372036854775807 120 -int(34) + 1234000 0 120 +int(25) -- Iteration 4 -- #1 0 $0 10 diff --git a/ext/standard/tests/strings/vprintf_variation16.phpt b/ext/standard/tests/strings/vprintf_variation16.phpt index 3bf2c579cd..8c3d66d02d 100644 --- a/ext/standard/tests/strings/vprintf_variation16.phpt +++ b/ext/standard/tests/strings/vprintf_variation16.phpt @@ -77,8 +77,8 @@ foreach($args_array as $args) { -- Iteration 1 -- 2 0 10 - 123456 u 1234 2147483647 - 2147483647 2147483647 12345 + 123456 u 1234 2820130816 + 2840207360 1177509888 12345 12 4294967284 4294843840 _3 10 123456 2 0 int(115) diff --git a/ext/standard/tests/strings/vprintf_variation4.phpt b/ext/standard/tests/strings/vprintf_variation4.phpt index 8a37c79dce..8d56fc9cb1 100644 --- a/ext/standard/tests/strings/vprintf_variation4.phpt +++ b/ext/standard/tests/strings/vprintf_variation4.phpt @@ -79,10 +79,10 @@ foreach($args_array as $args) { -- Iteration 1 -- 2 +0 10 123456 d -1234 1234 - 2147483647 200000 4000 22000000 + -1474836480 200000 4000 22000000 12345 12 -12 -123456 10 123456 2 0 -int(111) +int(112) -- Iteration 2 -- 0 +0 0 diff --git a/ext/standard/tests/strings/vsprintf_variation15.phpt b/ext/standard/tests/strings/vsprintf_variation15.phpt index 8252c2628d..f43ff3fd93 100644 --- a/ext/standard/tests/strings/vsprintf_variation15.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15.phpt @@ -55,7 +55,7 @@ foreach($formats as $format) { unicode(16) "1234567 342391 0" -- Iteration 2 -- -unicode(23) "2147483647 u 1234 12345" +unicode(23) "3755744308 u 1234 12345" -- Iteration 3 -- unicode(25) " 1234000 1012345 120" diff --git a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt index 9a5e62defb..58a6a8f35d 100644 --- a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt @@ -58,7 +58,7 @@ unicode(16) "1234567 342391 0" unicode(24) "12345678900 u 1234 12345" -- Iteration 3 -- -unicode(34) " 1234000 9223372036854775807 120" +unicode(25) " 1234000 0 120" -- Iteration 4 -- unicode(10) "#1 0 $0 10" diff --git a/ext/standard/tests/strings/vsprintf_variation16.phpt b/ext/standard/tests/strings/vsprintf_variation16.phpt index 74bbfb53ca..62153b8240 100644 --- a/ext/standard/tests/strings/vsprintf_variation16.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16.phpt @@ -76,8 +76,8 @@ echo "Done"; -- Iteration 1 -- unicode(115) "2 0 10 - 123456 u 1234 2147483647 - 2147483647 2147483647 12345 + 123456 u 1234 2820130816 + 2840207360 1177509888 12345 12 4294967284 4294843840 _3 10 123456 2 0" diff --git a/ext/standard/tests/strings/vsprintf_variation4.phpt b/ext/standard/tests/strings/vsprintf_variation4.phpt index 9bbbc13958..1ac73f640d 100644 --- a/ext/standard/tests/strings/vsprintf_variation4.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4.phpt @@ -75,9 +75,9 @@ echo "Done"; *** Testing vsprintf() : int formats and non-integer values *** -- Iteration 1 -- -unicode(111) "2 +0 10 +unicode(112) "2 +0 10 123456 d -1234 1234 - 2147483647 200000 4000 22000000 + -1474836480 200000 4000 22000000 12345 12 -12 -123456 10 123456 2 0" diff --git a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt new file mode 100644 index 0000000000..cefbb07cea --- /dev/null +++ b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt @@ -0,0 +1,205 @@ +--TEST-- +Test parse_url() function : usage variations - unexpected type for arg 2 +--SKIPIF-- + +--FILE-- + 'red', 'item' => 'pen'), + + // null data + NULL, + null, + + // boolean data + true, + false, + TRUE, + FALSE, + + // empty data + "", + '', + + // string data + "string", + 'string', + + // object data + new stdclass(), + + // undefined data + $undefined_var, + + // unset data + $unset_var, +); + +// loop through each element of the array for url_component + +foreach($values as $value) { + echo "\nArg value $value \n"; + var_dump( parse_url($url, $value) ); +}; + +echo "Done"; +?> +--EXPECTF-- +*** Testing parse_url() : usage variations *** +Error: 8 - Undefined variable: undefined_var, %s(61) +Error: 8 - Undefined variable: unset_var, %s(64) + +Arg value 10.5 +Error: 2 - parse_url(): Invalid URL component identifier 10, %s(71) +bool(false) + +Arg value -10.5 +array(8) { + [u"scheme"]=> + unicode(4) "http" + [u"host"]=> + unicode(11) "www.php.net" + [u"port"]=> + int(80) + [u"user"]=> + unicode(6) "secret" + [u"pass"]=> + unicode(7) "hideout" + [u"path"]=> + unicode(10) "/index.php" + [u"query"]=> + unicode(31) "test=1&test2=char&test3=mixesCI" + [u"fragment"]=> + unicode(16) "some_page_ref123" +} + +Arg value 101234567000 +array(8) { + [u"scheme"]=> + unicode(4) "http" + [u"host"]=> + unicode(11) "www.php.net" + [u"port"]=> + int(80) + [u"user"]=> + unicode(6) "secret" + [u"pass"]=> + unicode(7) "hideout" + [u"path"]=> + unicode(10) "/index.php" + [u"query"]=> + unicode(31) "test=1&test2=char&test3=mixesCI" + [u"fragment"]=> + unicode(16) "some_page_ref123" +} + +Arg value 1.07654321E-9 +unicode(4) "http" + +Arg value 0.5 +unicode(4) "http" +Error: 8 - Array to string conversion, %s(70) + +Arg value Array +Error: 2 - parse_url() expects parameter 2 to be long, array given, %s(71) +NULL +Error: 8 - Array to string conversion, %s(70) + +Arg value Array +Error: 2 - parse_url() expects parameter 2 to be long, array given, %s(71) +NULL +Error: 8 - Array to string conversion, %s(70) + +Arg value Array +Error: 2 - parse_url() expects parameter 2 to be long, array given, %s(71) +NULL +Error: 8 - Array to string conversion, %s(70) + +Arg value Array +Error: 2 - parse_url() expects parameter 2 to be long, array given, %s(71) +NULL +Error: 8 - Array to string conversion, %s(70) + +Arg value Array +Error: 2 - parse_url() expects parameter 2 to be long, array given, %s(71) +NULL + +Arg value +unicode(4) "http" + +Arg value +unicode(4) "http" + +Arg value 1 +unicode(11) "www.php.net" + +Arg value +unicode(4) "http" + +Arg value 1 +unicode(11) "www.php.net" + +Arg value +unicode(4) "http" + +Arg value +Error: 2 - parse_url() expects parameter 2 to be long, Unicode string given, %s(71) +NULL + +Arg value +Error: 2 - parse_url() expects parameter 2 to be long, Unicode string given, %s(71) +NULL + +Arg value string +Error: 2 - parse_url() expects parameter 2 to be long, Unicode string given, %s(71) +NULL + +Arg value string +Error: 2 - parse_url() expects parameter 2 to be long, Unicode string given, %s(71) +NULL +Error: 4096 - Object of class stdClass could not be converted to string, %s(70) + +Arg value +Error: 2 - parse_url() expects parameter 2 to be long, object given, %s(71) +NULL + +Arg value +unicode(4) "http" + +Arg value +unicode(4) "http" +Done diff --git a/ext/standard/tests/url/parse_url_variation_002.phpt b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt similarity index 97% rename from ext/standard/tests/url/parse_url_variation_002.phpt rename to ext/standard/tests/url/parse_url_variation_002_64bit.phpt index e0fea912c3..751299d9ea 100644 --- a/ext/standard/tests/url/parse_url_variation_002.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt @@ -1,5 +1,7 @@ --TEST-- Test parse_url() function : usage variations - unexpected type for arg 2 +--SKIPIF-- + --FILE--