diff options
Diffstat (limited to 'ext/standard/tests')
45 files changed, 596 insertions, 1809 deletions
diff --git a/ext/standard/tests/array/array_map_variation2.phpt b/ext/standard/tests/array/array_map_variation2.phpt index e9608438f..16561abff 100644 --- a/ext/standard/tests/array/array_map_variation2.phpt +++ b/ext/standard/tests/array/array_map_variation2.phpt @@ -47,16 +47,7 @@ array(4) { [0]=> &string(2) "v1" [1]=> - &array(4) { - ["k1"]=> - &string(2) "v1" - ["k2"]=> - string(2) "v2" - [0]=> - &string(2) "v1" - [1]=> - *RECURSION* - } + *RECURSION* } } array(4) { @@ -94,16 +85,7 @@ array(4) { [0]=> &string(2) "v1" [1]=> - &array(4) { - ["k1"]=> - &string(2) "v1" - ["k2"]=> - string(2) "v2" - [0]=> - &string(2) "v1" - [1]=> - *RECURSION* - } + *RECURSION* } } } @@ -127,16 +109,7 @@ array(4) { [0]=> &string(2) "v1" [1]=> - &array(4) { - ["k1"]=> - &string(2) "v1" - ["k2"]=> - string(2) "v2" - [0]=> - &string(2) "v1" - [1]=> - *RECURSION* - } + *RECURSION* } } array(4) { @@ -166,16 +139,7 @@ array(4) { [0]=> &string(2) "v1" [1]=> - &array(4) { - ["k1"]=> - &string(2) "v1" - ["k2"]=> - string(2) "v2" - [0]=> - &string(2) "v1" - [1]=> - *RECURSION* - } + *RECURSION* } } } @@ -195,16 +159,7 @@ array(4) { [0]=> &string(2) "v1" [1]=> - &array(4) { - ["k1"]=> - &string(2) "v1" - ["k2"]=> - string(2) "v2" - [0]=> - &string(2) "v1" - [1]=> - *RECURSION* - } + *RECURSION* } } array(4) { @@ -240,16 +195,7 @@ array(4) { [0]=> &string(2) "v1" [1]=> - &array(4) { - ["k1"]=> - &string(2) "v1" - ["k2"]=> - string(2) "v2" - [0]=> - &string(2) "v1" - [1]=> - *RECURSION* - } + *RECURSION* } [1]=> &array(4) { @@ -260,16 +206,7 @@ array(4) { [0]=> &string(2) "v1" [1]=> - &array(4) { - ["k1"]=> - &string(2) "v1" - ["k2"]=> - string(2) "v2" - [0]=> - &string(2) "v1" - [1]=> - *RECURSION* - } + *RECURSION* } } } diff --git a/ext/standard/tests/array/array_push_variation4.phpt b/ext/standard/tests/array/array_push_variation4.phpt index ed339204f..f8f89042a 100644 --- a/ext/standard/tests/array/array_push_variation4.phpt +++ b/ext/standard/tests/array/array_push_variation4.phpt @@ -104,28 +104,7 @@ array(10) { [8]=> &string(1) "z" [9]=> - &array(10) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - [3]=> - &string(1) "a" - [4]=> - &string(1) "b" - [5]=> - &string(1) "c" - [6]=> - &string(1) "x" - [7]=> - &string(1) "y" - [8]=> - &string(1) "z" - [9]=> - *RECURSION* - } + *RECURSION* } } Done diff --git a/ext/standard/tests/array/array_values_variation4.phpt b/ext/standard/tests/array/array_values_variation4.phpt index 25980663e..9c35331fd 100644 --- a/ext/standard/tests/array/array_values_variation4.phpt +++ b/ext/standard/tests/array/array_values_variation4.phpt @@ -93,23 +93,7 @@ array(4) { int(3) } [0]=> - &array(4) { - ["zero"]=> - string(4) "zero" - ["un"]=> - string(3) "one" - ["sub"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - [0]=> - *RECURSION* - } + *RECURSION* } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/bug51552.phpt b/ext/standard/tests/array/bug51552.phpt new file mode 100644 index 000000000..fb61f489b --- /dev/null +++ b/ext/standard/tests/array/bug51552.phpt @@ -0,0 +1,23 @@ +--TEST-- +Bug #51552 (debug_backtrace() causes segmentation fault and/or memory issues) +--FILE-- +<?php +function walk($element, $key, $p) { + $backtrace = debug_backtrace(); + echo "$element\n"; +} + +$a = array(1,2,3,4,5,6,7,8,9,10); +array_walk($a, 'walk', 'testthis'); +?> +--EXPECT-- +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 diff --git a/ext/standard/tests/array/current_variation5.phpt b/ext/standard/tests/array/current_variation5.phpt new file mode 100644 index 000000000..b9bf4a995 --- /dev/null +++ b/ext/standard/tests/array/current_variation5.phpt @@ -0,0 +1,58 @@ +--TEST-- +Test current() function : usage variations - reference +--FILE-- +<?php +/* Prototype : mixed current(array $array_arg) + * Description: Return the element currently pointed to by the internal array pointer + * Source code: ext/standard/array.c + * Alias to functions: pos + */ + +echo "*** Testing current() : usage variations ***\n"; + +echo "\n-- Function: reference parameter --\n"; + +function current_variation5_ref(&$a) +{ + var_dump(current($a)); + var_dump(next($a)); +} + +$a = array('yes', 'maybe', 'no'); + +var_dump(current($a)); +var_dump(next($a)); +current_variation5($a); + +echo "\n-- Function: normal parameter --\n"; + +function current_variation5($a) +{ + var_dump(current($a)); + var_dump(next($a)); +} + +$a = array('yes', 'maybe', 'no'); + +var_dump(current($a)); +var_dump(next($a)); +current_variation5($a); + +?> +===DONE=== +<?php exit(0); ?> +--EXPECTF-- +*** Testing current() : usage variations *** + +-- Function: reference parameter -- +string(3) "yes" +string(5) "maybe" +string(5) "maybe" +string(2) "no" + +-- Function: normal parameter -- +string(3) "yes" +string(5) "maybe" +string(5) "maybe" +string(2) "no" +===DONE=== diff --git a/ext/standard/tests/array/natcasesort_variation7.phpt b/ext/standard/tests/array/natcasesort_variation7.phpt index c038f7d1c..91be7e262 100644 --- a/ext/standard/tests/array/natcasesort_variation7.phpt +++ b/ext/standard/tests/array/natcasesort_variation7.phpt @@ -44,18 +44,7 @@ array(5) { [3]=> string(1) "2" [4]=> - &array(5) { - [0]=> - int(1) - [1]=> - float(3) - [2]=> - string(4) "zero" - [3]=> - string(1) "2" - [4]=> - *RECURSION* - } + *RECURSION* } } bool(true) @@ -75,22 +64,11 @@ array(5) { [1]=> float(3) [4]=> - &array(5) { - [0]=> - int(1) - [3]=> - string(1) "2" - [1]=> - float(3) - [4]=> - *RECURSION* - [2]=> - string(4) "zero" - } + *RECURSION* [2]=> string(4) "zero" } [2]=> string(4) "zero" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt index e8ffd5752..0accb2c85 100644 --- a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt +++ b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt @@ -35,13 +35,25 @@ Class [ <internal%s> class Directory ] { } - Methods [3] { - Method [ <internal%s> public method close ] { + Method [ <internal:standard> public method close ] { + + - Parameters [1] { + Parameter #0 [ <optional> $dir_handle ] + } } - Method [ <internal%s> public method rewind ] { + Method [ <internal:standard> public method rewind ] { + + - Parameters [1] { + Parameter #0 [ <optional> $dir_handle ] + } } - Method [ <internal%s> public method read ] { + Method [ <internal:standard> public method read ] { + + - Parameters [1] { + Parameter #0 [ <optional> $dir_handle ] + } } } } @@ -50,4 +62,4 @@ object(Directory)#%d (0) { } Warning: Directory::read(): Unable to find my handle property in %s on line 15 -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/standard/tests/file/bug39863.phpt b/ext/standard/tests/file/bug39863.phpt new file mode 100644 index 000000000..520a46412 --- /dev/null +++ b/ext/standard/tests/file/bug39863.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #39863 (file_exists() silently truncates after a null byte) +--CREDITS-- +Andrew van der Stock, vanderaj @ owasp.org +--FILE-- +<?php + +$filename = __FILE__ . chr(0). ".ridiculous"; + +if (file_exists($filename)) { + echo "FAIL\n"; +} +else { + echo "PASS\n"; +} +?> +===DONE=== +<?php exit(0); ?> +--XFAIL-- +Needs bug #39863 fixed +--EXPECT-- +PASS +===DONE=== + diff --git a/ext/standard/tests/file/realpath_cache.phpt b/ext/standard/tests/file/realpath_cache.phpt index 567f0e2c7..a476063d6 100644 --- a/ext/standard/tests/file/realpath_cache.phpt +++ b/ext/standard/tests/file/realpath_cache.phpt @@ -19,7 +19,7 @@ echo "Done\n"; int(%d) array(4) { ["key"]=> - int(%d) + int(%i) ["is_dir"]=> bool(true) ["realpath"]=> diff --git a/ext/standard/tests/general_functions/bug49847.phpt b/ext/standard/tests/general_functions/bug49847.phpt index 8895202d0..6312d03c0 100644 --- a/ext/standard/tests/general_functions/bug49847.phpt +++ b/ext/standard/tests/general_functions/bug49847.phpt @@ -23,3 +23,4 @@ array(1) { [0]=> string(4098) "%s 1" } + diff --git a/ext/standard/tests/general_functions/bug52138.data b/ext/standard/tests/general_functions/bug52138.data new file mode 100644 index 000000000..4ce82e097 --- /dev/null +++ b/ext/standard/tests/general_functions/bug52138.data @@ -0,0 +1,11 @@ +[MYCONST] +MYCONST = MYCONST + +[M_PI] +FOO=M_PI " test" + +[foo::bar] +A=1 +B=A "A" A + +[MYCONST M_PI] diff --git a/ext/standard/tests/general_functions/bug52138.phpt b/ext/standard/tests/general_functions/bug52138.phpt new file mode 100644 index 000000000..d4f38735a --- /dev/null +++ b/ext/standard/tests/general_functions/bug52138.phpt @@ -0,0 +1,37 @@ +--TEST-- +Bug #52138 (Constants are parsed into the ini file for section names) +--FILE-- +<?php + +define('MYCONST', 1); +define('A', 'B'); + +$ini_file = dirname(__FILE__)."/bug52138.data"; + +$ret = parse_ini_file($ini_file, true); +var_dump($ret); + +?> +--EXPECTF-- +array(4) { + ["MYCONST"]=> + array(1) { + ["MYCONST"]=> + string(1) "1" + } + ["M_PI"]=> + array(1) { + ["FOO"]=> + string(%d) "3.%d test" + } + ["foo::bar"]=> + array(2) { + ["A"]=> + string(1) "1" + ["B"]=> + string(3) "BAB" + } + ["MYCONST M_PI"]=> + array(0) { + } +} diff --git a/ext/standard/tests/general_functions/getservbyname_basic.phpt b/ext/standard/tests/general_functions/getservbyname_basic.phpt index 164e71afd..adaa7afb4 100755 --- a/ext/standard/tests/general_functions/getservbyname_basic.phpt +++ b/ext/standard/tests/general_functions/getservbyname_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test function getservbyport() by calling it more than or less than its expected arguments +Test function getservbyname() --CREDITS-- Italian PHP TestFest 2009 Cesena 19-20-21 june Fabio Fabbrucci (fabbrucci@grupporetina.com) diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt index 1a525c53b..09e9f3b99 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -573,7 +573,7 @@ array(2) { *** Testing var_dump() on object variables *** -- Iteration 1 -- -object(object_class)#%d (7) { +object(object_class)#6 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -590,14 +590,14 @@ object(object_class)#%d (7) { int(11) } -- Iteration 2 -- -object(no_member_class)#%d (0) { +object(no_member_class)#7 (0) { } -- Iteration 3 -- -object(contains_object_class)#%d (7) { +object(contains_object_class)#8 (7) { ["p"]=> int(30) ["class_object1"]=> - object(object_class)#%d (7) { + object(object_class)#9 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -614,7 +614,7 @@ object(contains_object_class)#%d (7) { int(11) } ["class_object2"]=> - object(object_class)#%d (7) { + object(object_class)#10 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -631,7 +631,7 @@ object(contains_object_class)#%d (7) { int(11) } ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (7) { + object(object_class)#9 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -648,7 +648,7 @@ object(contains_object_class)#%d (7) { int(11) } ["class_object4":protected]=> - object(object_class)#%d (7) { + object(object_class)#10 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -665,93 +665,17 @@ object(contains_object_class)#%d (7) { int(11) } ["no_member_class_object"]=> - object(no_member_class)#%d (0) { + object(no_member_class)#11 (0) { } ["class_object5"]=> - object(contains_object_class)#%d (7) { - ["p"]=> - int(30) - ["class_object1"]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object2"]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object4":protected]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["no_member_class_object"]=> - object(no_member_class)#%d (0) { - } - ["class_object5"]=> - *RECURSION* - } + *RECURSION* } -- Iteration 4 -- -object(contains_object_class)#%d (7) { +object(contains_object_class)#1 (7) { ["p"]=> int(30) ["class_object1"]=> - object(object_class)#%d (7) { + object(object_class)#2 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -768,7 +692,7 @@ object(contains_object_class)#%d (7) { int(11) } ["class_object2"]=> - object(object_class)#%d (7) { + object(object_class)#3 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -785,7 +709,7 @@ object(contains_object_class)#%d (7) { int(11) } ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (7) { + object(object_class)#2 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -802,7 +726,7 @@ object(contains_object_class)#%d (7) { int(11) } ["class_object4":protected]=> - object(object_class)#%d (7) { + object(object_class)#3 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -819,89 +743,13 @@ object(contains_object_class)#%d (7) { int(11) } ["no_member_class_object"]=> - object(no_member_class)#%d (0) { + object(no_member_class)#4 (0) { } ["class_object5"]=> - object(contains_object_class)#%d (7) { - ["p"]=> - int(30) - ["class_object1"]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object2"]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object4":protected]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["no_member_class_object"]=> - object(no_member_class)#%d (0) { - } - ["class_object5"]=> - *RECURSION* - } + *RECURSION* } -- Iteration 5 -- -object(object_class)#%d (7) { +object(object_class)#2 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -918,7 +766,7 @@ object(object_class)#%d (7) { int(11) } -- Iteration 6 -- -object(object_class)#%d (7) { +object(object_class)#3 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -935,10 +783,10 @@ object(object_class)#%d (7) { int(11) } -- Iteration 7 -- -object(no_member_class)#%d (0) { +object(no_member_class)#4 (0) { } -- Iteration 8 -- -object(object_class)#%d (7) { +object(object_class)#5 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -958,7 +806,7 @@ object(object_class)#%d (7) { NULL ** Testing var_dump() on objects having circular reference ** -object(object_class)#%d (8) { +object(object_class)#13 (8) { ["value"]=> int(50) ["public_var1"]=> @@ -974,7 +822,7 @@ object(object_class)#%d (8) { ["public_var2"]=> int(11) ["obj"]=> - &object(object_class)#%d (8) { + &object(object_class)#12 (8) { ["value"]=> int(50) ["public_var1"]=> @@ -990,49 +838,15 @@ object(object_class)#%d (8) { ["public_var2"]=> int(11) ["obj"]=> - &object(object_class)#%d (8) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - ["obj"]=> - &object(object_class)#%d (8) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - ["obj"]=> - *RECURSION* - } - } + *RECURSION* } } *** Testing var_dump() on resources *** -- Iteration 1 -- -resource(%d) of type (stream) +resource(5) of type (stream) -- Iteration 2 -- -resource(%d) of type (stream) +resource(6) of type (stream) *** Testing var_dump() on different combinations of scalar and non-scalar variables *** @@ -1066,7 +880,7 @@ array(4) { -- Iteration 3 -- array(4) { [0]=> - object(no_member_class)#%d (0) { + object(no_member_class)#14 (0) { } [1]=> array(0) { @@ -1413,13 +1227,13 @@ array(4) { } array(2) { [0]=> - resource(%d) of type (stream) + resource(5) of type (stream) [1]=> - resource(%d) of type (stream) + resource(6) of type (stream) } array(9) { [0]=> - object(object_class)#%d (7) { + object(object_class)#6 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1436,14 +1250,14 @@ array(9) { int(11) } [1]=> - object(no_member_class)#%d (0) { + object(no_member_class)#7 (0) { } [2]=> - object(contains_object_class)#%d (7) { + object(contains_object_class)#8 (7) { ["p"]=> int(30) ["class_object1"]=> - object(object_class)#%d (7) { + object(object_class)#9 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1460,7 +1274,7 @@ array(9) { int(11) } ["class_object2"]=> - object(object_class)#%d (7) { + object(object_class)#10 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1477,7 +1291,7 @@ array(9) { int(11) } ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (7) { + object(object_class)#9 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1494,7 +1308,7 @@ array(9) { int(11) } ["class_object4":protected]=> - object(object_class)#%d (7) { + object(object_class)#10 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1511,93 +1325,17 @@ array(9) { int(11) } ["no_member_class_object"]=> - object(no_member_class)#%d (0) { + object(no_member_class)#11 (0) { } ["class_object5"]=> - object(contains_object_class)#%d (7) { - ["p"]=> - int(30) - ["class_object1"]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object2"]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object4":protected]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["no_member_class_object"]=> - object(no_member_class)#%d (0) { - } - ["class_object5"]=> - *RECURSION* - } + *RECURSION* } [3]=> - object(contains_object_class)#%d (7) { + object(contains_object_class)#1 (7) { ["p"]=> int(30) ["class_object1"]=> - object(object_class)#%d (7) { + object(object_class)#2 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1614,7 +1352,7 @@ array(9) { int(11) } ["class_object2"]=> - object(object_class)#%d (7) { + object(object_class)#3 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1631,7 +1369,7 @@ array(9) { int(11) } ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (7) { + object(object_class)#2 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1648,7 +1386,7 @@ array(9) { int(11) } ["class_object4":protected]=> - object(object_class)#%d (7) { + object(object_class)#3 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1665,89 +1403,13 @@ array(9) { int(11) } ["no_member_class_object"]=> - object(no_member_class)#%d (0) { + object(no_member_class)#4 (0) { } ["class_object5"]=> - object(contains_object_class)#%d (7) { - ["p"]=> - int(30) - ["class_object1"]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object2"]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object4":protected]=> - object(object_class)#%d (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["no_member_class_object"]=> - object(no_member_class)#%d (0) { - } - ["class_object5"]=> - *RECURSION* - } + *RECURSION* } [4]=> - object(object_class)#%d (7) { + object(object_class)#2 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1764,7 +1426,7 @@ array(9) { int(11) } [5]=> - object(object_class)#%d (7) { + object(object_class)#3 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1781,10 +1443,10 @@ array(9) { int(11) } [6]=> - object(no_member_class)#%d (0) { + object(no_member_class)#4 (0) { } [7]=> - object(object_class)#%d (7) { + object(object_class)#5 (7) { ["value"]=> int(50) ["public_var1"]=> @@ -1844,7 +1506,7 @@ array(6) { [2]=> array(4) { [0]=> - object(no_member_class)#%d (0) { + object(no_member_class)#14 (0) { } [1]=> array(0) { @@ -1907,5 +1569,6 @@ string(9) " *** Testing error conditions *** -Warning: var_dump() expects at least %d parameter, %d given in %s on line %d +Warning: var_dump() expects at least 1 parameter, 0 given in %s on line %d Done + diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt index 3772536cf..a81980c02 100644 --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt @@ -462,8 +462,7 @@ string(34) "abcd -- Iteration 14 -- string(22) "1234 5678 - 9100 -abcda" + 9100
abcda" *** Testing var_dump() on boolean variables *** -- Iteration 1 -- @@ -669,83 +668,7 @@ object(contains_object_class)#8 (7) { object(no_member_class)#11 (0) { } ["class_object5"]=> - object(contains_object_class)#8 (7) { - ["p"]=> - int(30) - ["class_object1"]=> - object(object_class)#9 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object2"]=> - object(object_class)#10 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object3":"contains_object_class":private]=> - object(object_class)#9 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object4":protected]=> - object(object_class)#10 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["no_member_class_object"]=> - object(no_member_class)#11 (0) { - } - ["class_object5"]=> - *RECURSION* - } + *RECURSION* } -- Iteration 4 -- object(contains_object_class)#1 (7) { @@ -823,83 +746,7 @@ object(contains_object_class)#1 (7) { object(no_member_class)#4 (0) { } ["class_object5"]=> - object(contains_object_class)#1 (7) { - ["p"]=> - int(30) - ["class_object1"]=> - object(object_class)#2 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object2"]=> - object(object_class)#3 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object3":"contains_object_class":private]=> - object(object_class)#2 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object4":protected]=> - object(object_class)#3 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["no_member_class_object"]=> - object(no_member_class)#4 (0) { - } - ["class_object5"]=> - *RECURSION* - } + *RECURSION* } -- Iteration 5 -- object(object_class)#2 (7) { @@ -991,41 +838,7 @@ object(object_class)#13 (8) { ["public_var2"]=> int(11) ["obj"]=> - &object(object_class)#13 (8) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - ["obj"]=> - &object(object_class)#12 (8) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - ["obj"]=> - *RECURSION* - } - } + *RECURSION* } } @@ -1303,8 +1116,7 @@ array(14) { [13]=> string(22) "1234 5678 - 9100 -abcda" + 9100
abcda" } array(15) { [0]=> @@ -1516,83 +1328,7 @@ array(9) { object(no_member_class)#11 (0) { } ["class_object5"]=> - object(contains_object_class)#8 (7) { - ["p"]=> - int(30) - ["class_object1"]=> - object(object_class)#9 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object2"]=> - object(object_class)#10 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object3":"contains_object_class":private]=> - object(object_class)#9 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object4":protected]=> - object(object_class)#10 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["no_member_class_object"]=> - object(no_member_class)#11 (0) { - } - ["class_object5"]=> - *RECURSION* - } + *RECURSION* } [3]=> object(contains_object_class)#1 (7) { @@ -1670,83 +1406,7 @@ array(9) { object(no_member_class)#4 (0) { } ["class_object5"]=> - object(contains_object_class)#1 (7) { - ["p"]=> - int(30) - ["class_object1"]=> - object(object_class)#2 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object2"]=> - object(object_class)#3 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object3":"contains_object_class":private]=> - object(object_class)#2 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["class_object4":protected]=> - object(object_class)#3 (7) { - ["value"]=> - int(50) - ["public_var1"]=> - int(10) - ["private_var1":"object_class":private]=> - int(20) - ["private_var2":"object_class":private]=> - int(21) - ["protected_var1":protected]=> - string(8) "string_1" - ["protected_var2":protected]=> - string(8) "string_2" - ["public_var2"]=> - int(11) - } - ["no_member_class_object"]=> - object(no_member_class)#4 (0) { - } - ["class_object5"]=> - *RECURSION* - } + *RECURSION* } [4]=> object(object_class)#2 (7) { @@ -1911,3 +1571,4 @@ string(9) " Warning: var_dump() expects at least 1 parameter, 0 given in %s on line %d Done + diff --git a/ext/standard/tests/general_functions/var_export_error2.phpt b/ext/standard/tests/general_functions/var_export_error2.phpt index 93d0dc164..2b306696a 100644 --- a/ext/standard/tests/general_functions/var_export_error2.phpt +++ b/ext/standard/tests/general_functions/var_export_error2.phpt @@ -14,12 +14,5 @@ var_export($obj, true); ?> ===DONE=== --EXPECTF-- -stdClass::__set_state(array( - 'p' => - stdClass::__set_state(array( - 'p' => - stdClass::__set_state(array( - 'p' => - stdClass::__set_state(array( Fatal error: Nesting level too deep - recursive dependency? in %s on line 9
\ No newline at end of file diff --git a/ext/standard/tests/general_functions/var_export_error3.phpt b/ext/standard/tests/general_functions/var_export_error3.phpt index 4ad512168..03ed496ac 100644 --- a/ext/standard/tests/general_functions/var_export_error3.phpt +++ b/ext/standard/tests/general_functions/var_export_error3.phpt @@ -14,14 +14,5 @@ var_export($a, true); ?> ===DONE=== --EXPECTF-- -array ( - 0 => - array ( - 0 => - array ( - 0 => - array ( - 0 => - array ( Fatal error: Nesting level too deep - recursive dependency? in %s on line 9
\ No newline at end of file diff --git a/ext/standard/tests/mail/bug51604.phpt b/ext/standard/tests/mail/bug51604.phpt new file mode 100644 index 000000000..a65702102 --- /dev/null +++ b/ext/standard/tests/mail/bug51604.phpt @@ -0,0 +1,35 @@ +--TEST-- +Bug #51604 (newline in end of header is shown in start of message) +--INI-- +sendmail_path=tee mail_bug51604.out >/dev/null +mail.add_x_header = Off +--SKIPIF-- +<?php +if(substr(PHP_OS, 0, 3) == "WIN") + die("skip Won't run on Windows"); +?> +--FILE-- +<?php +// Initialise all required variables +$to = 'user@company.com'; +$subject = 'Test Subject'; +$message = 'A Message'; +$additional_headers = "KHeaders\n\n\n\n\n"; +$outFile = "mail_bug51604.out"; +@unlink($outFile); + +// Calling mail() with all additional headers +var_dump( mail($to, $subject, $message, $additional_headers) ); +echo file_get_contents($outFile); +unlink($outFile); + +?> +===DONE=== +--EXPECT-- +bool(true) +To: user@company.com +Subject: Test Subject +KHeaders + +A Message +===DONE=== diff --git a/ext/standard/tests/misc/time_sleep_until_basic.phpt b/ext/standard/tests/misc/time_sleep_until_basic.phpt index 7f2f32d24..956985a62 100644 --- a/ext/standard/tests/misc/time_sleep_until_basic.phpt +++ b/ext/standard/tests/misc/time_sleep_until_basic.phpt @@ -1,5 +1,7 @@ --TEST-- time_sleep_until() function - basic test for time_sleep_until() +--SKIPIF-- +<?php if (!function_exists("time_sleep_until")) die('skip time_sleep_until() not available');?> --CREDITS-- Manuel Baldassarri mb@ideato.it Michele Orselli mo@ideato.it diff --git a/ext/standard/tests/misc/time_sleep_until_error1.phpt b/ext/standard/tests/misc/time_sleep_until_error1.phpt index 9752fd70e..2a409a38b 100644 --- a/ext/standard/tests/misc/time_sleep_until_error1.phpt +++ b/ext/standard/tests/misc/time_sleep_until_error1.phpt @@ -1,5 +1,7 @@ --TEST-- time_sleep_until() function - error test for time_sleep_until() +--SKIPIF-- +<?php if (!function_exists("time_sleep_until")) die('skip time_sleep_until() not available');?> --CREDITS-- Fabio Fabbrucci fabbrucci@grupporetina.com Danilo Sanchi sanchi@grupporetina.com diff --git a/ext/standard/tests/misc/time_sleep_until_error2.phpt b/ext/standard/tests/misc/time_sleep_until_error2.phpt index d20c8ab65..bbfef1b76 100644 --- a/ext/standard/tests/misc/time_sleep_until_error2.phpt +++ b/ext/standard/tests/misc/time_sleep_until_error2.phpt @@ -1,9 +1,7 @@ --TEST-- time_sleep_until() function - error test for time_sleep_until() --SKIPIF-- -<?php - function_exists('time_sleep_until') or die('skip time_sleep_until() is not supported in this build.'); -?> +<?php if (!function_exists("time_sleep_until")) die('skip time_sleep_until() not available');?> --CREDITS-- Filippo De Santis fd@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 diff --git a/ext/standard/tests/misc/time_sleep_until_error3.phpt b/ext/standard/tests/misc/time_sleep_until_error3.phpt index 64489618a..f18e5b302 100644 --- a/ext/standard/tests/misc/time_sleep_until_error3.phpt +++ b/ext/standard/tests/misc/time_sleep_until_error3.phpt @@ -1,5 +1,7 @@ --TEST-- time_sleep_until() function - error test for time_sleep_until() +--SKIPIF-- +<?php if (!function_exists("time_sleep_until")) die('skip time_sleep_until() not available');?> --CREDITS-- Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 diff --git a/ext/standard/tests/network/getmxrr.phpt b/ext/standard/tests/network/getmxrr.phpt index 5dc3560d0..b6753f0d6 100644 --- a/ext/standard/tests/network/getmxrr.phpt +++ b/ext/standard/tests/network/getmxrr.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -$domains = array( 'php.net', 'ez.no' ); +$domains = array( 'php.net', 'lists.php.net' ); foreach ( $domains as $domain ) { if ( getmxrr( $domain, $hosts, $weights ) ) diff --git a/ext/standard/tests/serialize/bug28325.phpt b/ext/standard/tests/serialize/bug28325.phpt index 7f2bd6637..ee0e60e1a 100644 --- a/ext/standard/tests/serialize/bug28325.phpt +++ b/ext/standard/tests/serialize/bug28325.phpt @@ -24,16 +24,7 @@ object(a)#%d (1) { ["c"]=> object(c)#%d (1) { ["d"]=> - object(a)#%d (1) { - ["b"]=> - object(b)#%d (1) { - ["c"]=> - object(c)#%d (1) { - ["d"]=> - *RECURSION* - } - } - } + *RECURSION* } } } diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt index f62f69855..ff5f34c5b 100644 --- a/ext/standard/tests/serialize/serialization_arrays_001.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt @@ -34,7 +34,6 @@ var_dump($arr_asso); echo "\nDone"; ?> --EXPECTF-- - --- Testing Circular reference of an array --- -- Normal array -- string(238) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;R:8;}}" @@ -68,23 +67,7 @@ array(7) { array(0) { } [6]=> - &array(7) { - [0]=> - int(0) - [1]=> - int(1) - [2]=> - int(-2) - [3]=> - float(3.333333) - [4]=> - string(1) "a" - [5]=> - array(0) { - } - [6]=> - *RECURSION* - } + *RECURSION* } } @@ -103,4 +86,4 @@ array(2) { &string(4) "test" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_arrays_004.phpt b/ext/standard/tests/serialize/serialization_arrays_004.phpt index 942afdfb9..55d849c97 100644 --- a/ext/standard/tests/serialize/serialization_arrays_004.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_004.phpt @@ -52,21 +52,12 @@ check($a); echo "Done"; ?> --EXPECTF-- - - --- 1 refs container: array(3) { [0]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - int(1) - [2]=> - int(1) - } + *RECURSION* [1]=> int(1) [2]=> @@ -82,14 +73,7 @@ array(3) { [0]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - int(1) - [2]=> - int(1) - } + *RECURSION* [1]=> int(1) [2]=> @@ -102,7 +86,7 @@ array(3) { } array(3) { [0]=> - %string(10) "b0.changed" + string(10) "b0.changed" [1]=> int(1) [2]=> @@ -110,7 +94,7 @@ array(3) { } array(3) { [0]=> - %string(10) "b0.changed" + string(10) "b0.changed" [1]=> string(10) "b1.changed" [2]=> @@ -118,7 +102,7 @@ array(3) { } array(3) { [0]=> - %string(10) "b0.changed" + string(10) "b0.changed" [1]=> string(10) "b1.changed" [2]=> @@ -131,46 +115,18 @@ array(3) { [0]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } + *RECURSION* [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } + *RECURSION* [2]=> int(1) } [1]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } + *RECURSION* [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } + *RECURSION* [2]=> int(1) } @@ -182,46 +138,18 @@ array(3) { [0]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } + *RECURSION* [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } + *RECURSION* [2]=> int(1) } [1]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } + *RECURSION* [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - int(1) - } + *RECURSION* [2]=> int(1) } @@ -259,92 +187,29 @@ array(3) { [0]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* } [1]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* } [2]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* } } string(56) "a:3:{i:0;a:3:{i:0;R:2;i:1;R:2;i:2;R:2;}i:1;R:2;i:2;R:2;}" @@ -352,92 +217,29 @@ array(3) { [0]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* } [1]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* } [2]=> &array(3) { [0]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [1]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* [2]=> - &array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } + *RECURSION* } } array(3) { @@ -464,4 +266,4 @@ array(3) { [2]=> &string(10) "b2.changed" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_arrays_005.phpt b/ext/standard/tests/serialize/serialization_arrays_005.phpt index dd3e436ed..10e33129f 100644 --- a/ext/standard/tests/serialize/serialization_arrays_005.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_005.phpt @@ -79,8 +79,6 @@ check($c); ?> --EXPECTF-- - - --- Nested array references 1 element in containing array: array(3) { [0]=> @@ -443,19 +441,7 @@ array(3) { [1]=> int(1) [2]=> - &array(2) { - [0]=> - int(1) - [1]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - *RECURSION* - } - } + *RECURSION* } } } @@ -476,19 +462,7 @@ array(3) { [1]=> int(1) [2]=> - &array(2) { - [0]=> - int(1) - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - *RECURSION* - } - } + *RECURSION* } } } @@ -508,19 +482,7 @@ array(3) { [1]=> int(1) [2]=> - &array(2) { - [0]=> - int(1) - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - *RECURSION* - } - } + *RECURSION* } } } @@ -540,19 +502,7 @@ array(3) { [1]=> int(1) [2]=> - &array(2) { - [0]=> - string(12) "b2.0.changed" - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(1) - [2]=> - *RECURSION* - } - } + *RECURSION* } } } diff --git a/ext/standard/tests/serialize/serialization_objects_015.phpt b/ext/standard/tests/serialize/serialization_objects_015.phpt index 02e8279c4..2265caba9 100644 --- a/ext/standard/tests/serialize/serialization_objects_015.phpt +++ b/ext/standard/tests/serialize/serialization_objects_015.phpt @@ -74,14 +74,7 @@ echo "Done"; --- a refs container: object(stdClass)#%d (3) { ["a"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - int(1) - ["c"]=> - int(1) - } + *RECURSION* ["b"]=> int(1) ["c"]=> @@ -90,14 +83,7 @@ object(stdClass)#%d (3) { string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";i:1;s:1:"c";i:1;}" object(stdClass)#%d (3) { ["a"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - int(1) - ["c"]=> - int(1) - } + *RECURSION* ["b"]=> int(1) ["c"]=> @@ -132,14 +118,7 @@ object(stdClass)#%d (3) { --- a eqs container: object(stdClass)#%d (3) { ["a"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - int(1) - ["c"]=> - int(1) - } + *RECURSION* ["b"]=> int(1) ["c"]=> @@ -148,14 +127,7 @@ object(stdClass)#%d (3) { string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";i:1;s:1:"c";i:1;}" object(stdClass)#%d (3) { ["a"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - int(1) - ["c"]=> - int(1) - } + *RECURSION* ["b"]=> int(1) ["c"]=> @@ -190,46 +162,18 @@ object(stdClass)#%d (3) { --- a,b ref container: object(stdClass)#%d (3) { ["a"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } + *RECURSION* ["b"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } + *RECURSION* ["c"]=> int(1) } string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";R:1;s:1:"c";i:1;}" object(stdClass)#%d (3) { ["a"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } + *RECURSION* ["b"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } + *RECURSION* ["c"]=> int(1) } @@ -262,46 +206,18 @@ object(stdClass)#%d (3) { --- a,b eq container: object(stdClass)#%d (3) { ["a"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } + *RECURSION* ["b"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } + *RECURSION* ["c"]=> int(1) } string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";r:1;s:1:"c";i:1;}" object(stdClass)#%d (3) { ["a"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } + *RECURSION* ["b"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } + *RECURSION* ["c"]=> int(1) } @@ -309,14 +225,7 @@ object(stdClass)#%d (3) { ["a"]=> string(14) "obj->a.changed" ["b"]=> - object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - *RECURSION* - ["c"]=> - int(1) - } + *RECURSION* ["c"]=> int(1) } @@ -341,62 +250,20 @@ object(stdClass)#%d (3) { --- a,b,c ref container: object(stdClass)#%d (3) { ["a"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* ["b"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* ["c"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* } string(55) "O:8:"stdClass":3:{s:1:"a";R:1;s:1:"b";R:1;s:1:"c";R:1;}" object(stdClass)#%d (3) { ["a"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* ["b"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* ["c"]=> - &object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* } object(stdClass)#%d (3) { ["a"]=> @@ -427,84 +294,28 @@ object(stdClass)#%d (3) { --- a,b,c eq container: object(stdClass)#%d (3) { ["a"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* ["b"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* ["c"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* } string(55) "O:8:"stdClass":3:{s:1:"a";r:1;s:1:"b";r:1;s:1:"c";r:1;}" object(stdClass)#%d (3) { ["a"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* ["b"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* ["c"]=> - object(stdClass)#%d (3) { - ["a"]=> - *RECURSION* - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* } object(stdClass)#%d (3) { ["a"]=> string(14) "obj->a.changed" ["b"]=> - object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* ["c"]=> - object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - *RECURSION* - ["c"]=> - *RECURSION* - } + *RECURSION* } object(stdClass)#%d (3) { ["a"]=> @@ -512,14 +323,7 @@ object(stdClass)#%d (3) { ["b"]=> string(14) "obj->b.changed" ["c"]=> - object(stdClass)#%d (3) { - ["a"]=> - string(14) "obj->a.changed" - ["b"]=> - string(14) "obj->b.changed" - ["c"]=> - *RECURSION* - } + *RECURSION* } object(stdClass)#%d (3) { ["a"]=> @@ -529,4 +333,4 @@ object(stdClass)#%d (3) { ["c"]=> string(14) "obj->c.changed" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/bug47842.phpt b/ext/standard/tests/strings/bug47842.phpt new file mode 100644 index 000000000..4ac9da6d8 --- /dev/null +++ b/ext/standard/tests/strings/bug47842.phpt @@ -0,0 +1,34 @@ +--TEST-- +Bug #47842 sscanf() does not support 64-bit values +--SKIPIF-- +<?php +if (PHP_INT_MAX < pow(2,31)) die("skip PHP_INT_MAX < 32b\n"); +?> +--FILE-- +<?php +echo "-Test\n"; + +sscanf("2147483647", '%d', $int); +echo "sscanf 32-bit signed int '2147483647' (2^31)-1 = ",$int,"\n"; +sscanf("4294967295", '%u', $int); +echo "sscanf 32-bit unsign int '4294967295' (2^32)-1 = ",$int,"\n"; + +sscanf("9223372036854775807", '%d', $int); +echo "sscanf 64-bit signed int '9223372036854775807' (2^63)-1 = ",$int,"\n"; +sscanf("18446744073709551615", '%u', $int); +echo "sscanf 64-bit unsign int '18446744073709551615' (2^64)-1 = ",$int,"\n"; + +printf("printf 64-bit signed int '9223372036854775807' (2^63)-1 = %d\n", 9223372036854775807); +printf("printf 64-bit signed int '18446744073709551615' (2^64)-1 = %u\n", 18446744073709551615); + +echo "Done\n"; +?> +--EXPECTF-- +%aTest +sscanf 32-bit signed int '2147483647' (2^31)-1 = 2147483647 +sscanf 32-bit unsign int '4294967295' (2^32)-1 = 4294967295 +sscanf 64-bit signed int '9223372036854775807' (2^63)-1 = 9223372036854775807 +sscanf 64-bit unsign int '18446744073709551615' (2^64)-1 = 18446744073709551615 +printf 64-bit signed int '9223372036854775807' (2^63)-1 = 9223372036854775807 +printf 64-bit signed int '18446744073709551615' (2^64)-1 = 0 +Done diff --git a/ext/standard/tests/strings/bug51059.phpt b/ext/standard/tests/strings/bug51059.phpt index f2cbe9def..bdc56f176 100644 --- a/ext/standard/tests/strings/bug51059.phpt +++ b/ext/standard/tests/strings/bug51059.phpt @@ -2,8 +2,8 @@ Bug #51059 crypt() segfaults on certain salts --FILE-- <?php -$res = crypt('a', '_'); -if ($res == '*0' || $res == '*1') echo 'OK'; +$res = crypt(b'a', b'_'); +if ($res === b'*0' || $res === b'*1') echo 'OK'; else echo 'Not OK'; ?> diff --git a/ext/standard/tests/strings/bug51899.phpt b/ext/standard/tests/strings/bug51899.phpt new file mode 100644 index 000000000..fb430cf30 --- /dev/null +++ b/ext/standard/tests/strings/bug51899.phpt @@ -0,0 +1,37 @@ +--TEST-- +Bug #51899 (Parse error in parse_ini_file() function when empy value followed by no newline) +--FILE-- +<?php + +var_dump(parse_ini_string('a=')); +var_dump(parse_ini_string('a= ')); +var_dump(parse_ini_string('a='.PHP_EOL)); +var_dump(parse_ini_string('a=b ')); +var_dump(parse_ini_string('')); +var_dump(parse_ini_string(NULL)); +var_dump(parse_ini_string("\0")); + +?> +--EXPECT-- +array(1) { + ["a"]=> + string(0) "" +} +array(1) { + ["a"]=> + string(0) "" +} +array(1) { + ["a"]=> + string(0) "" +} +array(1) { + ["a"]=> + string(2) "b " +} +array(0) { +} +array(0) { +} +array(0) { +} diff --git a/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt b/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt deleted file mode 100644 index 6d40b0770..000000000 --- a/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt +++ /dev/null @@ -1,22 +0,0 @@ ---TEST-- -Test Blowfish crypt() with invalid rounds ---FILE-- -<?php - -foreach(range(32, 38) as $i) { - if (crypt('U*U', '$2a$'.$i.'$CCCCCCCCCCCCCCCCCCCCCC$') === FALSE) { - echo "$i. OK\n"; - } else { - echo "$i. Not OK\n"; - } -} - -?> ---EXPECT-- -32. OK -33. OK -34. OK -35. OK -36. OK -37. OK -38. OK diff --git a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt new file mode 100644 index 000000000..1592cfe87 --- /dev/null +++ b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt @@ -0,0 +1,37 @@ +--TEST-- +Test Blowfish crypt() with invalid rounds +--SKIPIF-- +<?php +if (!function_exists('crypt') || !defined("CRYPT_BLOWFISH")) { + die("SKIP crypt()-blowfish is not available"); +} +?> +--FILE-- +<?php + +$salts = array(b'32' => b'$2a$32$CCCCCCCCCCCCCCCCCCCCCC$', + b'33' => b'$2a$33$CCCCCCCCCCCCCCCCCCCCCC$', + b'34' => b'$2a$34$CCCCCCCCCCCCCCCCCCCCCC$', + b'35' => b'$2a$35$CCCCCCCCCCCCCCCCCCCCCC$', + b'36' => b'$2a$36$CCCCCCCCCCCCCCCCCCCCCC$', + b'37' => b'$2a$37$CCCCCCCCCCCCCCCCCCCCCC$', + b'38' => b'$2a$38$CCCCCCCCCCCCCCCCCCCCCC$',); + +foreach($salts as $i=>$salt) { + $crypt = crypt(b'U*U', $salt); + if ($crypt === b'*0' || $crypt === b'*1') { + echo "$i. OK\n"; + } else { + echo "$i. Not OK\n"; + } +} + +?> +--EXPECT-- +32. OK +33. OK +34. OK +35. OK +36. OK +37. OK +38. OK diff --git a/ext/standard/tests/strings/crypt_blowfish_variation2.phpt b/ext/standard/tests/strings/crypt_blowfish_variation2.phpt new file mode 100644 index 000000000..21bedc10c --- /dev/null +++ b/ext/standard/tests/strings/crypt_blowfish_variation2.phpt @@ -0,0 +1,14 @@ +--TEST-- +Test Blowfish crypt() falls back to DES when rounds are not specified, +or Blowfish is not available. +--FILE-- +<?php +$crypt = crypt(b'U*U', b'$2a$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW'); +if ($crypt===b'$2SHYF.wPGyfE') { + echo "OK\n"; +} else { + echo "Not OK\n"; +} +?> +--EXPECT-- +OK diff --git a/ext/standard/tests/strings/strtolower.phpt b/ext/standard/tests/strings/strtolower.phpt Binary files differindex d11f697e5..f498a95f7 100644 --- a/ext/standard/tests/strings/strtolower.phpt +++ b/ext/standard/tests/strings/strtolower.phpt diff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt Binary files differindex f7036a812..2890c02cc 100644 --- a/ext/standard/tests/strings/strtoupper1.phpt +++ b/ext/standard/tests/strings/strtoupper1.phpt diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt index 3d50689a4..7b9d51399 100644 --- a/ext/standard/tests/url/parse_url_basic_001.phpt +++ b/ext/standard/tests/url/parse_url_basic_001.phpt @@ -845,55 +845,29 @@ echo "Done"; string(1) "/" } ---> http:///blah.com: -Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15 -bool(false) +--> http:///blah.com: bool(false) ---> http://:80: -Warning: parse_url(http://:80): Unable to parse URL in %s on line 15 -bool(false) +--> http://:80: bool(false) ---> http://user@:80: -Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15 -bool(false) +--> http://user@:80: bool(false) ---> http://user:pass@:80: -Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15 -bool(false) +--> http://user:pass@:80: bool(false) ---> http://:: -Warning: parse_url(http://:): Unable to parse URL in %s on line 15 -bool(false) +--> http://:: bool(false) ---> http://@/: -Warning: parse_url(http://@/): Unable to parse URL in %s on line 15 -bool(false) +--> http://@/: bool(false) ---> http://@:/: -Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15 -bool(false) +--> http://@:/: bool(false) ---> http://:/: -Warning: parse_url(http://:/): Unable to parse URL in %s on line 15 -bool(false) +--> http://:/: bool(false) ---> http://?: -Warning: parse_url(http://?): Unable to parse URL in %s on line 15 -bool(false) +--> http://?: bool(false) ---> http://?:: -Warning: parse_url(http://?:): Unable to parse URL in %s on line 15 -bool(false) +--> http://?:: bool(false) ---> http://:?: -Warning: parse_url(http://:?): Unable to parse URL in %s on line 15 -bool(false) +--> http://:?: bool(false) ---> http://blah.com:123456: -Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15 -bool(false) +--> http://blah.com:123456: bool(false) ---> http://blah.com:abcdef: -Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15 -bool(false) +--> http://blah.com:abcdef: bool(false) Done
\ No newline at end of file diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt index e25ab8dcd..f3ac770f0 100644 --- a/ext/standard/tests/url/parse_url_basic_002.phpt +++ b/ext/standard/tests/url/parse_url_basic_002.phpt @@ -109,43 +109,17 @@ echo "Done"; --> http://[x:80]/ : string(4) "http" --> : NULL --> / : NULL ---> http:///blah.com : -Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15 -bool(false) ---> http://:80 : -Warning: parse_url(http://:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user@:80 : -Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user:pass@:80 : -Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://: : -Warning: parse_url(http://:): Unable to parse URL in %s on line 15 -bool(false) ---> http://@/ : -Warning: parse_url(http://@/): Unable to parse URL in %s on line 15 -bool(false) ---> http://@:/ : -Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://:/ : -Warning: parse_url(http://:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://? : -Warning: parse_url(http://?): Unable to parse URL in %s on line 15 -bool(false) ---> http://?: : -Warning: parse_url(http://?:): Unable to parse URL in %s on line 15 -bool(false) ---> http://:? : -Warning: parse_url(http://:?): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:123456 : -Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:abcdef : -Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15 -bool(false) +--> http:///blah.com : bool(false) +--> http://:80 : bool(false) +--> http://user@:80 : bool(false) +--> http://user:pass@:80 : bool(false) +--> http://: : bool(false) +--> http://@/ : bool(false) +--> http://@:/ : bool(false) +--> http://:/ : bool(false) +--> http://? : bool(false) +--> http://?: : bool(false) +--> http://:? : bool(false) +--> http://blah.com:123456 : bool(false) +--> http://blah.com:abcdef : bool(false) Done
\ No newline at end of file diff --git a/ext/standard/tests/url/parse_url_basic_003.phpt b/ext/standard/tests/url/parse_url_basic_003.phpt index e34dc2d19..dbd92088a 100644 --- a/ext/standard/tests/url/parse_url_basic_003.phpt +++ b/ext/standard/tests/url/parse_url_basic_003.phpt @@ -108,43 +108,17 @@ echo "Done"; --> http://[x:80]/ : string(6) "[x:80]" --> : NULL --> / : NULL ---> http:///blah.com : -Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15 -bool(false) ---> http://:80 : -Warning: parse_url(http://:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user@:80 : -Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user:pass@:80 : -Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://: : -Warning: parse_url(http://:): Unable to parse URL in %s on line 15 -bool(false) ---> http://@/ : -Warning: parse_url(http://@/): Unable to parse URL in %s on line 15 -bool(false) ---> http://@:/ : -Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://:/ : -Warning: parse_url(http://:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://? : -Warning: parse_url(http://?): Unable to parse URL in %s on line 15 -bool(false) ---> http://?: : -Warning: parse_url(http://?:): Unable to parse URL in %s on line 15 -bool(false) ---> http://:? : -Warning: parse_url(http://:?): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:123456 : -Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:abcdef : -Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15 -bool(false) +--> http:///blah.com : bool(false) +--> http://:80 : bool(false) +--> http://user@:80 : bool(false) +--> http://user:pass@:80 : bool(false) +--> http://: : bool(false) +--> http://@/ : bool(false) +--> http://@:/ : bool(false) +--> http://:/ : bool(false) +--> http://? : bool(false) +--> http://?: : bool(false) +--> http://:? : bool(false) +--> http://blah.com:123456 : bool(false) +--> http://blah.com:abcdef : bool(false) Done
\ No newline at end of file diff --git a/ext/standard/tests/url/parse_url_basic_004.phpt b/ext/standard/tests/url/parse_url_basic_004.phpt index af3279547..387907f0e 100644 --- a/ext/standard/tests/url/parse_url_basic_004.phpt +++ b/ext/standard/tests/url/parse_url_basic_004.phpt @@ -108,43 +108,17 @@ echo "Done"; --> http://[x:80]/ : NULL --> : NULL --> / : NULL ---> http:///blah.com : -Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15 -bool(false) ---> http://:80 : -Warning: parse_url(http://:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user@:80 : -Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user:pass@:80 : -Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://: : -Warning: parse_url(http://:): Unable to parse URL in %s on line 15 -bool(false) ---> http://@/ : -Warning: parse_url(http://@/): Unable to parse URL in %s on line 15 -bool(false) ---> http://@:/ : -Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://:/ : -Warning: parse_url(http://:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://? : -Warning: parse_url(http://?): Unable to parse URL in %s on line 15 -bool(false) ---> http://?: : -Warning: parse_url(http://?:): Unable to parse URL in %s on line 15 -bool(false) ---> http://:? : -Warning: parse_url(http://:?): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:123456 : -Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:abcdef : -Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15 -bool(false) +--> http:///blah.com : bool(false) +--> http://:80 : bool(false) +--> http://user@:80 : bool(false) +--> http://user:pass@:80 : bool(false) +--> http://: : bool(false) +--> http://@/ : bool(false) +--> http://@:/ : bool(false) +--> http://:/ : bool(false) +--> http://? : bool(false) +--> http://?: : bool(false) +--> http://:? : bool(false) +--> http://blah.com:123456 : bool(false) +--> http://blah.com:abcdef : bool(false) Done
\ No newline at end of file diff --git a/ext/standard/tests/url/parse_url_basic_005.phpt b/ext/standard/tests/url/parse_url_basic_005.phpt index 5eb2541c1..d44dcfef3 100644 --- a/ext/standard/tests/url/parse_url_basic_005.phpt +++ b/ext/standard/tests/url/parse_url_basic_005.phpt @@ -108,43 +108,17 @@ echo "Done"; --> http://[x:80]/ : NULL --> : NULL --> / : NULL ---> http:///blah.com : -Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15 -bool(false) ---> http://:80 : -Warning: parse_url(http://:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user@:80 : -Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user:pass@:80 : -Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://: : -Warning: parse_url(http://:): Unable to parse URL in %s on line 15 -bool(false) ---> http://@/ : -Warning: parse_url(http://@/): Unable to parse URL in %s on line 15 -bool(false) ---> http://@:/ : -Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://:/ : -Warning: parse_url(http://:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://? : -Warning: parse_url(http://?): Unable to parse URL in %s on line 15 -bool(false) ---> http://?: : -Warning: parse_url(http://?:): Unable to parse URL in %s on line 15 -bool(false) ---> http://:? : -Warning: parse_url(http://:?): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:123456 : -Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:abcdef : -Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15 -bool(false) +--> http:///blah.com : bool(false) +--> http://:80 : bool(false) +--> http://user@:80 : bool(false) +--> http://user:pass@:80 : bool(false) +--> http://: : bool(false) +--> http://@/ : bool(false) +--> http://@:/ : bool(false) +--> http://:/ : bool(false) +--> http://? : bool(false) +--> http://?: : bool(false) +--> http://:? : bool(false) +--> http://blah.com:123456 : bool(false) +--> http://blah.com:abcdef : bool(false) Done
\ No newline at end of file diff --git a/ext/standard/tests/url/parse_url_basic_006.phpt b/ext/standard/tests/url/parse_url_basic_006.phpt index 926200a1a..bd6d03efd 100644 --- a/ext/standard/tests/url/parse_url_basic_006.phpt +++ b/ext/standard/tests/url/parse_url_basic_006.phpt @@ -108,43 +108,17 @@ echo "Done"; --> http://[x:80]/ : NULL --> : NULL --> / : NULL ---> http:///blah.com : -Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15 -bool(false) ---> http://:80 : -Warning: parse_url(http://:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user@:80 : -Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user:pass@:80 : -Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://: : -Warning: parse_url(http://:): Unable to parse URL in %s on line 15 -bool(false) ---> http://@/ : -Warning: parse_url(http://@/): Unable to parse URL in %s on line 15 -bool(false) ---> http://@:/ : -Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://:/ : -Warning: parse_url(http://:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://? : -Warning: parse_url(http://?): Unable to parse URL in %s on line 15 -bool(false) ---> http://?: : -Warning: parse_url(http://?:): Unable to parse URL in %s on line 15 -bool(false) ---> http://:? : -Warning: parse_url(http://:?): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:123456 : -Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:abcdef : -Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15 -bool(false) +--> http:///blah.com : bool(false) +--> http://:80 : bool(false) +--> http://user@:80 : bool(false) +--> http://user:pass@:80 : bool(false) +--> http://: : bool(false) +--> http://@/ : bool(false) +--> http://@:/ : bool(false) +--> http://:/ : bool(false) +--> http://? : bool(false) +--> http://?: : bool(false) +--> http://:? : bool(false) +--> http://blah.com:123456 : bool(false) +--> http://blah.com:abcdef : bool(false) Done
\ No newline at end of file diff --git a/ext/standard/tests/url/parse_url_basic_007.phpt b/ext/standard/tests/url/parse_url_basic_007.phpt index d99ccb667..aa9f88ba5 100644 --- a/ext/standard/tests/url/parse_url_basic_007.phpt +++ b/ext/standard/tests/url/parse_url_basic_007.phpt @@ -108,43 +108,17 @@ echo "Done"; --> http://[x:80]/ : string(1) "/" --> : string(0) "" --> / : string(1) "/" ---> http:///blah.com : -Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15 -bool(false) ---> http://:80 : -Warning: parse_url(http://:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user@:80 : -Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user:pass@:80 : -Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://: : -Warning: parse_url(http://:): Unable to parse URL in %s on line 15 -bool(false) ---> http://@/ : -Warning: parse_url(http://@/): Unable to parse URL in %s on line 15 -bool(false) ---> http://@:/ : -Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://:/ : -Warning: parse_url(http://:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://? : -Warning: parse_url(http://?): Unable to parse URL in %s on line 15 -bool(false) ---> http://?: : -Warning: parse_url(http://?:): Unable to parse URL in %s on line 15 -bool(false) ---> http://:? : -Warning: parse_url(http://:?): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:123456 : -Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:abcdef : -Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15 -bool(false) +--> http:///blah.com : bool(false) +--> http://:80 : bool(false) +--> http://user@:80 : bool(false) +--> http://user:pass@:80 : bool(false) +--> http://: : bool(false) +--> http://@/ : bool(false) +--> http://@:/ : bool(false) +--> http://:/ : bool(false) +--> http://? : bool(false) +--> http://?: : bool(false) +--> http://:? : bool(false) +--> http://blah.com:123456 : bool(false) +--> http://blah.com:abcdef : bool(false) Done
\ No newline at end of file diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt index d2d2ebb59..7b166127f 100644 --- a/ext/standard/tests/url/parse_url_basic_008.phpt +++ b/ext/standard/tests/url/parse_url_basic_008.phpt @@ -108,43 +108,17 @@ echo "Done"; --> http://[x:80]/ : NULL --> : NULL --> / : NULL ---> http:///blah.com : -Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15 -bool(false) ---> http://:80 : -Warning: parse_url(http://:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user@:80 : -Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user:pass@:80 : -Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://: : -Warning: parse_url(http://:): Unable to parse URL in %s on line 15 -bool(false) ---> http://@/ : -Warning: parse_url(http://@/): Unable to parse URL in %s on line 15 -bool(false) ---> http://@:/ : -Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://:/ : -Warning: parse_url(http://:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://? : -Warning: parse_url(http://?): Unable to parse URL in %s on line 15 -bool(false) ---> http://?: : -Warning: parse_url(http://?:): Unable to parse URL in %s on line 15 -bool(false) ---> http://:? : -Warning: parse_url(http://:?): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:123456 : -Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:abcdef : -Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15 -bool(false) +--> http:///blah.com : bool(false) +--> http://:80 : bool(false) +--> http://user@:80 : bool(false) +--> http://user:pass@:80 : bool(false) +--> http://: : bool(false) +--> http://@/ : bool(false) +--> http://@:/ : bool(false) +--> http://:/ : bool(false) +--> http://? : bool(false) +--> http://?: : bool(false) +--> http://:? : bool(false) +--> http://blah.com:123456 : bool(false) +--> http://blah.com:abcdef : bool(false) Done
\ No newline at end of file diff --git a/ext/standard/tests/url/parse_url_basic_009.phpt b/ext/standard/tests/url/parse_url_basic_009.phpt index b23a30edf..a814546c5 100644 --- a/ext/standard/tests/url/parse_url_basic_009.phpt +++ b/ext/standard/tests/url/parse_url_basic_009.phpt @@ -108,43 +108,17 @@ echo "Done"; --> http://[x:80]/ : NULL --> : NULL --> / : NULL ---> http:///blah.com : -Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15 -bool(false) ---> http://:80 : -Warning: parse_url(http://:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user@:80 : -Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://user:pass@:80 : -Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15 -bool(false) ---> http://: : -Warning: parse_url(http://:): Unable to parse URL in %s on line 15 -bool(false) ---> http://@/ : -Warning: parse_url(http://@/): Unable to parse URL in %s on line 15 -bool(false) ---> http://@:/ : -Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://:/ : -Warning: parse_url(http://:/): Unable to parse URL in %s on line 15 -bool(false) ---> http://? : -Warning: parse_url(http://?): Unable to parse URL in %s on line 15 -bool(false) ---> http://?: : -Warning: parse_url(http://?:): Unable to parse URL in %s on line 15 -bool(false) ---> http://:? : -Warning: parse_url(http://:?): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:123456 : -Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15 -bool(false) ---> http://blah.com:abcdef : -Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15 -bool(false) +--> http:///blah.com : bool(false) +--> http://:80 : bool(false) +--> http://user@:80 : bool(false) +--> http://user:pass@:80 : bool(false) +--> http://: : bool(false) +--> http://@/ : bool(false) +--> http://@:/ : bool(false) +--> http://:/ : bool(false) +--> http://? : bool(false) +--> http://?: : bool(false) +--> http://:? : bool(false) +--> http://blah.com:123456 : bool(false) +--> http://blah.com:abcdef : bool(false) Done
\ No newline at end of file |