diff options
| author | Fabien Villepinte <fabien.villepinte@gmail.com> | 2019-11-07 21:31:47 +0100 |
|---|---|---|
| committer | Fabien Villepinte <fabien.villepinte@gmail.com> | 2019-11-07 21:31:47 +0100 |
| commit | a555cc0b3d4f745e6d0bb8c595de400a0c728827 (patch) | |
| tree | 61afac4216a8e7e629a878b8a873d8b32b7cf4a4 /ext/standard/tests/array | |
| parent | 80cfd990740aef314b7943a3fa18c27a23f40566 (diff) | |
| download | php-git-a555cc0b3d4f745e6d0bb8c595de400a0c728827.tar.gz | |
Clean DONE tags from tests
Remove most of the `===DONE===` tags and its variations.
Keep `===DONE===` if the test output otherwise becomes empty.
Closes GH-4872.
Diffstat (limited to 'ext/standard/tests/array')
137 files changed, 0 insertions, 278 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=== |