diff options
Diffstat (limited to 'ext/standard')
793 files changed, 3 insertions, 1580 deletions
diff --git a/ext/standard/tests/array/array_diff_key_error.phpt b/ext/standard/tests/array/array_diff_key_error.phpt index ec5ef10ba8..e957abce1c 100644 --- a/ext/standard/tests/array/array_diff_key_error.phpt +++ b/ext/standard/tests/array/array_diff_key_error.phpt @@ -28,7 +28,6 @@ try { echo $e->getMessage(), "\n"; } ?> -===DONE=== --EXPECTF-- *** Testing array_diff_key() : error conditions *** @@ -37,4 +36,3 @@ At least 2 parameters are required, 1 given -- Testing array_diff_key() function with no arguments -- At least 2 parameters are required, 0 given -===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt index f47042f009..7cc280c966 100644 --- a/ext/standard/tests/array/array_diff_key_variation1.phpt +++ b/ext/standard/tests/array/array_diff_key_variation1.phpt @@ -104,7 +104,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_diff_key() : usage variation *** @@ -211,4 +210,3 @@ Expected parameter 1 to be an array, null given --resource-- Expected parameter 1 to be an array, resource given Expected parameter 1 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation2.phpt b/ext/standard/tests/array/array_diff_key_variation2.phpt index 24ddffb530..e38c10a3c9 100644 --- a/ext/standard/tests/array/array_diff_key_variation2.phpt +++ b/ext/standard/tests/array/array_diff_key_variation2.phpt @@ -105,7 +105,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_diff_key() : usage variation *** @@ -212,4 +211,3 @@ Expected parameter 2 to be an array, null given --resource-- Expected parameter 2 to be an array, resource given Expected parameter 2 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation4.phpt b/ext/standard/tests/array/array_diff_key_variation4.phpt index c7171dc440..c4206eaa5c 100644 --- a/ext/standard/tests/array/array_diff_key_variation4.phpt +++ b/ext/standard/tests/array/array_diff_key_variation4.phpt @@ -25,7 +25,6 @@ foreach($input_arrays as $key =>$value) { var_dump( array_diff_key($value, $input_array) ); } ?> -===DONE=== --EXPECT-- *** Testing array_diff_key() : usage variation *** @@ -58,4 +57,3 @@ array(1) { [18]=> string(4) "0x12" } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation5.phpt b/ext/standard/tests/array/array_diff_key_variation5.phpt index f5017ba63b..cadb34d6d3 100644 --- a/ext/standard/tests/array/array_diff_key_variation5.phpt +++ b/ext/standard/tests/array/array_diff_key_variation5.phpt @@ -18,7 +18,6 @@ echo "\n-- Testing array_diff_key() function with float indexed array --\n"; var_dump( array_diff_key($input_array, $float_indx_array) ); var_dump( array_diff_key($float_indx_array, $input_array) ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_key() : usage variation *** @@ -31,4 +30,3 @@ array(2) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation6.phpt b/ext/standard/tests/array/array_diff_key_variation6.phpt index 7f00c4b3ab..bc7f7a15c9 100644 --- a/ext/standard/tests/array/array_diff_key_variation6.phpt +++ b/ext/standard/tests/array/array_diff_key_variation6.phpt @@ -18,7 +18,6 @@ echo "\n-- Testing array_diff_key() function with boolean indexed array --\n"; var_dump( array_diff_key($input_array, $boolean_indx_array) ); var_dump( array_diff_key($boolean_indx_array, $input_array) ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_key() : usage variation *** @@ -33,4 +32,3 @@ array(3) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation7.phpt b/ext/standard/tests/array/array_diff_key_variation7.phpt index 02cf2c9e67..1f9e04b36d 100644 --- a/ext/standard/tests/array/array_diff_key_variation7.phpt +++ b/ext/standard/tests/array/array_diff_key_variation7.phpt @@ -29,7 +29,6 @@ foreach($input_arrays as $key =>$value) { var_dump( array_diff_key($value, $input_array) ); } ?> -===DONE=== --EXPECT-- *** Testing array_diff_key() : usage variation *** @@ -56,4 +55,3 @@ array(1) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation8.phpt b/ext/standard/tests/array/array_diff_key_variation8.phpt index 349ebbbc6e..f96a1db578 100644 --- a/ext/standard/tests/array/array_diff_key_variation8.phpt +++ b/ext/standard/tests/array/array_diff_key_variation8.phpt @@ -32,7 +32,6 @@ echo "\n-- Testing array_diff_key() function with multi dimensional array --\n"; var_dump( array_diff_key($array1, $array2) ); var_dump( array_diff_key($array2, $array1) ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_key() : usage variation *** @@ -51,4 +50,3 @@ array(1) { string(3) "two" } } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_error.phpt b/ext/standard/tests/array/array_diff_uassoc_error.phpt index 13881f6993..33fa0e7bea 100644 --- a/ext/standard/tests/array/array_diff_uassoc_error.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_error.phpt @@ -47,7 +47,6 @@ try { } ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : error conditions *** @@ -57,4 +56,3 @@ array_diff_uassoc() expects parameter 6 to be a valid callback, array must have -- Testing array_diff_uassoc() function with less than expected no. of arguments -- At least 3 parameters are required, 2 given -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt index 03f3160a00..b0cf97e0a4 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt @@ -112,7 +112,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -193,4 +192,3 @@ Expected parameter 1 to be an array, null given --resource-- Expected parameter 1 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt index a32d566062..2b103f2c69 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt @@ -19,7 +19,6 @@ var_dump( array_diff_uassoc($input_array, $float_indx_array, "strcasecmp") ); var_dump( array_diff_uassoc($float_indx_array, $input_array, "strcasecmp") ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -44,4 +43,3 @@ array(3) { [-10]=> string(5) "-10.5" } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt index d317bfcde0..6101d6e300 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt @@ -19,7 +19,6 @@ var_dump( array_diff_uassoc($input_array, $boolean_indx_array, "strcasecmp") ); var_dump( array_diff_uassoc($boolean_indx_array, $input_array, "strcasecmp") ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -42,4 +41,3 @@ array(2) { [0]=> string(5) "boolF" } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt index c0f88f5051..c5de67a5cb 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt @@ -30,7 +30,6 @@ foreach($input_arrays as $key =>$value) { } ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -57,4 +56,3 @@ array(1) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt index 53a45ee278..2f70787487 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt @@ -32,7 +32,6 @@ var_dump( array_diff_uassoc($array1, $array2, "strcasecmp") ); var_dump( array_diff_uassoc($array2, $array1, "strcasecmp") ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -65,4 +64,3 @@ array(0) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt index 7ca05b1fd0..a05cc8332f 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt @@ -112,7 +112,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -193,4 +192,3 @@ Expected parameter 2 to be an array, null given --resource-- Expected parameter 2 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt index 9cd44cf1d8..81f173c72b 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt @@ -28,7 +28,6 @@ var_dump( array_diff_uassoc($arr_default_int, $arr_float, "key_compare_func") ); var_dump( array_diff_uassoc($arr_float, $arr_default_int, "key_compare_func") ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -37,4 +36,3 @@ array(0) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt index 463ca80d5c..e96c893b46 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt @@ -32,7 +32,6 @@ var_dump( array_diff_uassoc($arr_float, $arr_string_float, "key_compare_func") ) var_dump( array_diff_uassoc($arr_string_float, $arr_float, "key_compare_func") ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -55,4 +54,3 @@ array(2) { ["1.00"]=> string(4) "2.00" } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt index 4312688c59..2efaa1f830 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt @@ -27,7 +27,6 @@ var_dump( array_diff_uassoc($arr_string_int, $arr_string_float, "key_compare_fun var_dump( array_diff_uassoc($arr_string_float, $arr_string_int, "key_compare_func") ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -44,4 +43,3 @@ array(2) { ["1.00"]=> string(4) "2.00" } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt index 7bbe12212b..bdb2407296 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt @@ -32,7 +32,6 @@ var_dump( array_diff_uassoc($arr_default_int, $arr_string_float, "key_compare_fu var_dump( array_diff_uassoc($arr_string_float, $arr_default_int, "key_compare_func") ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -59,4 +58,3 @@ array(2) { ["1.00"]=> string(4) "2.00" } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt index fa36ea3ac2..7f9d8178ee 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt @@ -26,7 +26,6 @@ foreach($input_arrays as $key =>$value) { } ?> -===DONE=== --EXPECT-- *** Testing array_diff_uassoc() : usage variation *** @@ -59,4 +58,3 @@ array(1) { [-7]=> int(-7) } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation1.phpt b/ext/standard/tests/array/array_diff_ukey_variation1.phpt index 3b591018bd..12df148790 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation1.phpt @@ -112,7 +112,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_diff_ukey() : usage variation *** @@ -219,4 +218,3 @@ Expected parameter 1 to be an array, null given --resource-- Expected parameter 1 to be an array, resource given Expected parameter 1 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation10.phpt b/ext/standard/tests/array/array_diff_ukey_variation10.phpt index e80f02629e..b2304bb446 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation10.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation10.phpt @@ -28,9 +28,7 @@ try { } ?> -===DONE=== --EXPECT-- *** Testing array_diff_ukey() : usage variation *** array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name -===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation2.phpt b/ext/standard/tests/array/array_diff_ukey_variation2.phpt index 3638afcb53..ee0251f177 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation2.phpt @@ -116,7 +116,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_diff_ukey() : usage variation *** @@ -223,4 +222,3 @@ Expected parameter 2 to be an array, null given --resource-- Expected parameter 2 to be an array, resource given Expected parameter 2 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation5.phpt b/ext/standard/tests/array/array_diff_ukey_variation5.phpt index 7606212023..10946aa0ba 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation5.phpt @@ -32,7 +32,6 @@ echo "\n-- Testing array_diff_ukey() function with multi dimensional array --\n" var_dump( array_diff_ukey($array1, $array2, 'strcasecmp') ); var_dump( array_diff_ukey($array2, $array1, 'strcasecmp') ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_ukey() : usage variation *** @@ -51,4 +50,3 @@ array(1) { string(3) "two" } } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation6.phpt b/ext/standard/tests/array/array_diff_ukey_variation6.phpt index 1131922fc8..e4ac13899b 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation6.phpt @@ -29,7 +29,6 @@ foreach($input_arrays as $key =>$value) { var_dump( array_diff_ukey($input_array, $value, 'key_compare_func') ); } ?> -===DONE=== --EXPECT-- *** Testing array_diff_ukey() : usage variation *** @@ -62,4 +61,3 @@ array(1) { [10]=> string(3) "0xA" } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation7.phpt b/ext/standard/tests/array/array_diff_ukey_variation7.phpt index 16ba89e9f1..3a2935bef7 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation7.phpt @@ -24,7 +24,6 @@ var_dump( array_diff_ukey($float_indx_array, $input_array, 'key_compare_func') ) var_dump( array_diff_ukey($input_array, $float_indx_array, 'key_compare_func') ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_ukey() : usage variation *** @@ -39,4 +38,3 @@ array(2) { [20]=> string(2) "20" } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation8.phpt b/ext/standard/tests/array/array_diff_ukey_variation8.phpt index 0048bbb3fa..fc15526273 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation8.phpt @@ -24,7 +24,6 @@ var_dump( array_diff_ukey($boolean_indx_array, $input_array, 'key_compare_func') var_dump( array_diff_ukey($input_array, $boolean_indx_array, 'key_compare_func') ); ?> -===DONE=== --EXPECT-- *** Testing array_diff_ukey() : usage variation *** @@ -39,4 +38,3 @@ array(3) { ["false"]=> int(0) } -===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation9.phpt b/ext/standard/tests/array/array_diff_ukey_variation9.phpt index 5fdb0d4e24..ac825cffa7 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation9.phpt @@ -29,7 +29,6 @@ foreach($input_arrays as $key =>$value) { } ?> -===DONE=== --EXPECT-- *** Testing array_diff_ukey() : usage variation *** @@ -56,4 +55,3 @@ array(1) { [10]=> string(2) "10" } -===DONE=== diff --git a/ext/standard/tests/array/array_fill.phpt b/ext/standard/tests/array/array_fill.phpt index 230fe61652..2c90402fe8 100644 --- a/ext/standard/tests/array/array_fill.phpt +++ b/ext/standard/tests/array/array_fill.phpt @@ -17,9 +17,7 @@ foreach($array1 as $start) } } } -echo '== Done =='; ?> -===============Done==================== --EXPECT-- =========================== start: 0 num: 0 value: 1 @@ -345,4 +343,3 @@ array(2) { [3]=> string(1) "f" } -== Done =================Done==================== diff --git a/ext/standard/tests/array/array_filter.phpt b/ext/standard/tests/array/array_filter.phpt index 1488aedd09..a1b18bd234 100644 --- a/ext/standard/tests/array/array_filter.phpt +++ b/ext/standard/tests/array/array_filter.phpt @@ -27,7 +27,6 @@ var_dump(array_filter($array3, "even")); var_dump(array_filter(array())); -echo '== DONE =='; ?> --EXPECTF-- Odd : @@ -78,4 +77,3 @@ array(2) { } array(0) { } -== DONE == diff --git a/ext/standard/tests/array/array_intersect_key_error.phpt b/ext/standard/tests/array/array_intersect_key_error.phpt index 7db4b7415f..70cb53412d 100644 --- a/ext/standard/tests/array/array_intersect_key_error.phpt +++ b/ext/standard/tests/array/array_intersect_key_error.phpt @@ -28,7 +28,6 @@ try { echo $e->getMessage(), "\n"; } ?> -===DONE=== --EXPECT-- *** Testing array_intersect_key() : error conditions *** @@ -37,4 +36,3 @@ At least 2 parameters are required, 1 given -- Testing array_intersect_key() function with no arguments -- At least 2 parameters are required, 0 given -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation1.phpt b/ext/standard/tests/array/array_intersect_key_variation1.phpt index 0987205b7e..198cb1dfc6 100644 --- a/ext/standard/tests/array/array_intersect_key_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation1.phpt @@ -108,7 +108,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_key() : usage variation *** @@ -215,4 +214,3 @@ Expected parameter 1 to be an array, null given --resource var-- Expected parameter 1 to be an array, resource given Expected parameter 1 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation2.phpt b/ext/standard/tests/array/array_intersect_key_variation2.phpt index 8d46b6efae..c178480fca 100644 --- a/ext/standard/tests/array/array_intersect_key_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation2.phpt @@ -109,7 +109,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_key() : usage variation *** @@ -216,4 +215,3 @@ Expected parameter 2 to be an array, null given --resource var-- Expected parameter 2 to be an array, resource given Expected parameter 2 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation4.phpt b/ext/standard/tests/array/array_intersect_key_variation4.phpt index 8b49ba8db1..bbf992fae0 100644 --- a/ext/standard/tests/array/array_intersect_key_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation4.phpt @@ -24,7 +24,6 @@ foreach($input_arrays as $key =>$value) { var_dump( array_intersect_key($value,$input_array ) ); } ?> -===DONE=== --EXPECT-- *** Testing array_intersect_key() : usage variation *** @@ -57,4 +56,3 @@ array(1) { [-7]=> string(4) "-0x7" } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation5.phpt b/ext/standard/tests/array/array_intersect_key_variation5.phpt index fb01bb9207..d2b2541fc4 100644 --- a/ext/standard/tests/array/array_intersect_key_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation5.phpt @@ -17,7 +17,6 @@ echo "\n-- Testing array_intersect_key() function with float indexed array --\n" var_dump( array_intersect_key($input_array, $float_indx_array) ); var_dump( array_intersect_key($float_indx_array,$input_array ) ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_key() : usage variation *** @@ -38,4 +37,3 @@ array(3) { [-10]=> string(5) "-10.5" } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation6.phpt b/ext/standard/tests/array/array_intersect_key_variation6.phpt index da0115e368..6f84bac765 100644 --- a/ext/standard/tests/array/array_intersect_key_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation6.phpt @@ -17,7 +17,6 @@ echo "\n-- Testing array_intersect_key() function with boolean indexed array --\ var_dump( array_intersect_key($input_array, $boolean_indx_array) ); var_dump( array_intersect_key($boolean_indx_array,$input_array ) ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_key() : usage variation *** @@ -34,4 +33,3 @@ array(2) { [0]=> string(5) "boolF" } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation7.phpt b/ext/standard/tests/array/array_intersect_key_variation7.phpt index 589893db5a..6332e8adb2 100644 --- a/ext/standard/tests/array/array_intersect_key_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation7.phpt @@ -27,7 +27,6 @@ foreach($input_arrays as $key =>$value) { var_dump( array_intersect_key($value,$input_array ) ); } ?> -===DONE=== --EXPECT-- *** Testing array_intersect_key() : usage variation *** @@ -60,4 +59,3 @@ array(1) { [""]=> string(5) "unset" } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation8.phpt b/ext/standard/tests/array/array_intersect_key_variation8.phpt index 9a84b2aead..892863991a 100644 --- a/ext/standard/tests/array/array_intersect_key_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation8.phpt @@ -30,7 +30,6 @@ $array2 = array ( var_dump( array_intersect_key($array1, $array2) ); var_dump( array_intersect_key($array2,$array1 ) ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_key() : usage variation *** array(2) { @@ -61,4 +60,3 @@ array(2) { int(8) } } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt index 4c4a69250c..a26a5d99ec 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt @@ -116,7 +116,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** @@ -223,4 +222,3 @@ Expected parameter 1 to be an array, null given --resource-- Expected parameter 1 to be an array, resource given Expected parameter 1 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt index 8f0bfd4753..d8accf2886 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt @@ -33,7 +33,6 @@ echo "\n-- Testing array_intersect_uassoc() function using class with regular me $obj = new MyClass(); var_dump( array_intersect_uassoc($array1, $array2, array($obj,'class_compare_func')) ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** @@ -52,4 +51,3 @@ array(1) { ["a"]=> string(5) "green" } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt index 0daa424314..61877a0653 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt @@ -116,7 +116,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** @@ -223,4 +222,3 @@ Expected parameter 2 to be an array, null given --resource-- Expected parameter 2 to be an array, resource given Expected parameter 2 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt index 10835a1871..67463fb96d 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt @@ -32,7 +32,6 @@ var_dump( array_intersect_uassoc($arr_default_int, $arr_string, "key_compare_fun echo "\n-- Result of integers and strings containing floating points intersection --\n"; var_dump( array_intersect_uassoc($arr_default_int, $arr_string_float, "key_compare_func") ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** @@ -55,4 +54,3 @@ array(2) { -- Result of integers and strings containing floating points intersection -- array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt index b29a9684d5..0605af20f5 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt @@ -28,7 +28,6 @@ var_dump( array_intersect_uassoc($arr_float, $arr_string, "key_compare_func") ); echo "\n-- Result of floating points and strings containing floating point intersection --\n"; var_dump( array_intersect_uassoc($arr_float, $arr_string_float, "key_compare_func") ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** @@ -43,4 +42,3 @@ array(2) { -- Result of floating points and strings containing floating point intersection -- array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt index 4be5ebf5d7..eec2dc1f93 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt @@ -32,7 +32,6 @@ var_dump( array_intersect_uassoc($arr1_string_float, $arr2_string_float, "key_co echo "\n-- Result of strings containing integers and strings containing floating points intersection --\n"; var_dump( array_intersect_uassoc($arr1_string_int, $arr2_string_float, "key_compare_func") ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** @@ -51,4 +50,3 @@ array(1) { -- Result of strings containing integers and strings containing floating points intersection -- array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt index 256b883d28..4b6498470a 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt @@ -27,7 +27,6 @@ $array2 = &$array1; echo "\n-- Testing array_intersect_uassoc() function when \$array2 is referencd to \$array1 --\n"; var_dump( array_intersect_uassoc($array1, $array2, "strcasecmp") ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** @@ -48,4 +47,3 @@ array(2) { [1]=> string(1) "a" } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt index cf1525a519..417087feca 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt @@ -114,7 +114,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_ukey() : usage variation *** @@ -221,4 +220,3 @@ Expected parameter 1 to be an array, null given --resource var-- Expected parameter 1 to be an array, resource given Expected parameter 1 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt index f4df546f8e..f9f479915f 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt @@ -114,7 +114,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_ukey() : usage variation *** @@ -221,4 +220,3 @@ Expected parameter 2 to be an array, null given --resource var-- Expected parameter 2 to be an array, resource given Expected parameter 2 to be an array, resource given -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt index e56d6195d0..9f260b70ef 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt @@ -33,7 +33,6 @@ var_dump( array_intersect_ukey($arr_default_int, $arr_string, "key_compare_func" echo "\n-- Result of integers and strings containing floating points intersection --\n"; var_dump( array_intersect_ukey($arr_default_int, $arr_string_float, "key_compare_func") ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_ukey() : usage variation *** @@ -60,4 +59,3 @@ array(2) { [1]=> int(2) } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt index 9384c48a46..da8246ef8b 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt @@ -29,7 +29,6 @@ var_dump( array_intersect_ukey($arr_float, $arr_string, 'key_compare_func') ); echo "\n-- Result of floating points and strings containing floating point intersection --\n"; var_dump( array_intersect_ukey($arr_float, $arr_string_float, 'key_compare_func') ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_ukey() : usage variation *** @@ -48,4 +47,3 @@ array(2) { [1]=> float(2) } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt index 4f069c0ae8..dade6fd051 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt @@ -33,7 +33,6 @@ var_dump( array_intersect_ukey($arr1_string_float, $arr2_string_float, 'key_comp echo "\n-- Result of strings containing integers and strings containing floating points intersection --\n"; var_dump( array_intersect_ukey($arr1_string_int, $arr2_string_float, 'key_compare_func') ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_ukey() : usage variation *** @@ -60,4 +59,3 @@ array(2) { [1]=> string(1) "2" } -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt index f4b91503bc..b83c3302b2 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt @@ -28,9 +28,7 @@ try { } ?> -===DONE=== --EXPECTF-- *** Testing array_intersect_ukey() : usage variation *** array_intersect_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name array_intersect_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name -===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt index f6dddb9e83..09ff302a47 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt @@ -33,7 +33,6 @@ echo "\n-- Testing array_intersect_uassoc() function using class with regular me $obj = new MyClass(); var_dump( array_intersect_ukey($array1, $array2, array($obj,'class_compare_func')) ); ?> -===DONE=== --EXPECT-- *** Testing array_intersect_ukey() : usage variation *** @@ -58,4 +57,3 @@ array(2) { ["green"]=> int(3) } -===DONE=== diff --git a/ext/standard/tests/array/array_map_object1.phpt b/ext/standard/tests/array/array_map_object1.phpt index 43cc4484e6..c95395e04d 100644 --- a/ext/standard/tests/array/array_map_object1.phpt +++ b/ext/standard/tests/array/array_map_object1.phpt @@ -124,8 +124,6 @@ class InterClass implements myInterface test(array('InterClass', 'square'), array(1, 2)); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- *** Testing array_map() : object functionality *** -- simple class with public variable and method -- @@ -191,4 +189,3 @@ array(2) { [1]=> int(4) } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_basic1.phpt b/ext/standard/tests/array/array_multisort_basic1.phpt index 20e90be415..599838a5d5 100644 --- a/ext/standard/tests/array/array_multisort_basic1.phpt +++ b/ext/standard/tests/array/array_multisort_basic1.phpt @@ -24,7 +24,6 @@ var_dump($ar2); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : basic functionality *** @@ -57,4 +56,3 @@ array(3) { ["row1"]=> int(2) } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/array_multisort_basic2.phpt index e7af3b352f..41eb5d8a62 100644 --- a/ext/standard/tests/array/array_multisort_basic2.phpt +++ b/ext/standard/tests/array/array_multisort_basic2.phpt @@ -19,7 +19,6 @@ var_dump( array_multisort($ar1, SORT_ASC, SORT_REGULAR, $ar2, SORT_ASC, SORT_NUM var_dump($ar1, $ar2); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : basic functionality - renumbering of numeric keys *** @@ -41,4 +40,3 @@ array(3) { [2]=> int(2) } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_case.phpt b/ext/standard/tests/array/array_multisort_case.phpt index 390640700c..e56d297e49 100644 --- a/ext/standard/tests/array/array_multisort_case.phpt +++ b/ext/standard/tests/array/array_multisort_case.phpt @@ -35,7 +35,6 @@ array_multisort($b, SORT_STRING, $a); var_dump($a, $b); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : case-sensitive array(7) { @@ -70,4 +69,3 @@ array(7) { [6]=> string(3) "3 e" } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_error.phpt b/ext/standard/tests/array/array_multisort_error.phpt index 5d3bab456a..ddcf74eaae 100644 --- a/ext/standard/tests/array/array_multisort_error.phpt +++ b/ext/standard/tests/array/array_multisort_error.phpt @@ -27,7 +27,6 @@ try { } ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : error conditions *** @@ -36,4 +35,3 @@ Argument #3 is expected to be an array or sorting flag that has not already been -- Testing array_multisort() function with repeated flags -- Argument #3 is expected to be an array or sorting flag that has not already been specified -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_incase.phpt b/ext/standard/tests/array/array_multisort_incase.phpt index a20a0f1151..4799d8bcb5 100644 --- a/ext/standard/tests/array/array_multisort_incase.phpt +++ b/ext/standard/tests/array/array_multisort_incase.phpt @@ -35,7 +35,6 @@ array_multisort($b, SORT_STRING | SORT_FLAG_CASE, $a); var_dump($a, $b); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : case-insensitive array(7) { @@ -70,4 +69,3 @@ array(7) { [6]=> string(3) "3 e" } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_natural.phpt b/ext/standard/tests/array/array_multisort_natural.phpt index 56fb3df582..27b22a799d 100644 --- a/ext/standard/tests/array/array_multisort_natural.phpt +++ b/ext/standard/tests/array/array_multisort_natural.phpt @@ -31,7 +31,6 @@ array_multisort($b, SORT_NATURAL, $a); var_dump($a, $b); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : natural sorting array(5) { @@ -58,4 +57,3 @@ array(5) { [4]=> string(4) "20 c" } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_natural_case.phpt b/ext/standard/tests/array/array_multisort_natural_case.phpt index 79ff8e99c6..75db1565df 100644 --- a/ext/standard/tests/array/array_multisort_natural_case.phpt +++ b/ext/standard/tests/array/array_multisort_natural_case.phpt @@ -35,7 +35,6 @@ array_multisort($b, SORT_NATURAL, $a); var_dump($a, $b); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : natural sorting case-sensitive array(7) { @@ -70,4 +69,3 @@ array(7) { [6]=> string(4) "20 c" } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_natural_incase.phpt b/ext/standard/tests/array/array_multisort_natural_incase.phpt index f34c501eec..b603dd57a4 100644 --- a/ext/standard/tests/array/array_multisort_natural_incase.phpt +++ b/ext/standard/tests/array/array_multisort_natural_incase.phpt @@ -35,7 +35,6 @@ array_multisort($b, SORT_NATURAL | SORT_FLAG_CASE, $a); var_dump($a, $b); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : natural sorting case-insensitive array(7) { @@ -70,4 +69,3 @@ array(7) { [6]=> string(4) "20 c" } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt index 763944054a..4c09facb54 100644 --- a/ext/standard/tests/array/array_multisort_variation1.phpt +++ b/ext/standard/tests/array/array_multisort_variation1.phpt @@ -105,7 +105,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : usage variation *** @@ -183,4 +182,3 @@ Argument #1 is expected to be an array or a sort flag --unset var-- Argument #1 is expected to be an array or a sort flag -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/array_multisort_variation10.phpt index 17bdeae5cd..2a08156d94 100644 --- a/ext/standard/tests/array/array_multisort_variation10.phpt +++ b/ext/standard/tests/array/array_multisort_variation10.phpt @@ -13,8 +13,6 @@ echo "*** Testing array_multisort() : Testing with anonymous arguments ***\n"; var_dump(array_multisort(array(1,3,2,4))); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : Testing with anonymous arguments *** bool(true) -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation11.phpt b/ext/standard/tests/array/array_multisort_variation11.phpt index 49e8d0f30e..2a62b67abc 100644 --- a/ext/standard/tests/array/array_multisort_variation11.phpt +++ b/ext/standard/tests/array/array_multisort_variation11.phpt @@ -13,9 +13,6 @@ echo "*** Testing array_multisort() : Testing with empty array ***\n"; var_dump(array_multisort(array())); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- *** Testing array_multisort() : Testing with empty array *** bool(true) -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation2.phpt b/ext/standard/tests/array/array_multisort_variation2.phpt index b23d8b19fa..160172fa3b 100644 --- a/ext/standard/tests/array/array_multisort_variation2.phpt +++ b/ext/standard/tests/array/array_multisort_variation2.phpt @@ -113,7 +113,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : usage variation *** @@ -203,4 +202,3 @@ Argument #2 is expected to be an array or a sort flag --unset var-- Argument #2 is expected to be an array or a sort flag -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation3.phpt b/ext/standard/tests/array/array_multisort_variation3.phpt index 42b1d9fbe5..cedc6814cc 100644 --- a/ext/standard/tests/array/array_multisort_variation3.phpt +++ b/ext/standard/tests/array/array_multisort_variation3.phpt @@ -105,7 +105,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : usage variation *** @@ -183,4 +182,3 @@ Argument #3 is expected to be an array or a sort flag --unset var-- Argument #3 is expected to be an array or a sort flag -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation4.phpt b/ext/standard/tests/array/array_multisort_variation4.phpt index 562be2e70e..9b5f5fe1c7 100644 --- a/ext/standard/tests/array/array_multisort_variation4.phpt +++ b/ext/standard/tests/array/array_multisort_variation4.phpt @@ -21,7 +21,6 @@ var_dump($arr2); var_dump($arr3); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : Testing with multiple array arguments *** bool(true) @@ -55,4 +54,3 @@ array(4) { [3]=> int(9) } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation5.phpt b/ext/standard/tests/array/array_multisort_variation5.phpt index 2953846825..3298bb8099 100644 --- a/ext/standard/tests/array/array_multisort_variation5.phpt +++ b/ext/standard/tests/array/array_multisort_variation5.phpt @@ -23,7 +23,6 @@ var_dump($ar); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : Testing all array sort specifiers *** array(3) { @@ -50,4 +49,3 @@ array(3) { [2]=> int(2) } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation6.phpt b/ext/standard/tests/array/array_multisort_variation6.phpt index f5ffb8a7e4..5cf556087c 100644 --- a/ext/standard/tests/array/array_multisort_variation6.phpt +++ b/ext/standard/tests/array/array_multisort_variation6.phpt @@ -23,7 +23,6 @@ var_dump($ar); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : Testing all array sort specifiers *** array(3) { @@ -50,4 +49,3 @@ array(3) { [2]=> string(2) "aa" } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation7.phpt b/ext/standard/tests/array/array_multisort_variation7.phpt index 4ad68efe19..f073cd5df2 100644 --- a/ext/standard/tests/array/array_multisort_variation7.phpt +++ b/ext/standard/tests/array/array_multisort_variation7.phpt @@ -36,7 +36,6 @@ var_dump(array_multisort($inputs)); var_dump($inputs); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : usage variation - test sort order of all types*** bool(true) @@ -65,4 +64,3 @@ array(10) { object(classWithoutToString)#2 (0) { } } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation8.phpt b/ext/standard/tests/array/array_multisort_variation8.phpt index d681ef92c5..f0ef3e0dd5 100644 --- a/ext/standard/tests/array/array_multisort_variation8.phpt +++ b/ext/standard/tests/array/array_multisort_variation8.phpt @@ -41,7 +41,6 @@ var_dump(array_multisort($inputs, SORT_STRING)); var_dump($inputs); ?> -===DONE=== --EXPECT-- *** Testing array_multisort() : usage variation - test sort order of all types*** bool(true) @@ -67,4 +66,3 @@ array(9) { ["string DQ"]=> string(6) "string" } -===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation9.phpt b/ext/standard/tests/array/array_multisort_variation9.phpt index 8d422b78c0..a5d689cc87 100644 --- a/ext/standard/tests/array/array_multisort_variation9.phpt +++ b/ext/standard/tests/array/array_multisort_variation9.phpt @@ -36,7 +36,6 @@ var_dump(array_multisort($inputs, SORT_NUMERIC)); var_dump($inputs); ?> -===DONE=== --EXPECTF-- *** Testing array_multisort() : usage variation - test sort order of all types*** @@ -73,4 +72,3 @@ array(10) { object(classWithoutToString)#2 (0) { } } -===DONE=== diff --git a/ext/standard/tests/array/array_product_variation1.phpt b/ext/standard/tests/array/array_product_variation1.phpt index 98c23e4d26..379d59cb21 100644 --- a/ext/standard/tests/array/array_product_variation1.phpt +++ b/ext/standard/tests/array/array_product_variation1.phpt @@ -28,7 +28,6 @@ foreach ($types as $desc => $type) { fclose($fp); ?> -===DONE=== --EXPECTF-- *** Testing array_product() : variation - using non numeric values *** boolean (true) @@ -55,4 +54,3 @@ int(0) array int(1) -===DONE=== diff --git a/ext/standard/tests/array/array_product_variation2.phpt b/ext/standard/tests/array/array_product_variation2.phpt index 38faf712e1..624fc37e5a 100644 --- a/ext/standard/tests/array/array_product_variation2.phpt +++ b/ext/standard/tests/array/array_product_variation2.phpt @@ -13,10 +13,8 @@ echo "*** Testing array_product() : variations ***\n"; echo "\n-- Testing array_product() function with a keyed array array --\n"; var_dump( array_product(array("bob" => 2, "janet" => 5)) ); ?> -===DONE=== --EXPECT-- *** Testing array_product() : variations *** -- Testing array_product() function with a keyed array array -- int(10) -===DONE=== diff --git a/ext/standard/tests/array/array_product_variation3.phpt b/ext/standard/tests/array/array_product_variation3.phpt index a325879e45..588e46249e 100644 --- a/ext/standard/tests/array/array_product_variation3.phpt +++ b/ext/standard/tests/array/array_product_variation3.phpt @@ -27,7 +27,6 @@ var_dump( array_product(array(-99999999.9, 99999999.1))); ?> -===DONE=== --EXPECT-- *** Testing array_product() : variations - negative numbers*** @@ -45,4 +44,3 @@ float(-1.5) -- Testing array_product() function with negative floats -- float(-9.9999999E+15) -===DONE=== diff --git a/ext/standard/tests/array/array_product_variation4.phpt b/ext/standard/tests/array/array_product_variation4.phpt index c79077c78f..70f70516a7 100644 --- a/ext/standard/tests/array/array_product_variation4.phpt +++ b/ext/standard/tests/array/array_product_variation4.phpt @@ -20,10 +20,8 @@ for ($i = 0; $i < 999; $i++) { var_dump( array_product($array) ); ?> -===DONE=== --EXPECT-- *** Testing array_product() : variations *** -- Testing array_product() function with a very large array -- float(INF) -===DONE=== diff --git a/ext/standard/tests/array/array_reduce_variation1.phpt b/ext/standard/tests/array/array_reduce_variation1.phpt index 618a22282a..34c2856bac 100644 --- a/ext/standard/tests/array/array_reduce_variation1.phpt +++ b/ext/standard/tests/array/array_reduce_variation1.phpt @@ -32,7 +32,6 @@ try { } ?> -===DONE=== --EXPECT-- *** Testing array_reduce() : variation *** @@ -41,4 +40,3 @@ int(2) --- Testing with a callback with too many parameters --- Exception: Too few arguments to function threeArgs(), 2 passed and exactly 3 expected -===DONE=== diff --git a/ext/standard/tests/array/array_reduce_variation3.phpt b/ext/standard/tests/array/array_reduce_variation3.phpt index 01bd6d79d6..f43b8eb589 100644 --- a/ext/standard/tests/array/array_reduce_variation3.phpt +++ b/ext/standard/tests/array/array_reduce_variation3.phpt @@ -24,7 +24,6 @@ echo "\n--- Instance method callback ---\n"; var_dump(array_reduce($array, array(new A(), "adder2"))); ?> -===DONE=== --EXPECT-- *** Testing array_reduce() : variation - object callbacks *** @@ -33,4 +32,3 @@ int(1) --- Instance method callback --- int(1) -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_assoc_variation.phpt b/ext/standard/tests/array/array_udiff_assoc_variation.phpt index eca26a30e6..b71449b259 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation.phpt @@ -24,7 +24,6 @@ var_dump( array_udiff_assoc($arr1, $arr2, $arr3, $arr4, $key_compare_function) ) ?> -===DONE=== --EXPECT-- *** Testing array_udiff_assoc() : variation - testing with multiple array arguments *** array(2) { @@ -33,4 +32,3 @@ array(2) { ["0.5"]=> int(5) } -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt index 9f320c04ad..cc9e035f70 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt @@ -100,7 +100,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_udiff_assoc() : usage variation *** @@ -178,4 +177,3 @@ Expected parameter 1 to be an array, null given --unset var-- Expected parameter 1 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt index e0eaaf63ce..4ded746508 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt @@ -100,7 +100,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_udiff_assoc() : usage variation *** @@ -178,4 +177,3 @@ Expected parameter 2 to be an array, null given --unset var-- Expected parameter 2 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt index 10afe341a3..a48bda09b0 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt @@ -37,7 +37,6 @@ function too_few_parameters ($val1) { var_dump(array_udiff_assoc($arr1, $arr2, 'too_few_parameters')); ?> -===DONE=== --EXPECT-- *** Testing array_udiff_assoc() : usage variation - differing comparison functions*** @@ -55,4 +54,3 @@ array(1) { [0]=> int(1) } -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt index bbc213aee4..dcfe07083f 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt @@ -101,7 +101,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_udiff_uassoc() : usage variation *** @@ -179,4 +178,3 @@ Expected parameter 1 to be an array, null given --unset var-- Expected parameter 1 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt index 9466dc952b..e15076db5f 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt @@ -101,7 +101,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_udiff_uassoc() : usage variation *** @@ -179,4 +178,3 @@ Expected parameter 2 to be an array, null given --unset var-- Expected parameter 2 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt index 4939b8eba5..e6f256d79a 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt @@ -36,7 +36,6 @@ function too_few_parameters ($val1) { var_dump(array_udiff_uassoc($arr1, $arr2, 'too_few_parameters', 'too_few_parameters')); ?> -===DONE=== --EXPECT-- *** Testing array_udiff_uassoc() : usage variation - differing comparison functions*** @@ -54,4 +53,3 @@ array(1) { [0]=> int(1) } -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_variation1.phpt b/ext/standard/tests/array/array_udiff_variation1.phpt index f462be78c0..a90e3b0e67 100644 --- a/ext/standard/tests/array/array_udiff_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_variation1.phpt @@ -100,7 +100,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_udiff() : usage variation *** @@ -178,4 +177,3 @@ Expected parameter 1 to be an array, null given --unset var-- Expected parameter 1 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt index ee478837cd..5c37a3a20a 100644 --- a/ext/standard/tests/array/array_udiff_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_variation2.phpt @@ -100,7 +100,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_udiff() : usage variation *** @@ -178,4 +177,3 @@ Expected parameter 2 to be an array, null given --unset var-- Expected parameter 2 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_udiff_variation5.phpt b/ext/standard/tests/array/array_udiff_variation5.phpt index 967817bac3..1ca7977999 100644 --- a/ext/standard/tests/array/array_udiff_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_variation5.phpt @@ -37,7 +37,6 @@ function too_few_parameters ($val1) { var_dump(array_udiff($arr1, $arr2, 'too_few_parameters')); ?> -===DONE=== --EXPECT-- *** Testing array_udiff() : usage variation *** @@ -53,4 +52,3 @@ Exception: Too few arguments to function too_many_parameters(), 2 passed and exa -- comparison function taking too few parameters -- array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt index b9837e7954..c2655cdb5b 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt @@ -24,7 +24,6 @@ var_dump( array_uintersect_assoc($arr1, $arr2, $arr3, $arr4, $data_compare_funct ?> -===DONE=== --EXPECT-- *** Testing array_uintersect_assoc() : basic functionality - testing with multiple array arguments *** array(2) { @@ -33,4 +32,3 @@ array(2) { [3]=> string(5) "three" } -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt index 8a3ffe909d..c99a9947c5 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt @@ -100,7 +100,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_uintersect_assoc() : usage variation *** @@ -178,4 +177,3 @@ Expected parameter 1 to be an array, null given --unset var-- Expected parameter 1 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt index 3c04bd5a36..00a50f3c2f 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt @@ -100,7 +100,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_uintersect_assoc() : usage variation *** @@ -178,4 +177,3 @@ Expected parameter 2 to be an array, null given --unset var-- Expected parameter 2 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt index 34b10af344..3b6befcc5e 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt @@ -37,7 +37,6 @@ var_dump(array_uintersect_assoc($arr1, $arr2, 'too_few_parameters')); ?> -===DONE=== --EXPECT-- *** Testing array_uintersect_assoc() : usage variation - differing comparison functions*** @@ -52,4 +51,3 @@ Exception: Too few arguments to function too_many_parameters(), 2 passed and exa array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt index 385fffed96..4889025872 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt @@ -101,7 +101,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_uintersect_uassoc() : usage variation *** @@ -179,4 +178,3 @@ Expected parameter 1 to be an array, null given --unset var-- Expected parameter 1 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt index 74eeddf4ff..a1d897d86e 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt @@ -101,7 +101,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_uintersect_uassoc() : usage variation *** @@ -179,4 +178,3 @@ Expected parameter 2 to be an array, null given --unset var-- Expected parameter 2 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt index 6abeac09b7..5553adffb5 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt @@ -36,7 +36,6 @@ function too_few_parameters ($val1) { var_dump(array_uintersect_uassoc($arr1, $arr2, 'too_few_parameters', 'too_few_parameters')); ?> -===DONE=== --EXPECT-- *** Testing array_uintersect_uassoc() : usage variation - incorrect callbacks *** @@ -50,4 +49,3 @@ Exception: Too few arguments to function too_many_parameters(), 2 passed and exa -- comparison function taking too few parameters -- array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_variation1.phpt b/ext/standard/tests/array/array_uintersect_variation1.phpt index 32e2177758..47534f70bc 100644 --- a/ext/standard/tests/array/array_uintersect_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_variation1.phpt @@ -100,7 +100,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_uintersect() : usage variation *** @@ -178,4 +177,3 @@ Expected parameter 1 to be an array, null given --unset var-- Expected parameter 1 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_variation2.phpt b/ext/standard/tests/array/array_uintersect_variation2.phpt index bf914e9bc6..d79cf66c21 100644 --- a/ext/standard/tests/array/array_uintersect_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_variation2.phpt @@ -100,7 +100,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing array_uintersect() : usage variation *** @@ -178,4 +177,3 @@ Expected parameter 2 to be an array, null given --unset var-- Expected parameter 2 to be an array, null given -===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_variation5.phpt b/ext/standard/tests/array/array_uintersect_variation5.phpt index 699188290b..1996d386f1 100644 --- a/ext/standard/tests/array/array_uintersect_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_variation5.phpt @@ -37,7 +37,6 @@ var_dump(array_uintersect($arr1, $arr2, 'too_few_parameters')); ?> -===DONE=== --EXPECT-- *** Testing array_uintersect() : usage variation - differing comparison functions*** @@ -52,4 +51,3 @@ Exception: Too few arguments to function too_many_parameters(), 2 passed and exa array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/bug21918.phpt b/ext/standard/tests/array/bug21918.phpt index 1c9d746fdf..8e440baf8c 100644 --- a/ext/standard/tests/array/bug21918.phpt +++ b/ext/standard/tests/array/bug21918.phpt @@ -28,7 +28,6 @@ foreach($c as $k => $v) { var_dump($v); } -echo "==Done==\n"; ?> --EXPECT-- ==Mixed== @@ -52,4 +51,3 @@ string(1) "a" ==Negative== int(-2) string(1) "a" -==Done== diff --git a/ext/standard/tests/array/bug30266.phpt b/ext/standard/tests/array/bug30266.phpt index 8f7c3d2135..0a196c0cb8 100644 --- a/ext/standard/tests/array/bug30266.phpt +++ b/ext/standard/tests/array/bug30266.phpt @@ -31,7 +31,5 @@ catch(Exception $e) echo "Caught: " . $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- Caught: Error -===DONE=== diff --git a/ext/standard/tests/array/compact_variation2.phpt b/ext/standard/tests/array/compact_variation2.phpt index 8ca5020d6d..17ac7882c7 100644 --- a/ext/standard/tests/array/compact_variation2.phpt +++ b/ext/standard/tests/array/compact_variation2.phpt @@ -22,7 +22,6 @@ function f() { f(); ?> -==Done== --EXPECTF-- *** Testing compact() : usage variations - variables outside of current scope *** @@ -41,4 +40,3 @@ array(2) { ["c"]=> string(3) "f.c" } -==Done== diff --git a/ext/standard/tests/array/current_basic.phpt b/ext/standard/tests/array/current_basic.phpt index 287a479067..fc28b7c342 100644 --- a/ext/standard/tests/array/current_basic.phpt +++ b/ext/standard/tests/array/current_basic.phpt @@ -22,11 +22,9 @@ var_dump(current($array)); next($array); var_dump(current($array)); ?> -===DONE=== --EXPECT-- *** Testing current() : basic functionality *** string(4) "zero" string(3) "one" int(3) bool(false) -===DONE=== diff --git a/ext/standard/tests/array/current_variation2.phpt b/ext/standard/tests/array/current_variation2.phpt index d839370962..2bbc5dca42 100644 --- a/ext/standard/tests/array/current_variation2.phpt +++ b/ext/standard/tests/array/current_variation2.phpt @@ -115,7 +115,6 @@ foreach($inputs as $key => $input) { fclose($fp); ?> -===DONE=== --EXPECTF-- *** Testing current() : usage variations *** @@ -152,4 +151,3 @@ NULL -- Iteration 11 : resource data -- resource(%d) of type (stream) -===DONE=== diff --git a/ext/standard/tests/array/current_variation3.phpt b/ext/standard/tests/array/current_variation3.phpt index decb043116..b0684cd7b7 100644 --- a/ext/standard/tests/array/current_variation3.phpt +++ b/ext/standard/tests/array/current_variation3.phpt @@ -29,7 +29,6 @@ var_dump(current($array1)); echo "\$array2: "; var_dump(current($array2)); ?> -===DONE=== --EXPECT-- *** Testing current() : usage variations *** @@ -39,4 +38,3 @@ string(4) "zero" -- Position after calling next() -- $array1: string(3) "one" $array2: string(3) "one" -===DONE=== diff --git a/ext/standard/tests/array/current_variation4.phpt b/ext/standard/tests/array/current_variation4.phpt index 5862a86129..a8471e9d7f 100644 --- a/ext/standard/tests/array/current_variation4.phpt +++ b/ext/standard/tests/array/current_variation4.phpt @@ -45,7 +45,6 @@ var_dump(current($multi_array[3][3][3])); // see if internal pointer is in the same position from when accessing this inner array var_dump(current($multi_array[3][3][3][1])); ?> -===DONE=== --EXPECT-- *** Testing current() : usage variations *** @@ -68,4 +67,3 @@ Initial Position: int(1) Current Position: string(3) "two" string(3) "two" int(1) -===DONE=== diff --git a/ext/standard/tests/array/current_variation5.phpt b/ext/standard/tests/array/current_variation5.phpt index d49353c24f..7458de07f7 100644 --- a/ext/standard/tests/array/current_variation5.phpt +++ b/ext/standard/tests/array/current_variation5.phpt @@ -39,8 +39,6 @@ var_dump(next($a)); current_variation5($a); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- *** Testing current() : usage variations *** @@ -55,4 +53,3 @@ string(3) "yes" string(5) "maybe" string(5) "maybe" string(2) "no" -===DONE=== diff --git a/ext/standard/tests/array/end_basic.phpt b/ext/standard/tests/array/end_basic.phpt index b14cc2f836..b337ece75c 100644 --- a/ext/standard/tests/array/end_basic.phpt +++ b/ext/standard/tests/array/end_basic.phpt @@ -28,7 +28,6 @@ echo "\n-- Add a new element to array --\n"; $array[2] = 'foo'; var_dump(end($array)); ?> -===DONE=== --EXPECT-- *** Testing end() : basic functionality *** @@ -43,4 +42,3 @@ string(3) "two" -- Add a new element to array -- string(3) "foo" -===DONE=== diff --git a/ext/standard/tests/array/end_variation2.phpt b/ext/standard/tests/array/end_variation2.phpt index 43972b751e..354e3d5369 100644 --- a/ext/standard/tests/array/end_variation2.phpt +++ b/ext/standard/tests/array/end_variation2.phpt @@ -24,7 +24,6 @@ var_dump(end($array_arg)); echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(end($array_arg[0])); ?> -===DONE=== --EXPECT-- *** Testing end() : usage variations *** @@ -40,4 +39,3 @@ array(3) { -- Pass a sub-array as $array_arg -- int(7) -===DONE=== diff --git a/ext/standard/tests/array/end_variation3.phpt b/ext/standard/tests/array/end_variation3.phpt index fbeea68a12..8e9284b816 100644 --- a/ext/standard/tests/array/end_variation3.phpt +++ b/ext/standard/tests/array/end_variation3.phpt @@ -28,7 +28,6 @@ var_dump(current($array1)); echo "\$array2: "; var_dump(current($array2)); ?> -===DONE=== --EXPECT-- *** Testing end() : usage variations *** @@ -38,4 +37,3 @@ string(4) "zero" -- Position after calling end() -- $array1: string(3) "two" $array2: string(3) "two" -===DONE=== diff --git a/ext/standard/tests/array/key_basic.phpt b/ext/standard/tests/array/key_basic.phpt index 2b45124921..6e0d2f9d50 100644 --- a/ext/standard/tests/array/key_basic.phpt +++ b/ext/standard/tests/array/key_basic.phpt @@ -29,7 +29,6 @@ echo "\n-- Past end of the array --\n"; next($array); var_dump(key($array)); ?> -===DONE=== --EXPECT-- *** Testing key() : basic functionality *** @@ -44,4 +43,3 @@ string(5) "three" -- Past end of the array -- NULL -===DONE=== diff --git a/ext/standard/tests/array/key_variation2.phpt b/ext/standard/tests/array/key_variation2.phpt index cf7ca37531..67c7105ec6 100644 --- a/ext/standard/tests/array/key_variation2.phpt +++ b/ext/standard/tests/array/key_variation2.phpt @@ -103,7 +103,6 @@ foreach($inputs as $key => $input) { $iterator++; }; ?> -===DONE=== --EXPECT-- *** Testing key() : usage variations *** @@ -152,4 +151,3 @@ string(0) "" -- Iteration 12 : unset data -- string(0) "" -===DONE=== diff --git a/ext/standard/tests/array/key_variation3.phpt b/ext/standard/tests/array/key_variation3.phpt index 2d5387e56e..9ad9ff8a7d 100644 --- a/ext/standard/tests/array/key_variation3.phpt +++ b/ext/standard/tests/array/key_variation3.phpt @@ -30,7 +30,6 @@ var_dump(key($array1)); echo "\$array2: "; var_dump(key($array2)); ?> -===DONE=== --EXPECT-- *** Testing key() : usage variations *** @@ -40,4 +39,3 @@ int(0) -- Position after calling next() -- $array1: int(1) $array2: int(1) -===DONE=== diff --git a/ext/standard/tests/array/key_variation4.phpt b/ext/standard/tests/array/key_variation4.phpt index a7fa8d7bf9..b89ca829b4 100644 --- a/ext/standard/tests/array/key_variation4.phpt +++ b/ext/standard/tests/array/key_variation4.phpt @@ -44,7 +44,6 @@ var_dump(key($multi_array[3][3][3])); // see if internal pointer is in the same position from when accessing this inner array var_dump(key($multi_array[3][3][3][1])); ?> -===DONE=== --EXPECT-- *** Testing key() : usage variations *** @@ -60,4 +59,3 @@ Initial Position: int(0) Current Position: int(2) int(2) int(0) -===DONE=== diff --git a/ext/standard/tests/array/max_basiclong_64bit.phpt b/ext/standard/tests/array/max_basiclong_64bit.phpt index 95116b16c2..6d40be0388 100644 --- a/ext/standard/tests/array/max_basiclong_64bit.phpt +++ b/ext/standard/tests/array/max_basiclong_64bit.phpt @@ -28,8 +28,6 @@ $longVals = array( var_dump(max($longVals)); ?> -===DONE=== --EXPECT-- int(9223372036854775807) int(9223372036854775807) -===DONE=== diff --git a/ext/standard/tests/array/min_basiclong_64bit.phpt b/ext/standard/tests/array/min_basiclong_64bit.phpt index 526d77a27a..50e5dda125 100644 --- a/ext/standard/tests/array/min_basiclong_64bit.phpt +++ b/ext/standard/tests/array/min_basiclong_64bit.phpt @@ -28,8 +28,6 @@ $longVals = array( var_dump(min($longVals)); ?> -===DONE=== --EXPECT-- int(-9223372036854775808) int(-9223372036854775808) -===DONE=== diff --git a/ext/standard/tests/array/next_basic.phpt b/ext/standard/tests/array/next_basic.phpt index 2813f7c514..092eec555a 100644 --- a/ext/standard/tests/array/next_basic.phpt +++ b/ext/standard/tests/array/next_basic.phpt @@ -23,7 +23,6 @@ var_dump(next($array)); echo key($array) . " => " . current($array) . "\n"; var_dump(next($array)); ?> -===DONE=== --EXPECT-- *** Testing next() : basic functionality *** 0 => zero @@ -32,4 +31,3 @@ string(3) "one" string(3) "two" 2 => two bool(false) -===DONE=== diff --git a/ext/standard/tests/array/next_variation2.phpt b/ext/standard/tests/array/next_variation2.phpt index aff03a619a..892e120b5e 100644 --- a/ext/standard/tests/array/next_variation2.phpt +++ b/ext/standard/tests/array/next_variation2.phpt @@ -25,7 +25,6 @@ var_dump(next($array_arg)); echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(next($array_arg[0])); ?> -===DONE=== --EXPECT-- *** Testing next() : usage variations *** @@ -42,4 +41,3 @@ bool(false) -- Pass a sub-array as $array_arg -- int(8) -===DONE=== diff --git a/ext/standard/tests/array/prev_basic.phpt b/ext/standard/tests/array/prev_basic.phpt index 8e1703259e..92d1536c87 100644 --- a/ext/standard/tests/array/prev_basic.phpt +++ b/ext/standard/tests/array/prev_basic.phpt @@ -33,7 +33,6 @@ for ($i = $length; $i > 0; $i--) { } ?> -===DONE=== --EXPECT-- *** Testing prev() : basic functionality *** 2 => two @@ -50,4 +49,3 @@ int(3) string(4) "help" string(3) "one" bool(false) -===DONE=== diff --git a/ext/standard/tests/array/prev_variation2.phpt b/ext/standard/tests/array/prev_variation2.phpt index e4c707124c..9c38e6ef37 100644 --- a/ext/standard/tests/array/prev_variation2.phpt +++ b/ext/standard/tests/array/prev_variation2.phpt @@ -29,7 +29,6 @@ var_dump(prev($array_arg)); echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(prev($array_arg[0])); ?> -===DONE=== --EXPECT-- *** Testing prev() : usage variations *** @@ -46,4 +45,3 @@ bool(false) -- Pass a sub-array as $array_arg -- int(8) -===DONE=== diff --git a/ext/standard/tests/array/range_bug70239_0.phpt b/ext/standard/tests/array/range_bug70239_0.phpt index c902a168b2..048d40737b 100644 --- a/ext/standard/tests/array/range_bug70239_0.phpt +++ b/ext/standard/tests/array/range_bug70239_0.phpt @@ -8,7 +8,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- Invalid range supplied: start=0 end=inf -===DONE=== diff --git a/ext/standard/tests/array/range_bug70239_1.phpt b/ext/standard/tests/array/range_bug70239_1.phpt index 6d12348f67..9ab62870b1 100644 --- a/ext/standard/tests/array/range_bug70239_1.phpt +++ b/ext/standard/tests/array/range_bug70239_1.phpt @@ -8,7 +8,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- Invalid range supplied: start=inf end=inf -===DONE=== diff --git a/ext/standard/tests/array/range_bug70239_2.phpt b/ext/standard/tests/array/range_bug70239_2.phpt index c9396b3cb4..192644cd0f 100644 --- a/ext/standard/tests/array/range_bug70239_2.phpt +++ b/ext/standard/tests/array/range_bug70239_2.phpt @@ -8,7 +8,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- The supplied range exceeds the maximum array size: start=0 end=%d -===DONE=== diff --git a/ext/standard/tests/array/range_bug70239_3.phpt b/ext/standard/tests/array/range_bug70239_3.phpt index e49267bfe3..f1f7c94b89 100644 --- a/ext/standard/tests/array/range_bug70239_3.phpt +++ b/ext/standard/tests/array/range_bug70239_3.phpt @@ -8,7 +8,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- The supplied range exceeds the maximum array size: start=-%d end=0 -===DONE=== diff --git a/ext/standard/tests/array/reset_basic.phpt b/ext/standard/tests/array/reset_basic.phpt index 04c676a4cf..195c431fd9 100644 --- a/ext/standard/tests/array/reset_basic.phpt +++ b/ext/standard/tests/array/reset_basic.phpt @@ -27,7 +27,6 @@ echo key($array) . " => " . current($array) . "\n"; echo "\n-- Call to reset() --\n"; var_dump(reset($array)); ?> -===DONE=== --EXPECT-- *** Testing reset() : basic functionality *** @@ -42,4 +41,3 @@ string(3) "one" -- Call to reset() -- string(4) "zero" -===DONE=== diff --git a/ext/standard/tests/array/reset_variation2.phpt b/ext/standard/tests/array/reset_variation2.phpt index e155cad592..2dbf152ce6 100644 --- a/ext/standard/tests/array/reset_variation2.phpt +++ b/ext/standard/tests/array/reset_variation2.phpt @@ -22,7 +22,6 @@ echo "\n-- Unset First element in array and check reset() --\n"; unset($array[0]); var_dump(reset($array)); ?> -===DONE=== --EXPECT-- *** Testing reset() : usage variations *** @@ -31,4 +30,3 @@ a => 0 -- Unset First element in array and check reset() -- string(1) "b" -===DONE=== diff --git a/ext/standard/tests/array/reset_variation3.phpt b/ext/standard/tests/array/reset_variation3.phpt index ff17a0cc9e..fd0d86eda8 100644 --- a/ext/standard/tests/array/reset_variation3.phpt +++ b/ext/standard/tests/array/reset_variation3.phpt @@ -38,7 +38,6 @@ var_dump(current($array1)); echo "\$array2: "; var_dump(current($array2)); ?> -===DONE=== --EXPECT-- *** Testing reset() : usage variations *** @@ -53,4 +52,3 @@ $array2: string(3) "one" string(4) "zero" $array1: string(4) "zero" $array2: string(4) "zero" -===DONE=== diff --git a/ext/standard/tests/array/usort_basic.phpt b/ext/standard/tests/array/usort_basic.phpt index f5a8e7579d..36add207cf 100644 --- a/ext/standard/tests/array/usort_basic.phpt +++ b/ext/standard/tests/array/usort_basic.phpt @@ -53,7 +53,6 @@ echo "\n-- Associative array with string keys --\n"; var_dump( usort($string_key_arg, 'cmp') ); var_dump($string_key_arg); ?> -===DONE=== --EXPECT-- *** Testing usort() : basic functionality *** @@ -116,4 +115,3 @@ array(4) { [3]=> int(10) } -===DONE=== diff --git a/ext/standard/tests/array/usort_object1.phpt b/ext/standard/tests/array/usort_object1.phpt index 18ca31890e..c1e20b181c 100644 --- a/ext/standard/tests/array/usort_object1.phpt +++ b/ext/standard/tests/array/usort_object1.phpt @@ -82,7 +82,6 @@ $array_arg = array( var_dump( usort($array_arg, 'multiple_cmp') ); var_dump($array_arg); ?> -===DONE=== --EXPECTF-- *** Testing usort() : object functionality *** bool(true) @@ -138,4 +137,3 @@ array(3) { string(5) "apple" } } -===DONE=== diff --git a/ext/standard/tests/array/usort_object2.phpt b/ext/standard/tests/array/usort_object2.phpt index e0c41936d5..915c3755bc 100644 --- a/ext/standard/tests/array/usort_object2.phpt +++ b/ext/standard/tests/array/usort_object2.phpt @@ -95,7 +95,6 @@ $array_arg = array( var_dump( usort($array_arg, 'cmp_function') ); var_dump($array_arg); ?> -===DONE=== --EXPECTF-- *** Testing usort() : object functionality *** -- Testing usort() with StaticClass objects -- @@ -162,4 +161,3 @@ array(4) { NULL } } -===DONE=== diff --git a/ext/standard/tests/array/usort_variation10.phpt b/ext/standard/tests/array/usort_variation10.phpt index be5a1b0969..6985c0ac55 100644 --- a/ext/standard/tests/array/usort_variation10.phpt +++ b/ext/standard/tests/array/usort_variation10.phpt @@ -41,7 +41,6 @@ echo "\n-- Array with default/assigned keys --\n"; var_dump( usort($array_arg, 'cmp') ); var_dump($array_arg); ?> -===DONE=== --EXPECT-- *** Testing usort() : usage variation *** @@ -76,4 +75,3 @@ array(4) { [3]=> string(9) "Pineapple" } -===DONE=== diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/usort_variation3.phpt index 88ae8afe4b..0d83d5e2d6 100644 --- a/ext/standard/tests/array/usort_variation3.phpt +++ b/ext/standard/tests/array/usort_variation3.phpt @@ -74,7 +74,6 @@ var_dump( usort($array_arg, 'cmp_function') ); echo "\n-- Sorted array after usort() function call --\n"; var_dump($array_arg); ?> -===DONE=== --EXPECT-- *** Testing usort() : usage variation *** bool(true) @@ -112,4 +111,3 @@ array(15) { [14]=> int(0) } -===DONE=== diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/usort_variation4.phpt index 1335279708..e4365207a3 100644 --- a/ext/standard/tests/array/usort_variation4.phpt +++ b/ext/standard/tests/array/usort_variation4.phpt @@ -66,7 +66,6 @@ echo "\n-- Sorting empty array --\n"; var_dump( usort($empty_array, 'cmp_function') ); var_dump($empty_array); ?> -===DONE=== --EXPECT-- *** Testing usort() : usage variation *** @@ -152,4 +151,3 @@ array(7) { bool(true) array(0) { } -===DONE=== diff --git a/ext/standard/tests/array/usort_variation5.phpt b/ext/standard/tests/array/usort_variation5.phpt index 2fd3f24ae1..2757054ead 100644 --- a/ext/standard/tests/array/usort_variation5.phpt +++ b/ext/standard/tests/array/usort_variation5.phpt @@ -73,7 +73,6 @@ echo "\n-- Sorting Heredoc String values --\n"; var_dump( usort($heredoc_values, 'cmp_function') ); var_dump($heredoc_values); ?> -===DONE=== --EXPECTF-- *** Testing usort() : usage variation *** @@ -140,4 +139,3 @@ array(4) { string(%d) "heredoc string with!@# and 123 Test this!!!" } -===DONE=== diff --git a/ext/standard/tests/array/usort_variation6.phpt b/ext/standard/tests/array/usort_variation6.phpt index 473f61a0dd..1916ded151 100644 --- a/ext/standard/tests/array/usort_variation6.phpt +++ b/ext/standard/tests/array/usort_variation6.phpt @@ -53,7 +53,6 @@ var_dump( usort($array_args[5], 'cmp_function') ); echo "-- Array after call to usort() --\n"; var_dump($array_args[5]); ?> -===DONE=== --EXPECT-- *** Testing usort() : usage variation *** @@ -136,4 +135,3 @@ array(5) { [4]=> int(54) } -===DONE=== diff --git a/ext/standard/tests/array/usort_variation7.phpt b/ext/standard/tests/array/usort_variation7.phpt index a493ac752c..bf554bce1d 100644 --- a/ext/standard/tests/array/usort_variation7.phpt +++ b/ext/standard/tests/array/usort_variation7.phpt @@ -37,7 +37,6 @@ echo "\n-- Anonymous 'cmp_function' with parameters passed by reference --\n"; var_dump( usort($array_arg, $cmp_function) ); var_dump($array_arg); ?> -===DONE=== --EXPECT-- *** Testing usort() : usage variation *** @@ -68,4 +67,3 @@ array(4) { [3]=> string(9) "Pineapple" } -===DONE=== diff --git a/ext/standard/tests/array/usort_variation8.phpt b/ext/standard/tests/array/usort_variation8.phpt index 98c303e083..55ff362d41 100644 --- a/ext/standard/tests/array/usort_variation8.phpt +++ b/ext/standard/tests/array/usort_variation8.phpt @@ -31,7 +31,6 @@ var_dump( usort($temp_array2, 'strcmp') ); var_dump($temp_array2); ?> -===DONE=== --EXPECTF-- *** Testing usort() : usage variation *** @@ -64,4 +63,3 @@ array(5) { [4]=> string(6) "orange" } -===DONE=== diff --git a/ext/standard/tests/array/usort_variation9.phpt b/ext/standard/tests/array/usort_variation9.phpt index 8035c57b13..6c7f511b1f 100644 --- a/ext/standard/tests/array/usort_variation9.phpt +++ b/ext/standard/tests/array/usort_variation9.phpt @@ -45,7 +45,6 @@ echo "\n-- Sorting \$array_arg containing different references --\n"; var_dump( usort($array_arg, 'cmp_function') ); var_dump($array_arg); ?> -===DONE=== --EXPECT-- *** Testing usort() : usage variation *** @@ -63,4 +62,3 @@ array(5) { [4]=> int(200) } -===DONE=== diff --git a/ext/standard/tests/assert/assert03.phpt b/ext/standard/tests/assert/assert03.phpt index 3b231405f6..a15e936af3 100644 --- a/ext/standard/tests/assert/assert03.phpt +++ b/ext/standard/tests/assert/assert03.phpt @@ -30,8 +30,6 @@ ini_set("assert.callback", "b"); assert($a != 0); ?> -==DONE== --EXPECT-- assertion failed - a - 18,"assert($a != 0)" assertion failed - b - 22,"assert($a != 0)" -==DONE== diff --git a/ext/standard/tests/bug64370_var1.phpt b/ext/standard/tests/bug64370_var1.phpt index 87172c9b60..16d1ce3365 100644 --- a/ext/standard/tests/bug64370_var1.phpt +++ b/ext/standard/tests/bug64370_var1.phpt @@ -10,7 +10,6 @@ $d = (microtime(true)-$_SERVER['REQUEST_TIME_FLOAT'])*1000; echo "created in $d ms\n"; echo ((bool)($d >= 0)) . "\n"; ?> -===DONE=== --EXPECTF-- $_SERVER['REQUEST_TIME']: %d $_SERVER['REQUEST_TIME_FLOAT']: %f @@ -18,4 +17,3 @@ time(): %d microtime(true): %f created in %f ms 1 -===DONE=== diff --git a/ext/standard/tests/bug64370_var2.phpt b/ext/standard/tests/bug64370_var2.phpt index d0d3590ea7..3618a46980 100644 --- a/ext/standard/tests/bug64370_var2.phpt +++ b/ext/standard/tests/bug64370_var2.phpt @@ -17,7 +17,5 @@ while(100000 > $i++) { } echo "ok\n"; ?> -===DONE=== --EXPECT-- ok -===DONE=== diff --git a/ext/standard/tests/class_object/forward_static_call_001.phpt b/ext/standard/tests/class_object/forward_static_call_001.phpt index 0fac78f4ea..0eadad3d79 100644 --- a/ext/standard/tests/class_object/forward_static_call_001.phpt +++ b/ext/standard/tests/class_object/forward_static_call_001.phpt @@ -57,7 +57,6 @@ echo "-\n"; C::test3(); ?> -===DONE=== --EXPECT-- A - @@ -80,4 +79,3 @@ C - B C -===DONE=== diff --git a/ext/standard/tests/class_object/forward_static_call_003.phpt b/ext/standard/tests/class_object/forward_static_call_003.phpt index ea56f8d2e7..8a846fe3da 100644 --- a/ext/standard/tests/class_object/forward_static_call_003.phpt +++ b/ext/standard/tests/class_object/forward_static_call_003.phpt @@ -38,7 +38,6 @@ echo "-\n"; C::test(); ?> -===DONE=== --EXPECT-- A - @@ -48,4 +47,3 @@ B C B B -===DONE=== diff --git a/ext/standard/tests/class_object/get_class_vars_variation2.phpt b/ext/standard/tests/class_object/get_class_vars_variation2.phpt index 0e54864b09..9745c33b0e 100644 --- a/ext/standard/tests/class_object/get_class_vars_variation2.phpt +++ b/ext/standard/tests/class_object/get_class_vars_variation2.phpt @@ -74,7 +74,6 @@ $child->test(); echo "\n-- From a child's static context --\n"; Child::testStatic(); ?> -===DONE=== --EXPECT-- *** Testing get_class_vars() : testing visibility @@ -165,4 +164,3 @@ array(4) { ["prots"]=> string(20) "protected static var" } -===DONE=== diff --git a/ext/standard/tests/class_object/property_exists_error.phpt b/ext/standard/tests/class_object/property_exists_error.phpt index 7a2f4712da..43f68badd1 100644 --- a/ext/standard/tests/class_object/property_exists_error.phpt +++ b/ext/standard/tests/class_object/property_exists_error.phpt @@ -15,7 +15,6 @@ $property_name = 'string_val'; var_dump( property_exists(10, $property_name) ); ?> -===DONE=== --EXPECTF-- *** Testing property_exists() : error conditions *** @@ -23,4 +22,3 @@ var_dump( property_exists(10, $property_name) ); Warning: First parameter must either be an object or the name of an existing class in %sproperty_exists_error.php on line %d NULL -===DONE=== diff --git a/ext/standard/tests/class_object/property_exists_variation1.phpt b/ext/standard/tests/class_object/property_exists_variation1.phpt index 4b0ce2baff..f32790a029 100644 --- a/ext/standard/tests/class_object/property_exists_variation1.phpt +++ b/ext/standard/tests/class_object/property_exists_variation1.phpt @@ -21,7 +21,6 @@ echo "\ntesting __get magic method\n"; var_dump(property_exists("AutoTest", "foo")); ?> -===DONE=== --EXPECT-- *** Testing property_exists() : class auto loading *** @@ -30,4 +29,3 @@ bool(true) testing __get magic method bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/bug72625.phpt b/ext/standard/tests/dir/bug72625.phpt index b64010fcd4..e3594414ad 100644 --- a/ext/standard/tests/dir/bug72625.phpt +++ b/ext/standard/tests/dir/bug72625.phpt @@ -40,7 +40,6 @@ while ($tmp > $base) { } ?> -===DONE=== --EXPECTF-- string(%d) "%s/_test/documents/projects/myproject/vendor/name/library/classpath" bool(true) @@ -50,4 +49,3 @@ string(%d) "%s/_test/documents/projects/myproject/vendor/name/library/classpath/ bool(true) string(%d) "%s\_test\documents\projects\myproject\vendor\name\library\classpath" string(%d) "%s/_test/documents/projects/myproject/vendor/name/library" -===DONE=== diff --git a/ext/standard/tests/dir/chdir_basic-win32-mb.phpt b/ext/standard/tests/dir/chdir_basic-win32-mb.phpt index d2d590ff3c..680ff8bd3d 100644 --- a/ext/standard/tests/dir/chdir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_basic-win32-mb.phpt @@ -40,7 +40,6 @@ echo "\n-- Testing chdir() with relative paths: --\n"; var_dump(chdir($level_two_dir_name)); var_dump(getcwd()); ?> -===DONE=== --CLEAN-- <?php $base_dir_path = __DIR__ . '/chdir_basic-win32-mb'; @@ -59,4 +58,3 @@ string(%d) "%sç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one" -- Testing chdir() with relative paths: -- bool(true) string(%d) "%sç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one%eç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_two" -===DONE=== diff --git a/ext/standard/tests/dir/chdir_basic.phpt b/ext/standard/tests/dir/chdir_basic.phpt index 6c96898dd8..6a216f0362 100644 --- a/ext/standard/tests/dir/chdir_basic.phpt +++ b/ext/standard/tests/dir/chdir_basic.phpt @@ -33,7 +33,6 @@ echo "\n-- Testing chdir() with relative paths: --\n"; var_dump(chdir($level1_two_dir_name)); var_dump(getcwd()); ?> -===DONE=== --CLEAN-- <?php $file_path = __DIR__; @@ -50,4 +49,3 @@ string(%d) "%slevel1_one" -- Testing chdir() with relative paths: -- bool(true) string(%d) "%slevel1_one%elevel1_two" -===DONE=== diff --git a/ext/standard/tests/dir/chdir_error2-win32-mb.phpt b/ext/standard/tests/dir/chdir_error2-win32-mb.phpt index 4f6272ce4f..403dcef574 100644 --- a/ext/standard/tests/dir/chdir_error2-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_error2-win32-mb.phpt @@ -23,10 +23,8 @@ $directory = __FILE__ . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™idonotexist'; var_dump(chdir($directory)); ?> -===DONE=== --EXPECTF-- *** Testing chdir() : error conditions *** Warning: chdir(): %s (errno %d) in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/chdir_error2.phpt b/ext/standard/tests/dir/chdir_error2.phpt index 6c322a2e3a..414ae1427c 100644 --- a/ext/standard/tests/dir/chdir_error2.phpt +++ b/ext/standard/tests/dir/chdir_error2.phpt @@ -17,10 +17,8 @@ $directory = __FILE__ . '/idonotexist'; var_dump(chdir($directory)); ?> -===DONE=== --EXPECTF-- *** Testing chdir() : error conditions *** Warning: chdir(): %s (errno %d) in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt index 9b1d8f1e9c..9e1b2e9aa0 100644 --- a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt @@ -65,7 +65,6 @@ var_dump(chdir($level_two_dir_path)); var_dump(chdir("../../$level_one_dir_name")); var_dump(getcwd()); ?> -===DONE=== --CLEAN-- <?php $base_dir_path = __DIR__ . '/chdir_variation2-win32-mb'; @@ -109,4 +108,3 @@ string(%d) "%sç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one%eç§ã¯ã‚¬ãƒ©ã‚¹ã‚’é bool(true) bool(true) string(%d) "%sç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one" -===DONE=== diff --git a/ext/standard/tests/dir/chdir_variation2.phpt b/ext/standard/tests/dir/chdir_variation2.phpt index 7f9c3845ee..acab454ef6 100644 --- a/ext/standard/tests/dir/chdir_variation2.phpt +++ b/ext/standard/tests/dir/chdir_variation2.phpt @@ -59,7 +59,6 @@ var_dump(chdir("../../$level2_one_dir_name")); var_dump(getcwd()); ?> -===DONE=== --CLEAN-- <?php $file_path = __DIR__; @@ -101,4 +100,3 @@ string(%d) "%slevel2_one%elevel2_two" bool(true) bool(true) string(%d) "%slevel2_one" -===DONE=== diff --git a/ext/standard/tests/dir/closedir_basic-win32-mb.phpt b/ext/standard/tests/dir/closedir_basic-win32-mb.phpt index f74ac29952..dad5b2b657 100644 --- a/ext/standard/tests/dir/closedir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/closedir_basic-win32-mb.phpt @@ -40,7 +40,6 @@ var_dump(closedir($dh2)); echo "-- Check Directory Handle: --\n"; var_dump($dh2); ?> -===DONE=== --CLEAN-- <?php $base_dir = __DIR__; @@ -59,4 +58,3 @@ resource(%d) of type (Unknown) NULL -- Check Directory Handle: -- resource(%d) of type (Unknown) -===DONE=== diff --git a/ext/standard/tests/dir/closedir_basic.phpt b/ext/standard/tests/dir/closedir_basic.phpt index 94aaebf9f9..41b51f2080 100644 --- a/ext/standard/tests/dir/closedir_basic.phpt +++ b/ext/standard/tests/dir/closedir_basic.phpt @@ -34,7 +34,6 @@ var_dump(closedir($dh2)); echo "-- Check Directory Handle: --\n"; var_dump($dh2); ?> -===DONE=== --CLEAN-- <?php $base_dir = __DIR__; @@ -53,4 +52,3 @@ resource(%d) of type (Unknown) NULL -- Check Directory Handle: -- resource(%d) of type (Unknown) -===DONE=== diff --git a/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt b/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt index 26d410f4bd..a4013676ff 100644 --- a/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt @@ -40,7 +40,6 @@ try { echo "Directory Handle: "; var_dump($dh); ?> -===DONE=== --CLEAN-- <?php $directory = __DIR__ . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™closedir_variation2"; @@ -56,4 +55,3 @@ Directory Handle: resource(%d) of type (Unknown) -- Close directory handle second time: -- closedir(): %s is not a valid Directory resource Directory Handle: resource(%d) of type (Unknown) -===DONE=== diff --git a/ext/standard/tests/dir/closedir_variation2.phpt b/ext/standard/tests/dir/closedir_variation2.phpt index 7c814a4926..ee6e876ae8 100644 --- a/ext/standard/tests/dir/closedir_variation2.phpt +++ b/ext/standard/tests/dir/closedir_variation2.phpt @@ -34,7 +34,6 @@ try { echo "Directory Handle: "; var_dump($dh); ?> -===DONE=== --CLEAN-- <?php $directory = __DIR__ . "/closedir_variation2"; @@ -50,4 +49,3 @@ Directory Handle: resource(%d) of type (Unknown) -- Close directory handle second time: -- closedir(): supplied resource is not a valid Directory resource Directory Handle: resource(%d) of type (Unknown) -===DONE=== diff --git a/ext/standard/tests/dir/closedir_variation3.phpt b/ext/standard/tests/dir/closedir_variation3.phpt index 7c65f5f877..65418ca636 100644 --- a/ext/standard/tests/dir/closedir_variation3.phpt +++ b/ext/standard/tests/dir/closedir_variation3.phpt @@ -30,7 +30,6 @@ if(is_resource($fp)) { fclose($fp); } ?> -===DONE=== --EXPECTF-- *** Testing closedir() : usage variations *** @@ -42,4 +41,3 @@ resource(%d) of type (stream) -- Check file pointer: -- resource(%d) of type (stream) -===DONE=== diff --git a/ext/standard/tests/dir/dir_bug73971.phpt b/ext/standard/tests/dir/dir_bug73971.phpt index 3649b74329..e32516ea15 100644 --- a/ext/standard/tests/dir/dir_bug73971.phpt +++ b/ext/standard/tests/dir/dir_bug73971.phpt @@ -30,7 +30,6 @@ foreach ($dir as $finfo) { } ?> -==DONE== --CLEAN-- <?php $base = __DIR__ . DIRECTORY_SEPARATOR . "bug73971"; @@ -51,4 +50,3 @@ test DirectoryIterator string(1) "." string(2) ".." string(432) "テストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテスト" -==DONE== diff --git a/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt b/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt index 41d90864ef..accb70243d 100644 --- a/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt @@ -27,7 +27,6 @@ var_dump(getcwd()); chdir($directory); var_dump(getcwd()); ?> -===DONE=== --CLEAN-- <?php $directory = __DIR__ . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™getcwd_basic"; @@ -37,4 +36,3 @@ rmdir($directory); *** Testing getcwd() : basic functionality *** string(%d) "%s" string(%d) "%s%eç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™getcwd_basic" -===DONE=== diff --git a/ext/standard/tests/dir/getcwd_basic.phpt b/ext/standard/tests/dir/getcwd_basic.phpt index 577521a347..0067312041 100644 --- a/ext/standard/tests/dir/getcwd_basic.phpt +++ b/ext/standard/tests/dir/getcwd_basic.phpt @@ -21,7 +21,6 @@ var_dump(getcwd()); chdir($directory); var_dump(getcwd()); ?> -===DONE=== --CLEAN-- <?php $directory = __DIR__ . "/getcwd_basic"; @@ -31,4 +30,3 @@ rmdir($directory); *** Testing getcwd() : basic functionality *** string(%d) "%s" string(%d) "%s%egetcwd_basic" -===DONE=== diff --git a/ext/standard/tests/dir/opendir_basic-win32-mb.phpt b/ext/standard/tests/dir/opendir_basic-win32-mb.phpt index 8bdba8a5ce..340561b218 100644 --- a/ext/standard/tests/dir/opendir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_basic-win32-mb.phpt @@ -46,7 +46,6 @@ var_dump($dh1); closedir($dh2); var_dump($dh2); ?> -===DONE=== --CLEAN-- <?php $base_dir_path = __DIR__ . '/opendir_basic-win32-mb'; @@ -67,4 +66,3 @@ resource(%d) of type (stream) -- Close directory handles: -- resource(%d) of type (Unknown) resource(%d) of type (Unknown) -===DONE=== diff --git a/ext/standard/tests/dir/opendir_basic.phpt b/ext/standard/tests/dir/opendir_basic.phpt index fc5af44e66..6947e77952 100644 --- a/ext/standard/tests/dir/opendir_basic.phpt +++ b/ext/standard/tests/dir/opendir_basic.phpt @@ -40,7 +40,6 @@ var_dump($dh1); closedir($dh2); var_dump($dh2); ?> -===DONE=== --CLEAN-- <?php $base_dir_path = __DIR__ . '/opendir_basic'; @@ -61,4 +60,3 @@ resource(%d) of type (stream) -- Close directory handles: -- resource(%d) of type (Unknown) resource(%d) of type (Unknown) -===DONE=== diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt index 47b7709cec..1eac9a33d8 100644 --- a/ext/standard/tests/dir/opendir_error2.phpt +++ b/ext/standard/tests/dir/opendir_error2.phpt @@ -27,7 +27,6 @@ echo "\n-- Pass a non-existent relative path: --\n"; chdir(__DIR__); var_dump(opendir('idonotexist')); ?> -===DONE=== --EXPECTF-- *** Testing opendir() : error conditions *** @@ -40,4 +39,3 @@ bool(false) Warning: opendir(idonotexist): failed to open dir: %s in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt index 8bf2d3c26a..7185cff737 100644 --- a/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt @@ -37,7 +37,6 @@ if ($dh1 !== $dh2) { closedir($dh1); closedir($dh2); ?> -===DONE=== --CLEAN-- <?php $path = __DIR__ . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™opendir_variation3"; @@ -53,4 +52,3 @@ resource(%d) of type (stream) resource(%d) of type (stream) New resource created -===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation3.phpt b/ext/standard/tests/dir/opendir_variation3.phpt index 65ec8df82f..83a265ab81 100644 --- a/ext/standard/tests/dir/opendir_variation3.phpt +++ b/ext/standard/tests/dir/opendir_variation3.phpt @@ -31,7 +31,6 @@ if ($dh1 !== $dh2) { closedir($dh1); closedir($dh2); ?> -===DONE=== --CLEAN-- <?php $path = __DIR__ . "/opendir_variation3"; @@ -47,4 +46,3 @@ resource(%d) of type (stream) resource(%d) of type (stream) New resource created -===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt index ec9f2b3886..319e178a2e 100644 --- a/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt @@ -76,7 +76,6 @@ function clean_dh($dh){ unset($dh); } ?> -===DONE=== --CLEAN-- <?php $base_dir_path = __DIR__ . '/opendir_variation4-win32-mb'; @@ -112,4 +111,3 @@ resource(%d) of type (stream) -- $path = '../../'ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one': -- bool(true) resource(%d) of type (stream) -===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation4.phpt b/ext/standard/tests/dir/opendir_variation4.phpt index ea72c8b627..6434c9ef52 100644 --- a/ext/standard/tests/dir/opendir_variation4.phpt +++ b/ext/standard/tests/dir/opendir_variation4.phpt @@ -70,7 +70,6 @@ function clean_dh($dh){ unset($dh); } ?> -===DONE=== --CLEAN-- <?php $base_dir_path = __DIR__ . '/opendir_variation4'; @@ -106,4 +105,3 @@ resource(%d) of type (stream) -- $path = '../../'level_one': -- bool(true) resource(%d) of type (stream) -===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt index 937911227c..5f123275da 100644 --- a/ext/standard/tests/dir/opendir_variation5.phpt +++ b/ext/standard/tests/dir/opendir_variation5.phpt @@ -63,7 +63,6 @@ if (is_resource($dir_handle2)) { closedir($dir_handle2); } ?> -===DONE=== --CLEAN-- <?php $parent_dir_path = __DIR__ . "/opendir_variation5"; @@ -91,4 +90,3 @@ bool(false) Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation6-win32.phpt b/ext/standard/tests/dir/opendir_variation6-win32.phpt index 3e3c26e679..3972f6d5c2 100644 --- a/ext/standard/tests/dir/opendir_variation6-win32.phpt +++ b/ext/standard/tests/dir/opendir_variation6-win32.phpt @@ -37,7 +37,6 @@ var_dump( opendir($dir_path . "/sub_dir?") ); var_dump( opendir($dir_path . "/sub?dir1") ); ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/opendir_variation6"; @@ -72,4 +71,3 @@ Warning: opendir(%s/opendir_variation6/sub?dir1,%s/opendir_variation6/sub?dir1): Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt index c51cd4ca26..a9a0221e6e 100644 --- a/ext/standard/tests/dir/opendir_variation6.phpt +++ b/ext/standard/tests/dir/opendir_variation6.phpt @@ -37,7 +37,6 @@ var_dump( opendir($dir_path . "/sub_dir?") ); var_dump( opendir($dir_path . "/sub?dir1") ); ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/opendir_variation6"; @@ -64,4 +63,3 @@ bool(false) Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation7.phpt b/ext/standard/tests/dir/opendir_variation7.phpt index d781c4f538..0f2543805d 100644 --- a/ext/standard/tests/dir/opendir_variation7.phpt +++ b/ext/standard/tests/dir/opendir_variation7.phpt @@ -67,7 +67,6 @@ foreach ($permission_values as $perm) { $iterator++; } ?> -===DONE=== --CLEAN-- <?php // deleting temporary directory @@ -116,4 +115,3 @@ resource(%d) of type (stream) -- Iteration 10 -- bool(true) resource(%d) of type (stream) -===DONE=== diff --git a/ext/standard/tests/dir/readdir_basic-win32-mb.phpt b/ext/standard/tests/dir/readdir_basic-win32-mb.phpt index 697d8774f9..18ee74e6b3 100644 --- a/ext/standard/tests/dir/readdir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_basic-win32-mb.phpt @@ -52,7 +52,6 @@ foreach($a as $file) { delete_files($path, 3); closedir($dh); ?> -===DONE=== --CLEAN-- <?php $path = __DIR__ . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_basic'; @@ -76,4 +75,3 @@ string(2) ".." string(9) "file1.tmp" string(9) "file2.tmp" string(9) "file3.tmp" -===DONE=== diff --git a/ext/standard/tests/dir/readdir_basic.phpt b/ext/standard/tests/dir/readdir_basic.phpt index 8c615afc5e..9a45ee4002 100644 --- a/ext/standard/tests/dir/readdir_basic.phpt +++ b/ext/standard/tests/dir/readdir_basic.phpt @@ -46,7 +46,6 @@ foreach($a as $file) { delete_files($path, 3); closedir($dh); ?> -===DONE=== --CLEAN-- <?php $path = __DIR__ . '/readdir_basic'; @@ -70,4 +69,3 @@ string(2) ".." string(9) "file1.tmp" string(9) "file2.tmp" string(9) "file3.tmp" -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt index ede4199ac6..01ae34fb88 100644 --- a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt @@ -39,7 +39,6 @@ foreach($entries as $entry) { var_dump($entry); } ?> -===DONE=== --CLEAN-- <?php $path = __DIR__ . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation2'; @@ -51,4 +50,3 @@ rmdir($path); -- Pass an empty directory to readdir() -- string(1) "." string(2) ".." -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation2.phpt b/ext/standard/tests/dir/readdir_variation2.phpt index fbe383e768..3fb35a778e 100644 --- a/ext/standard/tests/dir/readdir_variation2.phpt +++ b/ext/standard/tests/dir/readdir_variation2.phpt @@ -33,7 +33,6 @@ foreach($entries as $entry) { var_dump($entry); } ?> -===DONE=== --CLEAN-- <?php $path = __DIR__ . '/readdir_variation2'; @@ -45,4 +44,3 @@ rmdir($path); -- Pass an empty directory to readdir() -- string(1) "." string(2) ".." -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt index 5c2b0c8385..b3f831e067 100644 --- a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt @@ -49,7 +49,6 @@ delete_files($path_sub, 2); closedir($dir_handle); ?> -===DONE=== --CLEAN-- <?php $path_top = __DIR__ . '/readdir_variation3-win32-mb'; @@ -71,4 +70,3 @@ array(5) { [4]=> string(46) "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™sub_folder" } -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation3.phpt b/ext/standard/tests/dir/readdir_variation3.phpt index 849068e97a..6adac51215 100644 --- a/ext/standard/tests/dir/readdir_variation3.phpt +++ b/ext/standard/tests/dir/readdir_variation3.phpt @@ -43,7 +43,6 @@ delete_files($path_sub, 2); closedir($dir_handle); ?> -===DONE=== --CLEAN-- <?php $path_top = __DIR__ . '/readdir_variation3'; @@ -65,4 +64,3 @@ array(5) { [4]=> string(10) "sub_folder" } -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt index a77fcd8ca4..8e9e3b610e 100644 --- a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt @@ -81,7 +81,6 @@ var_dump($contents); closedir($dir_handle); ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation4/"; @@ -181,4 +180,3 @@ array(16) { [15]=> string(51) "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™single_file.tmp" } -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation4.phpt b/ext/standard/tests/dir/readdir_variation4.phpt index 22eb62381a..8bfe176946 100644 --- a/ext/standard/tests/dir/readdir_variation4.phpt +++ b/ext/standard/tests/dir/readdir_variation4.phpt @@ -75,7 +75,6 @@ var_dump($contents); closedir($dir_handle); ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/readdir_variation4/"; @@ -175,4 +174,3 @@ array(16) { [15]=> string(15) "single_file.tmp" } -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation5.phpt b/ext/standard/tests/dir/readdir_variation5.phpt index 72ec24a9d8..920864d21a 100644 --- a/ext/standard/tests/dir/readdir_variation5.phpt +++ b/ext/standard/tests/dir/readdir_variation5.phpt @@ -65,7 +65,6 @@ foreach($permission_values as $perm) { $iterator++; } ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/readdir_variation5"; @@ -133,4 +132,3 @@ bool(true) resource(%d) of type (stream) -- Calling readdir() -- string(%d) "%s" -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt index 57a8147a46..3646316247 100644 --- a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt @@ -61,7 +61,6 @@ delete_files($dir_path, 3, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variatio closedir($dir_handle1); closedir(); ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation6"; @@ -83,4 +82,3 @@ string(2) ".." string(59) "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation61.tmp" string(59) "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation62.tmp" string(59) "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation63.tmp" -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation6.phpt b/ext/standard/tests/dir/readdir_variation6.phpt index 379d5cc80c..19bb906f14 100644 --- a/ext/standard/tests/dir/readdir_variation6.phpt +++ b/ext/standard/tests/dir/readdir_variation6.phpt @@ -55,7 +55,6 @@ delete_files($dir_path, 3, "readdir_variation6"); closedir($dir_handle1); closedir(); ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/readdir_variation6"; @@ -77,4 +76,3 @@ string(2) ".." string(23) "readdir_variation61.tmp" string(23) "readdir_variation62.tmp" string(23) "readdir_variation63.tmp" -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation7.phpt b/ext/standard/tests/dir/readdir_variation7.phpt index 7950d58823..a2c0ef059f 100644 --- a/ext/standard/tests/dir/readdir_variation7.phpt +++ b/ext/standard/tests/dir/readdir_variation7.phpt @@ -22,9 +22,7 @@ try { } ?> -===DONE=== --EXPECTF-- *** Testing readdir() : usage variations *** resource(%d) of type (stream) %d is not a valid Directory resource -===DONE=== diff --git a/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt index 5e704870ee..c16e993f83 100644 --- a/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt @@ -63,7 +63,6 @@ closedir($dh2); delete_files($dir_path1, 1, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); delete_files($dir_path2, 1, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file", 2); ?> -===DONE=== --CLEAN-- <?php $dir_path1 = __DIR__ . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™rewinddir_basic_dir1"; @@ -99,4 +98,3 @@ array(3) { } NULL bool(true) -===DONE=== diff --git a/ext/standard/tests/dir/rewinddir_basic.phpt b/ext/standard/tests/dir/rewinddir_basic.phpt index b0abc0a379..1750121b3e 100644 --- a/ext/standard/tests/dir/rewinddir_basic.phpt +++ b/ext/standard/tests/dir/rewinddir_basic.phpt @@ -57,7 +57,6 @@ closedir($dh2); delete_files($dir_path1, 1); delete_files($dir_path2, 1, 'file', 2); ?> -===DONE=== --CLEAN-- <?php $dir_path1 = __DIR__ . "/rewinddir_basic_dir1"; @@ -93,4 +92,3 @@ array(3) { } NULL bool(true) -===DONE=== diff --git a/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt index d38571c88a..7d86575b6d 100644 --- a/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt @@ -35,7 +35,6 @@ try { echo $e->getMessage(), "\n"; } ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™rewinddir_variation2'; @@ -50,4 +49,3 @@ string(%d) "%s" -- Call to rewinddir() -- rewinddir(): %s is not a valid Directory resource -===DONE=== diff --git a/ext/standard/tests/dir/rewinddir_variation2.phpt b/ext/standard/tests/dir/rewinddir_variation2.phpt index ca646f2002..9294d68b46 100644 --- a/ext/standard/tests/dir/rewinddir_variation2.phpt +++ b/ext/standard/tests/dir/rewinddir_variation2.phpt @@ -29,7 +29,6 @@ try { echo $e->getMessage(), "\n"; } ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . '/rewinddir_variation2'; @@ -44,4 +43,3 @@ string(%d) "%s" -- Call to rewinddir() -- rewinddir(): supplied resource is not a valid Directory resource -===DONE=== diff --git a/ext/standard/tests/dir/rewinddir_variation3.phpt b/ext/standard/tests/dir/rewinddir_variation3.phpt index 920e493c07..2bd69e45fc 100644 --- a/ext/standard/tests/dir/rewinddir_variation3.phpt +++ b/ext/standard/tests/dir/rewinddir_variation3.phpt @@ -33,7 +33,6 @@ if ($result1 === $result2) { echo "rewinddir() does not work on file pointers\n"; } ?> -===DONE=== --EXPECTF-- *** Testing rewinddir() : usage variations *** @@ -43,4 +42,3 @@ resource(%d) of type (stream) -- Check if rewinddir() has repositioned the file pointer -- rewinddir() does not work on file pointers -===DONE=== diff --git a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt index 39c375461e..501a3c54c5 100644 --- a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt @@ -37,7 +37,6 @@ var_dump(scandir($directory, $sorting_order, $context)); delete_files($directory, 3, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); ?> -===DONE=== --CLEAN-- <?php $directory = __DIR__ . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_basic'; @@ -73,4 +72,3 @@ array(5) { [4]=> string(1) "." } -===DONE=== diff --git a/ext/standard/tests/dir/scandir_basic.phpt b/ext/standard/tests/dir/scandir_basic.phpt index e0e40f5620..e31ef6ea41 100644 --- a/ext/standard/tests/dir/scandir_basic.phpt +++ b/ext/standard/tests/dir/scandir_basic.phpt @@ -31,7 +31,6 @@ var_dump(scandir($directory, $sorting_order, $context)); delete_files($directory, 3); ?> -===DONE=== --CLEAN-- <?php $directory = __DIR__ . '/scandir_basic'; @@ -67,4 +66,3 @@ array(5) { [4]=> string(1) "." } -===DONE=== diff --git a/ext/standard/tests/dir/scandir_error2.phpt b/ext/standard/tests/dir/scandir_error2.phpt index 121d68bab8..e77b098323 100644 --- a/ext/standard/tests/dir/scandir_error2.phpt +++ b/ext/standard/tests/dir/scandir_error2.phpt @@ -27,7 +27,6 @@ var_dump(scandir($directory)); echo "\n-- Pass scandir() a relative path that does not exist --\n"; var_dump(scandir('/idonotexist')); ?> -===DONE=== --EXPECTF-- *** Testing scandir() : error conditions *** @@ -44,4 +43,3 @@ Warning: scandir(/idonotexist): failed to open dir: %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt index b596eb0e17..120e12e6e7 100644 --- a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt @@ -46,7 +46,6 @@ var_dump(in_array('ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file2.tmp', $files)); delete_files($dir, 2, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); ?> -===DONE=== --CLEAN-- <?php $dir = __DIR__ . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_variation10'; @@ -82,4 +81,3 @@ bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation10.phpt b/ext/standard/tests/dir/scandir_variation10.phpt index 28220c66ba..1de1e9752c 100644 --- a/ext/standard/tests/dir/scandir_variation10.phpt +++ b/ext/standard/tests/dir/scandir_variation10.phpt @@ -40,7 +40,6 @@ var_dump(in_array('file2.tmp', $files)); delete_files($dir, 2); ?> -===DONE=== --CLEAN-- <?php $dir = __DIR__ . '/scandir_variation10'; @@ -76,4 +75,3 @@ bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt index 9bfeddf556..88389c6f92 100644 --- a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt @@ -65,7 +65,6 @@ var_dump(scandir('../../ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one')); @delete_files($level_one_dir_path, 2, 'ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one'); @delete_files($level_two_dir_path, 2, 'ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_two'); ?> -===DONE=== --CLEAN-- <?php $base_dir_path = __DIR__ . '/scandir_variation4-win32-mb'; @@ -174,4 +173,3 @@ array(5) { [4]=> string(45) "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_two" } -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation4.phpt b/ext/standard/tests/dir/scandir_variation4.phpt index 6030ace2ac..afaa17dee7 100644 --- a/ext/standard/tests/dir/scandir_variation4.phpt +++ b/ext/standard/tests/dir/scandir_variation4.phpt @@ -59,7 +59,6 @@ var_dump(scandir('../../level_one')); @delete_files($level_one_dir_path, 2, 'level_one'); @delete_files($level_two_dir_path, 2, 'level_two'); ?> -===DONE=== --CLEAN-- <?php $base_dir_path = __DIR__ . '/scandir_variation4'; @@ -168,4 +167,3 @@ array(5) { [4]=> string(9) "level_two" } -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt index 189687f1d0..cfd564ca79 100644 --- a/ext/standard/tests/dir/scandir_variation5.phpt +++ b/ext/standard/tests/dir/scandir_variation5.phpt @@ -55,7 +55,6 @@ chmod($parent_dir_path, 0666); // restricting parent directory echo "\n-- After restricting parent directory --\n"; var_dump(scandir($child_dir_path)); ?> -===DONE=== --CLEAN-- <?php $parent_dir_path = __DIR__ . "/scandir_variation5"; @@ -87,4 +86,3 @@ Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): failed to open dir: % Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt index d516411886..80b934f56f 100644 --- a/ext/standard/tests/dir/scandir_variation6.phpt +++ b/ext/standard/tests/dir/scandir_variation6.phpt @@ -38,7 +38,6 @@ var_dump( scandir($dir_path . "/sub_dir?") ); var_dump( scandir($dir_path . "/sub?dir1") ); ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/scandir_variation6"; @@ -73,4 +72,3 @@ Warning: scandir(%s/scandir_variation6/sub?dir1): failed to open dir: %s in %s o Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation7.phpt b/ext/standard/tests/dir/scandir_variation7.phpt index bd0cb74a15..901198ffaa 100644 --- a/ext/standard/tests/dir/scandir_variation7.phpt +++ b/ext/standard/tests/dir/scandir_variation7.phpt @@ -60,7 +60,6 @@ foreach ($permission_values as $perm) { $iterator++; } ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/scandir_variation7"; @@ -158,4 +157,3 @@ array(2) { [1]=> string(2) ".." } -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt index acc289e590..ffeda65be7 100644 --- a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt @@ -71,7 +71,6 @@ foreach ($content as $file_name) { @unlink($dir_path . $file_name); } ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_variation8"; @@ -157,4 +156,3 @@ array(16) { [15]=> string(51) "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™single_file.tmp" } -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation8.phpt b/ext/standard/tests/dir/scandir_variation8.phpt index 5ba7a6391b..7734c1531f 100644 --- a/ext/standard/tests/dir/scandir_variation8.phpt +++ b/ext/standard/tests/dir/scandir_variation8.phpt @@ -65,7 +65,6 @@ foreach ($content as $file_name) { @unlink($dir_path . $file_name); } ?> -===DONE=== --CLEAN-- <?php $dir_path = __DIR__ . "/scandir_variation8"; @@ -151,4 +150,3 @@ array(16) { [15]=> string(15) "single_file.tmp" } -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt index c634f2d3b3..16b26fbb78 100644 --- a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt @@ -37,7 +37,6 @@ foreach($ints as $sorting_order) { delete_files($dir, 2, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); ?> -===DONE=== --CLEAN-- <?php $dir = __DIR__ . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_variation9'; @@ -75,4 +74,3 @@ array(4) { [3]=> string(45) "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file2.tmp" } -===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation9.phpt b/ext/standard/tests/dir/scandir_variation9.phpt index 42e42bb6cb..6bfbe28ea0 100644 --- a/ext/standard/tests/dir/scandir_variation9.phpt +++ b/ext/standard/tests/dir/scandir_variation9.phpt @@ -31,7 +31,6 @@ foreach($ints as $sorting_order) { delete_files($dir, 2); ?> -===DONE=== --CLEAN-- <?php $dir = __DIR__ . '/scandir_variation9'; @@ -69,4 +68,3 @@ array(4) { [3]=> string(9) "file2.tmp" } -===DONE=== diff --git a/ext/standard/tests/directory/bug74589_utf8.phpt b/ext/standard/tests/directory/bug74589_utf8.phpt index 1bec90fe16..5bf047fbe2 100644 --- a/ext/standard/tests/directory/bug74589_utf8.phpt +++ b/ext/standard/tests/directory/bug74589_utf8.phpt @@ -32,12 +32,10 @@ $php = getenv('TEST_PHP_EXECUTABLE'); echo shell_exec("$php -n $test_file"); ?> -===DONE=== --EXPECTF-- string(%d) "%sbug74589_新建文件夹" string(%d) "%sbug74589_新建文件夹%etest.php" bool(true) -===DONE=== --CLEAN-- <?php $item = "bug74589_新建文件夹"; // utf-8 string diff --git a/ext/standard/tests/file/basename_bug66395-win32.phpt b/ext/standard/tests/file/basename_bug66395-win32.phpt index b4ad18dd28..c276107881 100644 --- a/ext/standard/tests/file/basename_bug66395-win32.phpt +++ b/ext/standard/tests/file/basename_bug66395-win32.phpt @@ -9,10 +9,8 @@ echo basename("d:subdir\\file.txt") . "\n"; echo basename("y:file.txt", ".txt") . "\n"; echo basename("notdriveletter:file.txt") . "\n"; ?> -==DONE== --EXPECT-- file.txt file.txt file notdriveletter:file.txt -==DONE== diff --git a/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt b/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt index 4dc05dbeb1..7311b7797c 100644 --- a/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt +++ b/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt @@ -19,7 +19,6 @@ echo basename("x:y:z:hello\world:my.stream:\$DATA") . "\n"; echo basename("a:\\b:\\c:d:hello\\world:c:\$DATA") . "\n"; echo basename("a:\\b:\\c:d:hello\\d:world:c:\$DATA") . "\n"; ?> -==DONE== --EXPECT-- y y @@ -35,4 +34,3 @@ world:some.stream:$DATA world:my.stream:$DATA world:c:$DATA world:c:$DATA -==DONE== diff --git a/ext/standard/tests/file/bug47517.phpt b/ext/standard/tests/file/bug47517.phpt index f8c9e41446..9a95ff52e7 100644 --- a/ext/standard/tests/file/bug47517.phpt +++ b/ext/standard/tests/file/bug47517.phpt @@ -15,7 +15,5 @@ if (!$status) { /* This has to behave same way on both 64- and 32-bits. */ file_put_contents('C:\Program Files\myfile.txt', 'hello'); ?> -==DONE== --EXPECTF-- Warning: file_put_contents(C:\Program Files\myfile.txt): failed to open stream: Permission denied in %sbug47517.php on line %d -==DONE== diff --git a/ext/standard/tests/file/bug61961.phpt b/ext/standard/tests/file/bug61961.phpt index a2d83fe77e..c9ae4c8880 100644 --- a/ext/standard/tests/file/bug61961.phpt +++ b/ext/standard/tests/file/bug61961.phpt @@ -8,7 +8,5 @@ file_put_contents($tmp_empty_file, ""); var_dump(file_get_contents($tmp_empty_file, NULL, NULL, NULL, 10)); unlink($tmp_empty_file); ?> -==DONE== --EXPECT-- string(0) "" -==DONE== diff --git a/ext/standard/tests/file/bug71882.phpt b/ext/standard/tests/file/bug71882.phpt index c132aa95c7..ce3adb1def 100644 --- a/ext/standard/tests/file/bug71882.phpt +++ b/ext/standard/tests/file/bug71882.phpt @@ -5,8 +5,6 @@ Bug #71882 (Negative ftruncate() on php://memory exhausts memory) $fd = fopen("php://memory", "w+"); var_dump(ftruncate($fd, -1)); ?> -==DONE== --EXPECTF-- Warning: ftruncate(): Negative size is not supported in %s%ebug71882.php on line %d bool(false) -==DONE== diff --git a/ext/standard/tests/file/bug72035.phpt b/ext/standard/tests/file/bug72035.phpt index 57feddbb09..1fd5b5c148 100644 --- a/ext/standard/tests/file/bug72035.phpt +++ b/ext/standard/tests/file/bug72035.phpt @@ -30,10 +30,8 @@ if (is_resource($proc)) { unlink($fl); ?> -==DONE== --EXPECTF-- X-Powered-By: PHP/%s Content-type: text/html; charset=UTF-8 hello -==DONE== diff --git a/ext/standard/tests/file/bug74719.phpt b/ext/standard/tests/file/bug74719.phpt index 57309bcf06..ab888d682f 100644 --- a/ext/standard/tests/file/bug74719.phpt +++ b/ext/standard/tests/file/bug74719.phpt @@ -33,11 +33,9 @@ if (rmdir($tmpDir, NULL)) { } ?> -===DONE=== --EXPECT-- ok ok ok ok ok -===DONE=== diff --git a/ext/standard/tests/file/bug75679.phpt b/ext/standard/tests/file/bug75679.phpt index 1441447853..df8b994781 100644 --- a/ext/standard/tests/file/bug75679.phpt +++ b/ext/standard/tests/file/bug75679.phpt @@ -24,7 +24,6 @@ foreach ($Files2Report as $file => &$Report) ?> -==DONE== --CLEAN-- <?php $d = __DIR__; @@ -63,4 +62,3 @@ Array [strlen] => 261 [result] => ok ) -==DONE== diff --git a/ext/standard/tests/file/chmod_error.phpt b/ext/standard/tests/file/chmod_error.phpt index b7999aa03d..e45ee4ecba 100644 --- a/ext/standard/tests/file/chmod_error.phpt +++ b/ext/standard/tests/file/chmod_error.phpt @@ -15,10 +15,8 @@ $filename = "___nonExisitingFile___"; var_dump(chmod($filename, 0777)); ?> -===DONE=== --EXPECTF-- *** Testing chmod() : error conditions *** Warning: chmod(): No such file or directory in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt index 9131a4cfcd..14f7bac438 100644 --- a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt +++ b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt @@ -7,7 +7,5 @@ $h = opendir($d); var_dump(fstat($h)); closedir($h); ?> -===DONE=== --EXPECT-- bool(false) -===DONE=== diff --git a/ext/standard/tests/file/dirname_basic-win32.phpt b/ext/standard/tests/file/dirname_basic-win32.phpt index bb53255fc8..f596f9a359 100644 --- a/ext/standard/tests/file/dirname_basic-win32.phpt +++ b/ext/standard/tests/file/dirname_basic-win32.phpt @@ -57,7 +57,6 @@ foreach ($paths as $path) { } ?> -===DONE=== --EXPECT-- *** Testing dirname() : basic functionality *** string(0) "" @@ -90,4 +89,3 @@ string(1) "." string(14) " c:\test\adir" string(1) "\" string(1) "\" -===DONE=== diff --git a/ext/standard/tests/file/dirname_basic.phpt b/ext/standard/tests/file/dirname_basic.phpt index 74d0a14e9e..774192830a 100644 --- a/ext/standard/tests/file/dirname_basic.phpt +++ b/ext/standard/tests/file/dirname_basic.phpt @@ -57,7 +57,6 @@ foreach ($paths as $path) { } ?> -===DONE=== --EXPECT-- *** Testing dirname() : basic functionality *** string(0) "" @@ -90,4 +89,3 @@ string(1) "." string(1) "." string(1) "/" string(1) "/" -===DONE=== diff --git a/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt b/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt index 2bb227b5c2..6098ca2694 100644 --- a/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt +++ b/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt @@ -21,7 +21,5 @@ if (strlen($s) >= 10000) { var_dump(strlen($s)); } ?> -===DONE=== --EXPECT-- OK -===DONE=== diff --git a/ext/standard/tests/file/fgetcsv_variation32.phpt b/ext/standard/tests/file/fgetcsv_variation32.phpt index eac1046c44..839e51734b 100644 --- a/ext/standard/tests/file/fgetcsv_variation32.phpt +++ b/ext/standard/tests/file/fgetcsv_variation32.phpt @@ -15,7 +15,6 @@ while (($data = fgetcsv($stream, 0, ',', '"', '')) !== false) { } fclose($stream); ?> -===DONE=== --EXPECT-- Array ( @@ -29,4 +28,3 @@ Array [0] => \\\line1 line2\\\ ) -===DONE=== diff --git a/ext/standard/tests/file/file_get_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt index eb502e0527..36bed7cb10 100644 --- a/ext/standard/tests/file/file_get_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_variation1.phpt @@ -43,8 +43,6 @@ function runtest() { } ?> -===DONE=== --EXPECT-- *** Testing file_get_contents() : variation *** File in include path -===DONE=== diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt index 8c24246aaa..b39c148b89 100644 --- a/ext/standard/tests/file/file_get_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_variation2.phpt @@ -44,8 +44,6 @@ function runtest() { } ?> -===DONE=== --EXPECT-- *** Testing file_get_contents() : variation *** File in script location -===DONE=== diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt index d1fca27d54..e0fed02054 100644 --- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt @@ -48,7 +48,6 @@ foreach($names_arr as $key =>$value) { } ?> -===Done=== --EXPECTF-- *** Testing file_get_contents() : variation *** @@ -97,4 +96,3 @@ bool(false) Warning: file_get_contents(php/php): failed to open stream: No such file or directory in %s on line %d bool(false) -===Done=== diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt index b6f8815cd0..8302454d72 100644 --- a/ext/standard/tests/file/file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_put_contents_variation1.phpt @@ -31,7 +31,6 @@ unlink($filename); ?> -===DONE=== --EXPECT-- *** Testing file_put_contents() : variation *** int(25) @@ -40,4 +39,3 @@ int(18) The first string to write, followed by this 25 The first string to write -===DONE=== diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt index 1f86ba1074..279291f2cf 100644 --- a/ext/standard/tests/file/file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_put_contents_variation2.phpt @@ -109,7 +109,6 @@ foreach($inputs as $key =>$value) { unlink($filename); ?> -===DONE=== --EXPECT-- *** Testing file_put_contents() : usage variation *** @@ -164,4 +163,3 @@ Class A object --undefined var-- --unset var-- -===DONE=== diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt index c7df0194ff..7d63ea4b7d 100644 --- a/ext/standard/tests/file/file_put_contents_variation4.phpt +++ b/ext/standard/tests/file/file_put_contents_variation4.phpt @@ -43,8 +43,6 @@ function runtest() { } ?> -===DONE=== --EXPECT-- File in include path File in include path -===DONE=== diff --git a/ext/standard/tests/file/file_put_contents_variation5.phpt b/ext/standard/tests/file/file_put_contents_variation5.phpt index c069c35a7e..d16db38b14 100644 --- a/ext/standard/tests/file/file_put_contents_variation5.phpt +++ b/ext/standard/tests/file/file_put_contents_variation5.phpt @@ -41,10 +41,8 @@ function runtest() { } } ?> -===DONE=== --EXPECT-- File written in working directory File written in working directory File written in working directory File written in working directory -===DONE=== diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt index 85f2aad363..389df4db27 100644 --- a/ext/standard/tests/file/file_put_contents_variation6.phpt +++ b/ext/standard/tests/file/file_put_contents_variation6.phpt @@ -47,9 +47,7 @@ function runtest() { } ?> -===DONE=== --EXPECT-- *** Testing file_put_contents() : variation *** File in include path. This was appended File in include path. This was appended -===DONE=== diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt index 99f7edf980..656bea5d34 100644 --- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt @@ -52,7 +52,6 @@ foreach($names_arr as $key =>$value) { }; ?> -===Done=== --EXPECTF-- *** Testing file_put_contents() : usage variation *** @@ -97,4 +96,3 @@ Failed to write data to: /no/such/file/dir Warning: file_put_contents(php/php): failed to open stream: %s in %s on line %d Failed to write data to: php/php -===Done=== diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt index 1c276a2957..1e006441c5 100644 --- a/ext/standard/tests/file/filetype_variation2.phpt +++ b/ext/standard/tests/file/filetype_variation2.phpt @@ -22,8 +22,6 @@ Description: Returns the type of the file. Possible values are fifo, char, echo "-- Checking for char --\n"; print( filetype("/dev/null") )."\n"; ?> -===DONE=== --EXPECT-- -- Checking for char -- char -===DONE=== diff --git a/ext/standard/tests/file/filetype_variation3.phpt b/ext/standard/tests/file/filetype_variation3.phpt index eb82a4d149..0abd264621 100644 --- a/ext/standard/tests/file/filetype_variation3.phpt +++ b/ext/standard/tests/file/filetype_variation3.phpt @@ -22,8 +22,6 @@ Description: Returns the type of the file. Possible values are fifo, char, echo "-- Checking for block --\n"; print( filetype("/dev/ram0") )."\n"; ?> -===DONE=== --EXPECT-- -- Checking for block -- block -===DONE=== diff --git a/ext/standard/tests/file/fopen_unlink.phpt b/ext/standard/tests/file/fopen_unlink.phpt index 117863b63d..c87a8bb055 100644 --- a/ext/standard/tests/file/fopen_unlink.phpt +++ b/ext/standard/tests/file/fopen_unlink.phpt @@ -18,7 +18,6 @@ var_dump( ); ?> -===DONE=== --EXPECTF-- string(%d) "%stututu" resource(%s) of type (Unknown) @@ -31,4 +30,3 @@ int(5) int(0) string(10) "helloworld" bool(true) -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index 300cf52864..ab6dc4f7bd 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -83,7 +83,6 @@ rmdir('c:\\'.$rootdir); ?> -===DONE=== --EXPECTF-- *** Testing fopen() : variation *** @@ -145,4 +144,3 @@ Warning: fopen(/sortout\fopen_variation10.tmp): failed to open stream: No such f file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt index ed6508b69a..60c41b9a64 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -81,7 +81,6 @@ rmdir($testdir); rmdir('c:\\'.$rootdir); ?> -===DONE=== --EXPECTF-- *** Testing fopen() : variation *** @@ -143,4 +142,3 @@ Warning: fopen(/sortout\fopen_variation11.tmp): failed to open stream: No such f file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation12.phpt b/ext/standard/tests/file/fopen_variation12.phpt index 2f79be1b63..8786337e23 100644 --- a/ext/standard/tests/file/fopen_variation12.phpt +++ b/ext/standard/tests/file/fopen_variation12.phpt @@ -44,8 +44,6 @@ function testme() { } } ?> -===DONE=== --EXPECT-- created in working dir Not created in script dir -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation13.phpt b/ext/standard/tests/file/fopen_variation13.phpt index 4d613a9145..0609f42d3b 100644 --- a/ext/standard/tests/file/fopen_variation13.phpt +++ b/ext/standard/tests/file/fopen_variation13.phpt @@ -47,9 +47,7 @@ function runtest() { } ?> -===DONE=== --EXPECT-- *** Testing fopen() : variation *** Created in correct location Created in correct location -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt index 73c5d68e76..ef8c2114c0 100644 --- a/ext/standard/tests/file/fopen_variation14-win32.phpt +++ b/ext/standard/tests/file/fopen_variation14-win32.phpt @@ -98,7 +98,6 @@ function runtest($fileURIs) { ?> -===DONE=== --EXPECTF-- *** Testing fopen() : variation *** --- READ: file://fopen14.tmpDir\fopen_variation14.tmp --- @@ -185,4 +184,3 @@ test passed test passed --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation14.phpt b/ext/standard/tests/file/fopen_variation14.phpt index f1e37fdda0..4728eca2db 100644 --- a/ext/standard/tests/file/fopen_variation14.phpt +++ b/ext/standard/tests/file/fopen_variation14.phpt @@ -90,7 +90,6 @@ function runtest($fileURIs) { ?> -===DONE=== --EXPECTF-- *** Testing fopen() : variation *** --- READ: file://fopen14.tmpDir/fopen_variation14.tmp --- @@ -131,4 +130,3 @@ Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): failed to open s test passed --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation15-win32.phpt b/ext/standard/tests/file/fopen_variation15-win32.phpt index 52f69db746..5439e0f637 100644 --- a/ext/standard/tests/file/fopen_variation15-win32.phpt +++ b/ext/standard/tests/file/fopen_variation15-win32.phpt @@ -102,7 +102,6 @@ function runtest($fileURIs) { ?> -===DONE=== --EXPECTF-- *** Testing fopen() : variation *** --- READ: file://fopen15.tmpDir\fopen_variation15.tmp --- @@ -189,4 +188,3 @@ test passed test passed --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation15.phpt b/ext/standard/tests/file/fopen_variation15.phpt index bad0a0b63c..9d0bdc51cb 100644 --- a/ext/standard/tests/file/fopen_variation15.phpt +++ b/ext/standard/tests/file/fopen_variation15.phpt @@ -94,7 +94,6 @@ function runtest($fileURIs) { ?> -===DONE=== --EXPECTF-- *** Testing fopen() : variation *** --- READ: file://fopen15.tmpDir/fopen_variation15.tmp --- @@ -135,4 +134,3 @@ Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): failed to open s test passed --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation16.phpt b/ext/standard/tests/file/fopen_variation16.phpt index 5888688fa8..6fe240bec9 100644 --- a/ext/standard/tests/file/fopen_variation16.phpt +++ b/ext/standard/tests/file/fopen_variation16.phpt @@ -65,10 +65,8 @@ function runtest() { rmdir($extraDir); } ?> -===DONE=== --EXPECT-- Not created in dir1 found file - not in dir1 Not created in dir1 found file - not in dir1 -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt index 5d639e8236..851493eb08 100644 --- a/ext/standard/tests/file/fopen_variation17.phpt +++ b/ext/standard/tests/file/fopen_variation17.phpt @@ -64,10 +64,8 @@ function runtest() { rmdir($extraDir); } ?> -===DONE=== --EXPECT-- Not created in dir1 found file for reading Not created in dir1 found file for reading -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation19.phpt b/ext/standard/tests/file/fopen_variation19.phpt index 069ce11170..58d69cc2cb 100644 --- a/ext/standard/tests/file/fopen_variation19.phpt +++ b/ext/standard/tests/file/fopen_variation19.phpt @@ -92,7 +92,6 @@ function writeFile($file) { ?> -===DONE=== --EXPECT-- *** Testing fopen() : variation *** *** testing reading of links *** @@ -107,4 +106,3 @@ link of link:Hello World again! again! again! soft link:Goodbye World hard link:Goodbye World link of link:Goodbye World -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index a3f5c1d3be..8d7e3b0384 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -121,7 +121,6 @@ function test_fopen($mode) { } ?> -===DONE=== --EXPECT-- --- testing include path --- @@ -145,4 +144,3 @@ in dir1 in dir1 in working dir in script dir -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation6.phpt b/ext/standard/tests/file/fopen_variation6.phpt index a3ce051deb..7a73aa8364 100644 --- a/ext/standard/tests/file/fopen_variation6.phpt +++ b/ext/standard/tests/file/fopen_variation6.phpt @@ -36,9 +36,7 @@ echo "\n"; unlink($absfile); unlink($relfile); ?> -===DONE=== --EXPECT-- *** Testing fopen() : variation *** This is an absolute file This is a relative file -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation7.phpt b/ext/standard/tests/file/fopen_variation7.phpt index 531b27e0bc..c4800ae9b2 100644 --- a/ext/standard/tests/file/fopen_variation7.phpt +++ b/ext/standard/tests/file/fopen_variation7.phpt @@ -56,10 +56,8 @@ function runtest() { } } ?> -===DONE=== --EXPECT-- created in working dir Not created in dir1 created in working dir Not created in dir1 -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index 3647191128..229edd5672 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -120,7 +120,6 @@ function test_fopen($mode) { } ?> -===DONE=== --EXPECT-- --- testing include path --- @@ -144,4 +143,3 @@ in dir1 in dir1 in working dir in script dir -===DONE=== diff --git a/ext/standard/tests/file/fopen_variation9.phpt b/ext/standard/tests/file/fopen_variation9.phpt index 5479ddcf2d..0f1c2bafb8 100644 --- a/ext/standard/tests/file/fopen_variation9.phpt +++ b/ext/standard/tests/file/fopen_variation9.phpt @@ -56,10 +56,8 @@ function runtest() { } } ?> -===DONE=== --EXPECT-- created in working dir Not created in dir1 created in working dir Not created in dir1 -===DONE=== diff --git a/ext/standard/tests/file/fputcsv.phpt b/ext/standard/tests/file/fputcsv.phpt index 5760882032..f7286254f2 100644 --- a/ext/standard/tests/file/fputcsv.phpt +++ b/ext/standard/tests/file/fputcsv.phpt @@ -55,8 +55,6 @@ echo '$list = ';var_export($res);echo ";\n"; @unlink($file); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- $list = array ( 0 => 'aaa,bbb', @@ -102,4 +100,3 @@ $list = array ( 18 => '"\\"","aaa"', 19 => '"\\""",aaa', ); -===DONE=== diff --git a/ext/standard/tests/file/fputcsv_variation15.phpt b/ext/standard/tests/file/fputcsv_variation15.phpt index 0e9d306ffa..1715d09e28 100644 --- a/ext/standard/tests/file/fputcsv_variation15.phpt +++ b/ext/standard/tests/file/fputcsv_variation15.phpt @@ -57,8 +57,6 @@ echo '$list = ';var_export($res);echo ";\n"; @unlink($file); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- $list = array ( 0 => 'aaa,bbb', @@ -104,4 +102,3 @@ $list = array ( 18 => '"/"","aaa"', 19 => '"/""",aaa', ); -===DONE=== diff --git a/ext/standard/tests/file/fputcsv_variation16.phpt b/ext/standard/tests/file/fputcsv_variation16.phpt index 1bae60da20..b5434312c6 100644 --- a/ext/standard/tests/file/fputcsv_variation16.phpt +++ b/ext/standard/tests/file/fputcsv_variation16.phpt @@ -14,8 +14,6 @@ rewind($stream); echo stream_get_contents($stream); fclose($stream); ?> -===DONE=== --EXPECT-- \ "\""" -===DONE=== diff --git a/ext/standard/tests/file/fstat_basic.phpt b/ext/standard/tests/file/fstat_basic.phpt index e1f92a7926..d5fdd44e34 100644 --- a/ext/standard/tests/file/fstat_basic.phpt +++ b/ext/standard/tests/file/fstat_basic.phpt @@ -6,7 +6,6 @@ $fp = fopen (__FILE__, 'r'); var_dump(fstat( $fp ) ); fclose($fp); ?> -===DONE=== --EXPECTF-- array(26) { [0]=> @@ -62,4 +61,3 @@ array(26) { ["blocks"]=> int(%i) } -===DONE=== diff --git a/ext/standard/tests/file/fstat_variation8.phpt b/ext/standard/tests/file/fstat_variation8.phpt index c738b1bcaa..4376d6e563 100644 --- a/ext/standard/tests/file/fstat_variation8.phpt +++ b/ext/standard/tests/file/fstat_variation8.phpt @@ -27,7 +27,5 @@ if ($failed !== true) { ?> -===DONE=== --EXPECT-- PASSED: all elements are the same -===DONE=== diff --git a/ext/standard/tests/file/glob_variation3.phpt b/ext/standard/tests/file/glob_variation3.phpt index 5db242825e..4bf008a9a7 100644 --- a/ext/standard/tests/file/glob_variation3.phpt +++ b/ext/standard/tests/file/glob_variation3.phpt @@ -15,7 +15,6 @@ var_dump(glob("$path/directly_not_exists")); var_dump(empty(ini_get('open_basedir'))); ?> -==DONE== --EXPECT-- array(0) { } @@ -30,4 +29,3 @@ array(0) { array(0) { } bool(true) -==DONE== diff --git a/ext/standard/tests/file/glob_variation4.phpt b/ext/standard/tests/file/glob_variation4.phpt index 6544c96944..b96f14fb38 100644 --- a/ext/standard/tests/file/glob_variation4.phpt +++ b/ext/standard/tests/file/glob_variation4.phpt @@ -15,7 +15,6 @@ var_dump(glob("$path/directly_not_exists")); var_dump($path == ini_get('open_basedir')); ?> -==DONE== --EXPECT-- array(0) { } @@ -30,4 +29,3 @@ array(0) { array(0) { } bool(true) -==DONE== diff --git a/ext/standard/tests/file/glob_variation5.phpt b/ext/standard/tests/file/glob_variation5.phpt index 800305aabd..e03bc08d56 100644 --- a/ext/standard/tests/file/glob_variation5.phpt +++ b/ext/standard/tests/file/glob_variation5.phpt @@ -17,7 +17,6 @@ var_dump(glob("$path/directly_not_exists")); var_dump('/tmp' == ini_get('open_basedir')); ?> -==DONE== --EXPECT-- bool(false) bool(false) @@ -26,4 +25,3 @@ bool(false) bool(false) bool(false) bool(true) -==DONE== diff --git a/ext/standard/tests/file/glob_variation6.phpt b/ext/standard/tests/file/glob_variation6.phpt index e0eaeb8c6e..553819326f 100644 --- a/ext/standard/tests/file/glob_variation6.phpt +++ b/ext/standard/tests/file/glob_variation6.phpt @@ -17,7 +17,6 @@ var_dump(glob("$path/directly_not_exists")); var_dump('c:\\windows' == ini_get('open_basedir')); ?> -==DONE== --EXPECT-- array(0) { } @@ -32,4 +31,3 @@ array(0) { array(0) { } bool(true) -==DONE== diff --git a/ext/standard/tests/file/lchgrp_basic.phpt b/ext/standard/tests/file/lchgrp_basic.phpt index fa97ce86ef..283d805a94 100644 --- a/ext/standard/tests/file/lchgrp_basic.phpt +++ b/ext/standard/tests/file/lchgrp_basic.phpt @@ -18,7 +18,6 @@ var_dump( lchgrp( $filename, $gid ) ); var_dump( filegroup( $symlink ) === $gid ); ?> -===DONE=== --CLEAN-- <?php @@ -33,4 +32,3 @@ bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/standard/tests/file/lchown_basic.phpt b/ext/standard/tests/file/lchown_basic.phpt index e38bbda1be..d6a6072792 100644 --- a/ext/standard/tests/file/lchown_basic.phpt +++ b/ext/standard/tests/file/lchown_basic.phpt @@ -25,7 +25,6 @@ var_dump( lchown( $filename, $uid ) ); var_dump( fileowner( $symlink ) === $uid ); ?> -===DONE=== --CLEAN-- <?php @@ -41,4 +40,3 @@ bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/standard/tests/file/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt index 5f9e8dbe69..093c0c5b31 100644 --- a/ext/standard/tests/file/lchown_error.phpt +++ b/ext/standard/tests/file/lchown_error.phpt @@ -28,7 +28,6 @@ var_dump( lchown( 'foobar_lchown.txt', $uid ) ); var_dump( lchown( $filename, -5 ) ); ?> -===DONE=== --CLEAN-- <?php @@ -44,4 +43,3 @@ bool(false) Warning: lchown(): %r(Operation not permitted|Invalid argument)%r in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/file/lstat_stat_variation3.phpt b/ext/standard/tests/file/lstat_stat_variation3.phpt index 962f1df5b2..15fc5f0b53 100644 --- a/ext/standard/tests/file/lstat_stat_variation3.phpt +++ b/ext/standard/tests/file/lstat_stat_variation3.phpt @@ -46,7 +46,6 @@ $keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, "rdev", "size", "atime", "mtime", "blksize", "blocks"); var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); ?> -===Done=== --CLEAN-- <?php $file_path = __DIR__; @@ -59,4 +58,3 @@ bool(true) bool(true) bool(true) bool(true) -===Done=== diff --git a/ext/standard/tests/file/mkdir_variation5-win32.phpt b/ext/standard/tests/file/mkdir_variation5-win32.phpt index b805dee3be..e2eea07f52 100644 --- a/ext/standard/tests/file/mkdir_variation5-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation5-win32.phpt @@ -68,7 +68,6 @@ foreach($dirs as $dir) { rmdir($workDir); ?> -===DONE=== --EXPECTF-- *** Testing mkdir() : variation *** -- creating mkdirVar5.tmp\aSubDir -- @@ -102,4 +101,3 @@ Directory created Directory created -- creating /%s/mkdirVar5.tmp/aSubDir -- Directory created -===DONE=== diff --git a/ext/standard/tests/file/mkdir_variation5.phpt b/ext/standard/tests/file/mkdir_variation5.phpt index ea60edf42f..c8e8b8d3ea 100644 --- a/ext/standard/tests/file/mkdir_variation5.phpt +++ b/ext/standard/tests/file/mkdir_variation5.phpt @@ -63,7 +63,6 @@ foreach($dirs as $dir) { rmdir($workDir); ?> -===DONE=== --EXPECTF-- *** Testing mkdir() : variation *** -- creating mkdirVar5.tmp/aSubDir -- @@ -95,4 +94,3 @@ Directory created Directory created -- creating %s//mkdirVar5.tmp//aSubDir -- Directory created -===DONE=== diff --git a/ext/standard/tests/file/parse_ini_file_variation1.phpt b/ext/standard/tests/file/parse_ini_file_variation1.phpt index 666ea433b1..82465d9b17 100644 --- a/ext/standard/tests/file/parse_ini_file_variation1.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation1.phpt @@ -30,7 +30,6 @@ var_dump($a); unlink($output_file); ?> -===DONE=== --EXPECT-- *** Testing parse_ini_file() : variation *** array(2) { @@ -65,4 +64,3 @@ array(2) { string(9) "different" } } -===DONE=== diff --git a/ext/standard/tests/file/parse_ini_file_variation2.phpt b/ext/standard/tests/file/parse_ini_file_variation2.phpt index e7b9091737..2ba810ae2e 100644 --- a/ext/standard/tests/file/parse_ini_file_variation2.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation2.phpt @@ -47,7 +47,6 @@ $a = parse_ini_file($output_file, true); var_dump($a); unlink($output_file); ?> -===DONE=== --EXPECT-- *** Testing parse_ini_file() : variation *** array(8) { @@ -108,4 +107,3 @@ array(8) { string(0) "" } } -===DONE=== diff --git a/ext/standard/tests/file/parse_ini_file_variation3.phpt b/ext/standard/tests/file/parse_ini_file_variation3.phpt index acdb4d83eb..23b0ec4a8a 100644 --- a/ext/standard/tests/file/parse_ini_file_variation3.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation3.phpt @@ -52,7 +52,6 @@ file_put_contents($output_file, $iniContent); var_dump(parse_ini_file($iniFile)); ?> -===Done=== --CLEAN-- <?php @@ -98,4 +97,3 @@ array(10) { ["docref_ext"]=> string(5) ".html" } -===Done=== diff --git a/ext/standard/tests/file/pathinfo_variation3.phpt b/ext/standard/tests/file/pathinfo_variation3.phpt index 014cc90e9a..251a20496f 100644 --- a/ext/standard/tests/file/pathinfo_variation3.phpt +++ b/ext/standard/tests/file/pathinfo_variation3.phpt @@ -32,7 +32,6 @@ var_dump(pathinfo($testfile, PATHINFO_DIRNAME|PATHINFO_BASENAME)); ?> -===DONE=== --EXPECTF-- *** Testing pathinfo() : usage variation *** array(4) { @@ -77,4 +76,3 @@ string(17) "/usr/include/arpa" string(6) "inet.h" string(17) "/usr/include/arpa" string(17) "/usr/include/arpa" -===DONE=== diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt index 04fdafca79..14c73ba179 100644 --- a/ext/standard/tests/file/readfile_variation10-win32.phpt +++ b/ext/standard/tests/file/readfile_variation10-win32.phpt @@ -45,7 +45,6 @@ foreach($names_arr as $key => $value) { }; ?> -===Done=== --EXPECTF-- *** Testing readfile() : variation *** @@ -86,4 +85,3 @@ Warning: readfile(/no/such/file/dir): failed to open stream: No such file or dir -- Filename: php/php -- Warning: readfile(php/php): failed to open stream: No such file or directory in %s on line %d -===Done=== diff --git a/ext/standard/tests/file/readfile_variation6.phpt b/ext/standard/tests/file/readfile_variation6.phpt index 38e0f23958..7e751753ff 100644 --- a/ext/standard/tests/file/readfile_variation6.phpt +++ b/ext/standard/tests/file/readfile_variation6.phpt @@ -42,8 +42,6 @@ function runtest() { } ?> -===DONE=== --EXPECT-- *** Testing readfile() : variation *** File in include path -===DONE=== diff --git a/ext/standard/tests/file/readfile_variation7.phpt b/ext/standard/tests/file/readfile_variation7.phpt index 955d77bd27..71f2d0beb5 100644 --- a/ext/standard/tests/file/readfile_variation7.phpt +++ b/ext/standard/tests/file/readfile_variation7.phpt @@ -42,8 +42,6 @@ function runtest() { } ?> -===DONE=== --EXPECT-- *** Testing readfile() : variation *** File in script location -===DONE=== diff --git a/ext/standard/tests/file/realpath_variation2.phpt b/ext/standard/tests/file/realpath_variation2.phpt index 9b0393a5f8..142e8846da 100644 --- a/ext/standard/tests/file/realpath_variation2.phpt +++ b/ext/standard/tests/file/realpath_variation2.phpt @@ -35,7 +35,6 @@ foreach($paths as $path) { }; ?> -===DONE=== --EXPECTF-- *** Testing realpath() : variation *** @@ -71,4 +70,3 @@ bool(false) --\tmp\-- bool(false) -===DONE=== diff --git a/ext/standard/tests/file/rename_basic.phpt b/ext/standard/tests/file/rename_basic.phpt index 49de9ac042..4313f061d6 100644 --- a/ext/standard/tests/file/rename_basic.phpt +++ b/ext/standard/tests/file/rename_basic.phpt @@ -31,7 +31,6 @@ $keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); ?> -===Done=== --CLEAN-- <?php unlink(__DIR__."/rename_basic_new.tmp"); @@ -42,4 +41,3 @@ bool(true) bool(false) bool(true) bool(true) -===Done=== diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt index ac8c9dd368..ca7e88f589 100644 --- a/ext/standard/tests/file/rmdir_variation3-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt @@ -71,7 +71,6 @@ foreach($dirs as $dir) { rmdir($workDir); ?> -===DONE=== --EXPECTF-- *** Testing rmdir() : variation *** -- removing rmdirVar3.tmp\aSubDir -- @@ -105,4 +104,3 @@ Directory removed Directory removed -- removing /%s/rmdirVar3.tmp/aSubDir -- Directory removed -===DONE=== diff --git a/ext/standard/tests/file/rmdir_variation3.phpt b/ext/standard/tests/file/rmdir_variation3.phpt index 095cde0880..c0714144e5 100644 --- a/ext/standard/tests/file/rmdir_variation3.phpt +++ b/ext/standard/tests/file/rmdir_variation3.phpt @@ -61,7 +61,6 @@ foreach($dirs as $dir) { rmdir($workDir); ?> -===DONE=== --EXPECTF-- *** Testing rmdir() : variation *** -- removing rmdirVar3.tmp/aSubDir -- @@ -93,4 +92,3 @@ Directory removed Directory removed -- removing %s//rmdirVar3.tmp//aSubDir -- Directory removed -===DONE=== diff --git a/ext/standard/tests/file/stream_rfc2397_001.phpt b/ext/standard/tests/file/stream_rfc2397_001.phpt index d88e778623..3036620eb5 100644 --- a/ext/standard/tests/file/stream_rfc2397_001.phpt +++ b/ext/standard/tests/file/stream_rfc2397_001.phpt @@ -15,8 +15,6 @@ unset($data); var_dump(stream_get_contents($file)); ?> -===DONE=== --EXPECT-- string(11) "hello world" string(11) "hello world" -===DONE=== diff --git a/ext/standard/tests/file/stream_rfc2397_002.phpt b/ext/standard/tests/file/stream_rfc2397_002.phpt index 6c58d0d7ad..9ec21fb90a 100644 --- a/ext/standard/tests/file/stream_rfc2397_002.phpt +++ b/ext/standard/tests/file/stream_rfc2397_002.phpt @@ -32,8 +32,6 @@ foreach($streams as $stream) } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- array(7) { ["base64"]=> @@ -167,4 +165,3 @@ array(10) { string(34) "data://text/plain;foo=bar;bar=baz," } string(3) "bar" -===DONE=== diff --git a/ext/standard/tests/file/stream_rfc2397_003.phpt b/ext/standard/tests/file/stream_rfc2397_003.phpt index 291b1301c5..1797d02ab5 100644 --- a/ext/standard/tests/file/stream_rfc2397_003.phpt +++ b/ext/standard/tests/file/stream_rfc2397_003.phpt @@ -28,11 +28,8 @@ foreach($streams as $original => $stream) } ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- string(12) "A brief note" string(40) "select_vcount,fcol_from_fieldtable/local" string(13) "foobar foobar" bool(true) -===DONE=== diff --git a/ext/standard/tests/file/stream_rfc2397_004.phpt b/ext/standard/tests/file/stream_rfc2397_004.phpt index 4c13a5f9cd..239a12e3bf 100644 --- a/ext/standard/tests/file/stream_rfc2397_004.phpt +++ b/ext/standard/tests/file/stream_rfc2397_004.phpt @@ -20,8 +20,6 @@ foreach($streams as $stream) } ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- string(5) ";test" string(4) "test" @@ -29,4 +27,3 @@ string(4) "test" bool(false) string(5) "Hello" string(3) "a,b" -===DONE=== diff --git a/ext/standard/tests/file/stream_rfc2397_005.phpt b/ext/standard/tests/file/stream_rfc2397_005.phpt index ab03f399f3..fb1cb85a07 100644 --- a/ext/standard/tests/file/stream_rfc2397_005.phpt +++ b/ext/standard/tests/file/stream_rfc2397_005.phpt @@ -23,8 +23,6 @@ foreach($streams as $stream) } ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- string(12) "A brief note" string(40) "select_vcount,fcol_from_fieldtable/local" @@ -35,4 +33,3 @@ string(4) "test" bool(false) string(5) "Hello" string(3) "a,b" -===DONE=== diff --git a/ext/standard/tests/file/stream_rfc2397_006.phpt b/ext/standard/tests/file/stream_rfc2397_006.phpt index 18d1c1b280..bc959bb3a9 100644 --- a/ext/standard/tests/file/stream_rfc2397_006.phpt +++ b/ext/standard/tests/file/stream_rfc2397_006.phpt @@ -22,8 +22,6 @@ foreach($streams as $stream) } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- file_get_contents() expects parameter 1 to be a valid path, string given file_get_contents() expects parameter 1 to be a valid path, string given @@ -33,4 +31,3 @@ bool(false) Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhc=): failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/file/stream_rfc2397_007.phpt b/ext/standard/tests/file/stream_rfc2397_007.phpt index 447b0246ae..a1558980c9 100644 --- a/ext/standard/tests/file/stream_rfc2397_007.phpt +++ b/ext/standard/tests/file/stream_rfc2397_007.phpt @@ -79,8 +79,6 @@ foreach($streams as $stream) } ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- ===data:,012345=== int(0) @@ -142,4 +140,3 @@ bool(false) int(-1) bool(false) bool(false) -===DONE=== diff --git a/ext/standard/tests/file/touch_variation5-win32.phpt b/ext/standard/tests/file/touch_variation5-win32.phpt index 5761824ef3..02cc4cfb4e 100644 --- a/ext/standard/tests/file/touch_variation5-win32.phpt +++ b/ext/standard/tests/file/touch_variation5-win32.phpt @@ -150,7 +150,6 @@ function get_atime($path) { ?> -===DONE=== --EXPECTF-- *** Testing touch() : variation *** @@ -226,4 +225,3 @@ PASSED: %s/touchVar5.tmp/aSubDirOrFile/ - touched PASSED: touchVar5.tmp//aSubDirOrFile - touched --- testing %s//touchVar5.tmp//aSubDirOrFile --- PASSED: %s//touchVar5.tmp//aSubDirOrFile - touched -===DONE=== diff --git a/ext/standard/tests/file/touch_variation5.phpt b/ext/standard/tests/file/touch_variation5.phpt index 7eb4aaa7e0..a42e509809 100644 --- a/ext/standard/tests/file/touch_variation5.phpt +++ b/ext/standard/tests/file/touch_variation5.phpt @@ -150,7 +150,6 @@ function get_atime($path) { ?> -===DONE=== --EXPECTF-- *** Testing touch() : variation *** @@ -226,4 +225,3 @@ PASSED: /%s/touchVar5.tmp/aSubDirOrFile/ - touched PASSED: touchVar5.tmp//aSubDirOrFile - touched --- testing /%s//touchVar5.tmp//aSubDirOrFile --- PASSED: /%s//touchVar5.tmp//aSubDirOrFile - touched -===DONE=== diff --git a/ext/standard/tests/file/touch_variation6-win32.phpt b/ext/standard/tests/file/touch_variation6-win32.phpt index 197078db3b..d03671fff8 100644 --- a/ext/standard/tests/file/touch_variation6-win32.phpt +++ b/ext/standard/tests/file/touch_variation6-win32.phpt @@ -156,7 +156,6 @@ function get_atime($path) { ?> -===DONE=== --EXPECTF-- *** Testing touch() : variation *** @@ -238,4 +237,3 @@ PASSED: touchVar5.tmp\\aSubDirOrFile - touched PASSED: %s\\touchVar5.tmp\\aSubDirOrFile - touched --- testing /%s/touchVar5.tmp/aSubDirOrFile --- PASSED: /%s/touchVar5.tmp/aSubDirOrFile - touched -===DONE=== diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt index 585b8f87fb..3a56a73a5a 100644 --- a/ext/standard/tests/file/unlink_variation10.phpt +++ b/ext/standard/tests/file/unlink_variation10.phpt @@ -80,7 +80,6 @@ function test_link($linkedDir, $toLinkTo, $tounlink, $softlink) { ?> -===DONE=== --EXPECTF-- *** Testing unlink() : variation *** -- unlinking soft link unlinkVar10.tmp/subDir.tmp -- @@ -103,4 +102,3 @@ directory unlinked --- try to unlink a directory --- Warning: unlink(unlinkVar10.tmp/linkme.tmp): %s in %s on line %d -===DONE=== diff --git a/ext/standard/tests/file/unlink_variation6.phpt b/ext/standard/tests/file/unlink_variation6.phpt index 64c009bf91..ff66cd2195 100644 --- a/ext/standard/tests/file/unlink_variation6.phpt +++ b/ext/standard/tests/file/unlink_variation6.phpt @@ -32,10 +32,8 @@ function f_exists($file) { } } ?> -===DONE=== --EXPECT-- *** Testing unlink() : variation: contexts and relative files *** subdir/testfile.txt exists bool(true) subdir/testfile.txt doesn't exist -===DONE=== diff --git a/ext/standard/tests/file/unlink_variation8-win32.phpt b/ext/standard/tests/file/unlink_variation8-win32.phpt index 9ee6b49d2a..efd24a22cb 100644 --- a/ext/standard/tests/file/unlink_variation8-win32.phpt +++ b/ext/standard/tests/file/unlink_variation8-win32.phpt @@ -76,7 +76,6 @@ function test_realfile($file, $tounlink) { } } ?> -===DONE=== --EXPECTF-- *** Testing unlink() : variation *** -- removing unlinkVar8.tmp/file.tmp -- @@ -110,4 +109,3 @@ Warning: unlink(%s/unlinkVar8.tmp/file.tmp/): No such file or directory in %s on file removed -- removing %s//unlinkVar8.tmp//file.tmp -- file removed -===DONE=== diff --git a/ext/standard/tests/file/unlink_variation8.phpt b/ext/standard/tests/file/unlink_variation8.phpt index ab074c7849..ee2540dd69 100644 --- a/ext/standard/tests/file/unlink_variation8.phpt +++ b/ext/standard/tests/file/unlink_variation8.phpt @@ -107,7 +107,6 @@ function test_link($linkedfile, $toLinkTo, $tounlink, $softlink) { ?> -===DONE=== --EXPECTF-- *** Testing unlink() : variation *** -- removing unlinkVar8.tmp/file.tmp -- @@ -203,4 +202,3 @@ file removed file unlinked -- unlinking hard link /%s//unlinkVar8.tmp//file.tmp -- file unlinked -===DONE=== diff --git a/ext/standard/tests/file/unlink_variation9-win32.phpt b/ext/standard/tests/file/unlink_variation9-win32.phpt index 2331c9edc8..3c9d5e4a14 100644 --- a/ext/standard/tests/file/unlink_variation9-win32.phpt +++ b/ext/standard/tests/file/unlink_variation9-win32.phpt @@ -78,7 +78,6 @@ foreach($files as $fileToUnlink) { rmdir($workDir); ?> -===DONE=== --EXPECTF-- *** Testing unlink() : variation *** -- removing unlinkVar9.tmp\file.tmp -- @@ -114,4 +113,3 @@ file removed file removed -- removing /%s/unlinkVar9.tmp/file.tmp -- file removed -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug54028.phpt b/ext/standard/tests/file/windows_mb_path/bug54028.phpt index 7b304c70f4..9c11be61f4 100644 --- a/ext/standard/tests/file/windows_mb_path/bug54028.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug54028.phpt @@ -43,7 +43,6 @@ foreach ($dirs as $d) { rmdir($prefix); ?> -===DONE=== --EXPECT-- Returned (a) Encoding: ASCII @@ -66,4 +65,3 @@ Encoding: UTF-8 Returned (王) Encoding: UTF-8 -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt b/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt index 81be60e640..87e7c162b0 100644 --- a/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt @@ -40,7 +40,6 @@ foreach ($dirs as $d) { rmdir($prefix); ?> -===DONE=== --EXPECTF-- bool(true) string(%d) "%sa" @@ -63,4 +62,3 @@ bool(true) bool(true) string(%d) "%s汚れã¦æŽ˜ã‚‹" bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug54977.phpt b/ext/standard/tests/file/windows_mb_path/bug54977.phpt index 173aed480f..b8749576ae 100644 --- a/ext/standard/tests/file/windows_mb_path/bug54977.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug54977.phpt @@ -39,7 +39,6 @@ foreach ($paths as $d) { rmdir($prefix); ?> -===DONE=== --EXPECT-- testBug54977 windows_mb_path @@ -49,4 +48,3 @@ windows_mb_path 汚れã¦æŽ˜ã‚‹.test 王 王.test -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug61315.phpt b/ext/standard/tests/file/windows_mb_path/bug61315.phpt index 1e97636175..8729aafe09 100644 --- a/ext/standard/tests/file/windows_mb_path/bug61315.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug61315.phpt @@ -44,7 +44,6 @@ rmdir($d1); rmdir($prefix); ?> -===DONE=== --EXPECTF-- Active code page: 65001 getting basename of %s\ソフト @@ -60,4 +59,3 @@ string(%d) "%s\フォルダ" Active code page: %d bool(true) bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug64506.phpt b/ext/standard/tests/file/windows_mb_path/bug64506.phpt index 44d5c6f5f7..fa9653fbd2 100644 --- a/ext/standard/tests/file/windows_mb_path/bug64506.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug64506.phpt @@ -35,7 +35,6 @@ get_basename_with_cp($fnw, 65001); var_dump(unlink($fnw)); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\Å¡.txt" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug64699.phpt b/ext/standard/tests/file/windows_mb_path/bug64699.phpt index db488c15ed..8b6859176f 100644 --- a/ext/standard/tests/file/windows_mb_path/bug64699.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug64699.phpt @@ -48,7 +48,6 @@ rmdir($prefix); set_active_cp($old_cp); ?> -===DONE=== --EXPECTF-- Active code page: 65001 filetype()[dir ] == is_dir()[dir ] -> OK: . @@ -60,4 +59,3 @@ filetype()[dir ] == is_dir()[dir ] -> OK: ゾ filetype()[dir ] == is_dir()[dir ] -> OK: 多国語 filetype()[dir ] == is_dir()[dir ] -> OK: 表 Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug70903.phpt b/ext/standard/tests/file/windows_mb_path/bug70903.phpt index 8d529484be..48cbf524c9 100644 --- a/ext/standard/tests/file/windows_mb_path/bug70903.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug70903.phpt @@ -37,7 +37,6 @@ rmdir($d0); rmdir($prefix); ?> -===DONE=== --EXPECTF-- Active code page: 65001 getting basename of %s\ı @@ -46,4 +45,3 @@ bool(true) string(%d) "%s\ı" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug71509.phpt b/ext/standard/tests/file/windows_mb_path/bug71509.phpt index ed094c6b7a..377b5d7e2a 100644 --- a/ext/standard/tests/file/windows_mb_path/bug71509.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug71509.phpt @@ -37,8 +37,6 @@ var_dump(file_exists($outputfile_zip)); remove_data("bug71509"); ?> -===DONE=== --EXPECT-- bool(true) bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug74923.phpt b/ext/standard/tests/file/windows_mb_path/bug74923.phpt index 210a49732f..544a7110ee 100644 --- a/ext/standard/tests/file/windows_mb_path/bug74923.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug74923.phpt @@ -19,8 +19,6 @@ $s = '\\\\hello.com' . str_repeat('\\', 260); var_dump($s, @stat($s)); ?> -===DONE=== --EXPECTF-- string(271) "%s" bool(false) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt b/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt index a56fecbbe3..c841aff194 100644 --- a/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt @@ -67,7 +67,6 @@ foreach ($obj as $file) { rmdir($d0); rmdir($prefix); ?> -===DONE=== --EXPECTF-- string(4) "òåñò" bool(true) @@ -75,4 +74,3 @@ string(%d) "%sbug75063-cp1251%eòåñò" string(8) "code.php" string(8) "test.txt" string(8) "òàñò.txt" -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt b/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt index beaf690dea..49a5229cf6 100644 --- a/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt @@ -52,7 +52,6 @@ print(shell_exec(getenv('TEST_PHP_EXECUTABLE') . " -nf code.php")); chdir($old_cwd); ?> -===DONE=== --CLEAN-- <?php $dir_basename = "теÑÑ‚"; @@ -76,4 +75,3 @@ string(%d) "%sbug75063-utf8%eтеÑÑ‚" string(8) "code.php" string(8) "test.txt" string(12) "таÑÑ‚.txt" -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/recursive_it.phpt b/ext/standard/tests/file/windows_mb_path/recursive_it.phpt index b42f796ee3..538aa0ad21 100644 --- a/ext/standard/tests/file/windows_mb_path/recursive_it.phpt +++ b/ext/standard/tests/file/windows_mb_path/recursive_it.phpt @@ -57,8 +57,6 @@ do { } while (__DIR__ != $dir);*/ ?> -==DONE== --EXPECTF-- string(%d) "%shello.txt" bool(false) -==DONE== diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt index 9390b3755f..39a6d30c77 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt @@ -36,10 +36,8 @@ if ($f) { remove_data("file_big5"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt index ad16770381..b0caf3b73f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt @@ -39,7 +39,6 @@ var_dump(rmdir($subpath)); remove_data("dir_big5"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s´ú¸Õ¦h¦r¸`¸ô®|5\´ú¸Õ¦h¦r¸`¸ô®|4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt index 088c46d7b6..5cc2c736ec 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt @@ -42,7 +42,6 @@ var_dump(unlink($fn)); remove_data("file_big5"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -55,4 +54,3 @@ bool(true) string(%d) "%s測試多å—節路徑25" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt index f738b9f5be..4a6dd19864 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_big5"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt index 45d87d1cbe..418e33f927 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_big5"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\測試多å—節路徑5\測試多å—節路徑4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt index 07f48eb218..e9294ababd 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt @@ -39,7 +39,6 @@ var_dump(unlink($fn)); remove_data("file_big5"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -52,4 +51,3 @@ bool(true) string(%d) "%s\測試多å—節路徑25" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt index d7b093281e..6de73c02a8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_cp1250"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt index 2c629e18ac..9276dcfc2d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1250"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\Å¡Ä‘Äćž_Å ÄČĆŽ42\Å¡Ä‘Äćž_Å ÄČĆŽ4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt index 77a5bf6a08..82255919ab 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt @@ -37,7 +37,6 @@ get_basename_with_cp($fn, 65001); remove_data("dir_cp1250"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -49,4 +48,3 @@ string(23) "Å¡Ä‘Äćž_Å ÄČĆŽ33" bool(true) string(%d) "%s\Å¡Ä‘Äćž_Å ÄČĆŽ33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt index f88cb70ac6..d359158564 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_cp1250"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt index eca9479978..1d29fe7f98 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1250"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\ÃrvÃztűrÅ‘ tükörfúrógép42\ÃrvÃztűrÅ‘ tükörfúrógép4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt index 910db7b04c..d5230c3782 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt @@ -37,7 +37,6 @@ get_basename_with_cp($fn, 65001); remove_data("dir_cp1250"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -49,4 +48,3 @@ string(33) "ÃrvÃztűrÅ‘ tükörfúrógép33" bool(true) string(%d) "%s\ÃrvÃztűrÅ‘ tükörfúrógép33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt index 1688d75a02..aeedc2c875 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt @@ -36,9 +36,7 @@ if ($f) { remove_data("file_cp1251"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt index 049800a0aa..05eb269daa 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt @@ -39,7 +39,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1251"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\ïðèâåò3\ïðèâåò4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt index 7d3290d99e..06bc8d2d87 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt @@ -41,7 +41,6 @@ var_dump(unlink($fn)); remove_data("file_cp1251"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -54,4 +53,3 @@ bool(true) string(%d) "%s\ïðèâåò7" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt index 27ba191d0d..dc870e829d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt @@ -33,9 +33,7 @@ if ($f) { remove_data("file_cp1251"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt index a6baa4b9c1..5cabf45641 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1251"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\привет3\привет4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt index c46bc48645..b5192dcf84 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt @@ -38,7 +38,6 @@ var_dump(unlink($fn)); remove_data("file_cp1251"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\привет7" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt index c4aa6f831c..9694e54ffd 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt @@ -36,9 +36,7 @@ if ($f) { remove_data("file_cp1251"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt index 9265f8ec0b..7416b0752d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt @@ -39,7 +39,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1251"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\привет3\привет4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt index 71ecc73bc9..3788ef2411 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt @@ -41,7 +41,6 @@ var_dump(unlink($fn)); remove_data("file_cp1251"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -54,4 +53,3 @@ bool(true) string(%d) "%s\привет7" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt index 2ebb63a688..402102e7ee 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt @@ -33,10 +33,8 @@ system("dir /b " . $fn); remove_data("file"); ?> -===DONE=== --EXPECTF-- string(%d) "%s\gefäß" bool(true) bool(true) gefäß -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt index dc673c260b..8a601bf666 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_cp1252"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(%d) "hallo " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt index eff0c923e8..e328576394 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1252"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\tschüß3\tschüß4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt index d0e39c0513..dc042a0475 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt @@ -38,7 +38,6 @@ var_dump(unlink($fn)); remove_data("dir_cp1252"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\tschüß7" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt index c3b3edb7ee..264558a657 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt @@ -33,9 +33,7 @@ if ($f) { remove_data("file2_cp1252"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(4) "hola" bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt index 2e97e78460..e35b2c5508 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir2_cp1252"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\Voláçao3\Voláçao4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt index c6a135f567..1945fc54be 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt @@ -38,7 +38,6 @@ var_dump(unlink($fn)); remove_data("dir2_cp1252"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\Voláçao7" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt index 07cf3c8e6c..08ab2aa7bb 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt @@ -36,10 +36,8 @@ if ($f) { remove_data("file_cp1253"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt index 9f03a9115c..b799fec4db 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt @@ -39,7 +39,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1253"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\äéáäñïìÞ äïêéìÞò42\äéáäñïìÞ äïêéìÞò4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt index 1ab6f658c0..c1ea99e32b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt @@ -40,7 +40,6 @@ get_basename_with_cp($fn, 1253); remove_data("dir_cp1253"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -52,4 +51,3 @@ string(%d) "äéáäñïìÞ äïêéìÞò33" bool(true) string(%d) "%s\äéáäñïìÞ äïêéìÞò33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt index 64ad358b5c..675bdd12c4 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_cp1253"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt index a178ea574a..01b489af9c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1253"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\διαδÏομή δοκιμής42\διαδÏομή δοκιμής4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt index a46a8854ce..8210704b3f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt @@ -37,7 +37,6 @@ get_basename_with_cp($fn, 65001); remove_data("dir_cp1253"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -49,4 +48,3 @@ string(33) "διαδÏομή δοκιμής33" bool(true) string(%d) "%s\διαδÏομή δοκιμής33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt index 9d92267b01..1ceefc759e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt @@ -36,10 +36,8 @@ if ($f) { remove_data("file_cp1254"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt index 8f79a2982b..9bb34e5316 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt @@ -39,7 +39,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1254"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\çokbaytlý iþleri42\çokbaytlý iþleri4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt index d924f87edd..4de9478b32 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt @@ -40,7 +40,6 @@ get_basename_with_cp($fn, 1254); remove_data("dir_cp1254"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -52,4 +51,3 @@ string(%d) "çokbaytlý iþleri33" bool(true) string(%d) "%s\çokbaytlý iþleri33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt index da264f9e3e..531aab848a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt @@ -34,10 +34,8 @@ system("dir /b \"" . $fn . "\""); remove_data("file_cp1254"); ?> -===DONE=== --EXPECTF-- string(%d) "%s\çokbaytlý iþleri" bool(true) bool(true) çokbaytlý iþleri -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt index b79e0f466f..39308b3368 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_cp1254"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt index 2966eebab4..c905c99b35 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1254"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\çokbaytlı iÅŸleri42\çokbaytlı iÅŸleri4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt index a8b1a9a67f..1f0c7816ec 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt @@ -37,7 +37,6 @@ get_basename_with_cp($fn, 65001); remove_data("dir_cp1254"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -49,4 +48,3 @@ string(%d) "çokbaytlı iÅŸleri33" bool(true) string(%d) "%s\çokbaytlı iÅŸleri33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt index a08dfc3e30..a1dcf7c90c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt @@ -31,10 +31,8 @@ system("dir /b \"" . $fn . "\""); remove_data("file_cp1254"); ?> -===DONE=== --EXPECTF-- string(%d) "%s\çokbaytlı iÅŸleri" bool(true) bool(true) çokbaytlı iÅŸleri -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt index db96aa08d6..26388620a1 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt @@ -36,10 +36,8 @@ if ($f) { remove_data("file_cp1255"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt index 4da386eaa4..f80047f07f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt @@ -39,7 +39,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1255"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\ëììéí îøåáéí42\ëììéí îøåáéí4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt index e5b6f4cf77..4b7ac57968 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt @@ -40,7 +40,6 @@ get_basename_with_cp($fn, 1255); remove_data("dir_cp1255"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -52,4 +51,3 @@ string(%d) "ëììéí îøåáéí33" bool(true) string(%d) "%s\ëììéí îøåáéí33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt index b8937a2f9e..c9517a18e3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_cp1255"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt index dc47630450..cf5be0bc21 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1255"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%s) "%s\×›×œ×œ×™× ×ž×¨×•×‘×™×42\×›×œ×œ×™× ×ž×¨×•×‘×™×4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt index 109d2dbd64..363d1b02b5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt @@ -37,7 +37,6 @@ get_basename_with_cp($fn, 65001); remove_data("dir_cp1255"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -49,4 +48,3 @@ string(%s) "×›×œ×œ×™× ×ž×¨×•×‘×™×33" bool(true) string(%d) "%s\×›×œ×œ×™× ×ž×¨×•×‘×™×33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt index 5ac99b2fd3..35ad1def2e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt @@ -36,10 +36,8 @@ if ($f) { remove_data("file_cp1256"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt index ec95e582d9..ec27dbdaaa 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt @@ -39,7 +39,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1256"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\ãÓÇÑ ãÊÚÏÏ ÇáÈÇíÊ ÇÎÊÈÇÑ42\ãÓÇÑ ãÊÚÏÏ ÇáÈÇíÊ ÇÎÊÈÇÑ4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt index fd7303f1e7..b277fc208b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt @@ -40,7 +40,6 @@ get_basename_with_cp($fn, 1256); remove_data("dir_cp1256"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -52,4 +51,3 @@ string(%d) "ãÓÇÑ ãÊÚÏÏ ÇáÈÇíÊ ÇÎÊÈÇÑ33" bool(true) string(%d) "%s\ãÓÇÑ ãÊÚÏÏ ÇáÈÇíÊ ÇÎÊÈÇÑ33" Active code page: %s -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt index 25e1118fcb..306414e5ca 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_cp1256"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt index f660c5e906..5d544a52d0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp1256"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\مسار متعدد البايت اختبار42\مسار متعدد البايت اختبار4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt index e8a14ca9a4..38ae6a4754 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt @@ -37,7 +37,6 @@ get_basename_with_cp($fn, 65001); remove_data("dir_cp1256"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -49,4 +48,3 @@ string(47) "مسار متعدد البايت اختبار33" bool(true) string(%d) "%s\مسار متعدد البايت اختبار33" Active code page: %s -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt index 8a52ab0a1f..7beae3a6bb 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt @@ -46,7 +46,6 @@ foreach ($names as $name) { } ?> -===DONE=== --EXPECTF-- Active code page: %d getting basename of %sà»ç¹á¿éÁ·Õè·´Êͺ1.txt @@ -111,4 +110,3 @@ bool(true) string(%d) "%sà»ç¹á¿éÁ·Õè·´Êͺ8 10.txt" Active code page: %d string(6) "hello8" -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt index 2e6df976a4..84c8c55983 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt @@ -34,10 +34,8 @@ system("dir /b " . $fn); remove_data("file_cp874"); ?> -===DONE=== --EXPECTF-- string(%d) "%s\à»ç¹á¿éÁ·Õè·´Êͺ11" bool(true) bool(true) à»ç¹á¿éÁ·Õè·´Êͺ11 -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt index 3ac3035b4c..009fcf16a5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt @@ -43,7 +43,6 @@ foreach ($names as $name) { } ?> -===DONE=== --EXPECTF-- Active code page: %d getting basename of %sเป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š1.txt @@ -108,4 +107,3 @@ bool(true) string(%d) "%sเป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š8 10.txt" Active code page: %d string(6) "hello8" -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt index 1bc8fca100..97d0b24192 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt @@ -31,10 +31,8 @@ system("dir /b " . $fn); remove_data("file_cp874"); ?> -===DONE=== --EXPECTF-- string(%d) "%s\เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š11" bool(true) bool(true) เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š11 -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt index 12c38eae69..f56aa7231e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt @@ -36,10 +36,8 @@ if ($f) { remove_data("file_cp932"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt index 9163f87b33..086e24483d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt @@ -39,7 +39,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp932"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX42\ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt index 149c0fe595..51420195e8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt @@ -40,7 +40,6 @@ get_basename_with_cp($fn, 932); remove_data("dir_cp932"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -52,4 +51,3 @@ string(%d) "ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX33" bool(true) string(%d) "%s\ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt index a6fd814203..b2c1f6d408 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt @@ -34,10 +34,8 @@ system("dir /b " . $fn); remove_data("file_cp932"); ?> -===DONE=== --EXPECTF-- string(%d) "%s\ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX77" bool(true) bool(true) ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX77 -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt index b845e313b3..40cef63621 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_cp932"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt index 80a49dd28b..5c150a3318 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp932"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\テストマルãƒãƒã‚¤ãƒˆãƒ»ãƒ‘ス42\テストマルãƒãƒã‚¤ãƒˆãƒ»ãƒ‘ス4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt index 1d7764236a..2c1adc9e0a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt @@ -37,7 +37,6 @@ get_basename_with_cp($fn, 65001); remove_data("dir_cp932"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -49,4 +48,3 @@ string(38) "テストマルãƒãƒã‚¤ãƒˆãƒ»ãƒ‘ス33" bool(true) string(%d) "%s\テストマルãƒãƒã‚¤ãƒˆãƒ»ãƒ‘ス33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt index b29631ad5c..9b65cd6905 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt @@ -36,10 +36,8 @@ if ($f) { remove_data("file_cp936"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt index d7ee04bf9e..74c9da9398 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt @@ -39,7 +39,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp936"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -51,4 +50,3 @@ bool(true) string(%d) "%s\œyÔ‡¶à×ֹ·½5\œyÔ‡¶à×ֹ·½4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt index eef4e4915e..d079666467 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt @@ -42,7 +42,6 @@ var_dump(unlink($fn)); remove_data("file_cp936"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -55,4 +54,3 @@ bool(true) string(%d) "%s\œyÔ‡¶à×ֹ·½25" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt index 52b164fdb2..1be1f57f5f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_cp936"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt index 1a22b13ea6..a4c3588cc6 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_cp936"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\測試多å—節路徑5\測試多å—節路徑4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt index b4fe8415c2..9d6ba06c21 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt @@ -39,7 +39,6 @@ var_dump(unlink($fn)); remove_data("file_cp936"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -52,4 +51,3 @@ bool(true) string(%d) "%s\測試多å—節路徑25" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt index 394ab17011..ced4230178 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt @@ -37,11 +37,9 @@ chdir($oldcwd); remove_data("dir_mb"); ?> -===DONE=== --EXPECTF-- Active code page: 65001 bool(true) string(%d) "%s\テストマルãƒãƒã‚¤ãƒˆãƒ»ãƒ‘ス42" bool(true) Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt index 0c8f70919f..a8d4e99a69 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_eucjp"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt index 634c676385..1e53da44fb 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_eucjp"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\テストマルãƒãƒã‚¤ãƒˆãƒ»ãƒ‘ス42\テストマルãƒãƒã‚¤ãƒˆãƒ»ãƒ‘ス4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt index 4b3c631837..dfd7de5273 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt @@ -37,7 +37,6 @@ get_basename_with_cp($fn, 65001); remove_data("dir_eucjp"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -49,4 +48,3 @@ string(38) "テストマルãƒãƒã‚¤ãƒˆãƒ»ãƒ‘ス33" bool(true) string(%d) "%s\テストマルãƒãƒã‚¤ãƒˆãƒ»ãƒ‘ス33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt index b1576e827a..796abf9867 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt @@ -33,10 +33,8 @@ if ($f) { remove_data("file_kartuli"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt index 73ae71a6ba..ae3fbbf8a3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt @@ -36,7 +36,6 @@ var_dump(rmdir($subpath)); remove_data("dir_kartuli"); ?> -===DONE=== --EXPECTF-- bool(true) bool(true) @@ -48,4 +47,3 @@ bool(true) string(%d) "%s\ქáƒáƒ თველები42\ქáƒáƒ თველები4" Active code page: %d bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt index 8aa7b2378c..04b4dc0aa3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt @@ -37,7 +37,6 @@ get_basename_with_cp($fn, 65001); remove_data("dir_kartuli"); ?> -===DONE=== --EXPECTF-- resource(%d) of type (stream) int(25) @@ -49,4 +48,3 @@ string(32) "ქáƒáƒ თველები33" bool(true) string(%d) "%s\ქáƒáƒ თველები33" Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt index 211124ad21..44614a5f26 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt @@ -31,10 +31,8 @@ system("dir /b " . $fn); remove_data("file_kartuli"); ?> -===DONE=== --EXPECTF-- string(%d) "%s\ქáƒáƒ თველები55" bool(true) bool(true) ქáƒáƒ თველები55 -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt index 181ba33ca1..b88424471f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt @@ -37,11 +37,9 @@ for ($i = 0; $i < $how_many; $i++) { var_dump(file_exists(realpath(__DIR__) . DIRECTORY_SEPARATOR . $s)); ?> -===DONE=== --EXPECTF-- %d%d%d%d %s\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ bool(true) bool(true) bool(false) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt index 48f30dbccd..ae3e1635a5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt @@ -44,7 +44,6 @@ for ($i = 0; $i < $how_many; $i++) { var_dump(file_exists(realpath(__DIR__) . DIRECTORY_SEPARATOR . $s)); ?> -===DONE=== --EXPECTF-- %d%d%d%d %s\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\ @@ -52,4 +51,3 @@ bool(true) bool(true) string(5) "hello" bool(false) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt index 3437656eec..2e39fa8d5c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt @@ -50,7 +50,6 @@ for ($i = 0; $i < $how_many; $i++) { var_dump(file_exists(realpath(__DIR__) . DIRECTORY_SEPARATOR . $s)); ?> -===DONE=== --EXPECTF-- %d%d%d%d %s\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxü\ @@ -61,4 +60,3 @@ bool(true) int(5) string(5) "hello" bool(false) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt index d572206c5d..6acdddd4c2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt @@ -34,11 +34,9 @@ var_dump(unlink($dest_file)); var_dump(rmdir($dest_dir)); ?> -===DONE=== --EXPECT-- bool(true) bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt index 6dd1e21afb..72d78b3b60 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt @@ -24,8 +24,6 @@ if ($fp = fopen($testFile, "r")) { unlink($testFile); ?> -===DONE=== --EXPECT-- Generating a file with a path length of 259 characters... Opening file... OK -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug71103.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug71103.phpt index 7a83c1e4f9..b98e087560 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug71103.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug71103.phpt @@ -44,7 +44,6 @@ do { } while ($p != $base); ?> -===DONE=== --EXPECTF-- string(%d) "%s\dev\http\tproj\app\cache\dev_old\annotations\72\5b53796d666f6e795c42756e646c655c5477696742756e646c655c436f6e74726f6c6c65725c457863657074696f6e436f6e74726f6c6c657223676574416e64436c65616e4f7574707574427566666572696e67405b416e6e6f745d5d5b.doctrinecache.data" bool(true) @@ -62,4 +61,3 @@ bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt index 287dbf192e..c3cceb6d1a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt @@ -54,7 +54,6 @@ if ($newstart) { } ?> -===DONE=== --EXPECTF-- string(251) "%s" string(1884) "%s" @@ -62,4 +61,3 @@ bool(true) bool(true) int(5) string(5) "hello" -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt index d64316b3af..62db0c8c65 100644 --- a/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt @@ -54,7 +54,6 @@ set_active_cp($old_cp); remove_data("mb_names"); ?> -===DONE=== --EXPECTF-- Active code page: 65001 filename: . : filetype: dir @@ -76,4 +75,3 @@ filename: テストマルãƒãƒã‚¤ãƒˆãƒ»ãƒ‘ス42 : filetype: dir filename: 測試多å—節路徑 : filetype: file filename: 測試多å—節路徑5 : filetype: dir Active code page: %d -===DONE=== diff --git a/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt index acd9323c5c..771d82b1bb 100644 --- a/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt @@ -55,7 +55,6 @@ set_active_cp($old_cp); remove_data("file2_mb"); ?> -===DONE=== --EXPECTF-- Active code page: 65001 bool(true) @@ -66,4 +65,3 @@ string(27) "測試多å—節路徑17.txt" bool(true) bool(true) Active code page: %d -===DONE=== diff --git a/ext/standard/tests/filters/stream_filter_remove_basic.phpt b/ext/standard/tests/filters/stream_filter_remove_basic.phpt index a264a0e4f6..65fc021c13 100644 --- a/ext/standard/tests/filters/stream_filter_remove_basic.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_basic.phpt @@ -31,7 +31,6 @@ fpassthru( $fp ); fclose( $fp ); ?> -===DONE=== --CLEAN-- <?php @@ -44,4 +43,3 @@ unlink( $file ); bool(true) Grfgvat gur ebg13 svygre juvpu fuvsgf fbzr guvatf nebhaq. add some more un-filtered foobar -===DONE=== diff --git a/ext/standard/tests/filters/stream_filter_remove_error.phpt b/ext/standard/tests/filters/stream_filter_remove_error.phpt index 07de5acf0c..f9d26837c8 100644 --- a/ext/standard/tests/filters/stream_filter_remove_error.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_error.phpt @@ -31,7 +31,6 @@ var_dump( stream_filter_remove( $filter ) ); fclose( $fp ); ?> -===DONE=== --CLEAN-- <?php @@ -52,4 +51,3 @@ bool(true) Warning: stream_filter_remove(): Invalid resource given, not a stream filter in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/general_functions/bug25038.phpt b/ext/standard/tests/general_functions/bug25038.phpt index 52fe032056..5bd549fd0f 100644 --- a/ext/standard/tests/general_functions/bug25038.phpt +++ b/ext/standard/tests/general_functions/bug25038.phpt @@ -25,8 +25,6 @@ catch (Exception $e) } ?> -===DONE=== --EXPECT-- This is an exception from bar(first try). This is an exception from bar(second try). -===DONE=== diff --git a/ext/standard/tests/general_functions/bug36011.phpt b/ext/standard/tests/general_functions/bug36011.phpt index 00530bf846..63e0015437 100644 --- a/ext/standard/tests/general_functions/bug36011.phpt +++ b/ext/standard/tests/general_functions/bug36011.phpt @@ -36,11 +36,9 @@ $a->whee5(); TestClass::whee5(); ?> -===DONE=== --EXPECT-- TestClass::test() TestClass::test() TestClass::test() TestClass::test() TestClass::test() -===DONE=== diff --git a/ext/standard/tests/general_functions/bug40398.phpt b/ext/standard/tests/general_functions/bug40398.phpt index e92be5bedc..b187c64efe 100644 --- a/ext/standard/tests/general_functions/bug40398.phpt +++ b/ext/standard/tests/general_functions/bug40398.phpt @@ -73,7 +73,6 @@ new Derived_5('5'); new Derived_6('6'); ?> -===DONE=== --EXPECT-- Base::__construct(1) Base::__construct(2) @@ -81,4 +80,3 @@ Base::__construct(3) Base::__construct(4) Base::__construct(5) Base::__construct(6) -===DONE=== diff --git a/ext/standard/tests/general_functions/bug67498.phpt b/ext/standard/tests/general_functions/bug67498.phpt index 5b5951b0f8..dd1ef11ef5 100644 --- a/ext/standard/tests/general_functions/bug67498.phpt +++ b/ext/standard/tests/general_functions/bug67498.phpt @@ -6,10 +6,8 @@ $PHP_SELF = 1; phpinfo(INFO_VARIABLES); ?> -==DONE== --EXPECTF-- phpinfo() PHP Variables %A -==DONE== diff --git a/ext/standard/tests/general_functions/bug76643.phpt b/ext/standard/tests/general_functions/bug76643.phpt index 47b5345860..07f789f464 100644 --- a/ext/standard/tests/general_functions/bug76643.phpt +++ b/ext/standard/tests/general_functions/bug76643.phpt @@ -6,7 +6,5 @@ $_SERVER = 'foo'; output_add_rewrite_var('bar', 'baz'); ?> <form action="http://example.com/"></form> -===DONE=== --EXPECT-- <form action="http://example.com/"></form> -===DONE=== diff --git a/ext/standard/tests/general_functions/call_user_func_return.phpt b/ext/standard/tests/general_functions/call_user_func_return.phpt index cb0f6998dc..1457ae2e36 100644 --- a/ext/standard/tests/general_functions/call_user_func_return.phpt +++ b/ext/standard/tests/general_functions/call_user_func_return.phpt @@ -31,7 +31,6 @@ test('test1'); test('test2'); ?> -===DONE=== --EXPECTF-- Direct Call string(5) "test1" refcount(%d) @@ -41,4 +40,3 @@ Direct Call string(5) "test2" refcount(%d) User Func string(5) "test2" refcount(%d) -===DONE=== diff --git a/ext/standard/tests/general_functions/callbacks_001.phpt b/ext/standard/tests/general_functions/callbacks_001.phpt index 76d0e94c82..827f5c0182 100644 --- a/ext/standard/tests/general_functions/callbacks_001.phpt +++ b/ext/standard/tests/general_functions/callbacks_001.phpt @@ -83,7 +83,6 @@ $o = new P; $o->test(); ?> -===DONE=== --EXPECTF-- parent|who B @@ -108,4 +107,3 @@ $this|O::who O $this|B::who call_user_func() expects parameter 1 to be a valid callback, class 'P' is not a subclass of 'B' -===DONE=== diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt index aa264cce37..1a3eadbb80 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt @@ -74,7 +74,6 @@ foreach($inputs as $input) { $iterator++; }; ?> -===Done=== --EXPECT-- *** Testing escapeshellarg() : usage variations *** @@ -137,4 +136,3 @@ string(2) """" -- Iteration 20 -- string(2) """" -===Done=== diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt index 6f3b6a9f32..ba56db69ea 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt @@ -74,7 +74,6 @@ foreach($inputs as $input) { $iterator++; }; ?> -===Done=== --EXPECT-- *** Testing escapeshellarg() : usage variations *** @@ -137,4 +136,3 @@ string(2) "''" -- Iteration 20 -- string(2) "''" -===Done=== diff --git a/ext/standard/tests/general_functions/floatval_basic.phpt b/ext/standard/tests/general_functions/floatval_basic.phpt index 8ad628b4f0..dc1c547731 100644 --- a/ext/standard/tests/general_functions/floatval_basic.phpt +++ b/ext/standard/tests/general_functions/floatval_basic.phpt @@ -50,7 +50,6 @@ foreach ($valid_floats as $key => $value ) { } ?> -===DONE=== --EXPECT-- *** Testing floatval() with valid float values *** @@ -169,4 +168,3 @@ float(5000000) -- Iteration : -.5e+7 -- float(-5000000) -===DONE=== diff --git a/ext/standard/tests/general_functions/floatval_variation1.phpt b/ext/standard/tests/general_functions/floatval_variation1.phpt index 2b49cd195b..098c4ad252 100644 --- a/ext/standard/tests/general_functions/floatval_variation1.phpt +++ b/ext/standard/tests/general_functions/floatval_variation1.phpt @@ -50,7 +50,6 @@ foreach ($not_float_types as $key => $type ) { var_dump( doubleval($type) ); } ?> -===DONE=== --EXPECTF-- Notice: A non well formed numeric value encountered in %s on line %d @@ -155,4 +154,3 @@ float(0) -- Iteration : null -- float(0) -===DONE=== diff --git a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt index 1d9ca4a277..2aee70e6d0 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt @@ -28,7 +28,6 @@ if ($n2 == $n1 + 1 && array_key_exists("USER_CONSTANT", $arr2)) { } ?> -===DONE=== --EXPECT-- *** Testing get_defined_constants() : basic functionality *** string(5) "array" @@ -36,4 +35,3 @@ string(5) "array" array(0) { } TEST PASSED -===DONE=== diff --git a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt index 6e9494509a..7f2b7a180e 100644 --- a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt @@ -63,7 +63,6 @@ if (count($vars) == 0) { f1(); ?> -===DONE=== --EXPECT-- Simple testcase for get_defined_vars() function @@ -149,4 +148,3 @@ array(9) { ["b1"]=> bool(true) } -===DONE=== diff --git a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt index c74e4f71fe..cb4b84c99d 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt @@ -18,10 +18,8 @@ var_dump(in_array("cos", $result)); var_dump(get_extension_funcs("foo")); ?> -===DONE=== --EXPECT-- Simple testcase for get_extension_funcs() function string(5) "array" bool(true) bool(false) -===DONE=== diff --git a/ext/standard/tests/general_functions/get_include_path_basic.phpt b/ext/standard/tests/general_functions/get_include_path_basic.phpt index 5b45c86449..809faf694d 100644 --- a/ext/standard/tests/general_functions/get_include_path_basic.phpt +++ b/ext/standard/tests/general_functions/get_include_path_basic.phpt @@ -20,9 +20,7 @@ if (ini_get("include_path") == get_include_path()) { } ?> -===DONE=== --EXPECTF-- *** Testing get_include_path() string(1) "." PASSED -===DONE=== diff --git a/ext/standard/tests/general_functions/get_included_files.phpt b/ext/standard/tests/general_functions/get_included_files.phpt index 36719fa933..d81c72e3ea 100644 --- a/ext/standard/tests/general_functions/get_included_files.phpt +++ b/ext/standard/tests/general_functions/get_included_files.phpt @@ -23,7 +23,6 @@ echo "\n-- List included files atfter including inc2 which will include inc3 whi var_dump(get_included_files()); ?> -===DONE=== --EXPECTF-- *** Testing get_included_files() @@ -52,4 +51,3 @@ array(4) { [3]=> string(%d) "%sget_included_files_inc3.inc" } -===DONE=== diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt index c72a88de13..3be43caecb 100644 --- a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt +++ b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt @@ -13,11 +13,9 @@ echo "Get loaded extensions\n"; var_dump(get_loaded_extensions()); ?> -===DONE=== --EXPECTF-- *** Testing get_loaded_extensions() : basic functionality *** Get loaded extensions array(%d) { %a } -===DONE=== diff --git a/ext/standard/tests/general_functions/get_resource_type_basic.phpt b/ext/standard/tests/general_functions/get_resource_type_basic.phpt index 58a49e713f..dcad549c7b 100644 --- a/ext/standard/tests/general_functions/get_resource_type_basic.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_basic.phpt @@ -13,8 +13,6 @@ $res = fopen(__FILE__, "r"); var_dump(get_resource_type($res)); ?> -===DONE=== --EXPECT-- *** Testing get_resource_type() : basic functionality *** string(6) "stream" -===DONE=== diff --git a/ext/standard/tests/general_functions/getrusage_basic.phpt b/ext/standard/tests/general_functions/getrusage_basic.phpt index a2b03ee07a..7aaacd51a0 100644 --- a/ext/standard/tests/general_functions/getrusage_basic.phpt +++ b/ext/standard/tests/general_functions/getrusage_basic.phpt @@ -22,9 +22,7 @@ if (!is_array($dat)) { echo "User time used (seconds) " . $dat["ru_utime.tv_sec"] . "\n"; echo "User time used (microseconds) " . $dat["ru_utime.tv_usec"] . "\n"; ?> -===DONE=== --EXPECTF-- Simple testcase for getrusage() function User time used (seconds) %d User time used (microseconds) %d -===DONE=== diff --git a/ext/standard/tests/general_functions/intval_variation1.phpt b/ext/standard/tests/general_functions/intval_variation1.phpt index e44bc1db80..470fa03630 100644 --- a/ext/standard/tests/general_functions/intval_variation1.phpt +++ b/ext/standard/tests/general_functions/intval_variation1.phpt @@ -108,7 +108,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing intval() : usage variation *** @@ -200,4 +199,3 @@ int(0) --unset var-- int(0) -===DONE=== diff --git a/ext/standard/tests/general_functions/is_callable_basic1.phpt b/ext/standard/tests/general_functions/is_callable_basic1.phpt index aa4c9aee23..50eb710e90 100644 --- a/ext/standard/tests/general_functions/is_callable_basic1.phpt +++ b/ext/standard/tests/general_functions/is_callable_basic1.phpt @@ -60,7 +60,6 @@ $defined_functions = array ( check_iscallable($defined_functions); ?> -===DONE=== --EXPECT-- *** Testing is_callable() on defined functions *** -- Iteration 1 -- @@ -103,4 +102,3 @@ Hello_World bool(true) bool(true) Hello_World -===DONE=== diff --git a/ext/standard/tests/general_functions/is_callable_basic2.phpt b/ext/standard/tests/general_functions/is_callable_basic2.phpt index 7b43191aab..e744350cdb 100644 --- a/ext/standard/tests/general_functions/is_callable_basic2.phpt +++ b/ext/standard/tests/general_functions/is_callable_basic2.phpt @@ -124,7 +124,6 @@ foreach($objects as $object) { } ?> -===DONE=== --EXPECT-- *** Testing is_callable() on objects *** @@ -781,4 +780,3 @@ bool(true) object_class::foo1 bool(false) object_class::foo1 -===DONE=== diff --git a/ext/standard/tests/general_functions/is_callable_variation1.phpt b/ext/standard/tests/general_functions/is_callable_variation1.phpt index 022c5a4549..4bb7f28a16 100644 --- a/ext/standard/tests/general_functions/is_callable_variation1.phpt +++ b/ext/standard/tests/general_functions/is_callable_variation1.phpt @@ -59,7 +59,6 @@ $undef_functions = array ( check_iscallable($undef_functions); ?> -===DONE=== --EXPECT-- *** Testing is_callable() on undefined functions *** -- Iteration 1 -- @@ -206,4 +205,3 @@ bool(true) bool(false) bool(false) "echo()" -===DONE=== diff --git a/ext/standard/tests/general_functions/is_callable_variation2.phpt b/ext/standard/tests/general_functions/is_callable_variation2.phpt index af562d4ef1..2c53939545 100644 --- a/ext/standard/tests/general_functions/is_callable_variation2.phpt +++ b/ext/standard/tests/general_functions/is_callable_variation2.phpt @@ -57,7 +57,6 @@ check_iscallable($variants); fclose($file_handle); ?> -===DONE=== --EXPECTF-- *** Testing is_callable() on invalid function names *** -- Iteration 1 -- @@ -148,4 +147,3 @@ Resource id #%d bool(false) bool(false) Resource id #%d -===DONE=== diff --git a/ext/standard/tests/general_functions/is_resource_basic.phpt b/ext/standard/tests/general_functions/is_resource_basic.phpt index 75f4e4a8d8..f8e9ff6369 100644 --- a/ext/standard/tests/general_functions/is_resource_basic.phpt +++ b/ext/standard/tests/general_functions/is_resource_basic.phpt @@ -68,7 +68,6 @@ if (is_resource($res)) { ?> -===DONE=== --EXPECTF-- *** Testing is_resource() : basic functionality *** @@ -89,4 +88,3 @@ Resource type..after file open is_resource() returns TRUE Resource type..var_dump after file close returns resource(%d) of type (Unknown) Resource type..after file close is_resource() returns FALSE -===DONE=== diff --git a/ext/standard/tests/general_functions/isset_basic1.phpt b/ext/standard/tests/general_functions/isset_basic1.phpt index bdaf1eb46d..7990810467 100644 --- a/ext/standard/tests/general_functions/isset_basic1.phpt +++ b/ext/standard/tests/general_functions/isset_basic1.phpt @@ -40,7 +40,6 @@ echo "Null test: " . (isset($n) ? "YES": "NO") . "\n"; echo "Object test: " . (isset($obj) ? "YES": "NO") . "\n"; echo "Resource test: " . (isset($res) ? "YES": "NO") . "\n"; ?> -===DONE=== --EXPECT-- *** Testing isset() : basic functionality *** Integer test: YES @@ -63,4 +62,3 @@ Boolean test: NO Null test: NO Object test: NO Resource test: NO -===DONE=== diff --git a/ext/standard/tests/general_functions/isset_basic2.phpt b/ext/standard/tests/general_functions/isset_basic2.phpt index 925b19a2c0..586203d4ee 100644 --- a/ext/standard/tests/general_functions/isset_basic2.phpt +++ b/ext/standard/tests/general_functions/isset_basic2.phpt @@ -38,7 +38,6 @@ var_dump(isset($var[1])); var_dump(isset($var, $var[1])); ?> -===DONE=== --EXPECT-- *** Testing isset() : basic functionality *** Test multiple scalar variables in a group @@ -57,4 +56,3 @@ bool(false) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt index 1c62340970..b724b3c91c 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt @@ -27,7 +27,6 @@ $string = ob_get_flush(); var_dump($string) ?> -===DONE=== --EXPECT-- *** Testing ob_get_flush() : basic functionality *** testing ob_get_flush() with some @@ -39,4 +38,3 @@ Newlines too array(0) { } string(0) "" -===DONE=== diff --git a/ext/standard/tests/general_functions/ob_get_flush_error.phpt b/ext/standard/tests/general_functions/ob_get_flush_error.phpt index 5603e3d238..d070c50c60 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_error.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_error.phpt @@ -16,10 +16,8 @@ echo "*** Testing ob_get_flush() : error conditions ***\n"; var_dump( ob_get_flush() ); ?> -===DONE=== --EXPECTF-- *** Testing ob_get_flush() : error conditions *** Notice: ob_get_flush(): failed to delete and flush buffer. No buffer to delete or flush in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/general_functions/ob_get_length_basic.phpt b/ext/standard/tests/general_functions/ob_get_length_basic.phpt index 75e22e7741..12e0a72026 100644 --- a/ext/standard/tests/general_functions/ob_get_length_basic.phpt +++ b/ext/standard/tests/general_functions/ob_get_length_basic.phpt @@ -32,7 +32,6 @@ dump_string_length( '' ); dump_string_length( null ); ?> -===DONE=== --EXPECTF-- *** Testing ob_get_length() : basic functionality *** bool(false) @@ -42,4 +41,3 @@ int(1) int(15) int(0) int(0) -===DONE=== diff --git a/ext/standard/tests/general_functions/ob_start_closures.phpt b/ext/standard/tests/general_functions/ob_start_closures.phpt index ba730961bd..c4b5fcc50d 100644 --- a/ext/standard/tests/general_functions/ob_start_closures.phpt +++ b/ext/standard/tests/general_functions/ob_start_closures.phpt @@ -27,7 +27,6 @@ ob_end_flush(); echo $str1, $str2; ?> -===DONE=== --EXPECT-- *** Testing ob_start() : closures as output handlers *** Output (1): Output (2): Test @@ -36,4 +35,3 @@ Test With newlines Output (2): Test With newlines -===DONE=== diff --git a/ext/standard/tests/general_functions/parse_ini_string_bug76068.phpt b/ext/standard/tests/general_functions/parse_ini_string_bug76068.phpt index 8362fb84d1..359e9c3446 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_bug76068.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_bug76068.phpt @@ -16,7 +16,6 @@ $s = parse_ini_string("[foo]\nbar=42|>baz",true, \INI_SCANNER_TYPED); var_dump($s); ?> -==DONE== --EXPECT-- array(1) { ["foo"]=> @@ -46,4 +45,3 @@ array(1) { string(2) "42" } } -==DONE== diff --git a/ext/standard/tests/general_functions/php_uname_basic.phpt b/ext/standard/tests/general_functions/php_uname_basic.phpt index 629318d725..b4fb78e6ea 100644 --- a/ext/standard/tests/general_functions/php_uname_basic.phpt +++ b/ext/standard/tests/general_functions/php_uname_basic.phpt @@ -20,7 +20,6 @@ var_dump(php_uname('v')); var_dump(php_uname('m')); ?> -===DONE=== --EXPECTF-- *** Testing php_uname() - basic test string(%d) "%s" @@ -32,4 +31,3 @@ string(%d) "%s" string(%d) "%s" string(%d) "%s" string(%d) "%s" -===DONE=== diff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt index ec5b2b5839..23859a33ac 100644 --- a/ext/standard/tests/general_functions/php_uname_error.phpt +++ b/ext/standard/tests/general_functions/php_uname_error.phpt @@ -13,10 +13,8 @@ echo "\n-- Testing php_uname() function with invalid mode --\n"; var_dump( php_uname('z') == php_uname('z') ); ?> -===DONE=== --EXPECTF-- *** Testing php_uname() - error test -- Testing php_uname() function with invalid mode -- bool(true) -===DONE=== diff --git a/ext/standard/tests/general_functions/proc_open-mb0.phpt b/ext/standard/tests/general_functions/proc_open-mb0.phpt index 03befdfb26..672a8cd357 100644 --- a/ext/standard/tests/general_functions/proc_open-mb0.phpt +++ b/ext/standard/tests/general_functions/proc_open-mb0.phpt @@ -38,7 +38,6 @@ proc_close($p); echo $out; ?> -==DONE== --EXPECTF-- array(4) { [0]=> @@ -50,4 +49,3 @@ array(4) { [3]=> string(14) "карамба" } -==DONE== diff --git a/ext/standard/tests/general_functions/proc_open-mb1.phpt b/ext/standard/tests/general_functions/proc_open-mb1.phpt index 46115c6337..af46346fbb 100644 --- a/ext/standard/tests/general_functions/proc_open-mb1.phpt +++ b/ext/standard/tests/general_functions/proc_open-mb1.phpt @@ -35,7 +35,6 @@ proc_close($p); echo $out; ?> -==DONE== --EXPECTF-- array(4) { [0]=> @@ -47,4 +46,3 @@ array(4) { [3]=> string(14) "карамба" } -==DONE== diff --git a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt index 69c455d076..9a92bef794 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt @@ -34,7 +34,6 @@ var_dump(putenv('FOO=°¡a°¡°¡°¡'), getenv("FOO")); var_dump(putenv('FOO=°¡a°¡°¡°¡°¡'), getenv("FOO")); ?> -===DONE=== --EXPECT-- bool(true) string(2) "°¡" @@ -58,4 +57,3 @@ bool(true) string(9) "°¡a°¡°¡°¡" bool(true) string(11) "°¡a°¡°¡°¡°¡" -===DONE=== diff --git a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt index ea8a0ab119..edf4c72f44 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt @@ -23,7 +23,6 @@ var_dump(putenv('FOO=å•Šaå•Šå•Šå•Š'), getenv("FOO")); var_dump(putenv('FOO=å•Šaå•Šå•Šå•Šå•Š'), getenv("FOO")); ?> -===DONE=== --EXPECT-- bool(true) string(3) "å•Š" @@ -47,4 +46,3 @@ bool(true) string(13) "å•Šaå•Šå•Šå•Š" bool(true) string(16) "å•Šaå•Šå•Šå•Šå•Š" -===DONE=== diff --git a/ext/standard/tests/general_functions/sleep_basic.phpt b/ext/standard/tests/general_functions/sleep_basic.phpt index d3dd8c44f5..3c7bcdfc09 100644 --- a/ext/standard/tests/general_functions/sleep_basic.phpt +++ b/ext/standard/tests/general_functions/sleep_basic.phpt @@ -37,10 +37,8 @@ if ($time >= $sleeplow) { echo "TEST FAILED - time is ${time} secs and sleep was ${sleeptime} secs\n"; } ?> -===DONE=== --EXPECTF-- *** Testing sleep() : basic functionality *** Thread slept for %f seconds Return value: 0 TEST PASSED -===DONE=== diff --git a/ext/standard/tests/general_functions/uniqid_basic.phpt b/ext/standard/tests/general_functions/uniqid_basic.phpt index 285365ab60..66cfdf8f97 100644 --- a/ext/standard/tests/general_functions/uniqid_basic.phpt +++ b/ext/standard/tests/general_functions/uniqid_basic.phpt @@ -34,7 +34,6 @@ for ($i = 0; $i < count($prefix); $i++) { } ?> -===DONE=== --EXPECTF-- *** Testing uniqid() : basic functionality *** @@ -69,4 +68,3 @@ string(13) "%s" string(23) "%s.%s" string(13) "%s" -===DONE=== diff --git a/ext/standard/tests/general_functions/usleep_basic.phpt b/ext/standard/tests/general_functions/usleep_basic.phpt index 776d634ea4..d057d47c11 100644 --- a/ext/standard/tests/general_functions/usleep_basic.phpt +++ b/ext/standard/tests/general_functions/usleep_basic.phpt @@ -35,8 +35,6 @@ if ($time >= $sleeplow) { echo "TEST FAILED: $summary"; } ?> -===DONE=== --EXPECTF-- *** Testing usleep() : basic functionality *** TEST PASSED: Thread slept for %f micro-seconds -===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_basic1.phpt b/ext/standard/tests/general_functions/var_export_basic1.phpt index 18fa404c29..f97fab2396 100644 --- a/ext/standard/tests/general_functions/var_export_basic1.phpt +++ b/ext/standard/tests/general_functions/var_export_basic1.phpt @@ -49,7 +49,6 @@ foreach($valid_ints as $key => $int_value) { } ?> -===DONE=== --EXPECT-- *** Testing var_export() with integer values *** @@ -144,4 +143,3 @@ string(11) "-2147483648" 2147483647 2147483647 string(10) "2147483647" -===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_basic1_32.phpt b/ext/standard/tests/general_functions/var_export_basic1_32.phpt index 95596800d6..61e69c6315 100644 --- a/ext/standard/tests/general_functions/var_export_basic1_32.phpt +++ b/ext/standard/tests/general_functions/var_export_basic1_32.phpt @@ -49,7 +49,6 @@ foreach($valid_ints as $key => $int_value) { } ?> -===DONE=== --EXPECT-- *** Testing var_export() with integer values *** @@ -144,4 +143,3 @@ string(13) "-2147483647-1" 2147483647 2147483647 string(10) "2147483647" -===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_basic2.phpt b/ext/standard/tests/general_functions/var_export_basic2.phpt index 29c3a138f9..87e92f20fd 100644 --- a/ext/standard/tests/general_functions/var_export_basic2.phpt +++ b/ext/standard/tests/general_functions/var_export_basic2.phpt @@ -32,7 +32,6 @@ foreach($valid_bool as $key => $bool_value) { echo "\n"; } ?> -===DONE=== --EXPECT-- *** Testing var_export() with valid boolean values *** @@ -73,4 +72,3 @@ false false string(5) "false" -===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt b/ext/standard/tests/general_functions/var_export_basic3.phpt index b66d2c4584..38618faea9 100644 --- a/ext/standard/tests/general_functions/var_export_basic3.phpt +++ b/ext/standard/tests/general_functions/var_export_basic3.phpt @@ -47,7 +47,6 @@ foreach($valid_floats as $key => $float_value) { } ?> -===DONE=== --EXPECT-- *** Testing var_export() with valid float values *** @@ -172,4 +171,3 @@ string(22) "5.0000000000000001E+42" 3.4000000000000001E-33 string(22) "3.4000000000000001E-33" -===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_basic4.phpt b/ext/standard/tests/general_functions/var_export_basic4.phpt index b99f4584a6..c1b7b8cb5b 100644 --- a/ext/standard/tests/general_functions/var_export_basic4.phpt +++ b/ext/standard/tests/general_functions/var_export_basic4.phpt @@ -43,7 +43,6 @@ foreach($valid_strings as $key => $str) { } ?> -===DONE=== --EXPECT-- *** Testing var_export() with valid strings *** @@ -144,4 +143,3 @@ string(7) "'\\060'" '8' string(3) "'8'" -===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt b/ext/standard/tests/general_functions/var_export_basic5.phpt index ab81fa802e..989197a23d 100644 --- a/ext/standard/tests/general_functions/var_export_basic5.phpt +++ b/ext/standard/tests/general_functions/var_export_basic5.phpt @@ -43,7 +43,6 @@ foreach($valid_arrays as $key => $arr) { echo "\n"; } ?> -===DONE=== --EXPECT-- *** Testing var_export() with valid arrays *** @@ -276,4 +275,3 @@ string(41) "array ( 1 => 'test', )" -===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_basic6.phpt b/ext/standard/tests/general_functions/var_export_basic6.phpt index 6eff478d70..a120f2fd1a 100644 --- a/ext/standard/tests/general_functions/var_export_basic6.phpt +++ b/ext/standard/tests/general_functions/var_export_basic6.phpt @@ -101,7 +101,6 @@ foreach($valid_objects as $key => $obj) { echo "\n"; } ?> -===DONE=== --EXPECT-- *** Testing var_export() with valid objects *** @@ -307,4 +306,3 @@ concreteClass::__set_state(array( string(36) "concreteClass::__set_state(array( ))" -===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_basic7.phpt b/ext/standard/tests/general_functions/var_export_basic7.phpt index 817ffc91f0..928721b926 100644 --- a/ext/standard/tests/general_functions/var_export_basic7.phpt +++ b/ext/standard/tests/general_functions/var_export_basic7.phpt @@ -33,7 +33,6 @@ foreach($valid_nulls as $key => $null_value) { echo "\n"; } ?> -===DONE=== --EXPECT-- *** Testing var_export() with valid null values *** @@ -56,4 +55,3 @@ NULL NULL string(4) "NULL" -===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_error2.phpt b/ext/standard/tests/general_functions/var_export_error2.phpt index 7ce21205b1..83dd2aa297 100644 --- a/ext/standard/tests/general_functions/var_export_error2.phpt +++ b/ext/standard/tests/general_functions/var_export_error2.phpt @@ -13,7 +13,5 @@ $obj->p =& $obj; var_export($obj, true); ?> -===DONE=== --EXPECTF-- Warning: var_export does not handle circular references in %s on line 10 -===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_error3.phpt b/ext/standard/tests/general_functions/var_export_error3.phpt index 38b5dbc28c..7c2bc54ef3 100644 --- a/ext/standard/tests/general_functions/var_export_error3.phpt +++ b/ext/standard/tests/general_functions/var_export_error3.phpt @@ -12,7 +12,5 @@ $a[] =& $a; var_export($a, true); ?> -===DONE=== --EXPECTF-- Warning: var_export does not handle circular references in %s on line 9 -===DONE=== diff --git a/ext/standard/tests/http/bug69337.phpt b/ext/standard/tests/http/bug69337.phpt index 8de8187485..223a4def7d 100644 --- a/ext/standard/tests/http/bug69337.phpt +++ b/ext/standard/tests/http/bug69337.phpt @@ -32,8 +32,6 @@ $f = file_get_contents('http://127.0.0.1:22345/', 0, $ctx); http_server_kill($pid); var_dump($f); ?> -==DONE== --EXPECTF-- Warning: file_get_contents(http://127.0.0.1:22345/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%ain %s on line %d bool(false) -==DONE== diff --git a/ext/standard/tests/http/bug75535.phpt b/ext/standard/tests/http/bug75535.phpt index 9bf298cc06..57a75a3ee5 100644 --- a/ext/standard/tests/http/bug75535.phpt +++ b/ext/standard/tests/http/bug75535.phpt @@ -19,7 +19,6 @@ var_dump($http_response_header); http_server_kill($pid); ?> -==DONE== --EXPECT-- string(0) "" array(2) { @@ -28,4 +27,3 @@ array(2) { [1]=> string(14) "Content-Length" } -==DONE== diff --git a/ext/standard/tests/http/http_response_header_01.phpt b/ext/standard/tests/http/http_response_header_01.phpt index d364ebd153..9772c09b02 100644 --- a/ext/standard/tests/http/http_response_header_01.phpt +++ b/ext/standard/tests/http/http_response_header_01.phpt @@ -23,7 +23,6 @@ test(); http_server_kill($pid); ?> -==DONE== --EXPECT-- string(4) "Body" array(3) { @@ -34,4 +33,3 @@ array(3) { [2]=> string(12) "Some: Header" } -==DONE== diff --git a/ext/standard/tests/http/http_response_header_02.phpt b/ext/standard/tests/http/http_response_header_02.phpt index 518ae9167b..0868672b01 100644 --- a/ext/standard/tests/http/http_response_header_02.phpt +++ b/ext/standard/tests/http/http_response_header_02.phpt @@ -25,7 +25,6 @@ test(); http_server_kill($pid); ?> -==DONE== --EXPECT-- string(4) "Body" array(5) { @@ -40,4 +39,3 @@ array(5) { [4]=> string(12) "Some: Header" } -==DONE== diff --git a/ext/standard/tests/http/http_response_header_03.phpt b/ext/standard/tests/http/http_response_header_03.phpt index 907983ac4b..dedd2c3550 100644 --- a/ext/standard/tests/http/http_response_header_03.phpt +++ b/ext/standard/tests/http/http_response_header_03.phpt @@ -25,7 +25,6 @@ test(); http_server_kill($pid); ?> -==DONE== --EXPECTF-- Warning: file_get_contents(http://127.0.0.1:22348/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%a bool(false) @@ -41,4 +40,3 @@ array(5) { [4]=> string(12) "Some: Header" } -==DONE== diff --git a/ext/standard/tests/http/http_response_header_04.phpt b/ext/standard/tests/http/http_response_header_04.phpt index 98badf9997..0d518327aa 100644 --- a/ext/standard/tests/http/http_response_header_04.phpt +++ b/ext/standard/tests/http/http_response_header_04.phpt @@ -23,7 +23,6 @@ test(); http_server_kill($pid); ?> -==DONE== --EXPECT-- string(4) "Body" array(2) { @@ -32,4 +31,3 @@ array(2) { [1]=> string(14) "Some: Header" } -==DONE== diff --git a/ext/standard/tests/http/http_response_header_05.phpt b/ext/standard/tests/http/http_response_header_05.phpt index dbdd7b8b1a..97c275413d 100644 --- a/ext/standard/tests/http/http_response_header_05.phpt +++ b/ext/standard/tests/http/http_response_header_05.phpt @@ -23,7 +23,6 @@ test(); http_server_kill($pid); ?> -==DONE== --EXPECT-- string(4) "Body" array(2) { @@ -32,4 +31,3 @@ array(2) { [1]=> string(0) "" } -==DONE== diff --git a/ext/standard/tests/image/bug71848.phpt b/ext/standard/tests/image/bug71848.phpt index d96ac1c537..25c05689e6 100644 --- a/ext/standard/tests/image/bug71848.phpt +++ b/ext/standard/tests/image/bug71848.phpt @@ -5,7 +5,6 @@ Bug #71848 (getimagesize with $imageinfo returns false) var_dump(getimagesize(__DIR__ . '/bug71848.jpg', $info)); var_dump(array_keys($info)); ?> -===DONE=== --EXPECT-- array(7) { [0]=> @@ -29,4 +28,3 @@ array(2) { [1]=> string(4) "APP5" } -===DONE=== diff --git a/ext/standard/tests/image/bug72278.phpt b/ext/standard/tests/image/bug72278.phpt index 6c5dfa8777..292aaf0952 100644 --- a/ext/standard/tests/image/bug72278.phpt +++ b/ext/standard/tests/image/bug72278.phpt @@ -6,7 +6,6 @@ define('FILENAME', __DIR__ . DIRECTORY_SEPARATOR . 'bug72278.jpg'); var_dump(getimagesize(FILENAME)); ?> -===DONE=== --EXPECTF-- Warning: getimagesize(): corrupt JPEG data: 3 extraneous bytes before marker in %s%ebug72278.php on line %d array(7) { @@ -25,4 +24,3 @@ array(7) { ["mime"]=> string(10) "image/jpeg" } -===DONE=== diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt index 8e03ff2e53..ad857243d7 100644 --- a/ext/standard/tests/image/getimagesize_basic.phpt +++ b/ext/standard/tests/image/getimagesize_basic.phpt @@ -45,7 +45,6 @@ foreach($imagetype_filenames as $key => $filename) { var_dump( $info ); }; ?> -===DONE=== --EXPECTF-- *** Testing getimagesize() : basic functionality *** @@ -216,4 +215,3 @@ array(6) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/image/getimagesize_jpgapp.phpt b/ext/standard/tests/image/getimagesize_jpgapp.phpt index 2776c8617a..74fd4e57d7 100644 --- a/ext/standard/tests/image/getimagesize_jpgapp.phpt +++ b/ext/standard/tests/image/getimagesize_jpgapp.phpt @@ -23,9 +23,7 @@ foreach ($arr as $key => $value) { } ?> -===DONE=== --EXPECT-- APP1 - length: 1717; md5: 02cbf4ba6640c131422483138c968516 APP2 - length: 7275; md5: f5036ccca2031e8bf932bcbd4aca4355 APP13 - length: 42; md5: 2202998bd05e78bcb419f08c070d6f61 -===DONE=== diff --git a/ext/standard/tests/image/getimagesize_tif_mm.phpt b/ext/standard/tests/image/getimagesize_tif_mm.phpt index 8fb7ceb87a..6d76c2bb06 100644 --- a/ext/standard/tests/image/getimagesize_tif_mm.phpt +++ b/ext/standard/tests/image/getimagesize_tif_mm.phpt @@ -13,7 +13,6 @@ var_dump(getimagesize(__DIR__ . "/2x2mm.tiff", $arr)); var_dump($arr); ?> -===DONE=== --EXPECT-- *** Testing getimagesize() : tiff_mm format *** array(5) { @@ -30,4 +29,3 @@ array(5) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt index 240b015f1f..6419881abc 100644 --- a/ext/standard/tests/image/getimagesize_variation2.phpt +++ b/ext/standard/tests/image/getimagesize_variation2.phpt @@ -78,7 +78,6 @@ foreach($values as $key => $value) { }; ?> -===DONE=== --EXPECT-- *** Testing getimagesize() : usage variations *** Error: 2 - Undefined variable: undefined_var @@ -158,4 +157,3 @@ string(28) "4a46494600010201006000600000" -- Arg value unset_var -- string(28) "4a46494600010201006000600000" -===DONE=== diff --git a/ext/standard/tests/image/getimagesize_variation3.phpt b/ext/standard/tests/image/getimagesize_variation3.phpt index fba79ed461..20efd1afbc 100644 --- a/ext/standard/tests/image/getimagesize_variation3.phpt +++ b/ext/standard/tests/image/getimagesize_variation3.phpt @@ -32,7 +32,6 @@ foreach($file_types_array as $key => $filename) { var_dump( $info ); }; ?> -===DONE=== --EXPECTF-- *** Testing getimagesize() : variation *** @@ -67,4 +66,3 @@ Notice: getimagesize(): Error reading from %s! in %s on line %d bool(false) array(0) { } -===DONE=== diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt index 526e35c305..d2e2c84554 100644 --- a/ext/standard/tests/image/getimagesize_variation4.phpt +++ b/ext/standard/tests/image/getimagesize_variation4.phpt @@ -18,7 +18,6 @@ echo "*** Testing getimagesize() : variation ***\n"; var_dump( getimagesize(__DIR__."/test13pix.swf", $info) ); var_dump( $info ); ?> -===DONE=== --EXPECT-- *** Testing getimagesize() : variation *** array(5) { @@ -35,4 +34,3 @@ array(5) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/image/getimagesize_variation_005.phpt b/ext/standard/tests/image/getimagesize_variation_005.phpt index 79d2de03e9..93a8648c11 100644 --- a/ext/standard/tests/image/getimagesize_variation_005.phpt +++ b/ext/standard/tests/image/getimagesize_variation_005.phpt @@ -18,7 +18,6 @@ echo "*** Testing getimagesize() : basic functionality ***\n"; var_dump( getimagesize(__DIR__."/test13pix.swf", $info) ); var_dump( $info ); ?> -===DONE=== --EXPECT-- *** Testing getimagesize() : basic functionality *** array(5) { @@ -35,4 +34,3 @@ array(5) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/image/getimagesize_wbmp.phpt b/ext/standard/tests/image/getimagesize_wbmp.phpt index 268a7b7b08..d0b0852a26 100644 --- a/ext/standard/tests/image/getimagesize_wbmp.phpt +++ b/ext/standard/tests/image/getimagesize_wbmp.phpt @@ -13,7 +13,6 @@ var_dump(getimagesize(__DIR__ . "/75x50.wbmp", $arr)); var_dump($arr); ?> -===DONE=== --EXPECT-- *** Testing getimagesize() : wbmp format *** array(5) { @@ -30,4 +29,3 @@ array(5) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/image/getimagesize_xbm.phpt b/ext/standard/tests/image/getimagesize_xbm.phpt index 6520cdb46e..bf8bdf924d 100644 --- a/ext/standard/tests/image/getimagesize_xbm.phpt +++ b/ext/standard/tests/image/getimagesize_xbm.phpt @@ -13,7 +13,6 @@ var_dump(getimagesize(__DIR__ . "/75x50.xbm", $arr)); var_dump($arr); ?> -===DONE=== --EXPECT-- *** Testing getimagesize() : xbm format *** array(5) { @@ -30,4 +29,3 @@ array(5) { } array(0) { } -===DONE=== diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt index 6043c81180..5123f373a7 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt @@ -38,7 +38,6 @@ foreach($values as $value) { $iterator++; }; ?> -===DONE=== --EXPECT-- *** Testing image_type_to_mime_type() : usage variations *** @@ -77,4 +76,3 @@ string(24) "application/octet-stream" -- Iteration 12 -- string(24) "application/octet-stream" -===DONE=== diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt index d8366c15e3..ac77faad33 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt @@ -16,7 +16,6 @@ for($imagetype = 0; $imagetype <= IMAGETYPE_COUNT; ++$imagetype) { var_dump(image_type_to_mime_type($imagetype)); } ?> -===DONE=== --EXPECTREGEX-- \*\*\* Testing image_type_to_mime_type\(\) : usage variations \*\*\* @@ -79,4 +78,3 @@ string\(10\) "image\/webp" -- Iteration 19 -- string\(24\) "application\/octet-stream" -===DONE=== diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt index 8ec2e37ae1..baaca4650a 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt @@ -21,9 +21,7 @@ error_reporting(E_ALL ^ E_NOTICE); var_dump( image_type_to_mime_type(IMAGETYPE_ICO) ); var_dump( image_type_to_mime_type(IMAGETYPE_SWC) ); ?> -===DONE=== --EXPECT-- *** Testing image_type_to_mime_type() : usage variations *** string(24) "image/vnd.microsoft.icon" string(29) "application/x-shockwave-flash" -===DONE=== diff --git a/ext/standard/tests/mail/bug51604.phpt b/ext/standard/tests/mail/bug51604.phpt index 988849c4e1..8b4b1f3c52 100644 --- a/ext/standard/tests/mail/bug51604.phpt +++ b/ext/standard/tests/mail/bug51604.phpt @@ -24,7 +24,6 @@ echo file_get_contents($outFile); unlink($outFile); ?> -===DONE=== --EXPECT-- bool(true) To: user@example.com @@ -32,4 +31,3 @@ Subject: Test Subject KHeaders A Message -===DONE=== diff --git a/ext/standard/tests/mail/bug66535.phpt b/ext/standard/tests/mail/bug66535.phpt index 09dad37ad6..72558f902a 100644 --- a/ext/standard/tests/mail/bug66535.phpt +++ b/ext/standard/tests/mail/bug66535.phpt @@ -31,7 +31,6 @@ echo file_get_contents($outFile); unlink($outFile); ?> -===DONE=== --EXPECTF-- *** Testing mail() : send email without additional headers *** bool(true) @@ -40,4 +39,3 @@ Subject: Test Subject X-PHP-Originating-Script: %d:bug66535.php A Message -===DONE=== diff --git a/ext/standard/tests/mail/bug69115.phpt b/ext/standard/tests/mail/bug69115.phpt index 98ece49769..dd128a9dc7 100644 --- a/ext/standard/tests/mail/bug69115.phpt +++ b/ext/standard/tests/mail/bug69115.phpt @@ -11,7 +11,5 @@ smtp_port = $message = "Line 1\r\nLine 2\r\nLine 3"; mail('user@example.com', 'My Subject', $message, "From: me@me.me"); ?> -===DONE=== --EXPECTREGEX-- .* -===DONE=== diff --git a/ext/standard/tests/mail/bug69874.phpt b/ext/standard/tests/mail/bug69874.phpt index 45cfd0d32f..5bbf113f6d 100644 --- a/ext/standard/tests/mail/bug69874.phpt +++ b/ext/standard/tests/mail/bug69874.phpt @@ -31,7 +31,6 @@ echo file_get_contents($outFile); unlink($outFile); ?> -===DONE=== --EXPECT-- *** Testing mail() : send email without additional headers *** bool(true) @@ -39,4 +38,3 @@ To: user@company.com Subject: Test Subject A Message -===DONE=== diff --git a/ext/standard/tests/mail/bug69874_2.phpt b/ext/standard/tests/mail/bug69874_2.phpt index e35d1c367e..a3aabc855e 100644 --- a/ext/standard/tests/mail/bug69874_2.phpt +++ b/ext/standard/tests/mail/bug69874_2.phpt @@ -31,7 +31,6 @@ echo file_get_contents($outFile); unlink($outFile); ?> -===DONE=== --EXPECTF-- *** Testing mail() : send email without additional headers *** bool(true) @@ -40,4 +39,3 @@ Subject: Test Subject X-PHP-Originating-Script: %d:bug69874_2.php A Message -===DONE=== diff --git a/ext/standard/tests/mail/bug73203.phpt b/ext/standard/tests/mail/bug73203.phpt index c3f22d36d5..1f32b7db94 100644 --- a/ext/standard/tests/mail/bug73203.phpt +++ b/ext/standard/tests/mail/bug73203.phpt @@ -18,7 +18,5 @@ var_dump( mail('test@example.com', 'subject', 'message', 'From: lala@example.com', '') ); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/standard/tests/mail/ezmlm_hash_basic.phpt b/ext/standard/tests/mail/ezmlm_hash_basic.phpt index aa1f4c63c9..31c1019c7a 100644 --- a/ext/standard/tests/mail/ezmlm_hash_basic.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_basic.phpt @@ -13,7 +13,6 @@ var_dump(ezmlm_hash("webmaster@somewhere.com")); var_dump(ezmlm_hash("foo@somewhere.com")); ?> -===Done=== --EXPECTF-- *** Testing ezmlm_hash() : basic functionality *** @@ -22,4 +21,3 @@ int(1) Deprecated: Function ezmlm_hash() is deprecated in %s on line %d int(7) -===Done=== diff --git a/ext/standard/tests/mail/mail_basic.phpt b/ext/standard/tests/mail/mail_basic.phpt index ddc5571c7e..9afef0b65a 100644 --- a/ext/standard/tests/mail/mail_basic.phpt +++ b/ext/standard/tests/mail/mail_basic.phpt @@ -40,7 +40,6 @@ echo file_get_contents($outFile); unlink($outFile); ?> -===DONE=== --EXPECT-- *** Testing mail() : basic functionality *** -- All Mail Content Parameters -- @@ -57,4 +56,3 @@ To: user@example.com Subject: Test Subject A Message -===DONE=== diff --git a/ext/standard/tests/mail/mail_basic2.phpt b/ext/standard/tests/mail/mail_basic2.phpt index aa1e0b1ecd..bee44f9f6b 100644 --- a/ext/standard/tests/mail/mail_basic2.phpt +++ b/ext/standard/tests/mail/mail_basic2.phpt @@ -35,7 +35,6 @@ var_dump( mail($to, $subject, $message, $additional_headers, $additional_paramet echo file_get_contents($outFile); unlink($outFile); ?> -===DONE=== --EXPECTF-- *** Testing mail() : basic functionality *** -- extra parameters -- @@ -45,4 +44,3 @@ bool(true) %w3%wKHeaders %w4%w %w5%wA Message -===DONE=== diff --git a/ext/standard/tests/mail/mail_basic3.phpt b/ext/standard/tests/mail/mail_basic3.phpt index 3bab805649..57aacfa865 100644 --- a/ext/standard/tests/mail/mail_basic3.phpt +++ b/ext/standard/tests/mail/mail_basic3.phpt @@ -27,9 +27,7 @@ $message = 'A Message'; echo "-- failure --\n"; var_dump( mail($to, $subject, $message) ); ?> -===DONE=== --EXPECT-- *** Testing mail() : basic functionality *** -- failure -- bool(false) -===DONE=== diff --git a/ext/standard/tests/mail/mail_basic4.phpt b/ext/standard/tests/mail/mail_basic4.phpt index c7f8ff9824..9424ad0400 100644 --- a/ext/standard/tests/mail/mail_basic4.phpt +++ b/ext/standard/tests/mail/mail_basic4.phpt @@ -28,9 +28,7 @@ echo "-- failure --\n"; var_dump( mail($to, $subject, $message) ); ?> -===DONE=== --EXPECT-- *** Testing mail() : basic functionality *** -- failure -- bool(false) -===DONE=== diff --git a/ext/standard/tests/mail/mail_basic5.phpt b/ext/standard/tests/mail/mail_basic5.phpt index c6cc005dd5..37e0d5ba3d 100644 --- a/ext/standard/tests/mail/mail_basic5.phpt +++ b/ext/standard/tests/mail/mail_basic5.phpt @@ -26,9 +26,7 @@ $message = 'A Message'; echo "-- failure --\n"; var_dump( mail($to, $subject, $message) ); ?> -===DONE=== --EXPECT-- *** Testing mail() : basic functionality *** -- failure -- bool(false) -===DONE=== diff --git a/ext/standard/tests/mail/mail_basic6.phpt b/ext/standard/tests/mail/mail_basic6.phpt index f9eab07e61..e7af072ff5 100644 --- a/ext/standard/tests/mail/mail_basic6.phpt +++ b/ext/standard/tests/mail/mail_basic6.phpt @@ -220,7 +220,6 @@ echo @file_get_contents($outFile); @unlink($outFile); ?> -===DONE=== --EXPECTF-- *** Testing mail() : basic functionality *** -- Valid Header -- @@ -326,4 +325,3 @@ HEAD1: a HEAD2: b A Message -===DONE=== diff --git a/ext/standard/tests/mail/mail_basic7.phpt b/ext/standard/tests/mail/mail_basic7.phpt index 0b2cdc2c4f..c19fcfa24e 100644 --- a/ext/standard/tests/mail/mail_basic7.phpt +++ b/ext/standard/tests/mail/mail_basic7.phpt @@ -125,7 +125,6 @@ echo file_get_contents($outFile); unlink($outFile); ?> -===DONE=== --EXPECTF-- *** Testing mail() : basic functionality *** @@ -215,4 +214,3 @@ foo5|: bar1 foo9: %&$#! A Message -===DONE=== diff --git a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt index 9f06e09854..c48634e99c 100644 --- a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt @@ -84,11 +84,9 @@ if (!$found) { imap_close($imap_stream, CL_EXPUNGE); ?> -===Done=== --EXPECTF-- *** Testing mail() : basic functionality *** Msg sent OK Id of msg just sent is %d .. delete it TEST PASSED: Msgs sent and deleted OK -===Done=== diff --git a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt index 498554f947..3aff59a614 100644 --- a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt @@ -81,11 +81,9 @@ if (!$found) { imap_close($imap_stream, CL_EXPUNGE); ?> -===Done=== --EXPECTF-- *** Testing mail() : basic functionality *** Msg sent OK Id of msg just sent is %d .. delete it TEST PASSED: Msgs sent and deleted OK -===Done=== diff --git a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt index 172474b1d0..52d48937ed 100644 --- a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt @@ -81,11 +81,9 @@ if (!$found) { imap_close($imap_stream, CL_EXPUNGE); ?> -===Done=== --EXPECTF-- *** Testing mail() : basic functionality *** Msg sent OK Id of msg just sent is %d .. delete it TEST PASSED: Msgs sent and deleted OK -===Done=== diff --git a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt index 9e7cbc5802..a677312442 100644 --- a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt @@ -82,11 +82,9 @@ if (!$found) { imap_close($imap_stream, CL_EXPUNGE); ?> -===Done=== --EXPECTF-- *** Testing mail() : basic functionality *** Msg sent OK Id of msg just sent is %d .. delete it TEST PASSED: Msgs sent and deleted OK -===Done=== diff --git a/ext/standard/tests/mail/mail_variation1.phpt b/ext/standard/tests/mail/mail_variation1.phpt index fd40f97b68..3e4d346b0b 100644 --- a/ext/standard/tests/mail/mail_variation1.phpt +++ b/ext/standard/tests/mail/mail_variation1.phpt @@ -23,8 +23,6 @@ $subject = 'Test Subject'; $message = 'A Message'; var_dump( mail($to, $subject, $message) ); ?> -===DONE=== --EXPECT-- *** Testing mail() : variation *** bool(false) -===DONE=== diff --git a/ext/standard/tests/mail/mail_variation2.phpt b/ext/standard/tests/mail/mail_variation2.phpt index 7e78bcfade..9ab8071b4b 100644 --- a/ext/standard/tests/mail/mail_variation2.phpt +++ b/ext/standard/tests/mail/mail_variation2.phpt @@ -32,7 +32,6 @@ echo file_get_contents($outFile); unlink($outFile); ?> -===DONE=== --EXPECTF-- *** Testing mail() : basic functionality *** bool(true) @@ -40,4 +39,3 @@ bool(true) %w2%wSubject: Test Subject %w3%w %w4%wA Message -===DONE=== diff --git a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt index bd259667c2..92a59477d0 100644 --- a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt @@ -83,7 +83,7 @@ if (!$found) { imap_close($imap_stream, CL_EXPUNGE); ?> -===Done=== +===DONE=== --EXPECTF-- *** Testing mail() : basic functionality *** diff --git a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt index c0698076e1..06c16eb5f8 100644 --- a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt @@ -83,7 +83,7 @@ if (!$found) { imap_close($imap_stream, CL_EXPUNGE); ?> -===Done=== +===DONE=== --EXPECTF-- *** Testing mail() : basic functionality *** diff --git a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt index fe961d3d16..44eda4555b 100644 --- a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt @@ -82,7 +82,7 @@ if (!$found) { imap_close($imap_stream, CL_EXPUNGE); ?> -===Done=== +===DONE=== --EXPECTF-- *** Testing mail() : basic functionality *** diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt index 5c3f8ff8ea..1866097c3e 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -31,7 +31,6 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> -===Done=== --EXPECT-- *** Testing abs() : basic functionality *** int(23) @@ -48,4 +47,3 @@ float(23.45) int(0) int(1) int(0) -===Done=== diff --git a/ext/standard/tests/math/abs_basiclong_64bit.phpt b/ext/standard/tests/math/abs_basiclong_64bit.phpt index 0f0cb5d55c..f3e72b062a 100644 --- a/ext/standard/tests/math/abs_basiclong_64bit.phpt +++ b/ext/standard/tests/math/abs_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- int(9223372036854775807) @@ -57,4 +56,3 @@ float(9.2233720368548E+18) int(9223372036854775807) --- testing: -9.2233720368548E+18 --- float(9.2233720368548E+18) -===DONE=== diff --git a/ext/standard/tests/math/abs_variation.phpt b/ext/standard/tests/math/abs_variation.phpt index e6838f7f72..f27a73559a 100644 --- a/ext/standard/tests/math/abs_variation.phpt +++ b/ext/standard/tests/math/abs_variation.phpt @@ -83,7 +83,6 @@ foreach($inputs as $input) { fclose($fp); ?> -===Done=== --EXPECT-- *** Testing abs() : usage variations *** @@ -134,4 +133,3 @@ int(0) -- Iteration 16 -- abs() expects parameter 1 to be int or float, resource given -===Done=== diff --git a/ext/standard/tests/math/acos_basiclong_64bit.phpt b/ext/standard/tests/math/acos_basiclong_64bit.phpt index a32180cd1b..89cc9763d5 100644 --- a/ext/standard/tests/math/acos_basiclong_64bit.phpt +++ b/ext/standard/tests/math/acos_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(NAN) @@ -57,4 +56,3 @@ float(NAN) float(NAN) --- testing: -9.2233720368548E+18 --- float(NAN) -===DONE=== diff --git a/ext/standard/tests/math/acosh_basiclong_64bit.phpt b/ext/standard/tests/math/acosh_basiclong_64bit.phpt index 902c235c32..428ae3e5fb 100644 --- a/ext/standard/tests/math/acosh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/acosh_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(44.361419555836) @@ -57,4 +56,3 @@ float(44.361419555836) float(NAN) --- testing: -9.2233720368548E+18 --- float(NAN) -===DONE=== diff --git a/ext/standard/tests/math/asin_basiclong_64bit.phpt b/ext/standard/tests/math/asin_basiclong_64bit.phpt index 071ad1c39c..7a21ba6167 100644 --- a/ext/standard/tests/math/asin_basiclong_64bit.phpt +++ b/ext/standard/tests/math/asin_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(NAN) @@ -57,4 +56,3 @@ float(NAN) float(NAN) --- testing: -9.2233720368548E+18 --- float(NAN) -===DONE=== diff --git a/ext/standard/tests/math/asinh_basiclong_64bit.phpt b/ext/standard/tests/math/asinh_basiclong_64bit.phpt index f4ccb0d23b..db8b7ad03e 100644 --- a/ext/standard/tests/math/asinh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/asinh_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(44.361419555836) @@ -57,4 +56,3 @@ float(44.361419555836) float(-44.361419555836) --- testing: -9.2233720368548E+18 --- float(-44.361419555836) -===DONE=== diff --git a/ext/standard/tests/math/atan2_basiclong_64bit.phpt b/ext/standard/tests/math/atan2_basiclong_64bit.phpt index f646585f30..235be3eca8 100644 --- a/ext/standard/tests/math/atan2_basiclong_64bit.phpt +++ b/ext/standard/tests/math/atan2_basiclong_64bit.phpt @@ -29,7 +29,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807, 0 --- float(1.5707963267949) @@ -361,4 +360,3 @@ float(-1.5707963270277) float(-0.78539816339745) --- testing: -9.2233720368548E+18, -9223372036854775808 --- float(-2.3561944901923) -===DONE=== diff --git a/ext/standard/tests/math/atan_basiclong_64bit.phpt b/ext/standard/tests/math/atan_basiclong_64bit.phpt index 15d9a000ae..2f5945dd2f 100644 --- a/ext/standard/tests/math/atan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/atan_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(1.5707963267949) @@ -57,4 +56,3 @@ float(1.5707963267949) float(-1.5707963267949) --- testing: -9.2233720368548E+18 --- float(-1.5707963267949) -===DONE=== diff --git a/ext/standard/tests/math/atanh_basiclong_64bit.phpt b/ext/standard/tests/math/atanh_basiclong_64bit.phpt index 426ca51f2a..aa84cbf338 100644 --- a/ext/standard/tests/math/atanh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/atanh_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(NAN) @@ -57,4 +56,3 @@ float(NAN) float(NAN) --- testing: -9.2233720368548E+18 --- float(NAN) -===DONE=== diff --git a/ext/standard/tests/math/base_convert_variation1.phpt b/ext/standard/tests/math/base_convert_variation1.phpt index ee151e3f7f..00eb9e7585 100644 --- a/ext/standard/tests/math/base_convert_variation1.phpt +++ b/ext/standard/tests/math/base_convert_variation1.phpt @@ -76,7 +76,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing base_convert() : usage variations *** @@ -178,4 +177,3 @@ string(1) "0" Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d string(1) "5" -===Done=== diff --git a/ext/standard/tests/math/bindec_basiclong_64bit.phpt b/ext/standard/tests/math/bindec_basiclong_64bit.phpt index 488ab538ed..8b69d6b4c3 100644 --- a/ext/standard/tests/math/bindec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/bindec_basiclong_64bit.phpt @@ -30,7 +30,6 @@ foreach ($binLongStrs as $strVal) { } ?> -===DONE=== --EXPECT-- --- testing: 0111111111111111111111111111111111111111111111111111111111111111 --- int(9223372036854775807) @@ -48,4 +47,3 @@ float(3.6893488147419E+19) int(4294967295) --- testing: 111111111111111111111111111111111 --- int(8589934591) -===DONE=== diff --git a/ext/standard/tests/math/bindec_variation1.phpt b/ext/standard/tests/math/bindec_variation1.phpt index a8444c5395..f215e8ee26 100644 --- a/ext/standard/tests/math/bindec_variation1.phpt +++ b/ext/standard/tests/math/bindec_variation1.phpt @@ -82,7 +82,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing bindec() : usage variations *** @@ -177,4 +176,3 @@ int(0) -- Iteration 24 -- bindec() expects parameter 1 to be string, resource given -===Done=== diff --git a/ext/standard/tests/math/bindec_variation1_64bit.phpt b/ext/standard/tests/math/bindec_variation1_64bit.phpt index 0fdfe4b5eb..3b5b3e82e0 100644 --- a/ext/standard/tests/math/bindec_variation1_64bit.phpt +++ b/ext/standard/tests/math/bindec_variation1_64bit.phpt @@ -82,7 +82,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing bindec() : usage variations *** @@ -177,4 +176,3 @@ int(0) -- Iteration 24 -- bindec() expects parameter 1 to be string, resource given -===Done=== diff --git a/ext/standard/tests/math/bug75514.phpt b/ext/standard/tests/math/bug75514.phpt index af97b6d0e1..da77b9bd9b 100644 --- a/ext/standard/tests/math/bug75514.phpt +++ b/ext/standard/tests/math/bug75514.phpt @@ -5,8 +5,6 @@ Bug #75514 mt_rand returns value outside [$min,$max] mt_srand(0, MT_RAND_PHP); var_dump(mt_rand(0,999999999), mt_rand(0,999)); ?> -===Done=== --EXPECT-- int(448865905) int(592) -===Done=== diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index 275ed485c2..61c3dd683d 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -38,7 +38,6 @@ for ($i = 0; $i < count($values); $i++) { } ?> -===Done=== --EXPECT-- *** Testing ceil() : basic functionality *** float(0) @@ -61,4 +60,3 @@ float(39) float(1) float(0) float(0) -===Done=== diff --git a/ext/standard/tests/math/ceil_basiclong_64bit.phpt b/ext/standard/tests/math/ceil_basiclong_64bit.phpt index 42d9f6b413..e1cc4b4dc6 100644 --- a/ext/standard/tests/math/ceil_basiclong_64bit.phpt +++ b/ext/standard/tests/math/ceil_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(9.2233720368548E+18) @@ -57,4 +56,3 @@ float(9.2233720368548E+18) float(-9.2233720368548E+18) --- testing: -9.2233720368548E+18 --- float(-9.2233720368548E+18) -===DONE=== diff --git a/ext/standard/tests/math/ceil_variation1.phpt b/ext/standard/tests/math/ceil_variation1.phpt index 07481126fd..a6f308d386 100644 --- a/ext/standard/tests/math/ceil_variation1.phpt +++ b/ext/standard/tests/math/ceil_variation1.phpt @@ -76,7 +76,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECT-- *** Testing ceil() : usage variations *** @@ -127,4 +126,3 @@ float(0) -- Iteration 16 -- ceil() expects parameter 1 to be int or float, resource given -===Done=== diff --git a/ext/standard/tests/math/cos_basiclong_64bit.phpt b/ext/standard/tests/math/cos_basiclong_64bit.phpt index 12355a7d86..c575bd7930 100644 --- a/ext/standard/tests/math/cos_basiclong_64bit.phpt +++ b/ext/standard/tests/math/cos_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(0.0118000765128) @@ -57,4 +56,3 @@ float(0.0118000765128) float(0.0118000765128) --- testing: -9.2233720368548E+18 --- float(0.0118000765128) -===DONE=== diff --git a/ext/standard/tests/math/cosh_basiclong_64bit.phpt b/ext/standard/tests/math/cosh_basiclong_64bit.phpt index f065b47213..8c805046c5 100644 --- a/ext/standard/tests/math/cosh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/cosh_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(INF) @@ -57,4 +56,3 @@ float(INF) float(INF) --- testing: -9.2233720368548E+18 --- float(INF) -===DONE=== diff --git a/ext/standard/tests/math/decbin_basiclong_64bit.phpt b/ext/standard/tests/math/decbin_basiclong_64bit.phpt index a2e9185ab5..d48d729bc9 100644 --- a/ext/standard/tests/math/decbin_basiclong_64bit.phpt +++ b/ext/standard/tests/math/decbin_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- string(63) "111111111111111111111111111111111111111111111111111111111111111" @@ -57,4 +56,3 @@ string(64) "1000000000000000000000000000000000000000000000000000000000000000" string(64) "1000000000000000000000000000000000000000000000000000000000000001" --- testing: -9.2233720368548E+18 --- string(64) "1000000000000000000000000000000000000000000000000000000000000000" -===DONE=== diff --git a/ext/standard/tests/math/decbin_variation1.phpt b/ext/standard/tests/math/decbin_variation1.phpt index 711f1733a2..46b509be3b 100644 --- a/ext/standard/tests/math/decbin_variation1.phpt +++ b/ext/standard/tests/math/decbin_variation1.phpt @@ -90,7 +90,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing decbin() : usage variations *** @@ -176,4 +175,3 @@ string(1) "0" -- Iteration 27 -- string(%d) "%d" -===Done=== diff --git a/ext/standard/tests/math/decbin_variation1_64bit.phpt b/ext/standard/tests/math/decbin_variation1_64bit.phpt index ccde29472b..589c954651 100644 --- a/ext/standard/tests/math/decbin_variation1_64bit.phpt +++ b/ext/standard/tests/math/decbin_variation1_64bit.phpt @@ -90,7 +90,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing decbin() : usage variations *** @@ -176,4 +175,3 @@ string(1) "0" -- Iteration 27 -- string(%d) "%d" -===Done=== diff --git a/ext/standard/tests/math/dechex_basiclong_64bit.phpt b/ext/standard/tests/math/dechex_basiclong_64bit.phpt index 135a422f66..812bafbfb7 100644 --- a/ext/standard/tests/math/dechex_basiclong_64bit.phpt +++ b/ext/standard/tests/math/dechex_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- string(16) "7fffffffffffffff" @@ -57,4 +56,3 @@ string(16) "8000000000000000" string(16) "8000000000000001" --- testing: -9.2233720368548E+18 --- string(16) "8000000000000000" -===DONE=== diff --git a/ext/standard/tests/math/dechex_variation1.phpt b/ext/standard/tests/math/dechex_variation1.phpt index e77ea9922e..e2a3e4ed67 100644 --- a/ext/standard/tests/math/dechex_variation1.phpt +++ b/ext/standard/tests/math/dechex_variation1.phpt @@ -90,7 +90,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing dechex() : usage variations *** @@ -176,4 +175,3 @@ string(1) "0" -- Iteration 27 -- string(%d) "%s" -===Done=== diff --git a/ext/standard/tests/math/dechex_variation1_64bit.phpt b/ext/standard/tests/math/dechex_variation1_64bit.phpt index ff88ec8c79..6d186fa008 100644 --- a/ext/standard/tests/math/dechex_variation1_64bit.phpt +++ b/ext/standard/tests/math/dechex_variation1_64bit.phpt @@ -90,7 +90,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing dechex() : usage variations *** @@ -176,4 +175,3 @@ string(1) "0" -- Iteration 27 -- string(%d) "%s" -===Done=== diff --git a/ext/standard/tests/math/decoct_basiclong_64bit.phpt b/ext/standard/tests/math/decoct_basiclong_64bit.phpt index f1812b9062..8b61aa8cbf 100644 --- a/ext/standard/tests/math/decoct_basiclong_64bit.phpt +++ b/ext/standard/tests/math/decoct_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- string(21) "777777777777777777777" @@ -57,4 +56,3 @@ string(22) "1000000000000000000000" string(22) "1000000000000000000001" --- testing: -9.2233720368548E+18 --- string(22) "1000000000000000000000" -===DONE=== diff --git a/ext/standard/tests/math/decoct_variation1.phpt b/ext/standard/tests/math/decoct_variation1.phpt index 85230df2b3..ad6c63f0dc 100644 --- a/ext/standard/tests/math/decoct_variation1.phpt +++ b/ext/standard/tests/math/decoct_variation1.phpt @@ -91,7 +91,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing decoct() : usage variations *** @@ -177,4 +176,3 @@ string(1) "0" -- Iteration 27 -- string(%d) "%d" -===Done=== diff --git a/ext/standard/tests/math/decoct_variation1_64bit.phpt b/ext/standard/tests/math/decoct_variation1_64bit.phpt index 8e76e15c2e..0a35475883 100644 --- a/ext/standard/tests/math/decoct_variation1_64bit.phpt +++ b/ext/standard/tests/math/decoct_variation1_64bit.phpt @@ -91,7 +91,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing decoct() : usage variations *** @@ -177,4 +176,3 @@ string(1) "0" -- Iteration 27 -- string(%d) "%d" -===Done=== diff --git a/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt b/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt index 3a14b11825..ae4087eccb 100644 --- a/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt +++ b/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(1.6097821017949E+17) @@ -57,4 +56,3 @@ float(1.6097821017949E+17) float(-1.6097821017949E+17) --- testing: -9.2233720368548E+18 --- float(-1.6097821017949E+17) -===DONE=== diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt index 6d90c9d8a8..ba53e22f28 100644 --- a/ext/standard/tests/math/exp_basic.phpt +++ b/ext/standard/tests/math/exp_basic.phpt @@ -26,7 +26,6 @@ foreach($values as $value) { }; ?> -===Done=== --EXPECT-- -- Iteration 1 -- float(22026.465794807) @@ -63,4 +62,3 @@ float(1) -- Iteration 12 -- float(1) -===Done=== diff --git a/ext/standard/tests/math/exp_basiclong_64bit.phpt b/ext/standard/tests/math/exp_basiclong_64bit.phpt index 75518548e3..f559b7c576 100644 --- a/ext/standard/tests/math/exp_basiclong_64bit.phpt +++ b/ext/standard/tests/math/exp_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(INF) @@ -57,4 +56,3 @@ float(INF) float(0) --- testing: -9.2233720368548E+18 --- float(0) -===DONE=== diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt index 5690f4cf6f..9e926b869d 100644 --- a/ext/standard/tests/math/expm1_basic.phpt +++ b/ext/standard/tests/math/expm1_basic.phpt @@ -33,7 +33,6 @@ foreach($values as $value) { $iterator++; }; ?> -===Done=== --EXPECT-- *** Testing expm1() : basic functionality *** @@ -72,4 +71,3 @@ float(0) -- Iteration 12 -- float(0) -===Done=== diff --git a/ext/standard/tests/math/expm1_basiclong_64bit.phpt b/ext/standard/tests/math/expm1_basiclong_64bit.phpt index 9046764d02..835ebc41c1 100644 --- a/ext/standard/tests/math/expm1_basiclong_64bit.phpt +++ b/ext/standard/tests/math/expm1_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(INF) @@ -57,4 +56,3 @@ float(INF) float(-1) --- testing: -9.2233720368548E+18 --- float(-1) -===DONE=== diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt index 986ee26924..c5d2fc46b1 100644 --- a/ext/standard/tests/math/floor_basic.phpt +++ b/ext/standard/tests/math/floor_basic.phpt @@ -38,7 +38,6 @@ foreach($values as $value) { }; ?> -===Done=== --EXPECT-- *** Testing floor() : basic functionality *** @@ -101,4 +100,3 @@ float(0) -- floor -- float(0) -===Done=== diff --git a/ext/standard/tests/math/floor_basiclong_64bit.phpt b/ext/standard/tests/math/floor_basiclong_64bit.phpt index 6b768ef90c..3bc4e6393e 100644 --- a/ext/standard/tests/math/floor_basiclong_64bit.phpt +++ b/ext/standard/tests/math/floor_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(9.2233720368548E+18) @@ -57,4 +56,3 @@ float(9.2233720368548E+18) float(-9.2233720368548E+18) --- testing: -9.2233720368548E+18 --- float(-9.2233720368548E+18) -===DONE=== diff --git a/ext/standard/tests/math/floor_variation1.phpt b/ext/standard/tests/math/floor_variation1.phpt index e3406eba87..6774816ead 100644 --- a/ext/standard/tests/math/floor_variation1.phpt +++ b/ext/standard/tests/math/floor_variation1.phpt @@ -76,7 +76,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECT-- *** Testing floor() : usage variations *** @@ -127,4 +126,3 @@ float(0) -- Iteration 16 -- floor() expects parameter 1 to be int or float, resource given -===Done=== diff --git a/ext/standard/tests/math/fmod_basiclong_64bit.phpt b/ext/standard/tests/math/fmod_basiclong_64bit.phpt index 6513e31159..e949aab00a 100644 --- a/ext/standard/tests/math/fmod_basiclong_64bit.phpt +++ b/ext/standard/tests/math/fmod_basiclong_64bit.phpt @@ -29,7 +29,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807, 0 --- float(NAN) @@ -361,4 +360,3 @@ float(-0) float(-0) --- testing: -9.2233720368548E+18, -9223372036854775808 --- float(-0) -===DONE=== diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt index e7b866253f..bb8c3d3f27 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -33,7 +33,6 @@ foreach($values as $value) { }; ?> -===Done=== --EXPECTF-- *** Testing hexdec() : basic functionality *** @@ -94,4 +93,3 @@ int(0) -- hexdec -- int(0) -===Done=== diff --git a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt index 225e42018b..b378b452eb 100644 --- a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt @@ -30,7 +30,6 @@ foreach ($hexLongStrs as $strVal) { } ?> -===DONE=== --EXPECT-- --- testing: 7fffffffffffffff --- int(9223372036854775807) @@ -48,4 +47,3 @@ float(4.7223664828696E+21) int(34359738367) --- testing: fffffffff --- int(68719476735) -===DONE=== diff --git a/ext/standard/tests/math/hexdec_variation1.phpt b/ext/standard/tests/math/hexdec_variation1.phpt index e7748a04d0..d395f8a8f1 100644 --- a/ext/standard/tests/math/hexdec_variation1.phpt +++ b/ext/standard/tests/math/hexdec_variation1.phpt @@ -86,7 +86,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing hexdec() : usage variations *** @@ -183,4 +182,3 @@ int(0) -- Iteration 26 -- hexdec() expects parameter 1 to be string, resource given -===Done=== diff --git a/ext/standard/tests/math/hexdec_variation1_64bit.phpt b/ext/standard/tests/math/hexdec_variation1_64bit.phpt index 31cc71b0e6..35c17f727a 100644 --- a/ext/standard/tests/math/hexdec_variation1_64bit.phpt +++ b/ext/standard/tests/math/hexdec_variation1_64bit.phpt @@ -86,7 +86,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing hexdec() : usage variations *** @@ -183,4 +182,3 @@ int(0) -- Iteration 26 -- hexdec() expects parameter 1 to be string, resource given -===Done=== diff --git a/ext/standard/tests/math/hypot_basic.phpt b/ext/standard/tests/math/hypot_basic.phpt index c09dd51da5..796c160810 100644 --- a/ext/standard/tests/math/hypot_basic.phpt +++ b/ext/standard/tests/math/hypot_basic.phpt @@ -48,7 +48,6 @@ for ($i = 0; $i < count($valuesy); $i++) { } } ?> -===Done=== --EXPECTF-- *** Testing hypot() : basic functionality *** @@ -441,4 +440,3 @@ Y: X: float(0) Y: X:1 float(1) Y: X: float(0) -===Done=== diff --git a/ext/standard/tests/math/hypot_basiclong_64bit.phpt b/ext/standard/tests/math/hypot_basiclong_64bit.phpt index 3bbfcb4afc..9a0b71ffc1 100644 --- a/ext/standard/tests/math/hypot_basiclong_64bit.phpt +++ b/ext/standard/tests/math/hypot_basiclong_64bit.phpt @@ -29,7 +29,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807, 0 --- float(9.2233720368548E+18) @@ -361,4 +360,3 @@ float(9.2233720368548E+18) float(1.3043817825333E+19) --- testing: -9.2233720368548E+18, -9223372036854775808 --- float(1.3043817825333E+19) -===DONE=== diff --git a/ext/standard/tests/math/is_finite_basiclong_64bit.phpt b/ext/standard/tests/math/is_finite_basiclong_64bit.phpt index 201d8473fa..b8e4b63f17 100644 --- a/ext/standard/tests/math/is_finite_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_finite_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- bool(true) @@ -57,4 +56,3 @@ bool(true) bool(true) --- testing: -9.2233720368548E+18 --- bool(true) -===DONE=== diff --git a/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt b/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt index ca53b77f0c..d6bd27c8a3 100644 --- a/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- bool(false) @@ -57,4 +56,3 @@ bool(false) bool(false) --- testing: -9.2233720368548E+18 --- bool(false) -===DONE=== diff --git a/ext/standard/tests/math/is_nan_basiclong_64bit.phpt b/ext/standard/tests/math/is_nan_basiclong_64bit.phpt index ca85db1660..2da97f592c 100644 --- a/ext/standard/tests/math/is_nan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_nan_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- bool(false) @@ -57,4 +56,3 @@ bool(false) bool(false) --- testing: -9.2233720368548E+18 --- bool(false) -===DONE=== diff --git a/ext/standard/tests/math/log10_basiclong_64bit.phpt b/ext/standard/tests/math/log10_basiclong_64bit.phpt index 2eb2d544b6..ef00d37d02 100644 --- a/ext/standard/tests/math/log10_basiclong_64bit.phpt +++ b/ext/standard/tests/math/log10_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(18.964889726831) @@ -57,4 +56,3 @@ float(18.964889726831) float(NAN) --- testing: -9.2233720368548E+18 --- float(NAN) -===DONE=== diff --git a/ext/standard/tests/math/log1p_basic.phpt b/ext/standard/tests/math/log1p_basic.phpt index 61a0c3d839..2b8c7f8cc5 100644 --- a/ext/standard/tests/math/log1p_basic.phpt +++ b/ext/standard/tests/math/log1p_basic.phpt @@ -34,7 +34,6 @@ foreach($values as $value) { ?> -===Done=== --EXPECT-- *** Testing log1p() : basic functionality *** @@ -75,4 +74,3 @@ float(0.69314718055995) -- log1p -- float(0) -===Done=== diff --git a/ext/standard/tests/math/log1p_basiclong_64bit.phpt b/ext/standard/tests/math/log1p_basiclong_64bit.phpt index 05580ff731..be6f8aa3a2 100644 --- a/ext/standard/tests/math/log1p_basiclong_64bit.phpt +++ b/ext/standard/tests/math/log1p_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(43.668272375277) @@ -57,4 +56,3 @@ float(43.668272375277) float(NAN) --- testing: -9.2233720368548E+18 --- float(NAN) -===DONE=== diff --git a/ext/standard/tests/math/log_basiclong_64bit.phpt b/ext/standard/tests/math/log_basiclong_64bit.phpt index 5259899323..c0598fed8b 100644 --- a/ext/standard/tests/math/log_basiclong_64bit.phpt +++ b/ext/standard/tests/math/log_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(43.668272375277) @@ -57,4 +56,3 @@ float(43.668272375277) float(NAN) --- testing: -9.2233720368548E+18 --- float(NAN) -===DONE=== diff --git a/ext/standard/tests/math/octdec_basic_64bit.phpt b/ext/standard/tests/math/octdec_basic_64bit.phpt index 6fd0b366b8..6401fdff3c 100644 --- a/ext/standard/tests/math/octdec_basic_64bit.phpt +++ b/ext/standard/tests/math/octdec_basic_64bit.phpt @@ -32,7 +32,6 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> -===Done=== --EXPECTF-- *** Testing octdec() : basic functionality *** @@ -64,4 +63,3 @@ int(823384) int(1) int(0) int(0) -===Done=== diff --git a/ext/standard/tests/math/octdec_basiclong_64bit.phpt b/ext/standard/tests/math/octdec_basiclong_64bit.phpt index 4a97a6f414..4e9d88def6 100644 --- a/ext/standard/tests/math/octdec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/octdec_basiclong_64bit.phpt @@ -30,7 +30,6 @@ foreach ($octLongStrs as $strVal) { } ?> -===DONE=== --EXPECT-- --- testing: 777777777777777777777 --- int(9223372036854775807) @@ -48,4 +47,3 @@ float(7.5557863725914E+22) int(34359738367) --- testing: 777777777777 --- int(68719476735) -===DONE=== diff --git a/ext/standard/tests/math/pow_basic.phpt b/ext/standard/tests/math/pow_basic.phpt index 3a719ada08..e23dac3fb4 100644 --- a/ext/standard/tests/math/pow_basic.phpt +++ b/ext/standard/tests/math/pow_basic.phpt @@ -46,7 +46,6 @@ foreach($bases as $base) { echo "\n\n"; } ?> -===Done=== --EXPECT-- Base = 23 ..... Exponent = 0 Result = 1 @@ -267,4 +266,3 @@ Base = -2147483648 ..... Exponent = 2147483647 Result = -INF ..... Exponent = -2147483648 Result = 0 -===Done=== diff --git a/ext/standard/tests/math/pow_basic2.phpt b/ext/standard/tests/math/pow_basic2.phpt index 8dfb487639..bb5a25520d 100644 --- a/ext/standard/tests/math/pow_basic2.phpt +++ b/ext/standard/tests/math/pow_basic2.phpt @@ -26,7 +26,6 @@ var_dump(pow(-24, $large_exp+1)); var_dump(pow(-0.24, -$large_exp+1)); ?> -===Done=== --EXPECTF-- -- The following all result in INF -- float(INF) @@ -48,4 +47,3 @@ float(%s) -- The following all result in -INF -- float(-INF) float(-INF) -===Done=== diff --git a/ext/standard/tests/math/pow_basic_64bit.phpt b/ext/standard/tests/math/pow_basic_64bit.phpt index 512efd034c..3dc37c4774 100644 --- a/ext/standard/tests/math/pow_basic_64bit.phpt +++ b/ext/standard/tests/math/pow_basic_64bit.phpt @@ -46,7 +46,6 @@ foreach($bases as $base) { echo "\n\n"; } ?> -===Done=== --EXPECT-- Base = 23 ..... Exponent = 0 Result = 1 @@ -267,4 +266,3 @@ Base = -9223372036854775808 ..... Exponent = 2147483647 Result = -INF ..... Exponent = -2147483648 Result = 0 -===Done=== diff --git a/ext/standard/tests/math/pow_basiclong_64bit.phpt b/ext/standard/tests/math/pow_basiclong_64bit.phpt index 722b01c0c7..ff661c3a9a 100644 --- a/ext/standard/tests/math/pow_basiclong_64bit.phpt +++ b/ext/standard/tests/math/pow_basiclong_64bit.phpt @@ -29,7 +29,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807, 0 --- int(1) @@ -361,4 +360,3 @@ float(0) float(INF) --- testing: -9.2233720368548E+18, -9223372036854775808 --- float(0) -===DONE=== diff --git a/ext/standard/tests/math/pow_variation1.phpt b/ext/standard/tests/math/pow_variation1.phpt index 86df8e0eb4..e005ced560 100644 --- a/ext/standard/tests/math/pow_variation1.phpt +++ b/ext/standard/tests/math/pow_variation1.phpt @@ -94,7 +94,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing pow() : usage variations *** @@ -187,4 +186,3 @@ int(0) -- Iteration 26 -- %s -===Done=== diff --git a/ext/standard/tests/math/pow_variation1_64bit.phpt b/ext/standard/tests/math/pow_variation1_64bit.phpt index da63ae3d9f..636c65eabf 100644 --- a/ext/standard/tests/math/pow_variation1_64bit.phpt +++ b/ext/standard/tests/math/pow_variation1_64bit.phpt @@ -94,7 +94,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing pow() : usage variations *** @@ -187,4 +186,3 @@ int(0) -- Iteration 26 -- %s -===Done=== diff --git a/ext/standard/tests/math/pow_variation2.phpt b/ext/standard/tests/math/pow_variation2.phpt index 83d1fda065..ad86e1721e 100644 --- a/ext/standard/tests/math/pow_variation2.phpt +++ b/ext/standard/tests/math/pow_variation2.phpt @@ -90,7 +90,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECTF-- *** Testing pow() : usage variations *** @@ -183,4 +182,3 @@ float(1) -- Iteration 26 -- %s -===Done=== diff --git a/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt b/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt index b3d973387e..fbde4ab585 100644 --- a/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt +++ b/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(5.2846029059076E+20) @@ -57,4 +56,3 @@ float(5.2846029059076E+20) float(-5.2846029059076E+20) --- testing: -9.2233720368548E+18 --- float(-5.2846029059076E+20) -===DONE=== diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt index d6b927f2d5..912529433e 100644 --- a/ext/standard/tests/math/round_basic.phpt +++ b/ext/standard/tests/math/round_basic.phpt @@ -44,7 +44,6 @@ for ($i = 0; $i < count($values); $i++) { } } ?> -===Done=== --EXPECT-- *** Testing round() : basic functionality *** round: 123456789 @@ -164,4 +163,3 @@ round: 2.3456789e8 ...with precision -> float(234567890) ...with precision 1-> float(234567890) ...with precision -> float(234567890) -===Done=== diff --git a/ext/standard/tests/math/round_basiclong_64bit.phpt b/ext/standard/tests/math/round_basiclong_64bit.phpt index fbae95437f..ee66684494 100644 --- a/ext/standard/tests/math/round_basiclong_64bit.phpt +++ b/ext/standard/tests/math/round_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(9.2233720368548E+18) @@ -57,4 +56,3 @@ float(9.2233720368548E+18) float(-9.2233720368548E+18) --- testing: -9.2233720368548E+18 --- float(-9.2233720368548E+18) -===DONE=== diff --git a/ext/standard/tests/math/round_bug71201.phpt b/ext/standard/tests/math/round_bug71201.phpt index 43a5e11263..b02d3b6ef4 100644 --- a/ext/standard/tests/math/round_bug71201.phpt +++ b/ext/standard/tests/math/round_bug71201.phpt @@ -4,7 +4,5 @@ Bug #71201 round() segfault on 64-bit builds <?php echo round(1.0, -2147483648), "\n"; ?> -===DONE=== --EXPECT-- 0 -===DONE=== diff --git a/ext/standard/tests/math/round_variation1.phpt b/ext/standard/tests/math/round_variation1.phpt index 774532f103..b8566e6df7 100644 --- a/ext/standard/tests/math/round_variation1.phpt +++ b/ext/standard/tests/math/round_variation1.phpt @@ -91,7 +91,6 @@ foreach($inputs as $input) { }; fclose($fp); ?> -===Done=== --EXPECT-- *** Testing round() : usage variations *** @@ -172,4 +171,3 @@ float(0) -- Iteration 26 -- round() expects parameter 1 to be int or float, resource given -===Done=== diff --git a/ext/standard/tests/math/sin_basiclong_64bit.phpt b/ext/standard/tests/math/sin_basiclong_64bit.phpt index f335b3bd62..35775d2f0b 100644 --- a/ext/standard/tests/math/sin_basiclong_64bit.phpt +++ b/ext/standard/tests/math/sin_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(0.99993037667344) @@ -57,4 +56,3 @@ float(0.99993037667344) float(-0.99993037667344) --- testing: -9.2233720368548E+18 --- float(-0.99993037667344) -===DONE=== diff --git a/ext/standard/tests/math/sinh_basiclong_64bit.phpt b/ext/standard/tests/math/sinh_basiclong_64bit.phpt index a52a48a8db..f192b7a1d6 100644 --- a/ext/standard/tests/math/sinh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/sinh_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(INF) @@ -57,4 +56,3 @@ float(INF) float(-INF) --- testing: -9.2233720368548E+18 --- float(-INF) -===DONE=== diff --git a/ext/standard/tests/math/sqrt_basiclong_64bit.phpt b/ext/standard/tests/math/sqrt_basiclong_64bit.phpt index 44fe578548..a20cccad79 100644 --- a/ext/standard/tests/math/sqrt_basiclong_64bit.phpt +++ b/ext/standard/tests/math/sqrt_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(3037000499.976) @@ -57,4 +56,3 @@ float(3037000499.976) float(NAN) --- testing: -9.2233720368548E+18 --- float(NAN) -===DONE=== diff --git a/ext/standard/tests/math/sqrt_variation.phpt b/ext/standard/tests/math/sqrt_variation.phpt index 6e2304b437..696596cefa 100644 --- a/ext/standard/tests/math/sqrt_variation.phpt +++ b/ext/standard/tests/math/sqrt_variation.phpt @@ -34,7 +34,6 @@ for ($i = 0; $i < count($values); $i++) { } ?> -===Done=== --EXPECTF-- *** Testing sqrt() : usage variations *** float(4.7958315233127) @@ -53,4 +52,3 @@ float(31.622776601684) float(0) float(1) float(0) -===Done=== diff --git a/ext/standard/tests/math/srand_basic.phpt b/ext/standard/tests/math/srand_basic.phpt index a3788cdf45..663653e485 100644 --- a/ext/standard/tests/math/srand_basic.phpt +++ b/ext/standard/tests/math/srand_basic.phpt @@ -20,7 +20,6 @@ var_dump(srand(true)); var_dump(srand(false)); var_dump(srand(NULL)); ?> -===Done=== --EXPECT-- *** Testing srand() : basic functionality *** NULL @@ -31,4 +30,3 @@ NULL NULL NULL NULL -===Done=== diff --git a/ext/standard/tests/math/tan_basiclong_64bit.phpt b/ext/standard/tests/math/tan_basiclong_64bit.phpt index b62f09a69e..29c057ce69 100644 --- a/ext/standard/tests/math/tan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/tan_basiclong_64bit.phpt @@ -27,7 +27,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(84.739) @@ -59,4 +58,3 @@ float(84.739) float(-84.739) --- testing: -9.2234E+18 --- float(-84.739) -===DONE=== diff --git a/ext/standard/tests/math/tanh_basiclong_64bit.phpt b/ext/standard/tests/math/tanh_basiclong_64bit.phpt index f3563f81fc..fd034a4cb0 100644 --- a/ext/standard/tests/math/tanh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/tanh_basiclong_64bit.phpt @@ -25,7 +25,6 @@ foreach ($longVals as $longVal) { } ?> -===DONE=== --EXPECT-- --- testing: 9223372036854775807 --- float(1) @@ -57,4 +56,3 @@ float(1) float(-1) --- testing: -9.2233720368548E+18 --- float(-1) -===DONE=== diff --git a/ext/standard/tests/misc/bug65550.phpt b/ext/standard/tests/misc/bug65550.phpt index 5ac0389d33..a0340d4727 100644 --- a/ext/standard/tests/misc/bug65550.phpt +++ b/ext/standard/tests/misc/bug65550.phpt @@ -8,8 +8,6 @@ $user_agent = 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/522+ $caps = get_browser($user_agent, true); var_dump($caps['browser'], $caps['version']); ?> -==DONE== --EXPECT-- string(7) "OmniWeb" string(3) "5.6" -==DONE== diff --git a/ext/standard/tests/misc/get_browser_basic.phpt b/ext/standard/tests/misc/get_browser_basic.phpt index 7daf668c50..81eb9d52e9 100644 --- a/ext/standard/tests/misc/get_browser_basic.phpt +++ b/ext/standard/tests/misc/get_browser_basic.phpt @@ -22,7 +22,6 @@ for( $x = 0; $x < 20; $x++) { } ?> -===DONE=== --EXPECT-- *** Testing get_browser() : basic functionality *** array(35) { @@ -1455,4 +1454,3 @@ array(35) { ["aolversion"]=> string(1) "0" } -===DONE=== diff --git a/ext/standard/tests/misc/get_browser_error.phpt b/ext/standard/tests/misc/get_browser_error.phpt index 4f38dc82a7..f1930b71d8 100644 --- a/ext/standard/tests/misc/get_browser_error.phpt +++ b/ext/standard/tests/misc/get_browser_error.phpt @@ -24,7 +24,6 @@ var_dump( get_browser( 'foobar', true ) ); var_dump( get_browser( null, 'foobar' ) ); ?> -===DONE=== --EXPECTF-- *** Testing get_browser() : error functionality *** array(34) { @@ -100,4 +99,3 @@ array(34) { Warning: get_browser(): HTTP_USER_AGENT variable is not set, cannot determine user agent name in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/misc/get_browser_variation1.phpt b/ext/standard/tests/misc/get_browser_variation1.phpt index dacfdfc8d9..7c32a722c7 100644 --- a/ext/standard/tests/misc/get_browser_variation1.phpt +++ b/ext/standard/tests/misc/get_browser_variation1.phpt @@ -23,7 +23,6 @@ for( $x = 20; $x < $count; $x++) { } ?> -===DONE=== --EXPECT-- *** Testing get_browser() : variation functionality: extra browser names *** array(35) { @@ -1386,4 +1385,3 @@ array(35) { ["aolversion"]=> string(1) "0" } -===DONE=== diff --git a/ext/standard/tests/network/bug64330.phpt b/ext/standard/tests/network/bug64330.phpt index e5653e7459..836709ea49 100644 --- a/ext/standard/tests/network/bug64330.phpt +++ b/ext/standard/tests/network/bug64330.phpt @@ -14,8 +14,6 @@ if ($client) { echo "ok\n"; } ?> -===DONE=== --EXPECT-- Test ok -===DONE=== diff --git a/ext/standard/tests/network/closelog_basic.phpt b/ext/standard/tests/network/closelog_basic.phpt index 77c7155ea8..8031da37a5 100644 --- a/ext/standard/tests/network/closelog_basic.phpt +++ b/ext/standard/tests/network/closelog_basic.phpt @@ -14,10 +14,8 @@ echo "*** Testing closelog() : basic functionality ***\n"; echo "\n-- Testing closelog() function with Zero arguments --\n"; var_dump( closelog() ); ?> -===DONE=== --EXPECT-- *** Testing closelog() : basic functionality *** -- Testing closelog() function with Zero arguments -- bool(true) -===DONE=== diff --git a/ext/standard/tests/network/gethostbyaddr_basic1.phpt b/ext/standard/tests/network/gethostbyaddr_basic1.phpt index 0e65937871..27605e7d2a 100644 --- a/ext/standard/tests/network/gethostbyaddr_basic1.phpt +++ b/ext/standard/tests/network/gethostbyaddr_basic1.phpt @@ -11,8 +11,6 @@ echo "*** Testing gethostbyaddr() : basic functionality ***\n"; echo gethostbyaddr("127.0.0.1")."\n"; ?> -===DONE=== --EXPECTF-- *** Testing gethostbyaddr() : basic functionality *** %rloopback|localhost(\.localdomain)?|%s%r -===DONE=== diff --git a/ext/standard/tests/network/gethostbyname_basic003.phpt b/ext/standard/tests/network/gethostbyname_basic003.phpt index 6462126a0d..d7df11ec76 100644 --- a/ext/standard/tests/network/gethostbyname_basic003.phpt +++ b/ext/standard/tests/network/gethostbyname_basic003.phpt @@ -11,8 +11,6 @@ echo "*** Testing gethostbyname() : basic functionality ***\n"; echo gethostbyname("localhost")."\n"; ?> -===DONE=== --EXPECT-- *** Testing gethostbyname() : basic functionality *** 127.0.0.1 -===DONE=== diff --git a/ext/standard/tests/network/gethostbynamel_basic1.phpt b/ext/standard/tests/network/gethostbynamel_basic1.phpt index 94fd2a01ff..85e2ff473d 100644 --- a/ext/standard/tests/network/gethostbynamel_basic1.phpt +++ b/ext/standard/tests/network/gethostbynamel_basic1.phpt @@ -10,10 +10,8 @@ Test gethostbynamel() function : basic functionality echo "*** Testing gethostbynamel() : basic functionality ***\n"; var_dump(gethostbynamel("localhost")); ?> -===DONE=== --EXPECTF-- *** Testing gethostbynamel() : basic functionality *** array(%d) { %a } -===DONE=== diff --git a/ext/standard/tests/network/ip2long_variation2.phpt b/ext/standard/tests/network/ip2long_variation2.phpt index d85b6ba3c9..0fcd701b26 100644 --- a/ext/standard/tests/network/ip2long_variation2.phpt +++ b/ext/standard/tests/network/ip2long_variation2.phpt @@ -27,7 +27,6 @@ foreach($ips as $ip) { } ?> -===DONE=== --EXPECT-- bool(false) int(2130706433) @@ -37,4 +36,3 @@ bool(false) int(-1062731776) bool(false) bool(false) -===DONE=== diff --git a/ext/standard/tests/network/ip2long_variation2_x64.phpt b/ext/standard/tests/network/ip2long_variation2_x64.phpt index a6fde5bdd9..563f579b84 100644 --- a/ext/standard/tests/network/ip2long_variation2_x64.phpt +++ b/ext/standard/tests/network/ip2long_variation2_x64.phpt @@ -34,7 +34,6 @@ foreach($ips as $ip) { } ?> -===DONE=== --EXPECT-- bool(false) int(2130706433) @@ -44,4 +43,3 @@ bool(false) int(3232235520) bool(false) bool(false) -===DONE=== diff --git a/ext/standard/tests/network/syslog_basic.phpt b/ext/standard/tests/network/syslog_basic.phpt index 47da28f094..196b167f8b 100644 --- a/ext/standard/tests/network/syslog_basic.phpt +++ b/ext/standard/tests/network/syslog_basic.phpt @@ -19,8 +19,6 @@ $message = 'A test syslog call invocation'; var_dump( syslog($priority, $message) ); ?> -===DONE=== --EXPECT-- *** Testing syslog() : basic functionality *** bool(true) -===DONE=== diff --git a/ext/standard/tests/password/bug75221.phpt b/ext/standard/tests/password/bug75221.phpt index bd6e386a16..64d8fb14d1 100644 --- a/ext/standard/tests/password/bug75221.phpt +++ b/ext/standard/tests/password/bug75221.phpt @@ -13,7 +13,5 @@ $hash = password_hash( ); var_dump(substr($hash, -1, 1) !== "\0"); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/standard/tests/php_version_win_const.phpt b/ext/standard/tests/php_version_win_const.phpt index 12de79b1ae..ea7c11f071 100644 --- a/ext/standard/tests/php_version_win_const.phpt +++ b/ext/standard/tests/php_version_win_const.phpt @@ -10,9 +10,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php var_dump(PHP_WINDOWS_VERSION_MAJOR > 0, PHP_WINDOWS_VERSION_MAJOR, PHP_WINDOWS_VERSION_MINOR); ?> -==DONE== --EXPECTF-- bool(true) int(%d) int(%d) -==DONE== diff --git a/ext/standard/tests/random/reflection.phpt b/ext/standard/tests/random/reflection.phpt index 2df6a33be7..662b23e8b0 100644 --- a/ext/standard/tests/random/reflection.phpt +++ b/ext/standard/tests/random/reflection.phpt @@ -10,10 +10,8 @@ $rf = new ReflectionFunction('random_int'); var_dump($rf->getNumberOfParameters()); var_dump($rf->getNumberOfRequiredParameters()); ?> -===DONE=== --EXPECT-- int(1) int(1) int(2) int(2) -===DONE=== diff --git a/ext/standard/tests/serialize/002.phpt b/ext/standard/tests/serialize/002.phpt index 635e728968..9d06f22d41 100644 --- a/ext/standard/tests/serialize/002.phpt +++ b/ext/standard/tests/serialize/002.phpt @@ -12,7 +12,6 @@ var_dump(unserialize('a:2:{i:0;a:0:{}i:1;a:0:{}}')); var_dump(unserialize('a:3:{i:0;s:3:"foo";i:1;s:3:"bar";i:2;s:3:"baz";}')); var_dump(unserialize('O:8:"stdClass":0:{}')); ?> -===DONE=== --EXPECTF-- bool(false) bool(true) @@ -41,4 +40,3 @@ array(3) { } object(stdClass)#%d (0) { } -===DONE=== diff --git a/ext/standard/tests/serialize/005.phpt b/ext/standard/tests/serialize/005.phpt index c0f5917ec9..13ae050129 100644 --- a/ext/standard/tests/serialize/005.phpt +++ b/ext/standard/tests/serialize/005.phpt @@ -127,8 +127,6 @@ var_dump(unserialize('O:19:"autoload_implements":0:{}')); echo "===AutoNA===\n"; var_dump(unserialize('O:22:"autoload_not_available":0:{}')); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- ===O1=== TestOld::__sleep() @@ -182,4 +180,3 @@ object(__PHP_Incomplete_Class)#%d (1) { ["__PHP_Incomplete_Class_Name"]=> string(22) "autoload_not_available" } -===DONE=== diff --git a/ext/standard/tests/serialize/bug25378.phpt b/ext/standard/tests/serialize/bug25378.phpt index 70bfbb46a3..ab8cd987e5 100644 --- a/ext/standard/tests/serialize/bug25378.phpt +++ b/ext/standard/tests/serialize/bug25378.phpt @@ -16,7 +16,6 @@ var_dump(unserialize("s:3000:\"123")); var_dump(unserialize("s:3:\"123;")); var_dump(unserialize("s:0:\"123\";")); ?> -===DONE=== --EXPECTF-- Notice: unserialize(): Error at offset 0 of 8 bytes in %sbug25378.php on line %d bool(false) @@ -56,4 +55,3 @@ bool(false) Notice: unserialize(): Error at offset 5 of 10 bytes in %sbug25378.php on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/serialize/bug30234.phpt b/ext/standard/tests/serialize/bug30234.phpt index 41ef9dd565..4b45d8d1ef 100644 --- a/ext/standard/tests/serialize/bug30234.phpt +++ b/ext/standard/tests/serialize/bug30234.phpt @@ -25,7 +25,6 @@ var_dump(interface_exists('autoload_interface', false)); var_dump(class_exists('autoload_implements', false)); ?> -===DONE=== --EXPECTF-- bool(false) bool(false) @@ -36,4 +35,3 @@ object(autoload_implements)#%d (0) { bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/standard/tests/serialize/bug31402.phpt b/ext/standard/tests/serialize/bug31402.phpt index 566e959554..66ade571fc 100644 --- a/ext/standard/tests/serialize/bug31402.phpt +++ b/ext/standard/tests/serialize/bug31402.phpt @@ -33,7 +33,6 @@ $after = unserialize($ser); var_dump($before, $after); ?> -===DONE=== --EXPECTF-- object(TestY)#%d (2) { ["A"]=> @@ -85,4 +84,3 @@ object(TestY)#%d (2) { int(1) } } -===DONE=== diff --git a/ext/standard/tests/serialize/bug68545.phpt b/ext/standard/tests/serialize/bug68545.phpt index c33155d269..9c37ab7c4f 100644 --- a/ext/standard/tests/serialize/bug68545.phpt +++ b/ext/standard/tests/serialize/bug68545.phpt @@ -4,8 +4,6 @@ Bug #68545 NULL pointer dereference in unserialize.c:var_push_dtor <?php var_dump(unserialize('a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"b22";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";s:3:"bar";')); ?> -===DONE=== --EXPECTF-- Notice: unserialize(): Error at offset %d of %d bytes in %sbug68545.php on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/serialize/bug68976.phpt b/ext/standard/tests/serialize/bug68976.phpt index 4e61e65354..d9ca33bdf7 100644 --- a/ext/standard/tests/serialize/bug68976.phpt +++ b/ext/standard/tests/serialize/bug68976.phpt @@ -25,7 +25,6 @@ for($i = 0; $i < 5; $i++) { var_dump($data); ?> -===DONE=== --EXPECT-- array(2) { [0]=> @@ -34,4 +33,3 @@ array(2) { [1]=> int(1) } -===DONE=== diff --git a/ext/standard/tests/serialize/bug74300.phpt b/ext/standard/tests/serialize/bug74300.phpt index d9adda256b..53c6e9a01f 100644 --- a/ext/standard/tests/serialize/bug74300.phpt +++ b/ext/standard/tests/serialize/bug74300.phpt @@ -7,10 +7,8 @@ serialize_precision=10 var_dump(unserialize('d:2e+2;')); var_dump(unserialize('d:2e++2;')); ?> -===DONE=== --EXPECTF-- float(200) Notice: unserialize(): Error at offset 0 of 8 bytes in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/streams/bug40459.phpt b/ext/standard/tests/streams/bug40459.phpt index ce06a3f804..9dc501170a 100644 --- a/ext/standard/tests/streams/bug40459.phpt +++ b/ext/standard/tests/streams/bug40459.phpt @@ -92,7 +92,6 @@ echo "\n"; ?> -==DONE== --EXPECT-- stream_open: yes url_stat: yes @@ -102,4 +101,3 @@ mkdir: yes rename: yes unlink: yes touch: yes -==DONE== diff --git a/ext/standard/tests/streams/bug49936.phpt b/ext/standard/tests/streams/bug49936.phpt index dccf87474c..d38d15624e 100644 --- a/ext/standard/tests/streams/bug49936.phpt +++ b/ext/standard/tests/streams/bug49936.phpt @@ -14,8 +14,6 @@ var_dump(@opendir($dir)); var_dump(@opendir($dir)); ?> -===DONE=== --EXPECT-- bool(false) bool(false) -===DONE=== diff --git a/ext/standard/tests/streams/bug54946.phpt b/ext/standard/tests/streams/bug54946.phpt index 0f58d19647..d057766ff2 100644 --- a/ext/standard/tests/streams/bug54946.phpt +++ b/ext/standard/tests/streams/bug54946.phpt @@ -30,7 +30,6 @@ var_dump($retval); fclose($stream); unlink($filename); ?> -===DONE=== --EXPECTF-- Notice: stream_get_contents(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d string(0) "" @@ -40,4 +39,3 @@ string(0) "" Notice: stream_get_contents(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d string(0) "" -===DONE=== diff --git a/ext/standard/tests/streams/bug60602.phpt b/ext/standard/tests/streams/bug60602.phpt index 4f88c8dd2c..396695f772 100644 --- a/ext/standard/tests/streams/bug60602.phpt +++ b/ext/standard/tests/streams/bug60602.phpt @@ -46,10 +46,8 @@ if (is_resource($p)) { echo "no process\n"; } ?> -==DONE== --EXPECTF-- Warning: Array to string conversion in %s on line %d int(%d) int(0) bool(true) -==DONE== diff --git a/ext/standard/tests/streams/bug61019.phpt b/ext/standard/tests/streams/bug61019.phpt index 7fead5362f..db0bf9d6a5 100644 --- a/ext/standard/tests/streams/bug61019.phpt +++ b/ext/standard/tests/streams/bug61019.phpt @@ -67,7 +67,6 @@ else echo "Can't start external command\n"; } ?> -===DONE=== --EXPECT-- Test External command executed @@ -75,4 +74,3 @@ External command exit: 0 STDOUT: testtext STDERR: -===DONE=== diff --git a/ext/standard/tests/streams/bug64770.phpt b/ext/standard/tests/streams/bug64770.phpt index bb904d7446..df25d3f8ca 100644 --- a/ext/standard/tests/streams/bug64770.phpt +++ b/ext/standard/tests/streams/bug64770.phpt @@ -45,8 +45,6 @@ if (is_resource($p)) { echo "no process\n"; } ?> -==DONE== --EXPECTF-- int(%d) int(0) -==DONE== diff --git a/ext/standard/tests/streams/bug70198.phpt b/ext/standard/tests/streams/bug70198.phpt index 83efb9669b..94585db882 100644 --- a/ext/standard/tests/streams/bug70198.phpt +++ b/ext/standard/tests/streams/bug70198.phpt @@ -56,7 +56,5 @@ if (!$fp) { proc_close($srv_proc); unlink($srv_fl); ?> -==DONE== --EXPECT-- int(0) -==DONE== diff --git a/ext/standard/tests/streams/bug72771.phpt b/ext/standard/tests/streams/bug72771.phpt index ebb358707e..1b94b334e4 100644 --- a/ext/standard/tests/streams/bug72771.phpt +++ b/ext/standard/tests/streams/bug72771.phpt @@ -16,8 +16,6 @@ $path="ftps://127.0.0.1:" . $port."/"; $ds=opendir($path, $context); var_dump($ds); ?> -==DONE== --EXPECTF-- Warning: opendir(ftps://127.0.0.1:%d/): failed to open dir: Server doesn't support FTPS. in %s on line %d bool(false) -==DONE== diff --git a/ext/standard/tests/streams/bug72857.phpt b/ext/standard/tests/streams/bug72857.phpt index 7b71c269f4..a74dff9c7e 100644 --- a/ext/standard/tests/streams/bug72857.phpt +++ b/ext/standard/tests/streams/bug72857.phpt @@ -13,8 +13,6 @@ Bug #72857 stream_socket_recvfrom read access violation fclose($fp0); unlink($fname); ?> -==DONE== --EXPECT-- bool(false) NULL -==DONE== diff --git a/ext/standard/tests/streams/bug73457.phpt b/ext/standard/tests/streams/bug73457.phpt index a49a2026b7..f60d65385e 100644 --- a/ext/standard/tests/streams/bug73457.phpt +++ b/ext/standard/tests/streams/bug73457.phpt @@ -16,8 +16,6 @@ $path="ftp://127.0.0.1:" . $port."/bug73457"; $ds=file_get_contents($path); var_dump($ds); ?> -==DONE== --EXPECTF-- Warning: file_get_contents(ftp://127.0.0.1:%d/bug73457): failed to open stream: Failed to set up data channel: Connection refused in %s on line %d bool(false) -==DONE== diff --git a/ext/standard/tests/streams/bug74090.phpt b/ext/standard/tests/streams/bug74090.phpt index 7a0250a124..31a5f8dc10 100644 --- a/ext/standard/tests/streams/bug74090.phpt +++ b/ext/standard/tests/streams/bug74090.phpt @@ -28,7 +28,5 @@ var_dump(strlen($ret) > 0); stream_socket_shutdown($fd, STREAM_SHUT_RDWR); stream_socket_shutdown($server, STREAM_SHUT_RDWR); ?> -==DONE== --EXPECT-- bool(true) -==DONE== diff --git a/ext/standard/tests/streams/bug77680.phpt b/ext/standard/tests/streams/bug77680.phpt index 8537bd4e36..7fe8062e6e 100644 --- a/ext/standard/tests/streams/bug77680.phpt +++ b/ext/standard/tests/streams/bug77680.phpt @@ -15,7 +15,6 @@ $path = "ftp://localhost:" . $port."/one/two/three/"; mkdir($path, 0755, true); ?> -==DONE== --EXPECTF-- string(20) "CWD /one/two/three " @@ -33,4 +32,3 @@ string(14) "MKD /one/two " string(20) "MKD /one/two/three " -==DONE== diff --git a/ext/standard/tests/streams/bug77765.phpt b/ext/standard/tests/streams/bug77765.phpt index fa933ffc0d..e048db53e4 100644 --- a/ext/standard/tests/streams/bug77765.phpt +++ b/ext/standard/tests/streams/bug77765.phpt @@ -14,9 +14,7 @@ $path = "ftp://localhost:" . $port."/www"; var_dump(stat($path)['mode']); ?> -==DONE== --EXPECTF-- string(11) "SIZE /www " int(16877) -==DONE== diff --git a/ext/standard/tests/streams/opendir-001.phpt b/ext/standard/tests/streams/opendir-001.phpt index d2d2ce8b9c..5659d57920 100644 --- a/ext/standard/tests/streams/opendir-001.phpt +++ b/ext/standard/tests/streams/opendir-001.phpt @@ -14,9 +14,7 @@ $path="ftp://localhost:" . $port."/bogusdir"; var_dump(opendir($path)); ?> -==DONE== --EXPECTF-- Warning: opendir(ftp://localhost:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory in %s on line %d bool(false) -==DONE== diff --git a/ext/standard/tests/streams/opendir-002.phpt b/ext/standard/tests/streams/opendir-002.phpt index a995979992..4978c8affa 100644 --- a/ext/standard/tests/streams/opendir-002.phpt +++ b/ext/standard/tests/streams/opendir-002.phpt @@ -21,11 +21,9 @@ while ($fn=readdir($ds)) { closedir($ds); ?> -==DONE== --EXPECTF-- resource(%d) of type (stream) string(5) "file1" string(5) "file1" string(3) "fil" string(4) "b0rk" -==DONE== diff --git a/ext/standard/tests/streams/opendir-003.phpt b/ext/standard/tests/streams/opendir-003.phpt index 2b3aedbf30..0d9f656261 100644 --- a/ext/standard/tests/streams/opendir-003.phpt +++ b/ext/standard/tests/streams/opendir-003.phpt @@ -18,9 +18,7 @@ $context = stream_context_create(array('ssl' => array('cafile' => __DIR__ . '/. var_dump(opendir($path, $context)); ?> -==DONE== --EXPECTF-- Warning: opendir(ftps://127.0.0.1:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory in %s on line %d bool(false) -==DONE== diff --git a/ext/standard/tests/streams/opendir-004.phpt b/ext/standard/tests/streams/opendir-004.phpt index 06a3f944be..885a7b96bc 100644 --- a/ext/standard/tests/streams/opendir-004.phpt +++ b/ext/standard/tests/streams/opendir-004.phpt @@ -22,11 +22,9 @@ while ($fn=readdir($ds)) { var_dump($fn); } ?> -==DONE== --EXPECTF-- resource(%d) of type (stream) string(5) "file1" string(5) "file1" string(3) "fil" string(4) "b0rk" -==DONE== diff --git a/ext/standard/tests/streams/proc_open_bug51800.phpt b/ext/standard/tests/streams/proc_open_bug51800.phpt index 7e7d2c7cb3..d54ba00262 100644 --- a/ext/standard/tests/streams/proc_open_bug51800.phpt +++ b/ext/standard/tests/streams/proc_open_bug51800.phpt @@ -74,7 +74,6 @@ var_dump(array( ), strlen($stdout), strlen($stderr)); ?> -===DONE=== --CLEAN-- <?php $callee = __DIR__ . "/process_proc_open_bug51800.php"; @@ -91,4 +90,3 @@ array(3) { } int(10000) int(10000) -===DONE=== diff --git a/ext/standard/tests/streams/proc_open_bug51800_right.phpt b/ext/standard/tests/streams/proc_open_bug51800_right.phpt index 22860f1fc3..12871cc1d3 100644 --- a/ext/standard/tests/streams/proc_open_bug51800_right.phpt +++ b/ext/standard/tests/streams/proc_open_bug51800_right.phpt @@ -57,7 +57,6 @@ var_dump(array( ), strlen($stdout), strlen($stderr)); ?> -===DONE=== --CLEAN-- <?php $callee = __DIR__ . "/process_proc_open_bug51800_right.php"; @@ -74,4 +73,3 @@ array(3) { } int(10000) int(10000) -===DONE=== diff --git a/ext/standard/tests/streams/proc_open_bug51800_right2.phpt b/ext/standard/tests/streams/proc_open_bug51800_right2.phpt index d183557066..1a2f69adbb 100644 --- a/ext/standard/tests/streams/proc_open_bug51800_right2.phpt +++ b/ext/standard/tests/streams/proc_open_bug51800_right2.phpt @@ -63,7 +63,6 @@ var_dump(array( ), strlen($stdout), strlen($stderr)); ?> -===DONE=== --CLEAN-- <?php $callee = __DIR__ . "/process_proc_open_bug51800_right2.php"; @@ -80,4 +79,3 @@ array(3) { } int(1000000) int(1000000) -===DONE=== diff --git a/ext/standard/tests/streams/proc_open_bug64438.phpt b/ext/standard/tests/streams/proc_open_bug64438.phpt index 2880865e1d..c310775a4d 100644 --- a/ext/standard/tests/streams/proc_open_bug64438.phpt +++ b/ext/standard/tests/streams/proc_open_bug64438.phpt @@ -65,7 +65,6 @@ while ($pipes || $writePipes) { var_dump($pipeEvents); ?> -===DONE=== --EXPECTF-- array(2) { [%d]=> @@ -83,4 +82,3 @@ array(2) { string(12) "Closing pipe" } } -===DONE=== diff --git a/ext/standard/tests/streams/proc_open_bug69900.phpt b/ext/standard/tests/streams/proc_open_bug69900.phpt index 65505d09fe..0eb9e45054 100644 --- a/ext/standard/tests/streams/proc_open_bug69900.phpt +++ b/ext/standard/tests/streams/proc_open_bug69900.phpt @@ -49,7 +49,6 @@ fclose($pipes[1]); proc_close($process); ?> -===DONE=== --CLEAN-- <?php $fl = __DIR__ . DIRECTORY_SEPARATOR . "test69900.php"; @@ -76,4 +75,3 @@ hello8 fgets() took less than %d ms hello9 fgets() took less than %d ms -===DONE=== diff --git a/ext/standard/tests/strings/006.phpt b/ext/standard/tests/strings/006.phpt index 7665aa20f5..4c83d93c5e 100644 --- a/ext/standard/tests/strings/006.phpt +++ b/ext/standard/tests/strings/006.phpt @@ -11,11 +11,9 @@ var_dump(highlight_file($file, true)); var_dump(ob_get_contents()); ?> -===DONE=== --EXPECTF-- Warning: highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): failed to open stream: %s006.php on line %d Warning: highlight_file(): Failed opening 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' for highlighting in %s006.php on line %d bool(false) bool(false) -===DONE=== diff --git a/ext/standard/tests/strings/007-win32.phpt b/ext/standard/tests/strings/007-win32.phpt index 7d06f018a5..665a45bf0f 100644 --- a/ext/standard/tests/strings/007-win32.phpt +++ b/ext/standard/tests/strings/007-win32.phpt @@ -12,9 +12,7 @@ var_dump(php_strip_whitespace($file)); var_dump(ob_get_contents()); ?> -===DONE=== --EXPECTF-- Warning: php_strip_whitespace(%s): failed to open stream: No such file or directory in %s on line %d string(0) "" bool(false) -===DONE=== diff --git a/ext/standard/tests/strings/007.phpt b/ext/standard/tests/strings/007.phpt index a0fd8acdf4..91b6edb717 100644 --- a/ext/standard/tests/strings/007.phpt +++ b/ext/standard/tests/strings/007.phpt @@ -12,9 +12,7 @@ var_dump(php_strip_whitespace($file)); var_dump(ob_get_contents()); ?> -===DONE=== --EXPECTF-- Warning: php_strip_whitespace(%s): failed to open stream: File name too long in %s007.php on line %d string(0) "" bool(false) -===DONE=== diff --git a/ext/standard/tests/strings/bin2hex_basic.phpt b/ext/standard/tests/strings/bin2hex_basic.phpt index 9eb07b573e..9079f77323 100644 --- a/ext/standard/tests/strings/bin2hex_basic.phpt +++ b/ext/standard/tests/strings/bin2hex_basic.phpt @@ -32,7 +32,6 @@ foreach($strings as $string) { $count ++; } ?> -===DONE=== --EXPECT-- *** Testing bin2hex() : basic functionality *** -- Iteration 1 -- @@ -47,4 +46,3 @@ string(46) "4865726520697320612073696d706c6520737472696e67" string(112) "5c74205468697320537472696e6720636f6e7461696e73205c745c7420736f6d6520636f6e74726f6c20636861726163746572735c725c6e" -- Iteration 6 -- string(144) "5c7839305c7839315c7830305c7839335c7839345c7839305c7839315c7839355c7839365c7839375c7839385c7839395c7839615c7839625c7839635c7839645c7839655c783966" -===DONE=== diff --git a/ext/standard/tests/strings/bug45166.phpt b/ext/standard/tests/strings/bug45166.phpt index 7140f762ca..0b694518df 100644 --- a/ext/standard/tests/strings/bug45166.phpt +++ b/ext/standard/tests/strings/bug45166.phpt @@ -4,7 +4,5 @@ Bug #45166 (substr() ) <?php echo substr('cd', -3) . "\n"; ?> -===DONE=== --EXPECT-- cd -===DONE=== diff --git a/ext/standard/tests/strings/bug62462.phpt b/ext/standard/tests/strings/bug62462.phpt index c6eb41a543..5596a42bdd 100644 --- a/ext/standard/tests/strings/bug62462.phpt +++ b/ext/standard/tests/strings/bug62462.phpt @@ -5,7 +5,6 @@ Multibyte characters shouldn't be split by soft line break added by quoted_print echo quoted_printable_encode(str_repeat("\xc4\x85", 77)); ?> -==DONE== --EXPECT-- =C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85= =C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85= @@ -14,4 +13,3 @@ echo quoted_printable_encode(str_repeat("\xc4\x85", 77)); =C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85= =C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85=C4=85= =C4=85=C4=85=C4=85=C4=85=C4=85 -==DONE== diff --git a/ext/standard/tests/strings/bug69522.phpt b/ext/standard/tests/strings/bug69522.phpt index fc86d409c6..8df13e699c 100644 --- a/ext/standard/tests/strings/bug69522.phpt +++ b/ext/standard/tests/strings/bug69522.phpt @@ -5,7 +5,5 @@ Bug #69522 (heap buffer overflow in unpack()) $a = pack("AAAAAAAAAAAA", 1,2,3,4,5,6,7,8,9,10,11,12); $b = unpack('h2147483648', $a); ?> -===DONE=== --EXPECTF-- Warning: unpack(): Type h: integer overflow in %s on line %d -===DONE=== diff --git a/ext/standard/tests/strings/bug72823.phpt b/ext/standard/tests/strings/bug72823.phpt index d0aaf0fd35..1571fdc7b5 100644 --- a/ext/standard/tests/strings/bug72823.phpt +++ b/ext/standard/tests/strings/bug72823.phpt @@ -6,7 +6,5 @@ var_dump( strtr(11, array('aaa' => 'bbb')) ); ?> -===DONE=== --EXPECT-- string(2) "11" -===DONE=== diff --git a/ext/standard/tests/strings/bug78003.phpt b/ext/standard/tests/strings/bug78003.phpt index 4379ca8a71..2420191f98 100644 --- a/ext/standard/tests/strings/bug78003.phpt +++ b/ext/standard/tests/strings/bug78003.phpt @@ -8,9 +8,7 @@ var_dump( strip_tags('<foo<?>bar>') ); ?> -===DONE=== --EXPECT-- string(0) "" string(0) "" string(0) "" -===DONE=== diff --git a/ext/standard/tests/strings/chr_basic.phpt b/ext/standard/tests/strings/chr_basic.phpt index e072febcff..ec80d76213 100644 --- a/ext/standard/tests/strings/chr_basic.phpt +++ b/ext/standard/tests/strings/chr_basic.phpt @@ -15,9 +15,7 @@ echo chr(10); // "\n" echo "World"; echo "\n"; ?> -===DONE=== --EXPECT-- *** Testing chr() : basic functionality *** Hello World -===DONE=== diff --git a/ext/standard/tests/strings/chr_error.phpt b/ext/standard/tests/strings/chr_error.phpt index 820cadece0..2603b69210 100644 --- a/ext/standard/tests/strings/chr_error.phpt +++ b/ext/standard/tests/strings/chr_error.phpt @@ -26,7 +26,6 @@ try { } ?> -===DONE=== --EXPECTF-- *** Testing chr() : error conditions *** @@ -35,4 +34,3 @@ chr() expects exactly 1 parameter, 0 given -- Testing chr() function with more than expected no. of arguments -- chr() expects exactly 1 parameter, 2 given -===DONE=== diff --git a/ext/standard/tests/strings/chr_variation1.phpt b/ext/standard/tests/strings/chr_variation1.phpt index c962aa0e78..7aae1bf905 100644 --- a/ext/standard/tests/strings/chr_variation1.phpt +++ b/ext/standard/tests/strings/chr_variation1.phpt @@ -66,7 +66,6 @@ foreach($inputs as $input) { fclose($file_handle); //closing the file handle ?> -===DONE=== --EXPECT-- *** Testing chr() function: with unexpected inputs for 'ascii' argument *** -- Iteration 1 -- @@ -99,4 +98,3 @@ string(2) "00" string(2) "00" -- Iteration 15 -- string(2) "00" -===DONE=== diff --git a/ext/standard/tests/strings/convert_cyr_string_basic.phpt b/ext/standard/tests/strings/convert_cyr_string_basic.phpt index f4c7f69918..110dccdc1f 100644 --- a/ext/standard/tests/strings/convert_cyr_string_basic.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_basic.phpt @@ -25,7 +25,6 @@ for ($i = 128; $i < 256; $i++) { } ?> -===DONE=== --EXPECTF-- *** Testing convert_cyr_string() : basic functionality *** @@ -166,4 +165,3 @@ string(102) "436f6e766572742066726f6d206f6e6520437972696c6c696320636861726163746 253: dc 254: c0 255: d1 -===DONE=== diff --git a/ext/standard/tests/strings/convert_cyr_string_error.phpt b/ext/standard/tests/strings/convert_cyr_string_error.phpt index 0444183ba1..393a778a30 100644 --- a/ext/standard/tests/strings/convert_cyr_string_error.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_error.phpt @@ -25,7 +25,6 @@ echo "\n-- Testing convert_cyr_string() function with invalid 'from' and 'to' ch var_dump(bin2hex( convert_cyr_string($str, ">", "?")) ); ?> -===DONE=== --EXPECTF-- *** Testing convert_cyr_string() : error conditions *** @@ -51,4 +50,3 @@ Warning: convert_cyr_string(): Unknown source charset: > in %s on line %d Warning: convert_cyr_string(): Unknown destination charset: ? in %s on line %d string(10) "68656c6c6f" -===DONE=== diff --git a/ext/standard/tests/strings/convert_uudecode_basic.phpt b/ext/standard/tests/strings/convert_uudecode_basic.phpt index 963c163761..7422ac06c0 100644 --- a/ext/standard/tests/strings/convert_uudecode_basic.phpt +++ b/ext/standard/tests/strings/convert_uudecode_basic.phpt @@ -47,8 +47,6 @@ foreach($strings as $string) { echo "TEST PASSED\n"; ?> -===DONE=== --EXPECT-- *** Testing convert_uudecode() : basic functionality *** TEST PASSED -===DONE=== diff --git a/ext/standard/tests/strings/convert_uuencode_basic.phpt b/ext/standard/tests/strings/convert_uuencode_basic.phpt index b8c338a1c6..8a4f57fa87 100644 --- a/ext/standard/tests/strings/convert_uuencode_basic.phpt +++ b/ext/standard/tests/strings/convert_uuencode_basic.phpt @@ -39,7 +39,6 @@ foreach($strings as $string) { ?> -===DONE=== --EXPECTF-- *** Testing convert_uuencode() : basic functionality *** -- Iteration 1 -- @@ -85,4 +84,3 @@ string(82) "M7'0@5&AI<R!3=')I;F<@8V]N=&%I;G,@7'1<="!S;VUE(&-O;G1R;VP@8VAA +<F%C=&5R<UQR7&X` ` " -===DONE=== diff --git a/ext/standard/tests/strings/count_chars_basic.phpt b/ext/standard/tests/strings/count_chars_basic.phpt index ddf7adac87..c1868714b0 100644 --- a/ext/standard/tests/strings/count_chars_basic.phpt +++ b/ext/standard/tests/strings/count_chars_basic.phpt @@ -27,7 +27,6 @@ try { } ?> -===DONE=== --EXPECT-- *** Testing count_chars() : basic functionality *** array(256) { @@ -1577,4 +1576,3 @@ array(238) { string(18) " Rabcdefghimnorstu" string(476) "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f5051535455565758595a5b5c5d5e5f606a6b6c7071767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff" Unknown mode -===DONE=== diff --git a/ext/standard/tests/strings/explode_variation4.phpt b/ext/standard/tests/strings/explode_variation4.phpt index 080531c6ec..9a6a862f8b 100644 --- a/ext/standard/tests/strings/explode_variation4.phpt +++ b/ext/standard/tests/strings/explode_variation4.phpt @@ -14,7 +14,6 @@ $pizza = "piece1 piece2 piece3 piece4 piece5 piece6 p"; $pieces = explode(" p", $pizza); var_dump($pieces); ?> -===DONE=== --EXPECT-- *** Testing explode() function: match longer string *** array(7) { @@ -33,4 +32,3 @@ array(7) { [6]=> string(0) "" } -===DONE=== diff --git a/ext/standard/tests/strings/explode_variation5.phpt b/ext/standard/tests/strings/explode_variation5.phpt index e5e6dd75d9..d5c1938eaf 100644 --- a/ext/standard/tests/strings/explode_variation5.phpt +++ b/ext/standard/tests/strings/explode_variation5.phpt @@ -20,7 +20,6 @@ var_dump(explode('||', $str, -1)); echo "\n-- negative limit (since PHP 5.1) with null string -- \n"; var_dump(explode('||', "", -1)); ?> -===DONE=== --EXPECT-- *** Testing explode() function: positive and negative limits *** @@ -45,4 +44,3 @@ array(3) { -- negative limit (since PHP 5.1) with null string -- array(0) { } -===DONE=== diff --git a/ext/standard/tests/strings/explode_variation6.phpt b/ext/standard/tests/strings/explode_variation6.phpt index 730e69ba13..2a823a4a3e 100644 --- a/ext/standard/tests/strings/explode_variation6.phpt +++ b/ext/standard/tests/strings/explode_variation6.phpt @@ -39,7 +39,6 @@ function test_explode($delim, $string, $limit) } } ?> -===DONE=== --EXPECT-- *** Testing explode() function: misc tests *** @@ -67,4 +66,3 @@ string(6) "6f6e65" string(6) "74776f" string(10) "7468726565" string(8) "666f7572" -===DONE=== diff --git a/ext/standard/tests/strings/hebrev_basic.phpt b/ext/standard/tests/strings/hebrev_basic.phpt index cc32d654e8..83e2cc8a8f 100644 --- a/ext/standard/tests/strings/hebrev_basic.phpt +++ b/ext/standard/tests/strings/hebrev_basic.phpt @@ -16,7 +16,6 @@ var_dump(hebrev($hebrew_text)); var_dump(hebrev($hebrew_text, 15)); ?> -===DONE=== --EXPECT-- *** Testing hebrev() : basic functionality *** string(109) ".The hebrev function converts logical Hebrew text to visual text @@ -32,4 +31,3 @@ breaking words tries to avoid .The function " -===DONE=== diff --git a/ext/standard/tests/strings/hebrevc_basic.phpt b/ext/standard/tests/strings/hebrevc_basic.phpt index 2af6c38f1e..22b3ba3d3e 100644 --- a/ext/standard/tests/strings/hebrevc_basic.phpt +++ b/ext/standard/tests/strings/hebrevc_basic.phpt @@ -16,7 +16,6 @@ var_dump(hebrevc($hebrew_text)); var_dump(hebrevc($hebrew_text, 15)); ?> -===DONE=== --EXPECTF-- *** Testing hebrevc() : basic functionality *** @@ -48,4 +47,3 @@ breaking words<br /> tries to avoid<br /> .The function<br /> " -===DONE=== diff --git a/ext/standard/tests/strings/htmlentities09.phpt b/ext/standard/tests/strings/htmlentities09.phpt index 655c6d7a26..11493b62a4 100644 --- a/ext/standard/tests/strings/htmlentities09.phpt +++ b/ext/standard/tests/strings/htmlentities09.phpt @@ -12,10 +12,8 @@ internal_encoding=Shift_JIS print mb_internal_encoding()."\n"; var_dump(bin2hex(htmlentities("\x81\x41\x81\x42\x81\x43", ENT_QUOTES, ''))); ?> -===DONE=== --EXPECTF-- SJIS Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s line %d string(12) "814181428143" -===DONE=== diff --git a/ext/standard/tests/strings/htmlentities16.phpt b/ext/standard/tests/strings/htmlentities16.phpt index b253f4b1b2..1971f8340d 100644 --- a/ext/standard/tests/strings/htmlentities16.phpt +++ b/ext/standard/tests/strings/htmlentities16.phpt @@ -13,9 +13,7 @@ $str = "\x88\xa9\xf0\xee\xf1\xea\xee\xf8\xed\xfb\xe9"; var_dump(bin2hex($str), bin2hex(htmlentities($str, ENT_QUOTES, ''))); var_dump(htmlentities($str, ENT_QUOTES | ENT_HTML5, '')); ?> -===DONE=== --EXPECT-- string(22) "88a9f0eef1eaeef8edfbe9" string(42) "266575726f3b26636f70793bf0eef1eaeef8edfbe9" string(58) "€©роскошный" -===DONE=== diff --git a/ext/standard/tests/strings/htmlspecialchars_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_basic.phpt index 4ac7733702..9bb4e4f82c 100644 --- a/ext/standard/tests/strings/htmlspecialchars_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_basic.phpt @@ -55,7 +55,6 @@ echo "Test 28: " . htmlspecialchars ($s1, ENT_NOQUOTES, "ISO-8859-1", true); echo "Test 29: " . htmlspecialchars ($s2, ENT_NOQUOTES, "ISO-8859-1", true); ?> -===DONE=== --EXPECT-- *** Testing htmlspecialchars() : basic functionality *** Basic tests @@ -94,4 +93,3 @@ Test 27: "300 < 400" Try with double decode TRUE Test 28: &quot;&amp;xyz&gt;abc&quot; Test 29: &quot;&amp;123&lt;456&quot; -===DONE=== diff --git a/ext/standard/tests/strings/ltrim_basic.phpt b/ext/standard/tests/strings/ltrim_basic.phpt index 45967fa24b..61994364a8 100644 --- a/ext/standard/tests/strings/ltrim_basic.phpt +++ b/ext/standard/tests/strings/ltrim_basic.phpt @@ -32,7 +32,6 @@ echo "\n-- Trim the ASCII control characters at the beginning of a string --\n"; var_dump(ltrim($binary, "\x00..\x1F")); ?> -===DONE=== --EXPECT-- *** Testing ltrim() : basic functionality *** @@ -50,4 +49,3 @@ string(10) "0123456789" -- Trim the ASCII control characters at the beginning of a string -- string(14) "Example string" -===DONE=== diff --git a/ext/standard/tests/strings/ltrim_error.phpt b/ext/standard/tests/strings/ltrim_error.phpt index 58324d7f3a..9da128c890 100644 --- a/ext/standard/tests/strings/ltrim_error.phpt +++ b/ext/standard/tests/strings/ltrim_error.phpt @@ -19,7 +19,6 @@ var_dump(ltrim($hello, "z..a")); var_dump(ltrim($hello, "a..b..c")); ?> -===DONE=== --EXPECTF-- *** Testing ltrim() : error conditions *** @@ -40,4 +39,3 @@ string(14) " Hello World Warning: ltrim(): Invalid '..'-range in %s on line %d string(14) " Hello World " -===DONE=== diff --git a/ext/standard/tests/strings/md5_basic1.phpt b/ext/standard/tests/strings/md5_basic1.phpt index e9898cd0c0..6e8dfe7fde 100644 --- a/ext/standard/tests/strings/md5_basic1.phpt +++ b/ext/standard/tests/strings/md5_basic1.phpt @@ -10,8 +10,6 @@ Test md5() function : basic functionality echo "*** Testing md5() : basic functionality ***\n"; var_dump(md5("apple")); ?> -===DONE=== --EXPECT-- *** Testing md5() : basic functionality *** string(32) "1f3870be274f6c49b3e31a0c6728957f" -===DONE=== diff --git a/ext/standard/tests/strings/md5_basic2.phpt b/ext/standard/tests/strings/md5_basic2.phpt index e72fd40077..f302753cd3 100644 --- a/ext/standard/tests/strings/md5_basic2.phpt +++ b/ext/standard/tests/strings/md5_basic2.phpt @@ -22,9 +22,7 @@ if (strcmp(bin2hex($md5_raw), $md5) == 0 ) { } ?> -===DONE=== --EXPECT-- *** Testing md5() : basic functionality - with raw output*** string(32) "b10a8db164e0754105b7a99be72e3fe5" TEST PASSED -===DONE=== diff --git a/ext/standard/tests/strings/money_format_basic1.phpt b/ext/standard/tests/strings/money_format_basic1.phpt index a9e8f70818..abf7bcf508 100644 --- a/ext/standard/tests/strings/money_format_basic1.phpt +++ b/ext/standard/tests/strings/money_format_basic1.phpt @@ -55,7 +55,6 @@ echo gettype(money_format('%=*!14#8.2n', $value))."\n"; echo gettype(money_format('%=*!14#8.2n', $negative_value))."\n"; ?> -===DONE=== --EXPECTF-- *** Testing money_format() : basic functionality*** Format values with 14 positions, 8 digits to left, 2 to right using national format @@ -100,4 +99,3 @@ string Deprecated: Function money_format() is deprecated in %s on line %d string -===DONE=== diff --git a/ext/standard/tests/strings/money_format_error.phpt b/ext/standard/tests/strings/money_format_error.phpt index d593c0ec7f..b462f1b9db 100644 --- a/ext/standard/tests/strings/money_format_error.phpt +++ b/ext/standard/tests/strings/money_format_error.phpt @@ -26,7 +26,6 @@ echo "*** Testing money_format() : error conditions ***\n"; echo "\n-- Testing money_format() function with more than one token --\n"; var_dump( money_format($string . $string, $value) ); ?> -===DONE=== --EXPECTF-- *** Testing money_format() : error conditions *** @@ -36,4 +35,3 @@ Deprecated: Function money_format() is deprecated in %s on line %d Warning: money_format(): Only a single %ci or %cn token can be used in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/strings/nl_langinfo_basic.phpt b/ext/standard/tests/strings/nl_langinfo_basic.phpt index c940479065..c686caf25d 100644 --- a/ext/standard/tests/strings/nl_langinfo_basic.phpt +++ b/ext/standard/tests/strings/nl_langinfo_basic.phpt @@ -26,7 +26,6 @@ var_dump(nl_langinfo(RADIXCHAR)); setlocale(LC_ALL, $original); ?> -===DONE=== --EXPECT-- *** Testing nl_langinfo() : basic functionality *** string(3) "Mon" @@ -34,4 +33,3 @@ string(9) "Wednesday" string(3) "Jul" string(5) "April" string(1) "." -===DONE=== diff --git a/ext/standard/tests/strings/number_format_basic.phpt b/ext/standard/tests/strings/number_format_basic.phpt index 79ec7b85ac..4eb4d51086 100644 --- a/ext/standard/tests/strings/number_format_basic.phpt +++ b/ext/standard/tests/strings/number_format_basic.phpt @@ -47,7 +47,6 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> -===DONE=== --EXPECT-- *** Testing number_format() : basic functionality *** @@ -106,4 +105,3 @@ string(6) "123,46" string(4) "0,00" string(4) "1,00" string(4) "0,00" -===DONE=== diff --git a/ext/standard/tests/strings/ord_basic.phpt b/ext/standard/tests/strings/ord_basic.phpt index f49948206a..a7c93fc6d3 100644 --- a/ext/standard/tests/strings/ord_basic.phpt +++ b/ext/standard/tests/strings/ord_basic.phpt @@ -30,7 +30,6 @@ for ($i = 0; $i < 255; $i++) { } ?> -===DONE=== --EXPECT-- *** Testing ord() : basic functionality *** int(97) @@ -44,4 +43,3 @@ int(10) int(10) int(255) int(72) -===DONE=== diff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt index e442c0fd70..60277fa184 100644 --- a/ext/standard/tests/strings/parse_str_basic1.phpt +++ b/ext/standard/tests/strings/parse_str_basic1.phpt @@ -27,7 +27,6 @@ var_dump(parse_str($s1, $res3_array)); var_dump($res3_array); ?> -===DONE=== --EXPECTF-- *** Testing parse_str() : basic functionality *** @@ -63,4 +62,3 @@ array(3) { ["third"]=> string(4) "val3" } -===DONE=== diff --git a/ext/standard/tests/strings/parse_str_basic2.phpt b/ext/standard/tests/strings/parse_str_basic2.phpt index 32a8fcd3fc..15bd3024d6 100644 --- a/ext/standard/tests/strings/parse_str_basic2.phpt +++ b/ext/standard/tests/strings/parse_str_basic2.phpt @@ -16,7 +16,6 @@ var_dump(parse_str($s1, $result)); var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing parse_str() : non-default arg_separator.input specified *** NULL @@ -28,4 +27,3 @@ array(3) { ["third"]=> string(4) "val3" } -===DONE=== diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt Binary files differindex 06f9579188..25b5f8745d 100644 --- a/ext/standard/tests/strings/parse_str_basic3.phpt +++ b/ext/standard/tests/strings/parse_str_basic3.phpt diff --git a/ext/standard/tests/strings/parse_str_basic4.phpt b/ext/standard/tests/strings/parse_str_basic4.phpt index b6126e974b..5b128c7cfc 100644 --- a/ext/standard/tests/strings/parse_str_basic4.phpt +++ b/ext/standard/tests/strings/parse_str_basic4.phpt @@ -30,7 +30,6 @@ $str = "arr.test[1]=sid&arr test[4][two]=fred"; var_dump(parse_str($str, $res)); var_dump($res); ?> -===DONE=== --EXPECTF-- Test string with badly formed strings NULL @@ -89,4 +88,3 @@ array(1) { } } } -===DONE=== diff --git a/ext/standard/tests/strings/print_basic.phpt b/ext/standard/tests/strings/print_basic.phpt index 0b75641991..9d8c8a618c 100644 --- a/ext/standard/tests/strings/print_basic.phpt +++ b/ext/standard/tests/strings/print_basic.phpt @@ -58,7 +58,6 @@ that the here document terminator must appear on a line with just a semicolon no extra whitespace!\n END; ?> -===DONE=== --EXPECT-- *** Testing print() : basic functionality *** @@ -89,4 +88,3 @@ This uses the "here document" syntax to output multiple lines with VARIABLE interpolation. Note that the here document terminator must appear on a line with just a semicolon no extra whitespace! -===DONE=== diff --git a/ext/standard/tests/strings/print_variation1.phpt b/ext/standard/tests/strings/print_variation1.phpt index 38fe919528..f06b83ee8f 100644 --- a/ext/standard/tests/strings/print_variation1.phpt +++ b/ext/standard/tests/strings/print_variation1.phpt @@ -81,7 +81,6 @@ foreach($inputs as $input) { fclose($file_handle); //closing the file handle ?> -===DONE=== --EXPECTF-- *** Testing print() function: with unexpected inputs for 'arg' argument *** -- Iteration 1 -- @@ -153,4 +152,3 @@ int(1) -- Iteration 21 -- int(1) -===DONE=== diff --git a/ext/standard/tests/strings/printf_basic1.phpt b/ext/standard/tests/strings/printf_basic1.phpt index db6edf6374..b2cbe22375 100644 --- a/ext/standard/tests/strings/printf_basic1.phpt +++ b/ext/standard/tests/strings/printf_basic1.phpt @@ -40,7 +40,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing printf() : basic functionality - using string format *** @@ -59,4 +58,3 @@ int(27) -- Calling printf() with string three arguments -- arg1 argument arg2 argument arg3 argument int(41) -===DONE=== diff --git a/ext/standard/tests/strings/printf_basic2.phpt b/ext/standard/tests/strings/printf_basic2.phpt index 6448fe6609..d7ed15e29e 100644 --- a/ext/standard/tests/strings/printf_basic2.phpt +++ b/ext/standard/tests/strings/printf_basic2.phpt @@ -40,7 +40,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing printf() : basic functionality - using integer format *** @@ -59,4 +58,3 @@ int(7) -- Calling printf() with three arguments-- 111 222 333 int(11) -===DONE=== diff --git a/ext/standard/tests/strings/printf_basic3.phpt b/ext/standard/tests/strings/printf_basic3.phpt index 711327cd6d..b5ee1b82b0 100644 --- a/ext/standard/tests/strings/printf_basic3.phpt +++ b/ext/standard/tests/strings/printf_basic3.phpt @@ -54,7 +54,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing printf() : basic functionality - using float format *** @@ -79,4 +78,3 @@ int(19) int(29) 11.110000 22.220000 33.330000 int(29) -===DONE=== diff --git a/ext/standard/tests/strings/printf_basic4.phpt b/ext/standard/tests/strings/printf_basic4.phpt index e5c07fd03c..cc1b533db6 100644 --- a/ext/standard/tests/strings/printf_basic4.phpt +++ b/ext/standard/tests/strings/printf_basic4.phpt @@ -39,7 +39,6 @@ $result = printf($format3, $arg1, $arg2, $arg3); echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing printf() : basic functionality - using bool format *** @@ -58,4 +57,3 @@ int(3) -- Calling printf() with three arguments-- 1 0 1 int(5) -===DONE=== diff --git a/ext/standard/tests/strings/printf_basic5.phpt b/ext/standard/tests/strings/printf_basic5.phpt index e7bebd6df7..e50e9d58b8 100644 --- a/ext/standard/tests/strings/printf_basic5.phpt +++ b/ext/standard/tests/strings/printf_basic5.phpt @@ -39,7 +39,6 @@ $result = printf($format3, $arg1, $arg2, $arg3); echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing printf() : basic functionality - using char format *** @@ -58,4 +57,3 @@ int(3) -- Calling printf() with three arguments -- A B C int(5) -===DONE=== diff --git a/ext/standard/tests/strings/printf_basic6.phpt b/ext/standard/tests/strings/printf_basic6.phpt index b3872efdd0..f84d703089 100644 --- a/ext/standard/tests/strings/printf_basic6.phpt +++ b/ext/standard/tests/strings/printf_basic6.phpt @@ -38,7 +38,6 @@ $result = printf($format3, $arg1, $arg2, $arg3); echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing printf() : basic functionality - using exponential format *** @@ -57,4 +56,3 @@ int(23) -- Calling printf() with three arguments -- 1.000000e+3 2.000000E+3 3.000000e+3 int(35) -===DONE=== diff --git a/ext/standard/tests/strings/printf_basic7.phpt b/ext/standard/tests/strings/printf_basic7.phpt index 6675ddb29e..1a7c24d895 100644 --- a/ext/standard/tests/strings/printf_basic7.phpt +++ b/ext/standard/tests/strings/printf_basic7.phpt @@ -46,7 +46,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing printf() : basic functionality - using unsigned format *** @@ -65,4 +64,3 @@ int(21) -- Calling printf() with three arguments -- 4294966185 4293732729 2345432 int(29) -===DONE=== diff --git a/ext/standard/tests/strings/printf_basic8.phpt b/ext/standard/tests/strings/printf_basic8.phpt index 3ec0eda5ec..5df156a553 100644 --- a/ext/standard/tests/strings/printf_basic8.phpt +++ b/ext/standard/tests/strings/printf_basic8.phpt @@ -45,7 +45,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing printf() : basic functionality - using octal format *** @@ -64,4 +63,3 @@ int(14) -- Calling printf() with three arguments -- 21 37777777431 567 int(18) -===DONE=== diff --git a/ext/standard/tests/strings/printf_basic9.phpt b/ext/standard/tests/strings/printf_basic9.phpt index cb9513d975..b86da032e8 100644 --- a/ext/standard/tests/strings/printf_basic9.phpt +++ b/ext/standard/tests/strings/printf_basic9.phpt @@ -55,7 +55,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing printf() : basic functionality - using hexadecimal format *** @@ -80,4 +79,3 @@ b 84 b1 int(7) B 84 B1 int(7) -===DONE=== diff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt index e5bd8c7e21..62591e9e6f 100644 --- a/ext/standard/tests/strings/printf_error.phpt +++ b/ext/standard/tests/strings/printf_error.phpt @@ -61,7 +61,6 @@ try { } ?> -===DONE=== --EXPECTF-- *** Testing printf() : error conditions *** @@ -81,4 +80,3 @@ printf() expects at least 1 parameter, 0 given -- Call printf with three argument less than expected -- 4 parameters are required, 1 given -===DONE=== diff --git a/ext/standard/tests/strings/printf_variation1.phpt b/ext/standard/tests/strings/printf_variation1.phpt index 62f5e21916..0884a2ff71 100644 --- a/ext/standard/tests/strings/printf_variation1.phpt +++ b/ext/standard/tests/strings/printf_variation1.phpt @@ -110,7 +110,6 @@ foreach($values as $value) { fclose($file_handle); ?> -===DONE=== --EXPECTF-- *** Testing printf() : with unexpected values for format argument *** @@ -351,4 +350,3 @@ Resource id #%d int(%d) Resource id #%d int(%d) -===DONE=== diff --git a/ext/standard/tests/strings/printf_variation2.phpt b/ext/standard/tests/strings/printf_variation2.phpt index 6cf3e90d62..3c3d92cbe3 100644 --- a/ext/standard/tests/strings/printf_variation2.phpt +++ b/ext/standard/tests/strings/printf_variation2.phpt @@ -105,7 +105,6 @@ foreach($values as $value) { fclose($file_handle); ?> -===DONE=== --EXPECTF-- *** Testing printf() : with different types of values passed for arg1 argument *** @@ -296,4 +295,3 @@ Resource id #%d int(%d) Resource id #%d int(%d) -===DONE=== diff --git a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt index 654c418dc4..09bcd343d0 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt @@ -18,8 +18,6 @@ $str = "=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A= var_dump(bin2hex(quoted_printable_decode($str))); ?> -===DONE=== --EXPECT-- *** Testing quoted_printable_decode() : basic functionality *** string(76) "fa776f772d666163746f72c1d0d5ddc5ceced9c50a20d4cfd2c7cfd7d9c520d0d2cfc5cbd4d9" -===DONE=== diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt index d2694db6b6..87b0718bd3 100644 --- a/ext/standard/tests/strings/quotemeta_basic.phpt +++ b/ext/standard/tests/strings/quotemeta_basic.phpt @@ -14,10 +14,8 @@ var_dump(quotemeta("Hello how are you ?")); var_dump(quotemeta("(100 + 50) * 10")); var_dump(quotemeta("\+*?[^]($)")); ?> -===DONE=== --EXPECT-- *** Testing quotemeta() : basic functionality *** string(20) "Hello how are you \?" string(19) "\(100 \+ 50\) \* 10" string(20) "\\\+\*\?\[\^\]\(\$\)" -===DONE=== diff --git a/ext/standard/tests/strings/rtrim_basic.phpt b/ext/standard/tests/strings/rtrim_basic.phpt index 9946f90c6e..d58a9e4a95 100644 --- a/ext/standard/tests/strings/rtrim_basic.phpt +++ b/ext/standard/tests/strings/rtrim_basic.phpt @@ -33,7 +33,6 @@ echo "\n-- Trim the ASCII control characters at the beginning of a string --\n"; var_dump(rtrim($binary, "\x00..\x1F")); ?> -===DONE=== --EXPECT-- *** Testing rtrim() : basic functionality *** @@ -51,4 +50,3 @@ string(10) "0123456789" -- Trim the ASCII control characters at the beginning of a string -- string(14) "Example string" -===DONE=== diff --git a/ext/standard/tests/strings/rtrim_error.phpt b/ext/standard/tests/strings/rtrim_error.phpt index 210fb58c4e..ef45f723f3 100644 --- a/ext/standard/tests/strings/rtrim_error.phpt +++ b/ext/standard/tests/strings/rtrim_error.phpt @@ -19,7 +19,6 @@ var_dump(rtrim($hello, "z..a")); var_dump(rtrim($hello, "a..b..c")); ?> -===DONE=== --EXPECTF-- *** Testing rtrim() : error conditions *** @@ -40,4 +39,3 @@ string(14) " Hello World Warning: rtrim(): Invalid '..'-range in %s on line %d string(14) " Hello World " -===DONE=== diff --git a/ext/standard/tests/strings/setlocale-win32.phpt b/ext/standard/tests/strings/setlocale-win32.phpt index fcfbce3579..e6aeda5f1c 100644 --- a/ext/standard/tests/strings/setlocale-win32.phpt +++ b/ext/standard/tests/strings/setlocale-win32.phpt @@ -14,7 +14,6 @@ var_dump(setlocale(LC_ALL, 'uk_US')); var_dump(setlocale(LC_ALL, 'us_UK')); var_dump(setlocale(LC_ALL, 'us_US')); ?> -===DONE=== --EXPECT-- bool(false) bool(false) @@ -22,4 +21,3 @@ string(27) "English_United Kingdom.1252" string(26) "English_United States.1252" string(27) "English_United Kingdom.1252" string(26) "English_United States.1252" -===DONE=== diff --git a/ext/standard/tests/strings/sha1_basic.phpt b/ext/standard/tests/strings/sha1_basic.phpt index 0761fe4cfd..1c179da202 100644 --- a/ext/standard/tests/strings/sha1_basic.phpt +++ b/ext/standard/tests/strings/sha1_basic.phpt @@ -37,7 +37,6 @@ var_dump(bin2hex(sha1("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234 var_dump(bin2hex(sha1("12345678901234567890123456789012345678901234567890123456789012345678901234567890", true))); ?> -===DONE=== --EXPECT-- *** Testing sha1() : basic functionality *** @@ -67,4 +66,3 @@ string(40) "c12252ceda8be8994d5fa0290a47231c1d16aae3" string(40) "32d10c7b8cf96570ca04ce37f2a19d84240d3a89" string(40) "761c457bf73b14d27e9e9265c46f4b4dda11f940" string(40) "50abf5706a150990a08b2c5ea40fa0e585554732" -===DONE=== diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt index 09e81be014..4b43eeee3c 100644 --- a/ext/standard/tests/strings/sha1_file.phpt +++ b/ext/standard/tests/strings/sha1_file.phpt @@ -63,7 +63,6 @@ unlink("DataFileSHA1.txt"); unlink("EmptyFileSHA1.txt"); ?> -===DONE=== --EXPECTF-- *** Testing sha1_file() : basic functionality *** @@ -100,4 +99,3 @@ string(40) "d16a568ab98233deff7ec8b1668eb4b3d9e53fee" -- Raw Binary Output for a valid file with some contents -- string(40) "d16a568ab98233deff7ec8b1668eb4b3d9e53fee" -===DONE=== diff --git a/ext/standard/tests/strings/similar_text_basic.phpt b/ext/standard/tests/strings/similar_text_basic.phpt index ad8807f102..20ae4854ce 100644 --- a/ext/standard/tests/strings/similar_text_basic.phpt +++ b/ext/standard/tests/strings/similar_text_basic.phpt @@ -26,7 +26,6 @@ var_dump($percent); similar_text("abcdefghabcdef", "zzzzabcdefggg", $percent); var_dump($percent); ?> -===DONE=== --EXPECT-- int(3) int(0) @@ -36,4 +35,3 @@ float(54.545454545455) float(0) float(18.181818181818) float(51.851851851852) -===DONE=== diff --git a/ext/standard/tests/strings/soundex_basic.phpt b/ext/standard/tests/strings/soundex_basic.phpt index 401eb67460..7c536f1d34 100644 --- a/ext/standard/tests/strings/soundex_basic.phpt +++ b/ext/standard/tests/strings/soundex_basic.phpt @@ -25,7 +25,6 @@ var_dump(soundex("Lukasiewicz") == soundex("Lissajous")); // L222 var_dump(soundex("Lukasiewicz") == soundex("Ghosh")); var_dump(soundex("Hilbert") == soundex("Ladd")); ?> -===DONE=== --EXPECT-- *** Testing soundex() : basic functionality *** string(4) "E460" @@ -42,4 +41,3 @@ bool(true) bool(true) bool(false) bool(false) -===DONE=== diff --git a/ext/standard/tests/strings/sprintf_variation23.phpt b/ext/standard/tests/strings/sprintf_variation23.phpt index 8a7a45e57a..b35d5cc849 100644 --- a/ext/standard/tests/strings/sprintf_variation23.phpt +++ b/ext/standard/tests/strings/sprintf_variation23.phpt @@ -42,7 +42,6 @@ fclose($fp); closedir($dfp); ?> -===DONE=== --EXPECTF-- *** Testing sprintf() : char formats with resource values *** @@ -75,4 +74,3 @@ string(1) "%a" string(1) "%a" string(11) "a-bA-B@#$&]" string(1) "c" -===DONE=== diff --git a/ext/standard/tests/strings/sprintf_variation36.phpt b/ext/standard/tests/strings/sprintf_variation36.phpt index b465e0cf9e..17869f0ade 100644 --- a/ext/standard/tests/strings/sprintf_variation36.phpt +++ b/ext/standard/tests/strings/sprintf_variation36.phpt @@ -42,7 +42,6 @@ fclose($fp); closedir($dfp); ?> -===DONE=== --EXPECTF-- *** Testing sprintf() : hexa formats with resource values *** @@ -75,4 +74,3 @@ string(4) "%a" string(30) "%a" string(10) "0-9A-Fa-f]" string(1) "x" -===DONE=== diff --git a/ext/standard/tests/strings/sprintf_variation48.phpt b/ext/standard/tests/strings/sprintf_variation48.phpt index 1f5504af4b..73dc5950a9 100644 --- a/ext/standard/tests/strings/sprintf_variation48.phpt +++ b/ext/standard/tests/strings/sprintf_variation48.phpt @@ -42,7 +42,6 @@ fclose($fp); closedir($dfp); ?> -===DONE=== --EXPECTF-- *** Testing sprintf() : scientific formats with resource values *** @@ -75,4 +74,3 @@ string(%d) "%f" string(30) "%s%f" string(%d) "0-1]" string(1) "e" -===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic1.phpt b/ext/standard/tests/strings/sscanf_basic1.phpt index 8a38f9d19e..388d80ea73 100644 --- a/ext/standard/tests/strings/sscanf_basic1.phpt +++ b/ext/standard/tests/strings/sscanf_basic1.phpt @@ -27,7 +27,6 @@ $res = sscanf($str, $format, $part, $number, $stock); var_dump($res, $part, $number, $stock); ?> -===DONE=== --EXPECT-- *** Testing sscanf() : basic functionality - using string format *** @@ -41,4 +40,3 @@ int(3) string(6) "Widget" string(7) "1234789" string(2) "25" -===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic2.phpt b/ext/standard/tests/strings/sscanf_basic2.phpt index 92f4d1051e..2c29bcacce 100644 --- a/ext/standard/tests/strings/sscanf_basic2.phpt +++ b/ext/standard/tests/strings/sscanf_basic2.phpt @@ -27,7 +27,6 @@ $res = sscanf($str, $format, $part, $number, $stock); var_dump($res, $part, $number, $stock); ?> -===DONE=== --EXPECT-- *** Testing sscanf() : basic functionality - using integer format *** @@ -41,4 +40,3 @@ int(3) string(6) "Widget" int(1234789) int(25) -===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic3.phpt b/ext/standard/tests/strings/sscanf_basic3.phpt index b728dea34d..e30f67aa44 100644 --- a/ext/standard/tests/strings/sscanf_basic3.phpt +++ b/ext/standard/tests/strings/sscanf_basic3.phpt @@ -24,7 +24,6 @@ $res = sscanf($str, $format, $part, $length, $width, $depth); var_dump($res, $part, $length, $width, $depth); ?> -===DONE=== --EXPECT-- *** Testing sscanf() : basic functionality -- using float format *** @@ -40,4 +39,3 @@ string(6) "Widget" float(111.53) float(22.345) float(12.4) -===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic4.phpt b/ext/standard/tests/strings/sscanf_basic4.phpt index 726bc08a10..2cf05383d5 100644 --- a/ext/standard/tests/strings/sscanf_basic4.phpt +++ b/ext/standard/tests/strings/sscanf_basic4.phpt @@ -24,7 +24,6 @@ $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4); var_dump($res, $arg1, $arg2, $arg3, $arg4); ?> -===DONE=== --EXPECT-- *** Testing sscanf() : basic functionality - using char format *** @@ -40,4 +39,3 @@ string(1) "X" string(1) "A" string(1) "B" string(1) "C" -===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic5.phpt b/ext/standard/tests/strings/sscanf_basic5.phpt index 36c2feba9d..16012f26cf 100644 --- a/ext/standard/tests/strings/sscanf_basic5.phpt +++ b/ext/standard/tests/strings/sscanf_basic5.phpt @@ -30,7 +30,6 @@ var_dump($res, $arg1, $arg2, $arg3, $arg4); ?> -===DONE=== --EXPECT-- *** Testing sscanf() : basic functionality -using exponential format *** @@ -55,4 +54,3 @@ float(10.12345) float(10123.45) float(10123.45) float(-101234.5) -===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic6.phpt b/ext/standard/tests/strings/sscanf_basic6.phpt index 381ccc12c2..4b109b9584 100644 --- a/ext/standard/tests/strings/sscanf_basic6.phpt +++ b/ext/standard/tests/strings/sscanf_basic6.phpt @@ -30,7 +30,6 @@ $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> -===DONE=== --EXPECT-- *** Testing sscanf() : basic functionality - using unsigned format *** @@ -50,4 +49,3 @@ int(11) string(10) "4294967285" NULL NULL -===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic7.phpt b/ext/standard/tests/strings/sscanf_basic7.phpt index 253dd1ba53..daa93715d6 100644 --- a/ext/standard/tests/strings/sscanf_basic7.phpt +++ b/ext/standard/tests/strings/sscanf_basic7.phpt @@ -24,7 +24,6 @@ $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> -===DONE=== --EXPECT-- *** Testing sscanf() : basic functionality - using octal format *** @@ -44,4 +43,3 @@ int(83) int(10) NULL NULL -===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic8.phpt b/ext/standard/tests/strings/sscanf_basic8.phpt index f4f237fec4..0adcb3d516 100644 --- a/ext/standard/tests/strings/sscanf_basic8.phpt +++ b/ext/standard/tests/strings/sscanf_basic8.phpt @@ -29,7 +29,6 @@ $res = sscanf($str, $format2, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> -===DONE=== --EXPECT-- *** Testing sscanf() : basic functionality - - using hexadecimal format *** @@ -62,4 +61,3 @@ int(4667) int(-4667) int(6844) int(1) -===DONE=== diff --git a/ext/standard/tests/strings/sscanf_error.phpt b/ext/standard/tests/strings/sscanf_error.phpt index 3e54a42f1e..25b6d889a9 100644 --- a/ext/standard/tests/strings/sscanf_error.phpt +++ b/ext/standard/tests/strings/sscanf_error.phpt @@ -17,7 +17,6 @@ echo "\n-- Testing sscanf() function with more than expected no. of arguments -- var_dump( sscanf($str, $format, $str1, $str2, $extra_str) ); ?> -===DONE=== --EXPECTF-- *** Testing sscanf() : error conditions *** @@ -25,4 +24,3 @@ var_dump( sscanf($str, $format, $str1, $str2, $extra_str) ); Warning: sscanf(): Variable is not assigned by any conversion specifiers in %s on line %d int(-1) -===DONE=== diff --git a/ext/standard/tests/strings/str_getcsv_002.phpt b/ext/standard/tests/strings/str_getcsv_002.phpt index a4ff87c206..de96e73913 100644 --- a/ext/standard/tests/strings/str_getcsv_002.phpt +++ b/ext/standard/tests/strings/str_getcsv_002.phpt @@ -7,7 +7,6 @@ $contents = <<<EOS EOS; print_r(str_getcsv($contents, ',', '"', '')); ?> -===DONE=== --EXPECT-- Array ( @@ -16,4 +15,3 @@ Array [2] => cell3 [3] => cell4 ) -===DONE=== diff --git a/ext/standard/tests/strings/str_replace_basic.phpt b/ext/standard/tests/strings/str_replace_basic.phpt index 790a32fffd..22b674ea6f 100644 --- a/ext/standard/tests/strings/str_replace_basic.phpt +++ b/ext/standard/tests/strings/str_replace_basic.phpt @@ -33,7 +33,6 @@ var_dump( $fp_copy ); fclose($fp); ?> -===DONE=== --EXPECTF-- *** Testing str_replace() on basic operations *** string(0) "" @@ -46,4 +45,3 @@ string(0) "" int(0) string(%d) "Resource id #%d" int(1) -===DONE=== diff --git a/ext/standard/tests/strings/str_replace_variation1.phpt b/ext/standard/tests/strings/str_replace_variation1.phpt index 067e26307d..2e6dd18b94 100644 --- a/ext/standard/tests/strings/str_replace_variation1.phpt +++ b/ext/standard/tests/strings/str_replace_variation1.phpt @@ -27,7 +27,6 @@ foreach( $search_arr as $value ) { } ?> -===DONE=== --EXPECT-- *** Testing str_replace() with various search values *** -- Iteration 0 -- @@ -389,4 +388,3 @@ array(12) { string(0) "" } int(0) -===DONE=== diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt Binary files differindex cbb2e0e5ed..79d50d40ff 100644 --- a/ext/standard/tests/strings/str_replace_variation2.phpt +++ b/ext/standard/tests/strings/str_replace_variation2.phpt diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index c6851c5c9c..7c520b404d 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -141,7 +141,6 @@ fclose($resource1); closedir($resource2); ?> -===DONE=== --EXPECTF-- *** Testing Miscelleneous input data *** string(3) "qqq" @@ -224,4 +223,3 @@ Warning: Undefined variable: strS in %s on line %d string(0) "" string(5) "FOUND" string(5) "FOUND" -===DONE=== diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt index 7f5fc1405c..b90e86fd4f 100644 --- a/ext/standard/tests/strings/str_rot13_basic.phpt +++ b/ext/standard/tests/strings/str_rot13_basic.phpt @@ -36,7 +36,6 @@ if (strcmp($str, $decode) == 0) { echo "Strings unequal : TEST FAILED\n"; } ?> -===DONE=== --EXPECT-- *** Testing str_rot13() : basic functionality *** @@ -52,4 +51,3 @@ Strings unequal : TEST FAILED Ensure strings round trip Strings equal : TEST PASSED -===DONE=== diff --git a/ext/standard/tests/strings/str_shuffle_basic.phpt b/ext/standard/tests/strings/str_shuffle_basic.phpt index 350600891b..037d65ac0e 100644 --- a/ext/standard/tests/strings/str_shuffle_basic.phpt +++ b/ext/standard/tests/strings/str_shuffle_basic.phpt @@ -51,9 +51,7 @@ if ($combinations != 24) { } ?> -===DONE=== --EXPECTF-- *** Testing str_shuffle() : basic functionality *** string(47) "%s" TEST PASSED -===DONE=== diff --git a/ext/standard/tests/strings/strcmp_unterminated.phpt b/ext/standard/tests/strings/strcmp_unterminated.phpt index 215193567b..afc082a221 100644 --- a/ext/standard/tests/strings/strcmp_unterminated.phpt +++ b/ext/standard/tests/strings/strcmp_unterminated.phpt @@ -15,8 +15,6 @@ var_dump( zend_terminate_string($a); zend_terminate_string($b); ?> -===DONE=== --EXPECT-- int(-1) int(1) -===DONE=== diff --git a/ext/standard/tests/strings/stripcslashes_basic.phpt b/ext/standard/tests/strings/stripcslashes_basic.phpt index 493e669131..70538b75b0 100644 --- a/ext/standard/tests/strings/stripcslashes_basic.phpt +++ b/ext/standard/tests/strings/stripcslashes_basic.phpt @@ -22,7 +22,6 @@ var_dump(bin2hex(stripcslashes('\\f'))); var_dump(bin2hex(stripcslashes('\\t'))); var_dump(bin2hex(stripcslashes('\\v'))); ?> -===DONE=== --EXPECT-- *** Testing stripcslashes() : basic functionality *** string(11) "Hello World" @@ -36,4 +35,3 @@ string(2) "08" string(2) "0c" string(2) "09" string(2) "0b" -===DONE=== diff --git a/ext/standard/tests/strings/stristr_basic.phpt b/ext/standard/tests/strings/stristr_basic.phpt index 73cbbbe17d..f95f9d2b1e 100644 --- a/ext/standard/tests/strings/stristr_basic.phpt +++ b/ext/standard/tests/strings/stristr_basic.phpt @@ -20,7 +20,6 @@ var_dump( stristr("teSt", "test") ); var_dump( stristr("Test String", "String", false) ); var_dump( stristr("Test String", "String", true) ); ?> -===DONE=== --EXPECT-- *** Testing stristr() : basic functionality *** string(11) "Test string" @@ -33,4 +32,3 @@ string(4) "tEst" string(4) "teSt" string(6) "String" string(5) "Test " -===DONE=== diff --git a/ext/standard/tests/strings/stristr_variation2.phpt b/ext/standard/tests/strings/stristr_variation2.phpt index dd0b34f883..553c462097 100644 --- a/ext/standard/tests/strings/stristr_variation2.phpt +++ b/ext/standard/tests/strings/stristr_variation2.phpt @@ -83,7 +83,6 @@ foreach($inputs as $input) { fclose($file_handle); //closing the file handle ?> -===DONE=== --EXPECT-- *** Testing stristr() function: with unexpected inputs for 'needle' argument *** -- Iteration 1 -- @@ -126,4 +125,3 @@ stristr() expects parameter 2 to be string, resource given string(11) "Hello World" -- Iteration 20 -- string(11) "Hello World" -===DONE=== diff --git a/ext/standard/tests/strings/strlen_basic.phpt b/ext/standard/tests/strings/strlen_basic.phpt index 721e4f1d26..fce6d70da0 100644 --- a/ext/standard/tests/strings/strlen_basic.phpt +++ b/ext/standard/tests/strings/strlen_basic.phpt @@ -14,11 +14,9 @@ var_dump(strlen(" ab de ")); var_dump(strlen("")); var_dump(strlen("\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f")); ?> -===DONE=== --EXPECT-- *** Testing strlen() : basic functionality *** int(6) int(7) int(0) int(18) -===DONE=== diff --git a/ext/standard/tests/strings/strnatcasecmp_basic.phpt b/ext/standard/tests/strings/strnatcasecmp_basic.phpt index 5b58e2331e..043ad43d37 100644 --- a/ext/standard/tests/strings/strnatcasecmp_basic.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_basic.phpt @@ -32,7 +32,6 @@ str_dump('pIc 6', 'pic 7'); str_dump(0xFFF, 0Xfff); ?> -===DONE=== --EXPECT-- *** Testing strnatcasecmp() : basic functionality *** int(0) @@ -48,4 +47,3 @@ int(-1) int(0) int(-1) int(0) -===DONE=== diff --git a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt index ac2cbb69f9..7f6d4579c3 100644 --- a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt @@ -44,7 +44,6 @@ str_dump("\x0", "\0"); str_dump($a, $b); ?> -===DONE=== --EXPECT-- *** Testing strnatcasecmp() : variation *** int(1) @@ -53,4 +52,3 @@ int(-1) int(-1) int(0) int(0) -===DONE=== diff --git a/ext/standard/tests/strings/strnatcmp_basic.phpt b/ext/standard/tests/strings/strnatcmp_basic.phpt index 734e5f57da..8f303e7395 100644 --- a/ext/standard/tests/strings/strnatcmp_basic.phpt +++ b/ext/standard/tests/strings/strnatcmp_basic.phpt @@ -49,7 +49,6 @@ var_dump(strnatcmp($d1, $a2)); var_dump(strnatcmp($c1, $b2)); var_dump(strnatcmp($c1, $d2)); ?> -===DONE=== --EXPECT-- *** Testing strnatcmp() : basic functionality *** Less than tests @@ -77,4 +76,3 @@ int(1) int(1) int(1) int(1) -===DONE=== diff --git a/ext/standard/tests/strings/strpbrk_basic.phpt b/ext/standard/tests/strings/strpbrk_basic.phpt index 9a92b8b4b5..f5a0306eaf 100644 --- a/ext/standard/tests/strings/strpbrk_basic.phpt +++ b/ext/standard/tests/strings/strpbrk_basic.phpt @@ -27,7 +27,6 @@ var_dump( strpbrk(5, 5) ); var_dump( strpbrk(5, "5") ); ?> -===DONE=== --EXPECT-- *** Testing strpbrk() : basic functionality *** string(20) "is is a Simple text." @@ -38,4 +37,3 @@ bool(false) string(12) " aaa aaaSLR" string(1) "5" string(1) "5" -===DONE=== diff --git a/ext/standard/tests/strings/strpbrk_error.phpt b/ext/standard/tests/strings/strpbrk_error.phpt index cce843c2f1..075e0b2462 100644 --- a/ext/standard/tests/strings/strpbrk_error.phpt +++ b/ext/standard/tests/strings/strpbrk_error.phpt @@ -16,7 +16,6 @@ echo "\n-- Testing strpbrk() function with empty second argument --\n"; var_dump( strpbrk($haystack, '') ); ?> -===DONE=== --EXPECTF-- *** Testing strpbrk() : error conditions *** @@ -24,4 +23,3 @@ var_dump( strpbrk($haystack, '') ); Warning: strpbrk(): The character list cannot be empty in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/strings/strripos_basic1.phpt b/ext/standard/tests/strings/strripos_basic1.phpt index 70bbdf94e5..4f8f8e8451 100644 --- a/ext/standard/tests/strings/strripos_basic1.phpt +++ b/ext/standard/tests/strings/strripos_basic1.phpt @@ -29,7 +29,6 @@ var_dump( strripos($heredoc_str, 'HelLO') ); var_dump( strripos($heredoc_str, $heredoc_str) ); ?> -===DONE=== --EXPECT-- *** Testing strripos() function: basic functionality *** @@ -48,4 +47,3 @@ int(5) int(0) int(0) int(0) -===DONE=== diff --git a/ext/standard/tests/strings/strripos_basic2.phpt b/ext/standard/tests/strings/strripos_basic2.phpt index 72d02d5c80..e13a8e5747 100644 --- a/ext/standard/tests/strings/strripos_basic2.phpt +++ b/ext/standard/tests/strings/strripos_basic2.phpt @@ -35,7 +35,6 @@ var_dump( strripos("Hello, World", "O", -1) ); var_dump( strripos("Hello, World", "O", -5) ); var_dump( strripos("Hello, World", "O", -9) ); ?> -===DONE=== --EXPECT-- *** Testing strripos() function: basic functionality *** @@ -61,4 +60,3 @@ bool(false) int(8) int(4) bool(false) -===DONE=== diff --git a/ext/standard/tests/strings/strripos_variation1.phpt b/ext/standard/tests/strings/strripos_variation1.phpt index 8b0c3a35cc..5c143d2564 100644 --- a/ext/standard/tests/strings/strripos_variation1.phpt +++ b/ext/standard/tests/strings/strripos_variation1.phpt @@ -73,7 +73,6 @@ foreach ($needles as $needle) { $count++; } ?> -===DONE=== --EXPECT-- *** Testing strripos() function: with double quoted strings *** -- Iteration 1 -- @@ -251,4 +250,3 @@ int(0) bool(false) bool(false) int(0) -===DONE=== diff --git a/ext/standard/tests/strings/strripos_variation2.phpt b/ext/standard/tests/strings/strripos_variation2.phpt index affe72a50a..273215b616 100644 --- a/ext/standard/tests/strings/strripos_variation2.phpt +++ b/ext/standard/tests/strings/strripos_variation2.phpt @@ -74,7 +74,6 @@ foreach ($needles as $needle) { $count++; } ?> -===DONE=== --EXPECT-- *** Testing strripos() function: with single quoted strings *** -- Iteration 1 -- @@ -257,4 +256,3 @@ int(0) bool(false) bool(false) int(0) -===DONE=== diff --git a/ext/standard/tests/strings/strripos_variation3.phpt b/ext/standard/tests/strings/strripos_variation3.phpt index 0f531f03da..f7a1f0ab20 100644 --- a/ext/standard/tests/strings/strripos_variation3.phpt +++ b/ext/standard/tests/strings/strripos_variation3.phpt @@ -36,7 +36,6 @@ var_dump( strripos($multi_line_str, "") ); var_dump( strripos($multi_line_str, " ") ); ?> -===DONE=== --EXPECT-- *** Testing strripos() function: with heredoc strings *** -- With heredoc string containing multi lines -- @@ -56,4 +55,3 @@ int(18) int(31) int(63) int(55) -===DONE=== diff --git a/ext/standard/tests/strings/strripos_variation4.phpt b/ext/standard/tests/strings/strripos_variation4.phpt index 3583f3646c..c9b1d0256d 100644 --- a/ext/standard/tests/strings/strripos_variation4.phpt +++ b/ext/standard/tests/strings/strripos_variation4.phpt @@ -27,7 +27,6 @@ var_dump( strripos($special_chars_str, "$*", 10) ); var_dump( strripos($special_chars_str, "(speCIal)") ); ?> -===DONE=== --EXPECT-- *** Testing strripos() function: with heredoc strings *** -- With heredoc string containing special chars -- @@ -38,4 +37,3 @@ int(39) int(55) int(55) int(57) -===DONE=== diff --git a/ext/standard/tests/strings/strripos_variation5.phpt b/ext/standard/tests/strings/strripos_variation5.phpt index 677e108e33..18572cc8d1 100644 --- a/ext/standard/tests/strings/strripos_variation5.phpt +++ b/ext/standard/tests/strings/strripos_variation5.phpt @@ -23,7 +23,6 @@ var_dump( strripos($control_char_str, "\n", 12) ); var_dump( strripos($control_char_str, "\t", 15) ); ?> -===DONE=== --EXPECT-- *** Testing strripos() function: with heredoc strings *** -- With heredoc string containing escape characters -- @@ -31,4 +30,3 @@ int(13) int(19) int(13) int(19) -===DONE=== diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt index 272e58a544..7deffa12fd 100644 --- a/ext/standard/tests/strings/strtr_variation6.phpt +++ b/ext/standard/tests/strings/strtr_variation6.phpt @@ -86,7 +86,6 @@ for($index = 0; $index < count($from_arr); $index++) { fclose($file_handle); //closing the file handle ?> -===DONE=== --EXPECTF-- *** Testing strtr() function: with unexpected inputs for 'from' *** -- Iteration 1 -- @@ -133,4 +132,3 @@ string(6) "012atm" string(6) "012atm" -- Iteration 19 -- string(6) "012atm" -===DONE=== diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt index 65f1c98366..ac89554527 100644 --- a/ext/standard/tests/strings/strval_basic.phpt +++ b/ext/standard/tests/strings/strval_basic.phpt @@ -46,7 +46,6 @@ foreach($values as $value) { $iterator++; }; ?> -===DONE=== --EXPECT-- *** Testing strval() : basic variations *** @@ -74,4 +73,3 @@ string(5) "0xABC" -- Iteration 7 -- string(21) "Simple HEREDOC string" -===DONE=== diff --git a/ext/standard/tests/strings/strval_error.phpt b/ext/standard/tests/strings/strval_error.phpt index 3cd76c5e15..18d502eb2b 100644 --- a/ext/standard/tests/strings/strval_error.phpt +++ b/ext/standard/tests/strings/strval_error.phpt @@ -25,10 +25,8 @@ try { } ?> -===DONE=== --EXPECTF-- *** Testing strval() : error conditions *** -- Testing strval() function with object which has not toString() method -- Object of class MyClass could not be converted to string -===DONE=== diff --git a/ext/standard/tests/strings/strval_variation1.phpt b/ext/standard/tests/strings/strval_variation1.phpt index d833fa01be..068e1e2649 100644 --- a/ext/standard/tests/strings/strval_variation1.phpt +++ b/ext/standard/tests/strings/strval_variation1.phpt @@ -89,7 +89,6 @@ foreach($values as $value) { $iterator++; }; ?> -===DONE=== --EXPECTF-- *** Testing strval() : usage variations *** @@ -189,4 +188,3 @@ string(0) "" -- Iteration 31 -- string(0) "" -===DONE=== diff --git a/ext/standard/tests/strings/strval_variation2.phpt b/ext/standard/tests/strings/strval_variation2.phpt index 3fa99f7718..cf635294d0 100644 --- a/ext/standard/tests/strings/strval_variation2.phpt +++ b/ext/standard/tests/strings/strval_variation2.phpt @@ -60,7 +60,6 @@ echo bin2hex(strval($sf)); echo "\n"; ?> -===DONE=== --EXPECT-- *** Testing strval() : usage variations - Pass all valid char codes *** 000102030405060708090a0b0c0d0e0f @@ -79,4 +78,3 @@ c0c1c2c3c4c5c6c7c8c9cacbcccdcecf d0d1d2d3d4d5d6d7d8d9dadbdcdddedf e0e1e2e3e4e5e6e7e8e9eaebecedeeef f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -===DONE=== diff --git a/ext/standard/tests/strings/substr_replace_error.phpt b/ext/standard/tests/strings/substr_replace_error.phpt index 936d0fd1d5..5e22fccb88 100644 --- a/ext/standard/tests/strings/substr_replace_error.phpt +++ b/ext/standard/tests/strings/substr_replace_error.phpt @@ -26,7 +26,6 @@ echo "\n-- Testing substr_replace() function with start and length as arrays but var_dump(substr_replace($s1, "evening", array(5), array(8))); ?> -===DONE=== --EXPECTF-- *** Testing substr_replace() : error conditions *** @@ -47,4 +46,3 @@ string(12) "Good morning" Warning: substr_replace(): Functionality of 'start' and 'length' as arrays is not implemented in %s on line %d string(12) "Good morning" -===DONE=== diff --git a/ext/standard/tests/strings/trim_basic.phpt b/ext/standard/tests/strings/trim_basic.phpt index 08f75846a5..53fd4c7cc3 100644 --- a/ext/standard/tests/strings/trim_basic.phpt +++ b/ext/standard/tests/strings/trim_basic.phpt @@ -27,7 +27,6 @@ echo "\n-- Trim the ASCII control characters at the beginning of a string --\n"; var_dump(trim($binary, "\x00..\x1F")); ?> -===DONE=== --EXPECT-- *** Testing trim() : basic functionality *** @@ -42,4 +41,3 @@ string(19) "!===Hello World===!" -- Trim the ASCII control characters at the beginning of a string -- string(14) "Example string" -===DONE=== diff --git a/ext/standard/tests/strings/trim_error.phpt b/ext/standard/tests/strings/trim_error.phpt index 046a2b04f9..c9b92bc5c9 100644 --- a/ext/standard/tests/strings/trim_error.phpt +++ b/ext/standard/tests/strings/trim_error.phpt @@ -19,7 +19,6 @@ var_dump(trim($hello, "z..a")); var_dump(trim($hello, "a..b..c")); ?> -===DONE=== --EXPECTF-- *** Testing trim() : error conditions *** @@ -40,4 +39,3 @@ string(14) " Hello World Warning: trim(): Invalid '..'-range in %s on line %d string(14) " Hello World " -===DONE=== diff --git a/ext/standard/tests/strings/unpack_bug68225.phpt b/ext/standard/tests/strings/unpack_bug68225.phpt index b02b0383bf..c3d1692c37 100644 --- a/ext/standard/tests/strings/unpack_bug68225.phpt +++ b/ext/standard/tests/strings/unpack_bug68225.phpt @@ -15,7 +15,6 @@ $result = unpack('V1a/X4/V1b/V1c/X4/V1d', $data); var_dump($result); ?> -===DONE=== --EXPECT-- array(1) { ["a"]=> @@ -35,4 +34,3 @@ array(4) { ["d"]=> int(2) } -===DONE=== diff --git a/ext/standard/tests/strings/unpack_error.phpt b/ext/standard/tests/strings/unpack_error.phpt index b34be23267..9308eef25e 100644 --- a/ext/standard/tests/strings/unpack_error.phpt +++ b/ext/standard/tests/strings/unpack_error.phpt @@ -14,7 +14,6 @@ echo "\n-- Testing unpack() function with invalid format character --\n"; $extra_arg = 10; var_dump(unpack("B", pack("I", 65534))); ?> -===DONE=== --EXPECTF-- *** Testing unpack() : error conditions *** @@ -22,4 +21,3 @@ var_dump(unpack("B", pack("I", 65534))); Warning: unpack(): Invalid format type B in %s on line %d bool(false) -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt index 30cd5348bf..16a0014425 100644 --- a/ext/standard/tests/strings/vfprintf_basic.phpt +++ b/ext/standard/tests/strings/vfprintf_basic.phpt @@ -42,7 +42,6 @@ writeAndDump( $fp, "Testing %b %d %f %s %x %X", array( 9, 6, 2.5502, "foobar", 1 fclose( $fp ); ?> -===DONE=== --CLEAN-- <?php @@ -68,4 +67,3 @@ string(2) "50" int(2) string(35) "Testing 1001 6 2.550200 foobar f 41" int(35) -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic1.phpt b/ext/standard/tests/strings/vfprintf_basic1.phpt index aa8d2eb850..0c64784bc4 100644 --- a/ext/standard/tests/strings/vfprintf_basic1.phpt +++ b/ext/standard/tests/strings/vfprintf_basic1.phpt @@ -37,7 +37,6 @@ print_r(file_get_contents($data_file)); unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : basic functionality - using string format *** int(4) @@ -46,4 +45,3 @@ int(14) one one two one two three -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic2.phpt b/ext/standard/tests/strings/vfprintf_basic2.phpt index 4593dbb1b6..770b41b5bc 100644 --- a/ext/standard/tests/strings/vfprintf_basic2.phpt +++ b/ext/standard/tests/strings/vfprintf_basic2.phpt @@ -42,10 +42,8 @@ print_r(file_get_contents($data_file)); unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : basic functionality - using integer format *** 111 111 222 111 222 333 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic3.phpt b/ext/standard/tests/strings/vfprintf_basic3.phpt index b303f196f8..142a7fdaa7 100644 --- a/ext/standard/tests/strings/vfprintf_basic3.phpt +++ b/ext/standard/tests/strings/vfprintf_basic3.phpt @@ -51,7 +51,6 @@ print_r(file_get_contents($data_file)); unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : basic functionality - using float format *** 11.110000 @@ -60,4 +59,3 @@ unlink($data_file); 11.110000 22.220000 11.110000 22.220000 33.330000 11.110000 22.220000 33.330000 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic4.phpt b/ext/standard/tests/strings/vfprintf_basic4.phpt index a0780c160b..c698c9776d 100644 --- a/ext/standard/tests/strings/vfprintf_basic4.phpt +++ b/ext/standard/tests/strings/vfprintf_basic4.phpt @@ -37,10 +37,8 @@ print_r(file_get_contents($data_file)); unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : basic functionality - using bool format *** 1 1 0 1 0 1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic5.phpt b/ext/standard/tests/strings/vfprintf_basic5.phpt index 56dd2c67fc..be35af7809 100644 --- a/ext/standard/tests/strings/vfprintf_basic5.phpt +++ b/ext/standard/tests/strings/vfprintf_basic5.phpt @@ -37,10 +37,8 @@ print_r(file_get_contents($data_file)); unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : basic functionality - using char format *** A A B A B C -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic6.phpt b/ext/standard/tests/strings/vfprintf_basic6.phpt index 0590810e31..9cc0bc6a7a 100644 --- a/ext/standard/tests/strings/vfprintf_basic6.phpt +++ b/ext/standard/tests/strings/vfprintf_basic6.phpt @@ -39,10 +39,8 @@ print_r(file_get_contents($data_file)); unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : basic functionality - using exponential format *** 1.000000e+3 1.000000e+3 2.000000e+3 1.000000e+3 2.000000e+3 3.000000e+3 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic7.phpt b/ext/standard/tests/strings/vfprintf_basic7.phpt index f7cc0ed0b3..f1c36768e0 100644 --- a/ext/standard/tests/strings/vfprintf_basic7.phpt +++ b/ext/standard/tests/strings/vfprintf_basic7.phpt @@ -42,10 +42,8 @@ print_r(file_get_contents($data_file)); unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : basic functionality - using unsigned format *** 4294966185 4294966185 4293732729 4294966185 4293732729 4292621864 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt index 3587792d81..54df744ff8 100644 --- a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt @@ -42,10 +42,8 @@ print_r(file_get_contents($data_file)); unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : basic functionality - using unsigned format *** 18446744073709550505 18446744073709550505 18446744073708317049 18446744073709550505 18446744073708317049 18446744073707206184 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic8.phpt b/ext/standard/tests/strings/vfprintf_basic8.phpt index ced87284f8..a5ac35600e 100644 --- a/ext/standard/tests/strings/vfprintf_basic8.phpt +++ b/ext/standard/tests/strings/vfprintf_basic8.phpt @@ -37,10 +37,8 @@ print_r(file_get_contents($data_file)); unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : basic functionality - using octal format *** 21 21 347 21 347 567 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic9.phpt b/ext/standard/tests/strings/vfprintf_basic9.phpt index db98c442e8..81cc8e0d9a 100644 --- a/ext/standard/tests/strings/vfprintf_basic9.phpt +++ b/ext/standard/tests/strings/vfprintf_basic9.phpt @@ -48,7 +48,6 @@ print_r(file_get_contents($data_file)); unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf) : basic functionality - using hexadecimal format *** b @@ -57,4 +56,3 @@ b 84 B 84 b 84 b1 B 84 B1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt index b4548e8b49..f2057ea388 100644 --- a/ext/standard/tests/strings/vfprintf_error1.phpt +++ b/ext/standard/tests/strings/vfprintf_error1.phpt @@ -35,7 +35,6 @@ try { fclose($fp); ?> -===DONE=== --CLEAN-- <?php @@ -47,4 +46,3 @@ unlink( $file ); -- Testing vfprintf() function with more than expected no. of arguments -- Wrong parameter count for vfprintf() Wrong parameter count for vfprintf() -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt index d02855d61e..06103878a6 100644 --- a/ext/standard/tests/strings/vfprintf_error3.phpt +++ b/ext/standard/tests/strings/vfprintf_error3.phpt @@ -35,7 +35,6 @@ rewind( $fp ); fclose( $fp ); ?> -===DONE=== --CLEAN-- <?php @@ -51,4 +50,3 @@ int(5) string(5) "Array" int(9) string(9) "Foo fake" -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_error4.phpt b/ext/standard/tests/strings/vfprintf_error4.phpt index 9ccd83b2d8..53eba8f415 100644 --- a/ext/standard/tests/strings/vfprintf_error4.phpt +++ b/ext/standard/tests/strings/vfprintf_error4.phpt @@ -31,7 +31,6 @@ try { fclose( $fp ); ?> -===DONE=== --CLEAN-- <?php @@ -43,4 +42,3 @@ unlink( $file ); -- Testing vfprintf() function with other strangeties -- vfprintf() expects parameter 1 to be resource, string given Error found: Argument number must be greater than zero. -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation1.phpt b/ext/standard/tests/strings/vfprintf_variation1.phpt index 7c969ffff9..744d9e2fd8 100644 --- a/ext/standard/tests/strings/vfprintf_variation1.phpt +++ b/ext/standard/tests/strings/vfprintf_variation1.phpt @@ -53,7 +53,6 @@ writeAndDump( $fp, "Testing %b %d %f %o %s %x %X", array( 9, 6, 2.5502, 24, "foo fclose( $fp ); ?> -===DONE=== --CLEAN-- <?php @@ -77,4 +76,3 @@ string(0) "" int(0) string(38) "Testing 1001 6 2.550200 30 foobar f 41" int(38) -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation10.phpt b/ext/standard/tests/strings/vfprintf_variation10.phpt Binary files differindex dda2105dcd..91bb67ef6e 100644 --- a/ext/standard/tests/strings/vfprintf_variation10.phpt +++ b/ext/standard/tests/strings/vfprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vfprintf_variation11.phpt b/ext/standard/tests/strings/vfprintf_variation11.phpt index 6c93875c75..2c4134f3b7 100644 --- a/ext/standard/tests/strings/vfprintf_variation11.phpt +++ b/ext/standard/tests/strings/vfprintf_variation11.phpt @@ -65,7 +65,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : octal formats with octal values *** @@ -85,4 +84,3 @@ unlink($data_file); % %o o -- Iteration 8 -- 1 2 3 4 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt index 5217442ff9..355d14d185 100644 --- a/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt @@ -65,7 +65,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : octal formats with octal values *** @@ -85,4 +84,3 @@ unlink($data_file); % %o o -- Iteration 8 -- 1 2 3 4 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation12.phpt b/ext/standard/tests/strings/vfprintf_variation12.phpt index a655da5367..3bd46f8899 100644 --- a/ext/standard/tests/strings/vfprintf_variation12.phpt +++ b/ext/standard/tests/strings/vfprintf_variation12.phpt @@ -88,7 +88,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : octal formats and non-octal values *** @@ -122,4 +121,3 @@ unlink($data_file); #0 1 $1 _0 0 1 1 1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt index 651ff7b70d..8e4cb71e82 100644 --- a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt @@ -88,7 +88,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : octal formats and non-octal values *** @@ -122,4 +121,3 @@ unlink($data_file); #0 1 $1 _0 0 1 1 1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation13.phpt b/ext/standard/tests/strings/vfprintf_variation13.phpt index dca1d4c169..6331172a0d 100644 --- a/ext/standard/tests/strings/vfprintf_variation13.phpt +++ b/ext/standard/tests/strings/vfprintf_variation13.phpt @@ -65,7 +65,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : hexa formats with hexa values *** @@ -85,4 +84,3 @@ ffffffff 1 22 %34 x -- Iteration 8 -- 1 2 3 4 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt index 7288abc485..aaad2512a4 100644 --- a/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt @@ -65,7 +65,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : hexa formats with hexa values *** @@ -85,4 +84,3 @@ ffffffffffffffff 1 22 %34 x -- Iteration 8 -- 1 2 3 4 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation14.phpt b/ext/standard/tests/strings/vfprintf_variation14.phpt index 7e0ab0193f..36fd10c31e 100644 --- a/ext/standard/tests/strings/vfprintf_variation14.phpt +++ b/ext/standard/tests/strings/vfprintf_variation14.phpt @@ -88,7 +88,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : hexa formats and non-hexa values *** @@ -122,4 +121,3 @@ unlink($data_file); #0 1 $1 _0 0 1 1 1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt index 83576b1d34..6560c67398 100644 --- a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt @@ -88,7 +88,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : hexa formats and non-hexa values *** @@ -122,4 +121,3 @@ unlink($data_file); #0 1 $1 _0 0 1 1 1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation15.phpt b/ext/standard/tests/strings/vfprintf_variation15.phpt index b0d7091c09..6ffcf7323c 100644 --- a/ext/standard/tests/strings/vfprintf_variation15.phpt +++ b/ext/standard/tests/strings/vfprintf_variation15.phpt @@ -58,7 +58,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : unsigned formats and unsigned values *** @@ -72,4 +71,3 @@ unlink($data_file); #1 0 $0 10 -- Iteration 5 -- 1 2 3 4 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt index 53dd105123..15332b7b32 100644 --- a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt @@ -58,7 +58,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : unsigned formats and unsigned values *** @@ -72,4 +71,3 @@ unlink($data_file); #1 0 $0 10 -- Iteration 5 -- 1 2 3 4 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt index 1d2858cbab..875af5838e 100644 --- a/ext/standard/tests/strings/vfprintf_variation16.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16.phpt @@ -81,7 +81,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : unsigned formats and signed & other types of values *** @@ -109,4 +108,3 @@ unlink($data_file); 1 1 0 #0 1 $1 _0 0 1 1 1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt index f65998aeef..79a36bcbd9 100644 --- a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt @@ -81,7 +81,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : unsigned formats and signed & other types of values *** @@ -109,4 +108,3 @@ unlink($data_file); 1 1 0 #0 1 $1 _0 0 1 1 1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation17.phpt b/ext/standard/tests/strings/vfprintf_variation17.phpt index 3c9d82025f..060b8c3e6b 100644 --- a/ext/standard/tests/strings/vfprintf_variation17.phpt +++ b/ext/standard/tests/strings/vfprintf_variation17.phpt @@ -53,7 +53,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : scientific formats and scientific values *** @@ -67,4 +66,3 @@ unlink($data_file); #########1.000000e+1 1.000000e+2 $$$$$$$$-1.000000e+3 _________1.000000e+2 -- Iteration 5 -- 1.000000e+3 2.000000e+3 3.000000e+3 4.000000e+3 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation18.phpt b/ext/standard/tests/strings/vfprintf_variation18.phpt index 71277ca3d8..2bd2c4e924 100644 --- a/ext/standard/tests/strings/vfprintf_variation18.phpt +++ b/ext/standard/tests/strings/vfprintf_variation18.phpt @@ -76,7 +76,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : scientific formats and non-scientific values *** @@ -104,4 +103,3 @@ unlink($data_file); 1.0000e+0 0.0000e+0 1.000000e+0 0.0000e+0 0.000000e+0 1.000000e+0 1.000000e+0 0.000000e+0 0.000000e+0 1.000000e+0 1.000000e+0 1.000000e+0 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation19.phpt b/ext/standard/tests/strings/vfprintf_variation19.phpt index b3d5eed82b..f8ce7ec55d 100644 --- a/ext/standard/tests/strings/vfprintf_variation19.phpt +++ b/ext/standard/tests/strings/vfprintf_variation19.phpt @@ -65,7 +65,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : with white spaces in format strings *** @@ -91,4 +90,3 @@ A B C 11 FFFFFFDE 33 -- Iteration 11 -- 2.000000E+1 2.000000E-1 -2.000000E+1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt index 0ae053ac98..4f7e0ee53b 100644 --- a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt @@ -65,7 +65,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : with white spaces in format strings *** @@ -91,4 +90,3 @@ A B C 11 FFFFFFFFFFFFFFDE 33 -- Iteration 11 -- 2.000000E+1 2.000000E-1 -2.000000E+1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation20.phpt b/ext/standard/tests/strings/vfprintf_variation20.phpt index 6285bd11f1..c831674bcd 100644 --- a/ext/standard/tests/strings/vfprintf_variation20.phpt +++ b/ext/standard/tests/strings/vfprintf_variation20.phpt @@ -104,7 +104,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECTF-- *** Testing vfprintf() : with unexpected values for format argument *** @@ -172,4 +171,3 @@ object -- Iteration 26 -- Resource id #%d -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation21.phpt b/ext/standard/tests/strings/vfprintf_variation21.phpt index 1358154f95..9b9c3c12ae 100644 --- a/ext/standard/tests/strings/vfprintf_variation21.phpt +++ b/ext/standard/tests/strings/vfprintf_variation21.phpt @@ -106,7 +106,6 @@ unlink($data_file); ?> -===DONE=== --EXPECTF-- *** Testing vfprintf() : with unexpected values for args argument *** @@ -163,4 +162,3 @@ The arguments array must contain 1 items, 0 given -- Iteration 23 -- Resource id #%d -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation3.phpt b/ext/standard/tests/strings/vfprintf_variation3.phpt index 7cb8e83d0d..3f43709b4e 100644 --- a/ext/standard/tests/strings/vfprintf_variation3.phpt +++ b/ext/standard/tests/strings/vfprintf_variation3.phpt @@ -63,7 +63,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : int formats with int values *** @@ -83,4 +82,3 @@ unlink($data_file); %-5678 d -- Iteration 8 -- 1 2 3 4 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt index 312ec6f18a..488adccfda 100644 --- a/ext/standard/tests/strings/vfprintf_variation4.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4.phpt @@ -82,7 +82,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : int formats and non-integer values *** @@ -110,4 +109,3 @@ unlink($data_file); 1 0 1 0000 #0 1 $1 _0 0 1 1 1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt index 690e2633f2..fea15a9552 100644 --- a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt @@ -82,7 +82,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : int formats and non-integer values *** @@ -110,4 +109,3 @@ unlink($data_file); 1 0 1 0000 #0 1 $1 _0 0 1 1 1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation5.phpt b/ext/standard/tests/strings/vfprintf_variation5.phpt index a9139ce6af..71f9b78fbf 100644 --- a/ext/standard/tests/strings/vfprintf_variation5.phpt +++ b/ext/standard/tests/strings/vfprintf_variation5.phpt @@ -62,7 +62,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : int formats with float values *** @@ -82,4 +81,3 @@ unlink($data_file); %-5678.567800 f -- Iteration 8 -- 1.110000 2.220000 3.330000 4.440000 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation6.phpt b/ext/standard/tests/strings/vfprintf_variation6.phpt index e586a074f2..7652e64325 100644 --- a/ext/standard/tests/strings/vfprintf_variation6.phpt +++ b/ext/standard/tests/strings/vfprintf_variation6.phpt @@ -77,7 +77,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECT-- *** Testing vfprintf() : float formats and non-float values *** @@ -105,4 +104,3 @@ unlink($data_file); 1.0000 0.0000 1.000000 0.0000 0.000000 1.000000 1.000000 0.000000 0.000000 1.000000 1.000000 1.000000 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation7.phpt b/ext/standard/tests/strings/vfprintf_variation7.phpt Binary files differindex 54b4ef4505..d6becb602d 100644 --- a/ext/standard/tests/strings/vfprintf_variation7.phpt +++ b/ext/standard/tests/strings/vfprintf_variation7.phpt diff --git a/ext/standard/tests/strings/vfprintf_variation8.phpt b/ext/standard/tests/strings/vfprintf_variation8.phpt index 6f3250e5f1..b32dfbc54f 100644 --- a/ext/standard/tests/strings/vfprintf_variation8.phpt +++ b/ext/standard/tests/strings/vfprintf_variation8.phpt @@ -78,7 +78,6 @@ echo "\n"; unlink($data_file); ?> -===DONE=== --EXPECTF-- *** Testing vfprintf() : string formats and non-string values *** @@ -142,4 +141,3 @@ Array Array Array 1 0001 0000 #0 1 $1 _0 1 1 1 -===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt Binary files differindex 30509d9119..cd5a2653bc 100644 --- a/ext/standard/tests/strings/vfprintf_variation9.phpt +++ b/ext/standard/tests/strings/vfprintf_variation9.phpt diff --git a/ext/standard/tests/strings/vprintf_basic1.phpt b/ext/standard/tests/strings/vprintf_basic1.phpt index 280649f70d..bfe287052c 100644 --- a/ext/standard/tests/strings/vprintf_basic1.phpt +++ b/ext/standard/tests/strings/vprintf_basic1.phpt @@ -30,7 +30,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing vprintf() : basic functionality - using string format *** one @@ -39,4 +38,3 @@ one two int(7) one two three int(13) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic2.phpt b/ext/standard/tests/strings/vprintf_basic2.phpt index 854d6eaeee..e8bdb80738 100644 --- a/ext/standard/tests/strings/vprintf_basic2.phpt +++ b/ext/standard/tests/strings/vprintf_basic2.phpt @@ -35,7 +35,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing vprintf() : basic functionality - using integer format *** 111 @@ -44,4 +43,3 @@ int(3) int(7) 111 222 333 int(11) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic3.phpt b/ext/standard/tests/strings/vprintf_basic3.phpt index 616399eed7..c052008666 100644 --- a/ext/standard/tests/strings/vprintf_basic3.phpt +++ b/ext/standard/tests/strings/vprintf_basic3.phpt @@ -48,7 +48,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing vprintf() : basic functionality - using float format *** 11.110000 @@ -63,4 +62,3 @@ int(19) int(29) 11.110000 22.220000 33.330000 int(29) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic4.phpt b/ext/standard/tests/strings/vprintf_basic4.phpt index d8cfa80452..c884e9c3eb 100644 --- a/ext/standard/tests/strings/vprintf_basic4.phpt +++ b/ext/standard/tests/strings/vprintf_basic4.phpt @@ -31,7 +31,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing vprintf() : basic functionality - using bool format *** 1 @@ -40,4 +39,3 @@ int(1) int(3) 1 0 1 int(5) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic5.phpt b/ext/standard/tests/strings/vprintf_basic5.phpt index 67922eaa5e..94a71bedba 100644 --- a/ext/standard/tests/strings/vprintf_basic5.phpt +++ b/ext/standard/tests/strings/vprintf_basic5.phpt @@ -31,7 +31,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing vprintf() : basic functionality - using char format *** A @@ -40,4 +39,3 @@ A B int(3) A B C int(5) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic6.phpt b/ext/standard/tests/strings/vprintf_basic6.phpt index 9ddead58c4..29189ce944 100644 --- a/ext/standard/tests/strings/vprintf_basic6.phpt +++ b/ext/standard/tests/strings/vprintf_basic6.phpt @@ -31,7 +31,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing vprintf() : basic functionality - using exponential format *** 1.000000e+3 @@ -40,4 +39,3 @@ int(11) int(23) 1.000000e+3 2.000000e+3 3.000000e+3 int(35) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic7.phpt b/ext/standard/tests/strings/vprintf_basic7.phpt index 7633e08f51..14f00a8b2d 100644 --- a/ext/standard/tests/strings/vprintf_basic7.phpt +++ b/ext/standard/tests/strings/vprintf_basic7.phpt @@ -35,7 +35,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing vprintf() : basic functionality - using unsigned format *** 4294966185 @@ -44,4 +43,3 @@ int(10) int(21) 4294966185 4293732729 4292621864 int(32) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt index 564e6f1168..2d4424b2df 100644 --- a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt @@ -34,7 +34,6 @@ $result = vprintf($format3,$arg3); echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing vprintf() : basic functionality - using unsigned format *** 18446744073709550505 @@ -43,4 +42,3 @@ int(20) int(41) 18446744073709550505 18446744073708317049 18446744073707206184 int(62) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic8.phpt b/ext/standard/tests/strings/vprintf_basic8.phpt index 6fa89a1ea2..873feb1a8f 100644 --- a/ext/standard/tests/strings/vprintf_basic8.phpt +++ b/ext/standard/tests/strings/vprintf_basic8.phpt @@ -31,7 +31,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing vprintf() : basic functionality - using octal format *** 21 @@ -40,4 +39,3 @@ int(2) int(6) 21 347 567 int(10) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic9.phpt b/ext/standard/tests/strings/vprintf_basic9.phpt index 8521d82ec4..46b9cb94b8 100644 --- a/ext/standard/tests/strings/vprintf_basic9.phpt +++ b/ext/standard/tests/strings/vprintf_basic9.phpt @@ -44,7 +44,6 @@ echo "\n"; var_dump($result); ?> -===DONE=== --EXPECT-- *** Testing vprintf() : basic functionality - using hexadecimal format *** b @@ -59,4 +58,3 @@ b 84 b1 int(7) B 84 B1 int(7) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation1.phpt b/ext/standard/tests/strings/vprintf_variation1.phpt index 94158243b7..146a4e44f2 100644 --- a/ext/standard/tests/strings/vprintf_variation1.phpt +++ b/ext/standard/tests/strings/vprintf_variation1.phpt @@ -99,7 +99,6 @@ foreach($values as $value) { fclose($file_handle); ?> -===DONE=== --EXPECTF-- *** Testing vprintf() : with unexpected values for format argument *** @@ -216,4 +215,3 @@ int(0) -- Iteration 26 -- Resource id #%d int(%d) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation10.phpt b/ext/standard/tests/strings/vprintf_variation10.phpt Binary files differindex 747b8c40c5..4a5b759c5e 100644 --- a/ext/standard/tests/strings/vprintf_variation10.phpt +++ b/ext/standard/tests/strings/vprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vprintf_variation11.phpt b/ext/standard/tests/strings/vprintf_variation11.phpt index 99f5c80386..21b6a27a55 100644 --- a/ext/standard/tests/strings/vprintf_variation11.phpt +++ b/ext/standard/tests/strings/vprintf_variation11.phpt @@ -56,7 +56,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : octal formats with octal values *** @@ -91,4 +90,3 @@ int(6) -- Iteration 8 -- 1 2 3 4 int(7) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt index 22e1d83840..e2ffb93ac4 100644 --- a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt @@ -56,7 +56,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : octal formats with octal values *** @@ -91,4 +90,3 @@ int(6) -- Iteration 8 -- 1 2 3 4 int(7) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation12.phpt b/ext/standard/tests/strings/vprintf_variation12.phpt index a4c6139144..26c355752d 100644 --- a/ext/standard/tests/strings/vprintf_variation12.phpt +++ b/ext/standard/tests/strings/vprintf_variation12.phpt @@ -79,7 +79,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : octal formats and non-octal values *** @@ -122,4 +121,3 @@ int(75) #0 1 $1 _0 0 1 1 1 int(75) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt index 27b420a7b0..21a76587cc 100644 --- a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt @@ -79,7 +79,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : octal formats and non-octal values *** @@ -122,4 +121,3 @@ int(75) #0 1 $1 _0 0 1 1 1 int(75) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation13.phpt b/ext/standard/tests/strings/vprintf_variation13.phpt index 6f9ab49b98..c598118285 100644 --- a/ext/standard/tests/strings/vprintf_variation13.phpt +++ b/ext/standard/tests/strings/vprintf_variation13.phpt @@ -56,7 +56,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : hexa formats with hexa values *** @@ -91,4 +90,3 @@ int(5) -- Iteration 8 -- 1 2 3 4 int(7) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt index af5a76eded..b5b750b542 100644 --- a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt @@ -56,7 +56,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : hexa formats with hexa values *** @@ -91,4 +90,3 @@ int(5) -- Iteration 8 -- 1 2 3 4 int(7) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation14.phpt b/ext/standard/tests/strings/vprintf_variation14.phpt index 830b7f8e15..5410056608 100644 --- a/ext/standard/tests/strings/vprintf_variation14.phpt +++ b/ext/standard/tests/strings/vprintf_variation14.phpt @@ -80,7 +80,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : hexa formats and non-hexa values *** @@ -123,4 +122,3 @@ int(75) #0 1 $1 _0 0 1 1 1 int(75) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vprintf_variation14_64bit.phpt index 74b57f4ae8..83cabce0d3 100644 --- a/ext/standard/tests/strings/vprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation14_64bit.phpt @@ -80,7 +80,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : hexa formats and non-hexa values *** @@ -123,4 +122,3 @@ int(75) #0 1 $1 _0 0 1 1 1 int(75) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation15.phpt b/ext/standard/tests/strings/vprintf_variation15.phpt index d27bb6270a..751dc5f6cb 100644 --- a/ext/standard/tests/strings/vprintf_variation15.phpt +++ b/ext/standard/tests/strings/vprintf_variation15.phpt @@ -49,7 +49,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : unsigned formats and unsigned values *** @@ -72,4 +71,3 @@ int(10) -- Iteration 5 -- 1 2 3 4 int(7) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt index 6e27b55dd3..3bf70f4cf1 100644 --- a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt @@ -49,7 +49,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : unsigned formats and unsigned values *** @@ -72,4 +71,3 @@ int(10) -- Iteration 5 -- 1 2 3 4 int(7) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation16.phpt b/ext/standard/tests/strings/vprintf_variation16.phpt index 78e03644cc..999feefaab 100644 --- a/ext/standard/tests/strings/vprintf_variation16.phpt +++ b/ext/standard/tests/strings/vprintf_variation16.phpt @@ -71,7 +71,6 @@ foreach($args_array as $args) { $counter++; } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : unsigned formats and signed & other types of values *** @@ -106,4 +105,3 @@ int(76) #0 1 $1 _0 0 1 1 1 int(76) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vprintf_variation16_64bit.phpt index 5189d58abc..27716be175 100644 --- a/ext/standard/tests/strings/vprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation16_64bit.phpt @@ -72,7 +72,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : unsigned formats and signed & other types of values *** @@ -107,4 +106,3 @@ int(76) #0 1 $1 _0 0 1 1 1 int(76) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation17.phpt b/ext/standard/tests/strings/vprintf_variation17.phpt index e86f80551c..d8b69c5b75 100644 --- a/ext/standard/tests/strings/vprintf_variation17.phpt +++ b/ext/standard/tests/strings/vprintf_variation17.phpt @@ -45,7 +45,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : scientific formats and scientific values *** @@ -68,4 +67,3 @@ int(74) -- Iteration 5 -- 1.000000e+3 2.000000e+3 3.000000e+3 4.000000e+3 int(47) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation18.phpt b/ext/standard/tests/strings/vprintf_variation18.phpt index 91f5d13694..a1128d3667 100644 --- a/ext/standard/tests/strings/vprintf_variation18.phpt +++ b/ext/standard/tests/strings/vprintf_variation18.phpt @@ -68,7 +68,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : scientific formats and non-scientific values *** @@ -103,4 +102,3 @@ int(227) 0.000000e+0 1.000000e+0 1.000000e+0 0.000000e+0 0.000000e+0 1.000000e+0 1.000000e+0 1.000000e+0 int(227) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation19.phpt b/ext/standard/tests/strings/vprintf_variation19.phpt index 6ceda77022..446eb43383 100644 --- a/ext/standard/tests/strings/vprintf_variation19.phpt +++ b/ext/standard/tests/strings/vprintf_variation19.phpt @@ -54,7 +54,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : with white spaces in format strings *** @@ -101,4 +100,3 @@ int(16) -- Iteration 11 -- 2.000000E+1 2.000000E-1 -2.000000E+1 int(38) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt index 9d059569f2..779ed87740 100644 --- a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt @@ -54,7 +54,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : with white spaces in format strings *** @@ -101,4 +100,3 @@ int(24) -- Iteration 11 -- 2.000000E+1 2.000000E-1 -2.000000E+1 int(38) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation2.phpt b/ext/standard/tests/strings/vprintf_variation2.phpt index a26d3590bc..4b59a5046d 100644 --- a/ext/standard/tests/strings/vprintf_variation2.phpt +++ b/ext/standard/tests/strings/vprintf_variation2.phpt @@ -98,7 +98,6 @@ foreach($values as $value) { fclose($file_handle); ?> -===DONE=== --EXPECTF-- *** Testing vprintf() : with unexpected values for args argument *** @@ -188,4 +187,3 @@ The arguments array must contain 1 items, 0 given -- Iteration 23 -- Resource id #%d int(%d) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation3.phpt b/ext/standard/tests/strings/vprintf_variation3.phpt index 6967679715..035b81a799 100644 --- a/ext/standard/tests/strings/vprintf_variation3.phpt +++ b/ext/standard/tests/strings/vprintf_variation3.phpt @@ -53,7 +53,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : int formats with int values *** @@ -88,4 +87,3 @@ int(8) -- Iteration 8 -- 1 2 3 4 int(7) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation4.phpt b/ext/standard/tests/strings/vprintf_variation4.phpt index aab27337d9..6adb3f19af 100644 --- a/ext/standard/tests/strings/vprintf_variation4.phpt +++ b/ext/standard/tests/strings/vprintf_variation4.phpt @@ -72,7 +72,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : int formats and non-integer values *** @@ -107,4 +106,3 @@ int(81) #0 1 $1 _0 0 1 1 1 int(81) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt index 76c079d69a..9172644dd1 100644 --- a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt @@ -72,7 +72,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : int formats and non-integer values *** @@ -107,4 +106,3 @@ int(81) #0 1 $1 _0 0 1 1 1 int(81) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation5.phpt b/ext/standard/tests/strings/vprintf_variation5.phpt index dde6170e9f..44e2d23607 100644 --- a/ext/standard/tests/strings/vprintf_variation5.phpt +++ b/ext/standard/tests/strings/vprintf_variation5.phpt @@ -53,7 +53,6 @@ foreach($formats as $format) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : int formats with float values *** @@ -88,4 +87,3 @@ int(15) -- Iteration 8 -- 1.110000 2.220000 3.330000 4.440000 int(35) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation6.phpt b/ext/standard/tests/strings/vprintf_variation6.phpt index 0283bc4541..bad2cbb7e5 100644 --- a/ext/standard/tests/strings/vprintf_variation6.phpt +++ b/ext/standard/tests/strings/vprintf_variation6.phpt @@ -68,7 +68,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECT-- *** Testing vprintf() : float formats and non-float values *** @@ -103,4 +102,3 @@ int(179) 0.000000 1.000000 1.000000 0.000000 0.000000 1.000000 1.000000 1.000000 int(179) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation7.phpt b/ext/standard/tests/strings/vprintf_variation7.phpt Binary files differindex d7c81fca14..ef17df59c2 100644 --- a/ext/standard/tests/strings/vprintf_variation7.phpt +++ b/ext/standard/tests/strings/vprintf_variation7.phpt diff --git a/ext/standard/tests/strings/vprintf_variation8.phpt b/ext/standard/tests/strings/vprintf_variation8.phpt index eecc60ac3c..31577bf1b6 100644 --- a/ext/standard/tests/strings/vprintf_variation8.phpt +++ b/ext/standard/tests/strings/vprintf_variation8.phpt @@ -69,7 +69,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECTF-- *** Testing vprintf() : string formats and non-string values *** @@ -140,4 +139,3 @@ int(131) #0 1 $1 _0 1 1 1 int(81) -===DONE=== diff --git a/ext/standard/tests/strings/vprintf_variation9.phpt b/ext/standard/tests/strings/vprintf_variation9.phpt Binary files differindex 128af1a692..a1c99a9098 100644 --- a/ext/standard/tests/strings/vprintf_variation9.phpt +++ b/ext/standard/tests/strings/vprintf_variation9.phpt diff --git a/ext/standard/tests/strings/vsprintf_variation15.phpt b/ext/standard/tests/strings/vsprintf_variation15.phpt index 62688be727..f31aadfb46 100644 --- a/ext/standard/tests/strings/vsprintf_variation15.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15.phpt @@ -47,7 +47,6 @@ foreach($formats as $format) { } ?> -===Done=== --EXPECT-- *** Testing vsprintf() : unsigned formats and unsigned values *** @@ -65,4 +64,3 @@ string(10) "#1 0 $0 10" -- Iteration 5 -- string(7) "1 2 3 4" -===Done=== diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt index a2adbfa093..17eb80fa21 100644 --- a/ext/standard/tests/strings/vsprintf_variation8.phpt +++ b/ext/standard/tests/strings/vsprintf_variation8.phpt @@ -67,7 +67,6 @@ foreach($args_array as $args) { } ?> -===DONE=== --EXPECTF-- *** Testing vsprintf() : string formats and non-string values *** @@ -134,4 +133,3 @@ string(79) "1 1 1 0001 0000 #0 1 $1 _0 1 1 1" -===DONE=== diff --git a/ext/standard/tests/time/bug38524.phpt b/ext/standard/tests/time/bug38524.phpt index 77d0f4f234..3def28e082 100644 --- a/ext/standard/tests/time/bug38524.phpt +++ b/ext/standard/tests/time/bug38524.phpt @@ -6,7 +6,6 @@ Bug #38524 (strptime() does not initialize the internal date storage structure) <?php var_dump(strptime('2006-08-20', '%Y-%m-%d')); ?> -===DONE=== --EXPECTF-- array(9) { ["tm_sec"]=> @@ -28,4 +27,3 @@ array(9) { ["unparsed"]=> string(0) "" } -===DONE=== diff --git a/ext/standard/tests/time/strptime_basic.phpt b/ext/standard/tests/time/strptime_basic.phpt index f352e9d06a..666cbcd0e3 100644 --- a/ext/standard/tests/time/strptime_basic.phpt +++ b/ext/standard/tests/time/strptime_basic.phpt @@ -33,7 +33,6 @@ var_dump(strptime($str, '%A %B %e %R')); setlocale(LC_ALL, $orig); ?> -===DONE=== --EXPECT-- *** Testing strptime() : basic functionality *** array(9) { @@ -96,4 +95,3 @@ array(9) { ["unparsed"]=> string(0) "" } -===DONE=== diff --git a/ext/standard/tests/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt index 3f7bbbdb82..d7eb11fc55 100644 --- a/ext/standard/tests/time/strptime_error.phpt +++ b/ext/standard/tests/time/strptime_error.phpt @@ -24,10 +24,8 @@ $format = '%b %d %Y %H:%M:%S'; var_dump( strptime('foo', $format) ); ?> -===DONE=== --EXPECTF-- *** Testing strptime() : error conditions *** -- Testing strptime() function on failure -- bool(false) -===DONE=== diff --git a/ext/standard/tests/time/strptime_parts.phpt b/ext/standard/tests/time/strptime_parts.phpt index 085b0e600f..bf7b8310f3 100644 --- a/ext/standard/tests/time/strptime_parts.phpt +++ b/ext/standard/tests/time/strptime_parts.phpt @@ -51,7 +51,6 @@ var_dump($res["tm_year"]); setlocale(LC_ALL, $orig); ?> -===DONE=== --EXPECT-- *** Testing strptime() : basic functionality *** int(20) @@ -72,4 +71,3 @@ int(10) int(2) int(6) int(0) -===DONE=== diff --git a/ext/standard/tests/url/base64_encode_basic_002.phpt b/ext/standard/tests/url/base64_encode_basic_002.phpt index 2bcb7519ab..15bd9380b1 100644 --- a/ext/standard/tests/url/base64_encode_basic_002.phpt +++ b/ext/standard/tests/url/base64_encode_basic_002.phpt @@ -41,7 +41,6 @@ foreach($values as $str) { } ?> -===Done=== --EXPECT-- *** Testing base64_encode() : basic functionality *** @@ -56,4 +55,3 @@ TEST PASSED TEST PASSED -- Iteration 5 -- TEST PASSED -===Done=== |