diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-19 05:59:41 -0300 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-02-20 21:53:48 +0100 |
| commit | ded3d984c6133b1f508ed84e96df3316e207c99b (patch) | |
| tree | 175c208197d72966fbeb22c1df9dac0a1a33124f /ext/standard/tests/array | |
| parent | a00286921e8963d284a7a5db0c1fecffa6cb6b54 (diff) | |
| download | php-git-ded3d984c6133b1f508ed84e96df3316e207c99b.tar.gz | |
Use EXPECT instead of EXPECTF when possible
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
Diffstat (limited to 'ext/standard/tests/array')
374 files changed, 363 insertions, 363 deletions
diff --git a/ext/standard/tests/array/array_change_key_case.phpt b/ext/standard/tests/array/array_change_key_case.phpt index 3123458252..1ce78d51fe 100644 --- a/ext/standard/tests/array/array_change_key_case.phpt +++ b/ext/standard/tests/array/array_change_key_case.phpt @@ -60,7 +60,7 @@ foreach ($arrays as $item) { echo "end\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic operations *** ** Iteration 1 ** array(0) { diff --git a/ext/standard/tests/array/array_change_key_case_variation3.phpt b/ext/standard/tests/array/array_change_key_case_variation3.phpt index f395f8ed6b..025e8f5d61 100644 --- a/ext/standard/tests/array/array_change_key_case_variation3.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation3.phpt @@ -100,7 +100,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/array_change_key_case_variation4.phpt b/ext/standard/tests/array/array_change_key_case_variation4.phpt index 89b6ee0797..022cee099d 100644 --- a/ext/standard/tests/array/array_change_key_case_variation4.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation4.phpt @@ -23,7 +23,7 @@ for ($i = -5; $i <=5; $i += 1){ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- $sort argument is -5 -- diff --git a/ext/standard/tests/array/array_change_key_case_variation5.phpt b/ext/standard/tests/array/array_change_key_case_variation5.phpt index 185534f9be..b58e78317f 100644 --- a/ext/standard/tests/array/array_change_key_case_variation5.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation5.phpt @@ -26,7 +26,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- Call array_change_key_case() -- diff --git a/ext/standard/tests/array/array_change_key_case_variation6.phpt b/ext/standard/tests/array/array_change_key_case_variation6.phpt index 3cafb4d0ad..c4aaa0bde4 100644 --- a/ext/standard/tests/array/array_change_key_case_variation6.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation6.phpt @@ -26,7 +26,7 @@ var_dump(array_change_key_case($input['English'], CASE_UPPER)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- Pass a two-dimensional array as $input argument -- diff --git a/ext/standard/tests/array/array_change_key_case_variation7.phpt b/ext/standard/tests/array/array_change_key_case_variation7.phpt index a08a1afa8c..b7539c63a6 100644 --- a/ext/standard/tests/array/array_change_key_case_variation7.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation7.phpt @@ -29,7 +29,7 @@ var_dump($new_input); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- $input argument is a reference to array -- diff --git a/ext/standard/tests/array/array_change_key_case_variation8.phpt b/ext/standard/tests/array/array_change_key_case_variation8.phpt index 361480008a..423310d7ab 100644 --- a/ext/standard/tests/array/array_change_key_case_variation8.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation8.phpt @@ -36,7 +36,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- $case = default -- diff --git a/ext/standard/tests/array/array_chunk_basic1.phpt b/ext/standard/tests/array/array_chunk_basic1.phpt index 56a90f479b..44c9b5ffaa 100644 --- a/ext/standard/tests/array/array_chunk_basic1.phpt +++ b/ext/standard/tests/array/array_chunk_basic1.phpt @@ -39,7 +39,7 @@ foreach ($input_arrays as $input_array){ echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_chunk_basic2.phpt b/ext/standard/tests/array/array_chunk_basic2.phpt index f96d863e12..6e622df070 100644 --- a/ext/standard/tests/array/array_chunk_basic2.phpt +++ b/ext/standard/tests/array/array_chunk_basic2.phpt @@ -39,7 +39,7 @@ foreach ($input_arrays as $input_array){ echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_chunk_variation4.phpt b/ext/standard/tests/array/array_chunk_variation4.phpt index 7f04f51bff..b5d0818327 100644 --- a/ext/standard/tests/array/array_chunk_variation4.phpt +++ b/ext/standard/tests/array/array_chunk_variation4.phpt @@ -34,7 +34,7 @@ var_dump( array_chunk($input_array, $size, false) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : usage variations *** -- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt -- diff --git a/ext/standard/tests/array/array_chunk_variation6.phpt b/ext/standard/tests/array/array_chunk_variation6.phpt index f44eb39604..0f66fc19f5 100644 --- a/ext/standard/tests/array/array_chunk_variation6.phpt +++ b/ext/standard/tests/array/array_chunk_variation6.phpt @@ -47,7 +47,7 @@ foreach ($input_arrays as $input_array){ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : usage variations *** -- Testing array_chunk() by supplying various arrays -- diff --git a/ext/standard/tests/array/array_chunk_variation7.phpt b/ext/standard/tests/array/array_chunk_variation7.phpt index c8a71964f1..0d5ccb7e6d 100644 --- a/ext/standard/tests/array/array_chunk_variation7.phpt +++ b/ext/standard/tests/array/array_chunk_variation7.phpt @@ -34,7 +34,7 @@ var_dump( array_chunk($input_array, $size, false) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : usage variations *** -- Testing array_chunk(), input array containing references diff --git a/ext/standard/tests/array/array_column_variant.phpt b/ext/standard/tests/array/array_column_variant.phpt index 0af0869497..576a2526cc 100644 --- a/ext/standard/tests/array/array_column_variant.phpt +++ b/ext/standard/tests/array/array_column_variant.phpt @@ -18,7 +18,7 @@ echo "-- pass null as second parameter and no third param to get back array_valu var_dump(array_column($rows, null)); echo "Done\n"; ---EXPECTF-- +--EXPECT-- -- pass null as second parameter to get back all columns indexed by third parameter -- array(2) { [3]=> diff --git a/ext/standard/tests/array/array_column_variant_objects.phpt b/ext/standard/tests/array/array_column_variant_objects.phpt index 80e1839736..dc9c0e7e8f 100644 --- a/ext/standard/tests/array/array_column_variant_objects.phpt +++ b/ext/standard/tests/array/array_column_variant_objects.phpt @@ -78,7 +78,7 @@ var_dump(array_column($records, 'last_name', 'first_name')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_column() : object property fetching (numeric property names) *** -- first_name column from recordset -- array(3) { diff --git a/ext/standard/tests/array/array_combine_basic.phpt b/ext/standard/tests/array/array_combine_basic.phpt index 5d855cfec6..40fb677234 100644 --- a/ext/standard/tests/array/array_combine_basic.phpt +++ b/ext/standard/tests/array/array_combine_basic.phpt @@ -29,7 +29,7 @@ var_dump( array_combine($keys_array, $values_array) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_combine() : basic functionality *** array(2) { [1]=> diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt index 1381fe0f4c..5d03ffe068 100644 --- a/ext/standard/tests/array/array_combine_variation3.phpt +++ b/ext/standard/tests/array/array_combine_variation3.phpt @@ -84,7 +84,7 @@ foreach($arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_combine() : Passing different types of arrays to both $keys and $values argument *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_combine_variation6.phpt b/ext/standard/tests/array/array_combine_variation6.phpt index 94c7b4d664..654ba0f16a 100644 --- a/ext/standard/tests/array/array_combine_variation6.phpt +++ b/ext/standard/tests/array/array_combine_variation6.phpt @@ -30,7 +30,7 @@ var_dump( array_combine($arr_binary, $arr_normal) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_combine() : binary safe checking *** array(2) { ["hello"]=> diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt index 1d614b452a..9a2830b918 100644 --- a/ext/standard/tests/array/array_count_values_variation.phpt +++ b/ext/standard/tests/array/array_count_values_variation.phpt @@ -37,7 +37,7 @@ echo "Done"; <?php unlink("array_count_file"); ?> ---EXPECTF-- +--EXPECT-- *** Testing array_count_values() : parameter variations *** array(3) { ["bobv"]=> diff --git a/ext/standard/tests/array/array_diff_assoc_basic.phpt b/ext/standard/tests/array/array_diff_assoc_basic.phpt index c6b3aef00b..919bd9b3ad 100644 --- a/ext/standard/tests/array/array_diff_assoc_basic.phpt +++ b/ext/standard/tests/array/array_diff_assoc_basic.phpt @@ -36,7 +36,7 @@ var_dump(array_diff_assoc($array_string_key, $array_numeric_key)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : basic functionality *** -- Compare Default keys to numeric keys -- array(3) { diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt index 0687ed8a5b..5e4460cd2a 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation10.phpt @@ -31,7 +31,7 @@ var_dump(array_diff_assoc($array2, $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt index 34e979ab29..c93f9c1d0f 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt @@ -101,7 +101,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** diff --git a/ext/standard/tests/array/array_diff_assoc_variation5.phpt b/ext/standard/tests/array/array_diff_assoc_variation5.phpt index c89c656421..ddaebb85ef 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation5.phpt @@ -47,7 +47,7 @@ var_dump(array_diff_assoc($arr_default_int, $arr_float, $arr_string, $arr_string echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Result of comparing integers and floating point numbers: -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation6.phpt b/ext/standard/tests/array/array_diff_assoc_variation6.phpt index d6190b658a..e04d80724b 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation6.phpt @@ -75,7 +75,7 @@ foreach($inputs as $input) { }; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation7.phpt b/ext/standard/tests/array/array_diff_assoc_variation7.phpt index 6fab0aebfd..eeb881f629 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation7.phpt @@ -47,7 +47,7 @@ var_dump(array_diff_assoc($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Results when $a = a: -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation8.phpt b/ext/standard/tests/array/array_diff_assoc_variation8.phpt index 3189c11f25..54680957ab 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation8.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation8.phpt @@ -30,7 +30,7 @@ var_dump(array_diff_assoc($array_assoc, $array_index)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : variation *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_diff_assoc_variation9.phpt b/ext/standard/tests/array/array_diff_assoc_variation9.phpt index 5ab6232659..bc3e5417cc 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation9.phpt @@ -37,7 +37,7 @@ var_dump(array_diff_assoc($array1, $array2['sub_arraya'])); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Compare two 2-D arrays -- array(2) { diff --git a/ext/standard/tests/array/array_diff_basic.phpt b/ext/standard/tests/array/array_diff_basic.phpt index 30aead657c..4ef78f88f9 100644 --- a/ext/standard/tests/array/array_diff_basic.phpt +++ b/ext/standard/tests/array/array_diff_basic.phpt @@ -52,7 +52,7 @@ var_dump(array_diff($array_int1, $array_int2, $array_string1, $array_string2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : basic functionality *** -- Test indexed array with integers as elements -- array(2) { diff --git a/ext/standard/tests/array/array_diff_key.phpt b/ext/standard/tests/array/array_diff_key.phpt index 765431f124..4110a65a6c 100644 --- a/ext/standard/tests/array/array_diff_key.phpt +++ b/ext/standard/tests/array/array_diff_key.phpt @@ -62,7 +62,7 @@ function comp_func($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- ------ Test 1 -------- array(4) { [1]=> diff --git a/ext/standard/tests/array/array_diff_key_variation4.phpt b/ext/standard/tests/array/array_diff_key_variation4.phpt index d3ef45c460..4201becefd 100644 --- a/ext/standard/tests/array/array_diff_key_variation4.phpt +++ b/ext/standard/tests/array/array_diff_key_variation4.phpt @@ -26,7 +26,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_diff_key_variation5.phpt b/ext/standard/tests/array/array_diff_key_variation5.phpt index f777953c59..ff8f3aff4b 100644 --- a/ext/standard/tests/array/array_diff_key_variation5.phpt +++ b/ext/standard/tests/array/array_diff_key_variation5.phpt @@ -19,7 +19,7 @@ var_dump( array_diff_key($input_array, $float_indx_array) ); var_dump( array_diff_key($float_indx_array, $input_array) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** -- Testing array_diff_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_key_variation6.phpt b/ext/standard/tests/array/array_diff_key_variation6.phpt index 48334fc0a9..8670d05257 100644 --- a/ext/standard/tests/array/array_diff_key_variation6.phpt +++ b/ext/standard/tests/array/array_diff_key_variation6.phpt @@ -19,7 +19,7 @@ var_dump( array_diff_key($input_array, $boolean_indx_array) ); var_dump( array_diff_key($boolean_indx_array, $input_array) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** -- Testing array_diff_key() function with boolean indexed array -- diff --git a/ext/standard/tests/array/array_diff_key_variation7.phpt b/ext/standard/tests/array/array_diff_key_variation7.phpt index c2e806c009..d3acf8c88c 100644 --- a/ext/standard/tests/array/array_diff_key_variation7.phpt +++ b/ext/standard/tests/array/array_diff_key_variation7.phpt @@ -30,7 +30,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_diff_key_variation8.phpt b/ext/standard/tests/array/array_diff_key_variation8.phpt index 3242e6970b..7134b4e52d 100644 --- a/ext/standard/tests/array/array_diff_key_variation8.phpt +++ b/ext/standard/tests/array/array_diff_key_variation8.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_key($array1, $array2) ); var_dump( array_diff_key($array2, $array1) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** -- Testing array_diff_key() function with multi dimensional array -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt index 57b17d1bcf..db0476ae34 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt @@ -20,7 +20,7 @@ var_dump( array_diff_uassoc($float_indx_array, $input_array, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Testing array_diff_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt index b77df32796..f2e945840f 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt @@ -20,7 +20,7 @@ var_dump( array_diff_uassoc($boolean_indx_array, $input_array, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Testing array_diff_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt index 9d48231a3f..656faf4793 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt @@ -31,7 +31,7 @@ foreach($input_arrays as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt index 92194262ab..4094218697 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_uassoc($array2, $array1, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Testing array_diff_uassoc() function with referenced variable $ref_var has value 'a' -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt index c35b2ebd9d..dde0b1ea07 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt @@ -29,7 +29,7 @@ var_dump( array_diff_uassoc($arr_float, $arr_default_int, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing integers and floating point numbers -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt index ad4e8ffda7..998cc33f42 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_uassoc($arr_string_float, $arr_float, "key_compare_func") ) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing floating points and strings containing integers -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt index da2030cf12..cbc1d8305c 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt @@ -28,7 +28,7 @@ var_dump( array_diff_uassoc($arr_string_float, $arr_string_int, "key_compare_fun ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing strings containing integers and strings containing floating points -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt index d450def21b..40062170c4 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_uassoc($arr_string_float, $arr_default_int, "key_compare_fu ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing integers and strings containing an integers -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt index 72746bb904..cb4672773d 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt @@ -27,7 +27,7 @@ foreach($input_arrays as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_diff_ukey_variation5.phpt b/ext/standard/tests/array/array_diff_ukey_variation5.phpt index fb0c97af09..eae2cbb915 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation5.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_ukey($array1, $array2, 'strcasecmp') ); var_dump( array_diff_ukey($array2, $array1, 'strcasecmp') ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** -- Testing array_diff_ukey() function with multi dimensional array -- diff --git a/ext/standard/tests/array/array_diff_ukey_variation6.phpt b/ext/standard/tests/array/array_diff_ukey_variation6.phpt index 2188a88dda..ab94239696 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation6.phpt @@ -30,7 +30,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_diff_ukey_variation7.phpt b/ext/standard/tests/array/array_diff_ukey_variation7.phpt index 88888d6b37..d499fe73c1 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation7.phpt @@ -25,7 +25,7 @@ var_dump( array_diff_ukey($input_array, $float_indx_array, 'key_compare_func') ) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** -- Testing array_diff_ukey() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_ukey_variation8.phpt b/ext/standard/tests/array/array_diff_ukey_variation8.phpt index 9bb9498996..c3dbdc1376 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation8.phpt @@ -25,7 +25,7 @@ var_dump( array_diff_ukey($input_array, $boolean_indx_array, 'key_compare_func') ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** -- Testing array_diff_ukey() function with boolean indexed array -- diff --git a/ext/standard/tests/array/array_diff_ukey_variation9.phpt b/ext/standard/tests/array/array_diff_ukey_variation9.phpt index 024f5f4247..c211bfe88b 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation9.phpt @@ -30,7 +30,7 @@ foreach($input_arrays as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt index 9442b946d9..ec748c2884 100644 --- a/ext/standard/tests/array/array_diff_variation10.phpt +++ b/ext/standard/tests/array/array_diff_variation10.phpt @@ -31,7 +31,7 @@ var_dump(array_diff($array2, $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** array(1) { [0]=> diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt index 84f73fd287..5888c3b1ba 100644 --- a/ext/standard/tests/array/array_diff_variation3.phpt +++ b/ext/standard/tests/array/array_diff_variation3.phpt @@ -103,7 +103,7 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** Iteration: 1 diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt index 75b01adaa1..01fb1a43ef 100644 --- a/ext/standard/tests/array/array_diff_variation4.phpt +++ b/ext/standard/tests/array/array_diff_variation4.phpt @@ -103,7 +103,7 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** Iteration: 1 diff --git a/ext/standard/tests/array/array_diff_variation5.phpt b/ext/standard/tests/array/array_diff_variation5.phpt index cb6b5d3dab..71667f67fa 100644 --- a/ext/standard/tests/array/array_diff_variation5.phpt +++ b/ext/standard/tests/array/array_diff_variation5.phpt @@ -48,7 +48,7 @@ var_dump(array_diff($arr_float_str, $arr_int_str)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** -- Compare integers and floats: -- array(0) { diff --git a/ext/standard/tests/array/array_diff_variation6.phpt b/ext/standard/tests/array/array_diff_variation6.phpt index 8ea84bb9da..9a71db570c 100644 --- a/ext/standard/tests/array/array_diff_variation6.phpt +++ b/ext/standard/tests/array/array_diff_variation6.phpt @@ -29,7 +29,7 @@ var_dump(array_diff($array_assoc, $array_index)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** array(1) { [0]=> diff --git a/ext/standard/tests/array/array_diff_variation7.phpt b/ext/standard/tests/array/array_diff_variation7.phpt index c53cbb3d1c..8274d858ca 100644 --- a/ext/standard/tests/array/array_diff_variation7.phpt +++ b/ext/standard/tests/array/array_diff_variation7.phpt @@ -45,7 +45,7 @@ var_dump(array_diff($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** -- Basic Comparison -- diff --git a/ext/standard/tests/array/array_fill.phpt b/ext/standard/tests/array/array_fill.phpt index c6c7e1e457..230fe61652 100644 --- a/ext/standard/tests/array/array_fill.phpt +++ b/ext/standard/tests/array/array_fill.phpt @@ -20,7 +20,7 @@ foreach($array1 as $start) echo '== Done =='; ?> ===============Done==================== ---EXPECTF-- +--EXPECT-- =========================== start: 0 num: 0 value: 1 array(0) { diff --git a/ext/standard/tests/array/array_fill_basic.phpt b/ext/standard/tests/array/array_fill_basic.phpt index 309c9ca073..a368bbaf93 100644 --- a/ext/standard/tests/array/array_fill_basic.phpt +++ b/ext/standard/tests/array/array_fill_basic.phpt @@ -42,7 +42,7 @@ for($i = 0; $i < count($values); $i ++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : basic functionality *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_fill_keys_variation2.phpt b/ext/standard/tests/array/array_fill_keys_variation2.phpt index 4f3681aaf4..1c9382eb09 100644 --- a/ext/standard/tests/array/array_fill_keys_variation2.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation2.phpt @@ -46,7 +46,7 @@ var_dump(array_fill_keys($refArray, $simpleStr)); fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill_keys() : parameter variations *** -- Testing array_fill_keys() function with reference value -- diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt index 13b566a7db..d3f9e4c1e7 100644 --- a/ext/standard/tests/array/array_fill_variation4.phpt +++ b/ext/standard/tests/array/array_fill_variation4.phpt @@ -43,7 +43,7 @@ for($i =0; $i < count($values); $i ++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : variation *** *** Filling 2 dimensional array with all basic valid values *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_fill_variation5.phpt b/ext/standard/tests/array/array_fill_variation5.phpt index 10fcc9c2eb..341e0cf565 100644 --- a/ext/standard/tests/array/array_fill_variation5.phpt +++ b/ext/standard/tests/array/array_fill_variation5.phpt @@ -52,7 +52,7 @@ for($i = 0; $i < count($values); $i++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : usage variations *** --- Testing array_fill() with different types of array values for 'val' argument --- -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_filter_basic.phpt b/ext/standard/tests/array/array_filter_basic.phpt index daec07bacd..28c10ff2e6 100644 --- a/ext/standard/tests/array/array_filter_basic.phpt +++ b/ext/standard/tests/array/array_filter_basic.phpt @@ -34,7 +34,7 @@ var_dump( array_filter($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : basic functionality *** array(2) { [1]=> diff --git a/ext/standard/tests/array/array_filter_variation3.phpt b/ext/standard/tests/array/array_filter_variation3.phpt index e22697a978..c4a12e661b 100644 --- a/ext/standard/tests/array/array_filter_variation3.phpt +++ b/ext/standard/tests/array/array_filter_variation3.phpt @@ -49,7 +49,7 @@ for($count = 0; $count < count($input_values); $count++) echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - different types of array for 'input' argument*** -- Iteration 1 -- array(5) { diff --git a/ext/standard/tests/array/array_filter_variation4.phpt b/ext/standard/tests/array/array_filter_variation4.phpt index 7f028b1552..03a08835b9 100644 --- a/ext/standard/tests/array/array_filter_variation4.phpt +++ b/ext/standard/tests/array/array_filter_variation4.phpt @@ -58,7 +58,7 @@ var_dump( array_filter($input, "callback4") ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variation - different 'callback' functions*** -- Callback function without parameter and with return -- array(8) { diff --git a/ext/standard/tests/array/array_filter_variation5.phpt b/ext/standard/tests/array/array_filter_variation5.phpt index 66b140a224..f35c321376 100644 --- a/ext/standard/tests/array/array_filter_variation5.phpt +++ b/ext/standard/tests/array/array_filter_variation5.phpt @@ -65,7 +65,7 @@ var_dump( array_filter($input, 'always_false') ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - different false elements in 'input' *** array(0) { } diff --git a/ext/standard/tests/array/array_filter_variation6.phpt b/ext/standard/tests/array/array_filter_variation6.phpt index 1020c28aad..2e7ea77dca 100644 --- a/ext/standard/tests/array/array_filter_variation6.phpt +++ b/ext/standard/tests/array/array_filter_variation6.phpt @@ -43,7 +43,7 @@ var_dump( array_filter($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - 'input' containing references *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_filter_variation7.phpt b/ext/standard/tests/array/array_filter_variation7.phpt index 79fb574e23..25e3c94d31 100644 --- a/ext/standard/tests/array/array_filter_variation7.phpt +++ b/ext/standard/tests/array/array_filter_variation7.phpt @@ -33,7 +33,7 @@ var_dump( array_filter($input, function($input) { }) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - Anonymous callback functions *** Anonymous callback function with regular parameter and statement array(3) { diff --git a/ext/standard/tests/array/array_filter_variation8.phpt b/ext/standard/tests/array/array_filter_variation8.phpt index 4440b3324e..810cb89732 100644 --- a/ext/standard/tests/array/array_filter_variation8.phpt +++ b/ext/standard/tests/array/array_filter_variation8.phpt @@ -59,7 +59,7 @@ var_dump( array_filter($input, 'callback5') ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - callback function with different return values*** callback function with int return value array(9) { diff --git a/ext/standard/tests/array/array_flip_basic.phpt b/ext/standard/tests/array/array_flip_basic.phpt index 08a63fb66b..ab326b4ab6 100644 --- a/ext/standard/tests/array/array_flip_basic.phpt +++ b/ext/standard/tests/array/array_flip_basic.phpt @@ -30,7 +30,7 @@ $input = array(1 => 'one','two', 3 => 'three', 4, "five" => 5); var_dump( array_flip($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_flip() : basic functionality *** array(2) { [1]=> diff --git a/ext/standard/tests/array/array_flip_variation3.phpt b/ext/standard/tests/array/array_flip_variation3.phpt Binary files differindex 1d56dfa6e0..a3ad5acd88 100644 --- a/ext/standard/tests/array/array_flip_variation3.phpt +++ b/ext/standard/tests/array/array_flip_variation3.phpt diff --git a/ext/standard/tests/array/array_flip_variation5.phpt b/ext/standard/tests/array/array_flip_variation5.phpt index 29222a12ce..cf60dc6955 100644 --- a/ext/standard/tests/array/array_flip_variation5.phpt +++ b/ext/standard/tests/array/array_flip_variation5.phpt @@ -39,7 +39,7 @@ var_dump( array_flip($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_flip() : 'input' array with repeatitive keys/values *** array(3) { ["VaLuE"]=> diff --git a/ext/standard/tests/array/array_intersect_assoc_basic.phpt b/ext/standard/tests/array/array_intersect_assoc_basic.phpt index bf0f2195a1..c1d381051a 100644 --- a/ext/standard/tests/array/array_intersect_assoc_basic.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_basic.phpt @@ -40,7 +40,7 @@ var_dump( array_intersect_assoc($arr_associative, $arr_default_keys, $arr3, $arr echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : basic functionality *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt index 9bce974a9d..95631fc1ac 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt @@ -31,7 +31,7 @@ var_dump( array_intersect_assoc($arr_binary, $arr_binary) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : binary safe checking *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt index e3f0ae08ec..af7df4f35c 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt @@ -101,7 +101,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : Passing different types of arrays to $arr1 argument *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt index 9eb342f8e7..495ec30ff9 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt @@ -100,7 +100,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : Passing different types of arrays to $arr2 argument *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt index 7d8e09eb2d..0aa109933a 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt @@ -79,7 +79,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : assoc array with diff keys to $arr1 argument *** -- Iteration 1 -- array(0) { diff --git a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt index 75806225ca..f3e6964d7b 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt @@ -79,7 +79,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : assoc array with diff keys to $arr2 argument *** -- Iteration 1 -- array(0) { diff --git a/ext/standard/tests/array/array_intersect_basic.phpt b/ext/standard/tests/array/array_intersect_basic.phpt index fde5782c90..03661f2756 100644 --- a/ext/standard/tests/array/array_intersect_basic.phpt +++ b/ext/standard/tests/array/array_intersect_basic.phpt @@ -39,7 +39,7 @@ var_dump( array_intersect($arr_associative, $arr_default_keys, $arr3, $arr_assoc echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : basic functionality *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_key.phpt b/ext/standard/tests/array/array_intersect_key.phpt index 6d27839404..52a0ee5e97 100644 --- a/ext/standard/tests/array/array_intersect_key.phpt +++ b/ext/standard/tests/array/array_intersect_key.phpt @@ -59,7 +59,7 @@ function comp_func($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- array(3) { [2]=> int(4) diff --git a/ext/standard/tests/array/array_intersect_key_variation4.phpt b/ext/standard/tests/array/array_intersect_key_variation4.phpt index 1d3d97602c..24e649fe15 100644 --- a/ext/standard/tests/array/array_intersect_key_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation4.phpt @@ -25,7 +25,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_intersect_key_variation5.phpt b/ext/standard/tests/array/array_intersect_key_variation5.phpt index c286de6e3f..c89add62ec 100644 --- a/ext/standard/tests/array/array_intersect_key_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation5.phpt @@ -18,7 +18,7 @@ var_dump( array_intersect_key($input_array, $float_indx_array) ); var_dump( array_intersect_key($float_indx_array,$input_array ) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** -- Testing array_intersect_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_intersect_key_variation6.phpt b/ext/standard/tests/array/array_intersect_key_variation6.phpt index 823b0707d9..b671e11e92 100644 --- a/ext/standard/tests/array/array_intersect_key_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation6.phpt @@ -18,7 +18,7 @@ var_dump( array_intersect_key($input_array, $boolean_indx_array) ); var_dump( array_intersect_key($boolean_indx_array,$input_array ) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** -- Testing array_intersect_key() function with boolean indexed array -- diff --git a/ext/standard/tests/array/array_intersect_key_variation7.phpt b/ext/standard/tests/array/array_intersect_key_variation7.phpt index fe4446a243..4dabf8d1b7 100644 --- a/ext/standard/tests/array/array_intersect_key_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation7.phpt @@ -28,7 +28,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_intersect_key_variation8.phpt b/ext/standard/tests/array/array_intersect_key_variation8.phpt index 2b889b5965..5792930afc 100644 --- a/ext/standard/tests/array/array_intersect_key_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation8.phpt @@ -31,7 +31,7 @@ var_dump( array_intersect_key($array1, $array2) ); var_dump( array_intersect_key($array2,$array1 ) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** array(2) { ["first"]=> diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt index aa0c82d158..9fda4da434 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt @@ -34,7 +34,7 @@ $obj = new MyClass(); var_dump( array_intersect_uassoc($array1, $array2, array($obj,'class_compare_func')) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Testing array_intersect_uassoc() function using class with static method as callback -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt index ec7ee81969..10835a1871 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt @@ -33,7 +33,7 @@ echo "\n-- Result of integers and strings containing floating points intersectio var_dump( array_intersect_uassoc($arr_default_int, $arr_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Result of integers and floating point intersection -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt index 55dd46d48e..b29a9684d5 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt @@ -29,7 +29,7 @@ echo "\n-- Result of floating points and strings containing floating point inter var_dump( array_intersect_uassoc($arr_float, $arr_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Result of floating points and strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt index 7fa053a91a..4be5ebf5d7 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt @@ -33,7 +33,7 @@ echo "\n-- Result of strings containing integers and strings containing floating var_dump( array_intersect_uassoc($arr1_string_int, $arr2_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Result of strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt index 7b218f7faa..256b883d28 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt @@ -28,7 +28,7 @@ echo "\n-- Testing array_intersect_uassoc() function when \$array2 is referencd var_dump( array_intersect_uassoc($array1, $array2, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Testing array_intersect_uassoc() function with referenced variable $ref_var has value 'a' -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt index c1520fbb64..b512b06040 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt @@ -34,7 +34,7 @@ echo "\n-- Result of integers and strings containing floating points intersectio var_dump( array_intersect_ukey($arr_default_int, $arr_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Result of integers and floating point intersection -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt index a918660e42..6231a657a9 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt @@ -30,7 +30,7 @@ echo "\n-- Result of floating points and strings containing floating point inter var_dump( array_intersect_ukey($arr_float, $arr_string_float, 'key_compare_func') ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Result of floating points and strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt index 75b601c11f..c79277df56 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt @@ -34,7 +34,7 @@ echo "\n-- Result of strings containing integers and strings containing floating var_dump( array_intersect_ukey($arr1_string_int, $arr2_string_float, 'key_compare_func') ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Result of strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt index fe130a86f6..38c91fca07 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt @@ -34,7 +34,7 @@ $obj = new MyClass(); var_dump( array_intersect_ukey($array1, $array2, array($obj,'class_compare_func')) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Testing array_intersect_ukey() function using class with static method as callback -- diff --git a/ext/standard/tests/array/array_intersect_variation10.phpt b/ext/standard/tests/array/array_intersect_variation10.phpt index e193f97d46..266f9b8f89 100644 --- a/ext/standard/tests/array/array_intersect_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_variation10.phpt @@ -30,7 +30,7 @@ var_dump( array_intersect($arr_binary, $arr_binary) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : binary safe checking *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt index c404e58bab..aa0f0b704a 100644 --- a/ext/standard/tests/array/array_intersect_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_variation3.phpt @@ -100,7 +100,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : Passing different types of arrays to $arr1 argument *** -- Iterator 1 -- array(2) { diff --git a/ext/standard/tests/array/array_intersect_variation4.phpt b/ext/standard/tests/array/array_intersect_variation4.phpt index 66624a66cd..93419842cb 100644 --- a/ext/standard/tests/array/array_intersect_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_variation4.phpt @@ -99,7 +99,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : Passing different types of arrays to $arr2 argument *** -- Iteration 1 -- array(3) { diff --git a/ext/standard/tests/array/array_intersect_variation5.phpt b/ext/standard/tests/array/array_intersect_variation5.phpt index 9aaedeb382..14f8cdd6d1 100644 --- a/ext/standard/tests/array/array_intersect_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_variation5.phpt @@ -76,7 +76,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : assoc array with diff keys to $arr1 argument *** -- Iterator 1 -- array(0) { diff --git a/ext/standard/tests/array/array_intersect_variation6.phpt b/ext/standard/tests/array/array_intersect_variation6.phpt index 48d01f7d54..8534bd2a8a 100644 --- a/ext/standard/tests/array/array_intersect_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_variation6.phpt @@ -76,7 +76,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : assoc array with diff keys to $arr2 argument *** -- Iterator 1 -- array(0) { diff --git a/ext/standard/tests/array/array_key_exists_basic.phpt b/ext/standard/tests/array/array_key_exists_basic.phpt index 6fbd415dc5..6ebaf56ded 100644 --- a/ext/standard/tests/array/array_key_exists_basic.phpt +++ b/ext/standard/tests/array/array_key_exists_basic.phpt @@ -22,7 +22,7 @@ var_dump(array_key_exists($key2, $search)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : basic functionality *** bool(true) bool(false) diff --git a/ext/standard/tests/array/array_key_exists_object1.phpt b/ext/standard/tests/array/array_key_exists_object1.phpt index 3b263df474..70fb49a725 100644 --- a/ext/standard/tests/array/array_key_exists_object1.phpt +++ b/ext/standard/tests/array/array_key_exists_object1.phpt @@ -47,7 +47,7 @@ var_dump($class2); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : object functionality *** -- Do not assign a value to $class1->var3 -- diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt index 4a790e9d37..78c20c9c72 100644 --- a/ext/standard/tests/array/array_key_exists_object2.phpt +++ b/ext/standard/tests/array/array_key_exists_object2.phpt @@ -49,7 +49,7 @@ var_dump($class2); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : object functionality *** -- Do not assign a value to $class1->var3 -- diff --git a/ext/standard/tests/array/array_key_exists_variation4.phpt b/ext/standard/tests/array/array_key_exists_variation4.phpt index 84dfeb9373..4bf3473ef3 100644 --- a/ext/standard/tests/array/array_key_exists_variation4.phpt +++ b/ext/standard/tests/array/array_key_exists_variation4.phpt @@ -23,7 +23,7 @@ var_dump(array_key_exists('one', $search)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- $search is a reference to $array -- diff --git a/ext/standard/tests/array/array_key_exists_variation5.phpt b/ext/standard/tests/array/array_key_exists_variation5.phpt index 9c15759fc7..2144fb893c 100644 --- a/ext/standard/tests/array/array_key_exists_variation5.phpt +++ b/ext/standard/tests/array/array_key_exists_variation5.phpt @@ -28,7 +28,7 @@ var_dump(array_key_exists(0, $multi_array['sub1'])); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Attempt to match key in sub-array -- diff --git a/ext/standard/tests/array/array_key_exists_variation6.phpt b/ext/standard/tests/array/array_key_exists_variation6.phpt index d19e58e764..abfba0a4c3 100644 --- a/ext/standard/tests/array/array_key_exists_variation6.phpt +++ b/ext/standard/tests/array/array_key_exists_variation6.phpt @@ -43,7 +43,7 @@ foreach($array as $name => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Key in $search array is : null -- diff --git a/ext/standard/tests/array/array_key_exists_variation7.phpt b/ext/standard/tests/array/array_key_exists_variation7.phpt index 845c1e54ba..6211882222 100644 --- a/ext/standard/tests/array/array_key_exists_variation7.phpt +++ b/ext/standard/tests/array/array_key_exists_variation7.phpt @@ -25,7 +25,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Call array_key_exists() -- diff --git a/ext/standard/tests/array/array_key_exists_variation8.phpt b/ext/standard/tests/array/array_key_exists_variation8.phpt index d5bad62e2c..522fd67e99 100644 --- a/ext/standard/tests/array/array_key_exists_variation8.phpt +++ b/ext/standard/tests/array/array_key_exists_variation8.phpt @@ -110,7 +110,7 @@ foreach($inputs as $type => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Iteration 1: int data -- diff --git a/ext/standard/tests/array/array_keys_basic.phpt b/ext/standard/tests/array/array_keys_basic.phpt index 80b624bb20..0aa84d984d 100644 --- a/ext/standard/tests/array/array_keys_basic.phpt +++ b/ext/standard/tests/array/array_keys_basic.phpt @@ -10,7 +10,7 @@ var_dump(array_keys($basic_arr)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on basic array operation *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_keys_variation_001.phpt b/ext/standard/tests/array/array_keys_variation_001.phpt index 1891c131cb..a6203fbbf5 100644 --- a/ext/standard/tests/array/array_keys_variation_001.phpt +++ b/ext/standard/tests/array/array_keys_variation_001.phpt @@ -29,7 +29,7 @@ foreach ($arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on various arrays *** -- Iteration 0 -- array(0) { diff --git a/ext/standard/tests/array/array_keys_variation_002.phpt b/ext/standard/tests/array/array_keys_variation_002.phpt index d5df95b828..1e7f0df4ad 100644 --- a/ext/standard/tests/array/array_keys_variation_002.phpt +++ b/ext/standard/tests/array/array_keys_variation_002.phpt @@ -25,7 +25,7 @@ var_dump(array_keys(array())); // null array echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on range of values *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt index c0a034ec3e..04f574d810 100644 --- a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt +++ b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt @@ -25,7 +25,7 @@ var_dump(array_keys(array())); // null array echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on range of values *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_keys_variation_003.phpt b/ext/standard/tests/array/array_keys_variation_003.phpt index 5ccf542b69..b3a97a0dfb 100644 --- a/ext/standard/tests/array/array_keys_variation_003.phpt +++ b/ext/standard/tests/array/array_keys_variation_003.phpt @@ -26,7 +26,7 @@ foreach ($values as $value){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on all the types other than arrays *** bool(true) array(3) { diff --git a/ext/standard/tests/array/array_keys_variation_004.phpt b/ext/standard/tests/array/array_keys_variation_004.phpt index 1a4f0fcca1..081660d51b 100644 --- a/ext/standard/tests/array/array_keys_variation_004.phpt +++ b/ext/standard/tests/array/array_keys_variation_004.phpt @@ -25,7 +25,7 @@ foreach ($values as $value){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on all the types other than arrays *** array(0) { } diff --git a/ext/standard/tests/array/array_keys_variation_005.phpt b/ext/standard/tests/array/array_keys_variation_005.phpt index 9a912d68ed..ee37400801 100644 --- a/ext/standard/tests/array/array_keys_variation_005.phpt +++ b/ext/standard/tests/array/array_keys_variation_005.phpt @@ -20,7 +20,7 @@ fclose( $resource1 ); closedir( $resource2 ); ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() with resource type *** array(1) { [0]=> diff --git a/ext/standard/tests/array/array_map_001.phpt b/ext/standard/tests/array/array_map_001.phpt index 7d313b59f6..087e3ba284 100644 --- a/ext/standard/tests/array/array_map_001.phpt +++ b/ext/standard/tests/array/array_map_001.phpt @@ -17,6 +17,6 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(17) "exception caught!" Done diff --git a/ext/standard/tests/array/array_map_basic.phpt b/ext/standard/tests/array/array_map_basic.phpt index 53a7bb4e26..e67817e2ae 100644 --- a/ext/standard/tests/array/array_map_basic.phpt +++ b/ext/standard/tests/array/array_map_basic.phpt @@ -40,7 +40,7 @@ var_dump( array_map('concatenate', $arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : basic functionality *** -- With two integer array -- array(3) { diff --git a/ext/standard/tests/array/array_map_variation11.phpt b/ext/standard/tests/array/array_map_variation11.phpt index 9cad3668d5..6a17b299ee 100644 --- a/ext/standard/tests/array/array_map_variation11.phpt +++ b/ext/standard/tests/array/array_map_variation11.phpt @@ -26,7 +26,7 @@ var_dump( array_map('square_recur_single_array', $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : recursive callback function *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_map_variation13.phpt b/ext/standard/tests/array/array_map_variation13.phpt index 94babdf963..d83f78cbfa 100644 --- a/ext/standard/tests/array/array_map_variation13.phpt +++ b/ext/standard/tests/array/array_map_variation13.phpt @@ -54,7 +54,7 @@ var_dump( array_map('callback_without_ret', $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : callback with diff return value *** -- with integer return value -- array(3) { diff --git a/ext/standard/tests/array/array_map_variation19.phpt b/ext/standard/tests/array/array_map_variation19.phpt index 0e56428a03..1f4d2f5679 100644 --- a/ext/standard/tests/array/array_map_variation19.phpt +++ b/ext/standard/tests/array/array_map_variation19.phpt @@ -25,7 +25,7 @@ $ref =& $arr2[0]; array_map("callback", $arr2); var_dump($arr2); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "original.0" diff --git a/ext/standard/tests/array/array_map_variation3.phpt b/ext/standard/tests/array/array_map_variation3.phpt index a0715504e9..3e8bfea962 100644 --- a/ext/standard/tests/array/array_map_variation3.phpt +++ b/ext/standard/tests/array/array_map_variation3.phpt @@ -56,7 +56,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : different arrays for 'arr1' argument *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_map_variation6.phpt b/ext/standard/tests/array/array_map_variation6.phpt index 2409a5763c..9b6ee42e2a 100644 --- a/ext/standard/tests/array/array_map_variation6.phpt +++ b/ext/standard/tests/array/array_map_variation6.phpt @@ -30,7 +30,7 @@ $arr1 = array( var_dump( array_map('callback', $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : array having subarrays *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_map_variation7.phpt b/ext/standard/tests/array/array_map_variation7.phpt index 8f88a0f88c..44ad142184 100644 --- a/ext/standard/tests/array/array_map_variation7.phpt +++ b/ext/standard/tests/array/array_map_variation7.phpt @@ -32,7 +32,7 @@ var_dump( array_map('callback', array(), array(1, 2, 3), array('a', 'b')) ); // echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : arrays with diff. size *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_map_variation8.phpt b/ext/standard/tests/array/array_map_variation8.phpt index 5672e6cd95..99b206d0f9 100644 --- a/ext/standard/tests/array/array_map_variation8.phpt +++ b/ext/standard/tests/array/array_map_variation8.phpt @@ -46,7 +46,7 @@ var_dump( array_map('callback_cat', $arr1, $arr1) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : array with references for 'arr1' argument *** -- with one array -- array(6) { diff --git a/ext/standard/tests/array/array_map_variation9.phpt b/ext/standard/tests/array/array_map_variation9.phpt index f33b717c6c..9c70340b30 100644 --- a/ext/standard/tests/array/array_map_variation9.phpt +++ b/ext/standard/tests/array/array_map_variation9.phpt @@ -37,7 +37,7 @@ try { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : array with binary data for 'arr1' argument *** -- checking binary safe array with one parameter callback function -- array(4) { diff --git a/ext/standard/tests/array/array_merge_basic.phpt b/ext/standard/tests/array/array_merge_basic.phpt index c4dc69638e..fcf9131ed8 100644 --- a/ext/standard/tests/array/array_merge_basic.phpt +++ b/ext/standard/tests/array/array_merge_basic.phpt @@ -25,7 +25,7 @@ var_dump(array_merge($array2, $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : basic functionality *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_merge_recursive_basic1.phpt b/ext/standard/tests/array/array_merge_recursive_basic1.phpt index a86a8510ae..e22208753e 100644 --- a/ext/standard/tests/array/array_merge_recursive_basic1.phpt +++ b/ext/standard/tests/array/array_merge_recursive_basic1.phpt @@ -25,7 +25,7 @@ var_dump( array_merge_recursive($arr1,$arr2,$arr3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with default keys *** -- With default argument -- array(2) { diff --git a/ext/standard/tests/array/array_merge_recursive_basic2.phpt b/ext/standard/tests/array/array_merge_recursive_basic2.phpt index 3f8c62e7ab..ce17a06b89 100644 --- a/ext/standard/tests/array/array_merge_recursive_basic2.phpt +++ b/ext/standard/tests/array/array_merge_recursive_basic2.phpt @@ -25,7 +25,7 @@ var_dump( array_merge_recursive($arr1,$arr2,$arr3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : associative arrays *** -- With default argument -- array(2) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation10.phpt b/ext/standard/tests/array/array_merge_recursive_variation10.phpt index 42d315eb89..06595d5130 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation10.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation10.phpt @@ -39,7 +39,7 @@ var_dump( array_merge_recursive($arr1["array"], $arr2["array"]) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : two dimensional array for $arr1 argument *** -- Passing the entire 2-d array -- -- With default argument -- diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt index 76bf913918..8a76a67153 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt @@ -95,7 +95,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : Passing different arrays to $arr1 argument *** -- Iteration 1 -- -- With default argument -- diff --git a/ext/standard/tests/array/array_merge_recursive_variation6.phpt b/ext/standard/tests/array/array_merge_recursive_variation6.phpt index 8e460ba366..22819dfb37 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation6.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation6.phpt @@ -33,7 +33,7 @@ var_dump( array_merge_recursive($arr1_string_key, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with duplicate keys for $arr1 argument *** -- With default argument -- array(3) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation7.phpt b/ext/standard/tests/array/array_merge_recursive_variation7.phpt index b244e7d6b8..419eed5d11 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation7.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation7.phpt @@ -40,7 +40,7 @@ var_dump( array_merge_recursive($arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with reference variables for $arr1 argument *** -- With default argument -- array(6) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation8.phpt b/ext/standard/tests/array/array_merge_recursive_variation8.phpt index 6ad2f6989f..255ed070aa 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation8.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation8.phpt @@ -27,7 +27,7 @@ var_dump( array_merge_recursive($arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with binary data for $arr1 argument *** -- With default argument -- array(5) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation9.phpt b/ext/standard/tests/array/array_merge_recursive_variation9.phpt index d51d2f8908..59a94024f1 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation9.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation9.phpt @@ -48,7 +48,7 @@ var_dump( array_merge_recursive($arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : arrays with common key and value *** -- Integer values -- array(3) { diff --git a/ext/standard/tests/array/array_merge_variation10.phpt b/ext/standard/tests/array/array_merge_variation10.phpt index 7f08a4bb78..46403fac9e 100644 --- a/ext/standard/tests/array/array_merge_variation10.phpt +++ b/ext/standard/tests/array/array_merge_variation10.phpt @@ -35,7 +35,7 @@ echo key($arr3) . " => " . current ($arr3) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Call array_merge() -- diff --git a/ext/standard/tests/array/array_merge_variation4.phpt b/ext/standard/tests/array/array_merge_variation4.phpt index e4eb2570cd..ad7d7fe5dc 100644 --- a/ext/standard/tests/array/array_merge_variation4.phpt +++ b/ext/standard/tests/array/array_merge_variation4.phpt @@ -107,7 +107,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Iteration 1: int data -- diff --git a/ext/standard/tests/array/array_merge_variation5.phpt b/ext/standard/tests/array/array_merge_variation5.phpt index eca6078e6a..143d4ca1e6 100644 --- a/ext/standard/tests/array/array_merge_variation5.phpt +++ b/ext/standard/tests/array/array_merge_variation5.phpt @@ -24,7 +24,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** array(7) { [0]=> diff --git a/ext/standard/tests/array/array_merge_variation6.phpt b/ext/standard/tests/array/array_merge_variation6.phpt index 13b346eb3f..3ddc068244 100644 --- a/ext/standard/tests/array/array_merge_variation6.phpt +++ b/ext/standard/tests/array/array_merge_variation6.phpt @@ -24,7 +24,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** array(5) { ["zero"]=> diff --git a/ext/standard/tests/array/array_merge_variation7.phpt b/ext/standard/tests/array/array_merge_variation7.phpt index 00943f3ea4..fedf61e96e 100644 --- a/ext/standard/tests/array/array_merge_variation7.phpt +++ b/ext/standard/tests/array/array_merge_variation7.phpt @@ -24,7 +24,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** array(8) { [0]=> diff --git a/ext/standard/tests/array/array_merge_variation8.phpt b/ext/standard/tests/array/array_merge_variation8.phpt index a4cdea74fe..700bbb8913 100644 --- a/ext/standard/tests/array/array_merge_variation8.phpt +++ b/ext/standard/tests/array/array_merge_variation8.phpt @@ -26,7 +26,7 @@ var_dump(array_merge($arr2, $arr1[3])); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Merge a two-dimensional and a one-dimensional array -- diff --git a/ext/standard/tests/array/array_merge_variation9.phpt b/ext/standard/tests/array/array_merge_variation9.phpt index 69e0401a0e..95daa10558 100644 --- a/ext/standard/tests/array/array_merge_variation9.phpt +++ b/ext/standard/tests/array/array_merge_variation9.phpt @@ -34,7 +34,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Merge an array made up of referenced variables to an assoc. array -- diff --git a/ext/standard/tests/array/array_multisort_basic1.phpt b/ext/standard/tests/array/array_multisort_basic1.phpt index ab7db94463..7d33596630 100644 --- a/ext/standard/tests/array/array_multisort_basic1.phpt +++ b/ext/standard/tests/array/array_multisort_basic1.phpt @@ -25,7 +25,7 @@ var_dump($ar2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : basic functionality *** -- Testing array_multisort() function with all normal arguments -- diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/array_multisort_basic2.phpt index 4a46072e65..682543bc9f 100644 --- a/ext/standard/tests/array/array_multisort_basic2.phpt +++ b/ext/standard/tests/array/array_multisort_basic2.phpt @@ -20,7 +20,7 @@ var_dump($ar1, $ar2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : basic functionality - renumbering of numeric keys *** -- Testing array_multisort() function with all normal arguments -- diff --git a/ext/standard/tests/array/array_multisort_case.phpt b/ext/standard/tests/array/array_multisort_case.phpt index 6be42edf57..f766e5fc1d 100644 --- a/ext/standard/tests/array/array_multisort_case.phpt +++ b/ext/standard/tests/array/array_multisort_case.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : case-sensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_incase.phpt b/ext/standard/tests/array/array_multisort_incase.phpt index 951cce4927..46d55ae065 100644 --- a/ext/standard/tests/array/array_multisort_incase.phpt +++ b/ext/standard/tests/array/array_multisort_incase.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : case-insensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_natural.phpt b/ext/standard/tests/array/array_multisort_natural.phpt index e7910882e4..35576c481c 100644 --- a/ext/standard/tests/array/array_multisort_natural.phpt +++ b/ext/standard/tests/array/array_multisort_natural.phpt @@ -32,7 +32,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : natural sorting array(5) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_natural_case.phpt b/ext/standard/tests/array/array_multisort_natural_case.phpt index d59e4931b6..163819ef96 100644 --- a/ext/standard/tests/array/array_multisort_natural_case.phpt +++ b/ext/standard/tests/array/array_multisort_natural_case.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : natural sorting case-sensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_natural_incase.phpt b/ext/standard/tests/array/array_multisort_natural_incase.phpt index 87514058a9..1ada637f0e 100644 --- a/ext/standard/tests/array/array_multisort_natural_incase.phpt +++ b/ext/standard/tests/array/array_multisort_natural_incase.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : natural sorting case-insensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/array_multisort_variation10.phpt index 71c4494270..e4e9075562 100644 --- a/ext/standard/tests/array/array_multisort_variation10.phpt +++ b/ext/standard/tests/array/array_multisort_variation10.phpt @@ -14,7 +14,7 @@ var_dump(array_multisort(array(1,3,2,4))); ?> ===DONE=== ---EXPECTF-- +--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 046b45f020..49e8d0f30e 100644 --- a/ext/standard/tests/array/array_multisort_variation11.phpt +++ b/ext/standard/tests/array/array_multisort_variation11.phpt @@ -15,7 +15,7 @@ var_dump(array_multisort(array())); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing with empty array *** bool(true) ===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation4.phpt b/ext/standard/tests/array/array_multisort_variation4.phpt index 5d11fb3ac0..76eb9ab04b 100644 --- a/ext/standard/tests/array/array_multisort_variation4.phpt +++ b/ext/standard/tests/array/array_multisort_variation4.phpt @@ -22,7 +22,7 @@ var_dump($arr3); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing with multiple array arguments *** bool(true) array(4) { diff --git a/ext/standard/tests/array/array_multisort_variation5.phpt b/ext/standard/tests/array/array_multisort_variation5.phpt index 76d7092c21..66504ca798 100644 --- a/ext/standard/tests/array/array_multisort_variation5.phpt +++ b/ext/standard/tests/array/array_multisort_variation5.phpt @@ -24,7 +24,7 @@ var_dump($ar); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing all array sort specifiers *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_variation6.phpt b/ext/standard/tests/array/array_multisort_variation6.phpt index 4e2a62227d..81bd1d1acd 100644 --- a/ext/standard/tests/array/array_multisort_variation6.phpt +++ b/ext/standard/tests/array/array_multisort_variation6.phpt @@ -24,7 +24,7 @@ var_dump($ar); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing all array sort specifiers *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_variation7.phpt b/ext/standard/tests/array/array_multisort_variation7.phpt index 10980be592..996c183fcd 100644 --- a/ext/standard/tests/array/array_multisort_variation7.phpt +++ b/ext/standard/tests/array/array_multisort_variation7.phpt @@ -37,7 +37,7 @@ var_dump($inputs); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : usage variation - test sort order of all types*** bool(true) array(10) { diff --git a/ext/standard/tests/array/array_multisort_variation8.phpt b/ext/standard/tests/array/array_multisort_variation8.phpt index 6b50e0ebbb..90c66a97cc 100644 --- a/ext/standard/tests/array/array_multisort_variation8.phpt +++ b/ext/standard/tests/array/array_multisort_variation8.phpt @@ -43,7 +43,7 @@ var_dump($inputs); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : usage variation - test sort order of all types*** bool(true) array(10) { diff --git a/ext/standard/tests/array/array_pad_variation4.phpt b/ext/standard/tests/array/array_pad_variation4.phpt index 83c1e8300d..0216245cc2 100644 --- a/ext/standard/tests/array/array_pad_variation4.phpt +++ b/ext/standard/tests/array/array_pad_variation4.phpt @@ -27,7 +27,7 @@ var_dump( array_pad($input, -$pad_size, $binary) ); // negative 'pad_size' echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing binary values to $pad_value argument *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_pad_variation5.phpt b/ext/standard/tests/array/array_pad_variation5.phpt index 4e8e0f1132..ec4c87eee6 100644 --- a/ext/standard/tests/array/array_pad_variation5.phpt +++ b/ext/standard/tests/array/array_pad_variation5.phpt @@ -31,7 +31,7 @@ var_dump( array_pad($input, -$pad_size, $pad_value) ); // negative 'pad_value' echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing 2-d array to $pad_value argument *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_pad_variation6.phpt b/ext/standard/tests/array/array_pad_variation6.phpt index a491573909..1ef1ef067c 100644 --- a/ext/standard/tests/array/array_pad_variation6.phpt +++ b/ext/standard/tests/array/array_pad_variation6.phpt @@ -90,7 +90,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing different arrays to $input argument *** -- Iteration 1 -- array(6) { diff --git a/ext/standard/tests/array/array_pad_variation7.phpt b/ext/standard/tests/array/array_pad_variation7.phpt index 887f351948..06836b8239 100644 --- a/ext/standard/tests/array/array_pad_variation7.phpt +++ b/ext/standard/tests/array/array_pad_variation7.phpt @@ -38,7 +38,7 @@ var_dump( array_pad($input[1], -$pad_size, $pad_value) ); // negative 'pad_size echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing 2-D array to $input argument *** -- Entire 2-d array for $input argument -- array(5) { diff --git a/ext/standard/tests/array/array_pop.phpt b/ext/standard/tests/array/array_pop.phpt index 34a5c54268..2336d2a394 100644 --- a/ext/standard/tests/array/array_pop.phpt +++ b/ext/standard/tests/array/array_pop.phpt @@ -42,7 +42,7 @@ foreach( $mixed_array as $sub_array ) echo"\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Normal testing with various array inputs *** -- Input Array for Iteration 1 is -- diff --git a/ext/standard/tests/array/array_pop_variation.phpt b/ext/standard/tests/array/array_pop_variation.phpt index 795a8bcf86..c2e30cb7a3 100644 --- a/ext/standard/tests/array/array_pop_variation.phpt +++ b/ext/standard/tests/array/array_pop_variation.phpt @@ -39,7 +39,7 @@ var_dump( current($mixed_array[1]) ); echo"\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Checking for internal array pointer being reset when pop is called *** Current Element is : int(1) diff --git a/ext/standard/tests/array/array_product_variation2.phpt b/ext/standard/tests/array/array_product_variation2.phpt index c4c47d86a2..79821981a0 100644 --- a/ext/standard/tests/array/array_product_variation2.phpt +++ b/ext/standard/tests/array/array_product_variation2.phpt @@ -14,7 +14,7 @@ echo "\n-- Testing array_product() function with a keyed array array --\n"; var_dump( array_product(array("bob" => 2, "janet" => 5)) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_product() : variations *** -- Testing array_product() function with a keyed array array -- diff --git a/ext/standard/tests/array/array_product_variation3.phpt b/ext/standard/tests/array/array_product_variation3.phpt index dc8609ebd8..e2b5e3efe8 100644 --- a/ext/standard/tests/array/array_product_variation3.phpt +++ b/ext/standard/tests/array/array_product_variation3.phpt @@ -28,7 +28,7 @@ var_dump( array_product(array(-99999999.9, 99999999.1))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_product() : variations - negative numbers*** -- Testing array_product() function with one negative number -- diff --git a/ext/standard/tests/array/array_product_variation4.phpt b/ext/standard/tests/array/array_product_variation4.phpt index 9f83c5646b..f2b9f2bc29 100644 --- a/ext/standard/tests/array/array_product_variation4.phpt +++ b/ext/standard/tests/array/array_product_variation4.phpt @@ -21,7 +21,7 @@ for ($i = 0; $i < 999; $i++) { var_dump( array_product($array) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_product() : variations *** -- Testing array_product() function with a very large array -- diff --git a/ext/standard/tests/array/array_push_basic.phpt b/ext/standard/tests/array/array_push_basic.phpt index 5ccf037dab..ff4ab2d711 100644 --- a/ext/standard/tests/array/array_push_basic.phpt +++ b/ext/standard/tests/array/array_push_basic.phpt @@ -30,7 +30,7 @@ var_dump($array_assoc); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : basic functionality *** -- Push values onto an indexed array -- diff --git a/ext/standard/tests/array/array_push_variation2.phpt b/ext/standard/tests/array/array_push_variation2.phpt index 7fefcfa49a..9e31a7628a 100644 --- a/ext/standard/tests/array/array_push_variation2.phpt +++ b/ext/standard/tests/array/array_push_variation2.phpt @@ -98,7 +98,7 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_push_variation3.phpt b/ext/standard/tests/array/array_push_variation3.phpt index 2bc71a7696..8b7ef48ce7 100644 --- a/ext/standard/tests/array/array_push_variation3.phpt +++ b/ext/standard/tests/array/array_push_variation3.phpt @@ -27,7 +27,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** -- Pass array as $var argument -- diff --git a/ext/standard/tests/array/array_push_variation5.phpt b/ext/standard/tests/array/array_push_variation5.phpt index 4b6f39975d..e5024daccf 100644 --- a/ext/standard/tests/array/array_push_variation5.phpt +++ b/ext/standard/tests/array/array_push_variation5.phpt @@ -24,7 +24,7 @@ echo key($stack) . " => " . current ($stack) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** diff --git a/ext/standard/tests/array/array_push_variation6.phpt b/ext/standard/tests/array/array_push_variation6.phpt index 19afebb747..903a7a5ef4 100644 --- a/ext/standard/tests/array/array_push_variation6.phpt +++ b/ext/standard/tests/array/array_push_variation6.phpt @@ -106,7 +106,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/array_reduce.phpt b/ext/standard/tests/array/array_reduce.phpt index 94ecca6130..9d702ebce0 100644 --- a/ext/standard/tests/array/array_reduce.phpt +++ b/ext/standard/tests/array/array_reduce.phpt @@ -37,7 +37,7 @@ var_dump(array_reduce($array, 'reduce_null', $initial), $initial); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reduce() to integer *** int(61) int(42) diff --git a/ext/standard/tests/array/array_reduce_variation1.phpt b/ext/standard/tests/array/array_reduce_variation1.phpt index adffeb53d4..e4bbea8bf0 100644 --- a/ext/standard/tests/array/array_reduce_variation1.phpt +++ b/ext/standard/tests/array/array_reduce_variation1.phpt @@ -33,7 +33,7 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_reduce() : variation *** --- Testing with a callback with too few parameters --- diff --git a/ext/standard/tests/array/array_reduce_variation3.phpt b/ext/standard/tests/array/array_reduce_variation3.phpt index f6301026b3..a359d425db 100644 --- a/ext/standard/tests/array/array_reduce_variation3.phpt +++ b/ext/standard/tests/array/array_reduce_variation3.phpt @@ -25,7 +25,7 @@ var_dump(array_reduce($array, array(new A(), "adder2"))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_reduce() : variation - object callbacks *** --- Static method callback --- diff --git a/ext/standard/tests/array/array_reverse_basic1.phpt b/ext/standard/tests/array/array_reverse_basic1.phpt index f41e0a3f49..abca4e4ae5 100644 --- a/ext/standard/tests/array/array_reverse_basic1.phpt +++ b/ext/standard/tests/array/array_reverse_basic1.phpt @@ -25,7 +25,7 @@ var_dump( array_reverse($array, false) ); // expects the keys not to be preserv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : basic functionality *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_reverse_basic2.phpt b/ext/standard/tests/array/array_reverse_basic2.phpt index 9f41f0b486..88a62b8573 100644 --- a/ext/standard/tests/array/array_reverse_basic2.phpt +++ b/ext/standard/tests/array/array_reverse_basic2.phpt @@ -25,7 +25,7 @@ var_dump( array_reverse($array, false) ); // expects the keys not to be preserv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : basic functionality *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_reverse_variation3.phpt b/ext/standard/tests/array/array_reverse_variation3.phpt index 10298428f8..a5ef1e0d2b 100644 --- a/ext/standard/tests/array/array_reverse_variation3.phpt +++ b/ext/standard/tests/array/array_reverse_variation3.phpt @@ -81,7 +81,7 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : usage variations *** -- Iteration 1 -- - with default argument - diff --git a/ext/standard/tests/array/array_reverse_variation6.phpt b/ext/standard/tests/array/array_reverse_variation6.phpt index ae1e195ca6..edbefd345f 100644 --- a/ext/standard/tests/array/array_reverse_variation6.phpt +++ b/ext/standard/tests/array/array_reverse_variation6.phpt @@ -43,7 +43,7 @@ var_dump( array_reverse($two_dimensional_array[1], false) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : usage variations *** -- with default argument -- array(3) { diff --git a/ext/standard/tests/array/array_search.phpt b/ext/standard/tests/array/array_search.phpt Binary files differindex 1afcb1d4ba..1787e52163 100644 --- a/ext/standard/tests/array/array_search.phpt +++ b/ext/standard/tests/array/array_search.phpt diff --git a/ext/standard/tests/array/array_search_variation1.phpt b/ext/standard/tests/array/array_search_variation1.phpt index 96395013bb..094767dacd 100644 --- a/ext/standard/tests/array/array_search_variation1.phpt +++ b/ext/standard/tests/array/array_search_variation1.phpt @@ -60,7 +60,7 @@ foreach($arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_search() with different needle values *** -- Iteration 1 -- bool(false) diff --git a/ext/standard/tests/array/array_search_variation2.phpt b/ext/standard/tests/array/array_search_variation2.phpt index da90de0cb7..a8bac04edb 100644 --- a/ext/standard/tests/array/array_search_variation2.phpt +++ b/ext/standard/tests/array/array_search_variation2.phpt @@ -49,7 +49,7 @@ foreach($array_type as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_search() with different haystack values *** -- Iteration 1 -- int(0) diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt index 7feb2ef147..95656899ce 100644 --- a/ext/standard/tests/array/array_search_variation4.phpt +++ b/ext/standard/tests/array/array_search_variation4.phpt @@ -55,7 +55,7 @@ var_dump( array_search('123abc', array(123), TRUE) ); // false in strict mode echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing resource type with array_search() *** int(0) bool(false) diff --git a/ext/standard/tests/array/array_shift_basic.phpt b/ext/standard/tests/array/array_shift_basic.phpt index 2bb4ae93ae..e030adc2bc 100644 --- a/ext/standard/tests/array/array_shift_basic.phpt +++ b/ext/standard/tests/array/array_shift_basic.phpt @@ -25,7 +25,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : basic functionality *** -- Before shift: -- diff --git a/ext/standard/tests/array/array_shift_variation3.phpt b/ext/standard/tests/array/array_shift_variation3.phpt index cc260c6305..d3a359fab8 100644 --- a/ext/standard/tests/array/array_shift_variation3.phpt +++ b/ext/standard/tests/array/array_shift_variation3.phpt @@ -103,7 +103,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/array_shift_variation4.phpt b/ext/standard/tests/array/array_shift_variation4.phpt index f27681561a..150f312e70 100644 --- a/ext/standard/tests/array/array_shift_variation4.phpt +++ b/ext/standard/tests/array/array_shift_variation4.phpt @@ -36,7 +36,7 @@ var_dump($stack_last); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Before shift: -- diff --git a/ext/standard/tests/array/array_shift_variation6.phpt b/ext/standard/tests/array/array_shift_variation6.phpt index 9033e7d17c..1840e080d2 100644 --- a/ext/standard/tests/array/array_shift_variation6.phpt +++ b/ext/standard/tests/array/array_shift_variation6.phpt @@ -37,7 +37,7 @@ var_dump($copied_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Variable is referenced array -- diff --git a/ext/standard/tests/array/array_shift_variation7.phpt b/ext/standard/tests/array/array_shift_variation7.phpt index 9367cacbc9..02af5dd4a1 100644 --- a/ext/standard/tests/array/array_shift_variation7.phpt +++ b/ext/standard/tests/array/array_shift_variation7.phpt @@ -23,7 +23,7 @@ echo key($stack) . " => " . current ($stack) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Call array_shift() -- diff --git a/ext/standard/tests/array/array_slice_basic.phpt b/ext/standard/tests/array/array_slice_basic.phpt index a4cbe46751..295d9625a0 100644 --- a/ext/standard/tests/array/array_slice_basic.phpt +++ b/ext/standard/tests/array/array_slice_basic.phpt @@ -30,7 +30,7 @@ var_dump( array_slice($input, $offset) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : basic functionality *** -- All arguments -- diff --git a/ext/standard/tests/array/array_slice_variation1.phpt b/ext/standard/tests/array/array_slice_variation1.phpt index daed1d84fc..ccb83ccf57 100644 --- a/ext/standard/tests/array/array_slice_variation1.phpt +++ b/ext/standard/tests/array/array_slice_variation1.phpt @@ -21,7 +21,7 @@ var_dump($a); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/ext/standard/tests/array/array_slice_variation10.phpt b/ext/standard/tests/array/array_slice_variation10.phpt index 85c521d6d3..c2b48a94f6 100644 --- a/ext/standard/tests/array/array_slice_variation10.phpt +++ b/ext/standard/tests/array/array_slice_variation10.phpt @@ -26,7 +26,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Call array_slice() -- diff --git a/ext/standard/tests/array/array_slice_variation3.phpt b/ext/standard/tests/array/array_slice_variation3.phpt index bdcb7591a2..32bfc045c6 100644 --- a/ext/standard/tests/array/array_slice_variation3.phpt +++ b/ext/standard/tests/array/array_slice_variation3.phpt @@ -82,7 +82,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_slice_variation5.phpt b/ext/standard/tests/array/array_slice_variation5.phpt index ed5c82f18f..fb632c2bf9 100644 --- a/ext/standard/tests/array/array_slice_variation5.phpt +++ b/ext/standard/tests/array/array_slice_variation5.phpt @@ -28,7 +28,7 @@ var_dump(array_slice($input, -PHP_INT_MAX)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- $offset is -7 -- diff --git a/ext/standard/tests/array/array_slice_variation6.phpt b/ext/standard/tests/array/array_slice_variation6.phpt index e32abfcbce..c1a673a8f7 100644 --- a/ext/standard/tests/array/array_slice_variation6.phpt +++ b/ext/standard/tests/array/array_slice_variation6.phpt @@ -29,7 +29,7 @@ var_dump(array_slice($input, $offset, -PHP_INT_MAX)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- $length is -6 -- diff --git a/ext/standard/tests/array/array_slice_variation7.phpt b/ext/standard/tests/array/array_slice_variation7.phpt index abf517d1f2..fd0bfd822d 100644 --- a/ext/standard/tests/array/array_slice_variation7.phpt +++ b/ext/standard/tests/array/array_slice_variation7.phpt @@ -111,7 +111,7 @@ foreach($inputs as $type => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Iteration 1 : key type is int -- diff --git a/ext/standard/tests/array/array_slice_variation8.phpt b/ext/standard/tests/array/array_slice_variation8.phpt index aece410c02..011a50f9dd 100644 --- a/ext/standard/tests/array/array_slice_variation8.phpt +++ b/ext/standard/tests/array/array_slice_variation8.phpt @@ -26,7 +26,7 @@ var_dump(array_slice($input[2], 1, 2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Slice a two-dimensional array -- diff --git a/ext/standard/tests/array/array_slice_variation9.phpt b/ext/standard/tests/array/array_slice_variation9.phpt index 7ae9238d47..ecd787a069 100644 --- a/ext/standard/tests/array/array_slice_variation9.phpt +++ b/ext/standard/tests/array/array_slice_variation9.phpt @@ -30,7 +30,7 @@ var_dump(array_slice($input, 1, 2, true)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Array of referenced variables ($preserve_keys = default) -- diff --git a/ext/standard/tests/array/array_sum_basic.phpt b/ext/standard/tests/array/array_sum_basic.phpt index c178853d75..ecbc15fae6 100644 --- a/ext/standard/tests/array/array_sum_basic.phpt +++ b/ext/standard/tests/array/array_sum_basic.phpt @@ -26,7 +26,7 @@ var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : basic functionality *** -- array_sum() with integer array entries -- int(15) diff --git a/ext/standard/tests/array/array_sum_variation2.phpt b/ext/standard/tests/array/array_sum_variation2.phpt index 56d9131493..e746238155 100644 --- a/ext/standard/tests/array/array_sum_variation2.phpt +++ b/ext/standard/tests/array/array_sum_variation2.phpt @@ -36,7 +36,7 @@ var_dump( array_sum($mixed_int_value) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : different integer array *** -- Sum of Integer array -- int(-573) diff --git a/ext/standard/tests/array/array_sum_variation3.phpt b/ext/standard/tests/array/array_sum_variation3.phpt index 9d32c2c386..7f1a756bec 100644 --- a/ext/standard/tests/array/array_sum_variation3.phpt +++ b/ext/standard/tests/array/array_sum_variation3.phpt @@ -42,7 +42,7 @@ var_dump( array_sum($float_input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with different float values *** -- simple float array -- float(1.3) diff --git a/ext/standard/tests/array/array_sum_variation4.phpt b/ext/standard/tests/array/array_sum_variation4.phpt index 4959deee7d..af03d7fb7b 100644 --- a/ext/standard/tests/array/array_sum_variation4.phpt +++ b/ext/standard/tests/array/array_sum_variation4.phpt @@ -25,7 +25,7 @@ var_dump( array_sum($float_input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with duplicate values *** -- With integer array -- int(117) diff --git a/ext/standard/tests/array/array_sum_variation5.phpt b/ext/standard/tests/array/array_sum_variation5.phpt index 9068c4565e..ee1c186c18 100644 --- a/ext/standard/tests/array/array_sum_variation5.phpt +++ b/ext/standard/tests/array/array_sum_variation5.phpt @@ -31,7 +31,7 @@ var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with elements as reference *** int(305) Done diff --git a/ext/standard/tests/array/array_sum_variation6.phpt b/ext/standard/tests/array/array_sum_variation6.phpt index ba67cfd499..950f2e2a20 100644 --- a/ext/standard/tests/array/array_sum_variation6.phpt +++ b/ext/standard/tests/array/array_sum_variation6.phpt @@ -24,7 +24,7 @@ echo "-- with string keys --\n"; var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : with associative array *** -- with numeric keys -- float(32.56) diff --git a/ext/standard/tests/array/array_sum_variation7.phpt b/ext/standard/tests/array/array_sum_variation7.phpt index d30987535b..fbc426902f 100644 --- a/ext/standard/tests/array/array_sum_variation7.phpt +++ b/ext/standard/tests/array/array_sum_variation7.phpt @@ -67,7 +67,7 @@ echo "-- array with mixed values --\n"; var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with unexpected entries *** -- empty array -- int(0) diff --git a/ext/standard/tests/array/array_udiff_assoc_variation.phpt b/ext/standard/tests/array/array_udiff_assoc_variation.phpt index 465c5008fd..f824244f6f 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation.phpt @@ -25,7 +25,7 @@ var_dump( array_udiff_assoc($arr1, $arr2, $arr3, $arr4, $key_compare_function) ) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_assoc() : variation - testing with multiple array arguments *** array(2) { [4]=> diff --git a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt index 6b7f014467..5eb21cd723 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_udiff_assoc($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_assoc() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt index bf2c0f3d2d..f8ca5300ca 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt @@ -37,7 +37,7 @@ var_dump(array_udiff_uassoc($arr1, $arr2, 'too_few_parameters', 'too_few_paramet ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_uassoc() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_udiff_variation5.phpt b/ext/standard/tests/array/array_udiff_variation5.phpt index ce6362fc08..a391cb4eb6 100644 --- a/ext/standard/tests/array/array_udiff_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_udiff($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff() : usage variation *** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt index f0c7ecc802..076dbf16fb 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt @@ -25,7 +25,7 @@ var_dump( array_uintersect_assoc($arr1, $arr2, $arr3, $arr4, $data_compare_funct ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_assoc() : basic functionality - testing with multiple array arguments *** array(2) { ["one"]=> diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt index bebe5b52c9..802934b37d 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_uintersect_assoc($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_assoc() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt index a5317c1c0d..782821f4a7 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt @@ -37,7 +37,7 @@ var_dump(array_uintersect_uassoc($arr1, $arr2, 'too_few_parameters', 'too_few_pa ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_uassoc() : usage variation - incorrect callbacks *** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_uintersect_variation5.phpt b/ext/standard/tests/array/array_uintersect_variation5.phpt index 642ebc0077..04051dbf5e 100644 --- a/ext/standard/tests/array/array_uintersect_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_uintersect($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_unique_basic.phpt b/ext/standard/tests/array/array_unique_basic.phpt index 58d3acf1be..91532db8c7 100644 --- a/ext/standard/tests/array/array_unique_basic.phpt +++ b/ext/standard/tests/array/array_unique_basic.phpt @@ -23,7 +23,7 @@ var_dump( array_unique($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : basic functionality *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt index 62dfab4568..470cd284d0 100644 --- a/ext/standard/tests/array/array_unique_variation2.phpt +++ b/ext/standard/tests/array/array_unique_variation2.phpt @@ -80,7 +80,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : Passing different arrays to $input argument *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_unique_variation5.phpt b/ext/standard/tests/array/array_unique_variation5.phpt index 5e3f7c36d0..acb94b4db0 100644 --- a/ext/standard/tests/array/array_unique_variation5.phpt +++ b/ext/standard/tests/array/array_unique_variation5.phpt @@ -20,7 +20,7 @@ var_dump( array_unique($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : array with duplicate keys for $input argument *** array(3) { [1]=> diff --git a/ext/standard/tests/array/array_unique_variation6.phpt b/ext/standard/tests/array/array_unique_variation6.phpt index 15a46518b7..65bdb421a5 100644 --- a/ext/standard/tests/array/array_unique_variation6.phpt +++ b/ext/standard/tests/array/array_unique_variation6.phpt @@ -33,7 +33,7 @@ var_dump( array_unique($input, SORT_STRING) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : array with reference variables for $input argument *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation7.phpt b/ext/standard/tests/array/array_unique_variation7.phpt index e998a73c6c..4135f98d97 100644 --- a/ext/standard/tests/array/array_unique_variation7.phpt +++ b/ext/standard/tests/array/array_unique_variation7.phpt @@ -20,7 +20,7 @@ var_dump( array_unique($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : array with binary data for $input argument *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation9.phpt b/ext/standard/tests/array/array_unique_variation9.phpt index bbbbf0ec8a..aa0830100d 100644 --- a/ext/standard/tests/array/array_unique_variation9.phpt +++ b/ext/standard/tests/array/array_unique_variation9.phpt @@ -79,7 +79,7 @@ $a = array ( print_r(array_unique($a)); ?> ---EXPECTF-- +--EXPECT-- Array ( [0] => acls_channel diff --git a/ext/standard/tests/array/array_unshift_basic1.phpt b/ext/standard/tests/array/array_unshift_basic1.phpt index 97ea895547..c041a47756 100644 --- a/ext/standard/tests/array/array_unshift_basic1.phpt +++ b/ext/standard/tests/array/array_unshift_basic1.phpt @@ -36,7 +36,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : basic functionality with default key array *** int(3) array(3) { diff --git a/ext/standard/tests/array/array_unshift_basic2.phpt b/ext/standard/tests/array/array_unshift_basic2.phpt index e4fd2e00ab..eec6412042 100644 --- a/ext/standard/tests/array/array_unshift_basic2.phpt +++ b/ext/standard/tests/array/array_unshift_basic2.phpt @@ -36,7 +36,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : basic functionality with associative array *** int(5) array(5) { diff --git a/ext/standard/tests/array/array_unshift_variation3.phpt b/ext/standard/tests/array/array_unshift_variation3.phpt index 286cb290b8..9e955f7ca0 100644 --- a/ext/standard/tests/array/array_unshift_variation3.phpt +++ b/ext/standard/tests/array/array_unshift_variation3.phpt @@ -72,7 +72,7 @@ foreach($arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : different arrays for $array argument *** -- Iteration 1 -- int(3) diff --git a/ext/standard/tests/array/array_unshift_variation6.phpt b/ext/standard/tests/array/array_unshift_variation6.phpt index 47da53be96..1660442094 100644 --- a/ext/standard/tests/array/array_unshift_variation6.phpt +++ b/ext/standard/tests/array/array_unshift_variation6.phpt @@ -73,7 +73,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : two dimensional arrays for $array argument *** int(4) array(4) { diff --git a/ext/standard/tests/array/array_unshift_variation7.phpt b/ext/standard/tests/array/array_unshift_variation7.phpt index 9a94eca9d1..a54e2ce9f5 100644 --- a/ext/standard/tests/array/array_unshift_variation7.phpt +++ b/ext/standard/tests/array/array_unshift_variation7.phpt @@ -54,7 +54,7 @@ foreach($vars as $var) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : double quoted strings for $var argument *** -- Iteration 1 -- int(5) diff --git a/ext/standard/tests/array/array_unshift_variation8.phpt b/ext/standard/tests/array/array_unshift_variation8.phpt index a64349c866..a184ec44c2 100644 --- a/ext/standard/tests/array/array_unshift_variation8.phpt +++ b/ext/standard/tests/array/array_unshift_variation8.phpt @@ -54,7 +54,7 @@ foreach($vars as $var) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : single quoted strings for $var argument *** -- Iteration 1 -- int(5) diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt index b6440f899e..89d867df92 100644 --- a/ext/standard/tests/array/array_unshift_variation9.phpt +++ b/ext/standard/tests/array/array_unshift_variation9.phpt @@ -94,7 +94,7 @@ foreach($vars as $var) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : heredoc strings for $var argument *** -- Iteration 1 -- int(5) diff --git a/ext/standard/tests/array/array_user_key_compare.phpt b/ext/standard/tests/array/array_user_key_compare.phpt index 933e6d679a..69bc37f48a 100644 --- a/ext/standard/tests/array/array_user_key_compare.phpt +++ b/ext/standard/tests/array/array_user_key_compare.phpt @@ -15,5 +15,5 @@ uksort($arr, "array_compare"); var_dump($a); ?> ---EXPECTF-- +--EXPECT-- string(1) "B" diff --git a/ext/standard/tests/array/array_values.phpt b/ext/standard/tests/array/array_values.phpt Binary files differindex e5e46ca3f7..ba24e90eb5 100644 --- a/ext/standard/tests/array/array_values.phpt +++ b/ext/standard/tests/array/array_values.phpt diff --git a/ext/standard/tests/array/array_values_basic.phpt b/ext/standard/tests/array/array_values_basic.phpt index 9cbdf07b81..a26a767b40 100644 --- a/ext/standard/tests/array/array_values_basic.phpt +++ b/ext/standard/tests/array/array_values_basic.phpt @@ -23,7 +23,7 @@ var_dump( array_values($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : basic functionality *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_values_variation3.phpt b/ext/standard/tests/array/array_values_variation3.phpt index 5c74c0d47d..d036cfdebe 100644 --- a/ext/standard/tests/array/array_values_variation3.phpt +++ b/ext/standard/tests/array/array_values_variation3.phpt @@ -103,7 +103,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- Iteration 1: int data -- diff --git a/ext/standard/tests/array/array_values_variation4.phpt b/ext/standard/tests/array/array_values_variation4.phpt index 9c35331fdd..3fac7b44c9 100644 --- a/ext/standard/tests/array/array_values_variation4.phpt +++ b/ext/standard/tests/array/array_values_variation4.phpt @@ -32,7 +32,7 @@ var_dump(array_values($input)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- Array values of a two-dimensional array -- diff --git a/ext/standard/tests/array/array_values_variation5.phpt b/ext/standard/tests/array/array_values_variation5.phpt index d65b4674d3..4fc4b011cf 100644 --- a/ext/standard/tests/array/array_values_variation5.phpt +++ b/ext/standard/tests/array/array_values_variation5.phpt @@ -26,7 +26,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- Call array_values() -- diff --git a/ext/standard/tests/array/array_values_variation6.phpt b/ext/standard/tests/array/array_values_variation6.phpt index 8c4479ca6f..b4ead80b3e 100644 --- a/ext/standard/tests/array/array_values_variation6.phpt +++ b/ext/standard/tests/array/array_values_variation6.phpt @@ -30,7 +30,7 @@ var_dump($result1); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- $input is an array made up of referenced variables: -- diff --git a/ext/standard/tests/array/array_values_variation7.phpt b/ext/standard/tests/array/array_values_variation7.phpt index 660809357d..cfa600c3c5 100644 --- a/ext/standard/tests/array/array_values_variation7.phpt +++ b/ext/standard/tests/array/array_values_variation7.phpt @@ -26,7 +26,7 @@ var_dump(array_values($input)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- $input argument: -- diff --git a/ext/standard/tests/array/array_walk_object2.phpt b/ext/standard/tests/array/array_walk_object2.phpt index 61d0529753..97606a6592 100644 --- a/ext/standard/tests/array/array_walk_object2.phpt +++ b/ext/standard/tests/array/array_walk_object2.phpt @@ -77,7 +77,7 @@ var_dump( array_walk($input, "callback_protected")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : array of objects *** -- For private member -- value : int(3) diff --git a/ext/standard/tests/array/array_walk_recursive.phpt b/ext/standard/tests/array/array_walk_recursive.phpt index c3b37c321c..c8523055e9 100644 --- a/ext/standard/tests/array/array_walk_recursive.phpt +++ b/ext/standard/tests/array/array_walk_recursive.phpt @@ -15,7 +15,7 @@ var_dump (array_walk_recursive ($arr, 'foo')); var_dump (array_walk_recursive ($arr, 'bar')); ?> ---EXPECTF-- +--EXPECT-- 1 foo 2 foo 3 foo diff --git a/ext/standard/tests/array/array_walk_recursive_object2.phpt b/ext/standard/tests/array/array_walk_recursive_object2.phpt index aa12fe869a..87d8e49d95 100644 --- a/ext/standard/tests/array/array_walk_recursive_object2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_object2.phpt @@ -79,7 +79,7 @@ var_dump( array_walk_recursive($input, "callback_protected")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : array of objects *** -- For private member -- value : int(3) diff --git a/ext/standard/tests/array/array_walk_recursive_variation3.phpt b/ext/standard/tests/array/array_walk_recursive_variation3.phpt index 9abdc0b5c2..96c93d6f35 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation3.phpt @@ -61,7 +61,7 @@ for($count = 0; $count < count($input_values); $count++) { } echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : 'input' array with different values*** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_walk_recursive_variation4.phpt b/ext/standard/tests/array/array_walk_recursive_variation4.phpt index 4db34979a4..a7cf93bd9a 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation4.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation4.phpt @@ -40,7 +40,7 @@ var_dump( array_walk_recursive( $input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : array with subarray *** int(0) int(1) diff --git a/ext/standard/tests/array/array_walk_recursive_variation5.phpt b/ext/standard/tests/array/array_walk_recursive_variation5.phpt index 688da57f01..4db5989582 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation5.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation5.phpt @@ -40,7 +40,7 @@ var_dump( array_walk_recursive($input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : array with references *** int(0) int(10) diff --git a/ext/standard/tests/array/array_walk_recursive_variation6.phpt b/ext/standard/tests/array/array_walk_recursive_variation6.phpt index 747eb7403c..fdda065904 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation6.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation6.phpt @@ -81,7 +81,7 @@ var_dump( array_walk_recursive($input, "for_mixed")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : 'input' as an associative array *** -- Associative array with numeric keys -- int(1) diff --git a/ext/standard/tests/array/array_walk_recursive_variation9.phpt b/ext/standard/tests/array/array_walk_recursive_variation9.phpt index f18fe248c1..780d779a7e 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation9.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation9.phpt @@ -50,7 +50,7 @@ var_dump( array_walk_recursive($input, 'callback_two_parameter', 10)); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : callback function variation *** -- callback function with both parameters -- int(0) diff --git a/ext/standard/tests/array/array_walk_variation3.phpt b/ext/standard/tests/array/array_walk_variation3.phpt index 9ff7d5dfac..964853705c 100644 --- a/ext/standard/tests/array/array_walk_variation3.phpt +++ b/ext/standard/tests/array/array_walk_variation3.phpt @@ -61,7 +61,7 @@ for($count = 0; $count < count($input_values); $count++) { } echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : 'input' array with different values*** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_walk_variation4.phpt b/ext/standard/tests/array/array_walk_variation4.phpt index 868732daaf..c495f2acfc 100644 --- a/ext/standard/tests/array/array_walk_variation4.phpt +++ b/ext/standard/tests/array/array_walk_variation4.phpt @@ -40,7 +40,7 @@ var_dump( array_walk( $input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : array with subarray *** int(0) array(0) { diff --git a/ext/standard/tests/array/array_walk_variation5.phpt b/ext/standard/tests/array/array_walk_variation5.phpt index b5d262a733..c80cfba44f 100644 --- a/ext/standard/tests/array/array_walk_variation5.phpt +++ b/ext/standard/tests/array/array_walk_variation5.phpt @@ -40,7 +40,7 @@ var_dump( array_walk($input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : array with references *** int(0) int(10) diff --git a/ext/standard/tests/array/array_walk_variation6.phpt b/ext/standard/tests/array/array_walk_variation6.phpt index c1f23233ec..5392618c17 100644 --- a/ext/standard/tests/array/array_walk_variation6.phpt +++ b/ext/standard/tests/array/array_walk_variation6.phpt @@ -81,7 +81,7 @@ var_dump( array_walk($input, "for_mixed")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : 'input' as an associative array *** -- Associative array with numeric keys -- int(1) diff --git a/ext/standard/tests/array/array_walk_variation9.phpt b/ext/standard/tests/array/array_walk_variation9.phpt index 37077841af..3af6316c12 100644 --- a/ext/standard/tests/array/array_walk_variation9.phpt +++ b/ext/standard/tests/array/array_walk_variation9.phpt @@ -50,7 +50,7 @@ var_dump( array_walk($input, 'callback_two_parameter', 10)); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : callback function variation *** -- callback function with both parameters -- int(0) diff --git a/ext/standard/tests/array/arsort_basic.phpt b/ext/standard/tests/array/arsort_basic.phpt index 24799ab771..598fe6aab3 100644 --- a/ext/standard/tests/array/arsort_basic.phpt +++ b/ext/standard/tests/array/arsort_basic.phpt @@ -75,7 +75,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : basic functionality *** -- Testing arsort() by supplying string array, 'flag' value is default -- diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/arsort_variation10.phpt index ec483df3ad..0520e455c6 100644 --- a/ext/standard/tests/array/arsort_variation10.phpt +++ b/ext/standard/tests/array/arsort_variation10.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation11.phpt b/ext/standard/tests/array/arsort_variation11.phpt Binary files differindex 0ab1c8abf5..b669cf078f 100644 --- a/ext/standard/tests/array/arsort_variation11.phpt +++ b/ext/standard/tests/array/arsort_variation11.phpt diff --git a/ext/standard/tests/array/arsort_variation4.phpt b/ext/standard/tests/array/arsort_variation4.phpt index a76a180f40..b52d3a16a2 100644 --- a/ext/standard/tests/array/arsort_variation4.phpt +++ b/ext/standard/tests/array/arsort_variation4.phpt @@ -41,7 +41,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() :usage variations *** -- Testing arsort() by supplying reference variable array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt index 187d43c482..b7adf76eab 100644 --- a/ext/standard/tests/array/arsort_variation5.phpt +++ b/ext/standard/tests/array/arsort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/arsort_variation6.phpt b/ext/standard/tests/array/arsort_variation6.phpt index 687b20a714..ff85223ef4 100644 --- a/ext/standard/tests/array/arsort_variation6.phpt +++ b/ext/standard/tests/array/arsort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation7.phpt b/ext/standard/tests/array/arsort_variation7.phpt index dc661b572e..d65f11ce98 100644 --- a/ext/standard/tests/array/arsort_variation7.phpt +++ b/ext/standard/tests/array/arsort_variation7.phpt @@ -41,7 +41,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying bool value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation8.phpt b/ext/standard/tests/array/arsort_variation8.phpt index c2473160c9..d190408d54 100644 --- a/ext/standard/tests/array/arsort_variation8.phpt +++ b/ext/standard/tests/array/arsort_variation8.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/arsort_variation9.phpt b/ext/standard/tests/array/arsort_variation9.phpt index 1e319e783c..61c532e4d8 100644 --- a/ext/standard/tests/array/arsort_variation9.phpt +++ b/ext/standard/tests/array/arsort_variation9.phpt @@ -49,7 +49,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying various arrays with key values -- diff --git a/ext/standard/tests/array/asort_basic.phpt b/ext/standard/tests/array/asort_basic.phpt index b80d31d37f..03c696499b 100644 --- a/ext/standard/tests/array/asort_basic.phpt +++ b/ext/standard/tests/array/asort_basic.phpt @@ -75,7 +75,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : basic functionality *** -- Testing asort() by supplying string array, 'flag' value is default -- diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/asort_variation10.phpt index f51945bf9e..793315e999 100644 --- a/ext/standard/tests/array/asort_variation10.phpt +++ b/ext/standard/tests/array/asort_variation10.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/asort_variation11.phpt Binary files differindex 013865f2c2..a1db5cbdf7 100644 --- a/ext/standard/tests/array/asort_variation11.phpt +++ b/ext/standard/tests/array/asort_variation11.phpt diff --git a/ext/standard/tests/array/asort_variation4.phpt b/ext/standard/tests/array/asort_variation4.phpt index 9fd76009ff..088e58a3da 100644 --- a/ext/standard/tests/array/asort_variation4.phpt +++ b/ext/standard/tests/array/asort_variation4.phpt @@ -41,7 +41,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() :usage variations *** -- Testing asort() by supplying reference variable array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt index 3d6a12ef27..e416a59ca6 100644 --- a/ext/standard/tests/array/asort_variation5.phpt +++ b/ext/standard/tests/array/asort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/asort_variation6.phpt b/ext/standard/tests/array/asort_variation6.phpt index 117f30d38b..a25e96fd64 100644 --- a/ext/standard/tests/array/asort_variation6.phpt +++ b/ext/standard/tests/array/asort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation7.phpt b/ext/standard/tests/array/asort_variation7.phpt index c078eb042c..a32c0de859 100644 --- a/ext/standard/tests/array/asort_variation7.phpt +++ b/ext/standard/tests/array/asort_variation7.phpt @@ -41,7 +41,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying bool value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation8.phpt b/ext/standard/tests/array/asort_variation8.phpt index 561cc7d708..b097346dff 100644 --- a/ext/standard/tests/array/asort_variation8.phpt +++ b/ext/standard/tests/array/asort_variation8.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/asort_variation9.phpt b/ext/standard/tests/array/asort_variation9.phpt index 85ef679daa..f3c27ef94a 100644 --- a/ext/standard/tests/array/asort_variation9.phpt +++ b/ext/standard/tests/array/asort_variation9.phpt @@ -49,7 +49,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying various arrays with key values -- diff --git a/ext/standard/tests/array/bug29253.phpt b/ext/standard/tests/array/bug29253.phpt index 4be9839221..4a1a90ebea 100644 --- a/ext/standard/tests/array/bug29253.phpt +++ b/ext/standard/tests/array/bug29253.phpt @@ -7,7 +7,7 @@ $gg = 'afad'; var_dump(@array_diff_assoc($GLOBALS, $zz)); var_dump($gg); ?> ---EXPECTF-- +--EXPECT-- array(0) { } string(4) "afad" diff --git a/ext/standard/tests/array/bug34066.phpt b/ext/standard/tests/array/bug34066.phpt index 023f4176fc..eb5b85e700 100644 --- a/ext/standard/tests/array/bug34066.phpt +++ b/ext/standard/tests/array/bug34066.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- gen_xml(prefix=/Docs/) gen_xml(prefix=/Docs/@) /Docs/@Version=1.0 diff --git a/ext/standard/tests/array/bug34066_1.phpt b/ext/standard/tests/array/bug34066_1.phpt index 6d0f7f84e9..12aa35c347 100644 --- a/ext/standard/tests/array/bug34066_1.phpt +++ b/ext/standard/tests/array/bug34066_1.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- gen_xml(prefix=/Docs/) /Docs/Version=1.0 gen_xml(prefix=/Docs/) end diff --git a/ext/standard/tests/array/bug48854.phpt b/ext/standard/tests/array/bug48854.phpt index 7aaade03a4..ed5b8e1ad1 100644 --- a/ext/standard/tests/array/bug48854.phpt +++ b/ext/standard/tests/array/bug48854.phpt @@ -22,7 +22,7 @@ $merged = array_merge_recursive($array1, $array2); var_dump($array1, $array2); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["friends"]=> int(5) diff --git a/ext/standard/tests/array/bug50006.phpt b/ext/standard/tests/array/bug50006.phpt index 948866361a..2ae15eab33 100644 --- a/ext/standard/tests/array/bug50006.phpt +++ b/ext/standard/tests/array/bug50006.phpt @@ -20,7 +20,7 @@ function magic_sort_cmp($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- Array ( [foo] => 0 diff --git a/ext/standard/tests/array/bug50006_1.phpt b/ext/standard/tests/array/bug50006_1.phpt index 3df67f3a4b..9db2c7796f 100644 --- a/ext/standard/tests/array/bug50006_1.phpt +++ b/ext/standard/tests/array/bug50006_1.phpt @@ -20,7 +20,7 @@ function magic_sort_cmp($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- Array ( [0] => foo diff --git a/ext/standard/tests/array/bug50006_2.phpt b/ext/standard/tests/array/bug50006_2.phpt index 48bb751703..a501986981 100644 --- a/ext/standard/tests/array/bug50006_2.phpt +++ b/ext/standard/tests/array/bug50006_2.phpt @@ -20,7 +20,7 @@ function magic_sort_cmp($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- Array ( [2] => foo diff --git a/ext/standard/tests/array/bug52719.phpt b/ext/standard/tests/array/bug52719.phpt index 078c53d225..b3f0a31101 100644 --- a/ext/standard/tests/array/bug52719.phpt +++ b/ext/standard/tests/array/bug52719.phpt @@ -11,5 +11,5 @@ array_walk_recursive( ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/standard/tests/array/compact_basic.phpt b/ext/standard/tests/array/compact_basic.phpt index 53a946e12a..4d9aab0689 100644 --- a/ext/standard/tests/array/compact_basic.phpt +++ b/ext/standard/tests/array/compact_basic.phpt @@ -34,7 +34,7 @@ var_dump (compact(array("g"))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing compact() : basic functionality *** array(6) { ["a"]=> diff --git a/ext/standard/tests/array/compact_variation2.phpt b/ext/standard/tests/array/compact_variation2.phpt index 79db8ab047..91806bc0c8 100644 --- a/ext/standard/tests/array/compact_variation2.phpt +++ b/ext/standard/tests/array/compact_variation2.phpt @@ -23,7 +23,7 @@ f(); ?> ==Done== ---EXPECTF-- +--EXPECT-- *** Testing compact() : usage variations - variables outside of current scope *** array(2) { ["b"]=> diff --git a/ext/standard/tests/array/count_basic.phpt b/ext/standard/tests/array/count_basic.phpt index 45f63d6a49..010d6cdf3c 100644 --- a/ext/standard/tests/array/count_basic.phpt +++ b/ext/standard/tests/array/count_basic.phpt @@ -31,7 +31,7 @@ var_dump(count($array_multi, 1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing count() : basic functionality *** -- One Dimensional Array: -- diff --git a/ext/standard/tests/array/current_basic.phpt b/ext/standard/tests/array/current_basic.phpt index cec6959778..f2a6aad78e 100644 --- a/ext/standard/tests/array/current_basic.phpt +++ b/ext/standard/tests/array/current_basic.phpt @@ -23,7 +23,7 @@ next($array); var_dump(current($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing current() : basic functionality *** string(4) "zero" string(3) "one" diff --git a/ext/standard/tests/array/current_variation3.phpt b/ext/standard/tests/array/current_variation3.phpt index bab5e6e0c5..decb043116 100644 --- a/ext/standard/tests/array/current_variation3.phpt +++ b/ext/standard/tests/array/current_variation3.phpt @@ -30,7 +30,7 @@ echo "\$array2: "; var_dump(current($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing current() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/current_variation4.phpt b/ext/standard/tests/array/current_variation4.phpt index 741fced2e7..5862a86129 100644 --- a/ext/standard/tests/array/current_variation4.phpt +++ b/ext/standard/tests/array/current_variation4.phpt @@ -46,7 +46,7 @@ var_dump(current($multi_array[3][3][3])); var_dump(current($multi_array[3][3][3][1])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing current() : usage variations *** -- Two Dimensional Array -- diff --git a/ext/standard/tests/array/current_variation5.phpt b/ext/standard/tests/array/current_variation5.phpt index 9e7c9e8d9d..d49353c24f 100644 --- a/ext/standard/tests/array/current_variation5.phpt +++ b/ext/standard/tests/array/current_variation5.phpt @@ -41,7 +41,7 @@ current_variation5($a); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- *** Testing current() : usage variations *** -- Function: reference parameter -- diff --git a/ext/standard/tests/array/end_basic.phpt b/ext/standard/tests/array/end_basic.phpt index 5a6606d381..2e92587068 100644 --- a/ext/standard/tests/array/end_basic.phpt +++ b/ext/standard/tests/array/end_basic.phpt @@ -29,7 +29,7 @@ $array[2] = 'foo'; var_dump(end($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing end() : basic functionality *** -- Initial Position: -- diff --git a/ext/standard/tests/array/end_variation2.phpt b/ext/standard/tests/array/end_variation2.phpt index 180f7cdfbd..ea9c336ac0 100644 --- a/ext/standard/tests/array/end_variation2.phpt +++ b/ext/standard/tests/array/end_variation2.phpt @@ -25,7 +25,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(end($array_arg[0])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing end() : usage variations *** -- Pass a two-dimensional array as $array_arg -- diff --git a/ext/standard/tests/array/end_variation3.phpt b/ext/standard/tests/array/end_variation3.phpt index cd1e2d0ec5..cbc30212cd 100644 --- a/ext/standard/tests/array/end_variation3.phpt +++ b/ext/standard/tests/array/end_variation3.phpt @@ -29,7 +29,7 @@ echo "\$array2: "; var_dump(current($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing end() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/extract_variation10.phpt b/ext/standard/tests/array/extract_variation10.phpt index 6e4565dc8c..2170b4f6b4 100644 --- a/ext/standard/tests/array/extract_variation10.phpt +++ b/ext/standard/tests/array/extract_variation10.phpt @@ -9,5 +9,5 @@ extract($a, EXTR_REFS); $a['foo'] = 'changed.foo'; var_dump($nonref); ?> ---EXPECTF-- +--EXPECT-- string(12) "original.foo" diff --git a/ext/standard/tests/array/extract_variation11.phpt b/ext/standard/tests/array/extract_variation11.phpt index dfab4ddbba..039d474f89 100644 --- a/ext/standard/tests/array/extract_variation11.phpt +++ b/ext/standard/tests/array/extract_variation11.phpt @@ -9,5 +9,5 @@ extract($a, EXTR_OVERWRITE|EXTR_REFS); $foo = 'changed.foo'; var_dump($a['foo']); ?> ---EXPECTF-- +--EXPECT-- string(11) "changed.foo" diff --git a/ext/standard/tests/array/extract_variation2.phpt b/ext/standard/tests/array/extract_variation2.phpt index 570e75f076..5483fa0c9d 100644 --- a/ext/standard/tests/array/extract_variation2.phpt +++ b/ext/standard/tests/array/extract_variation2.phpt @@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation3.phpt b/ext/standard/tests/array/extract_variation3.phpt index 2dcb775fe7..1a6a088646 100644 --- a/ext/standard/tests/array/extract_variation3.phpt +++ b/ext/standard/tests/array/extract_variation3.phpt @@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation4.phpt b/ext/standard/tests/array/extract_variation4.phpt index 11528f4b87..31adb6e814 100644 --- a/ext/standard/tests/array/extract_variation4.phpt +++ b/ext/standard/tests/array/extract_variation4.phpt @@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation5.phpt b/ext/standard/tests/array/extract_variation5.phpt index 4a3e95bbb7..f4455e9e57 100644 --- a/ext/standard/tests/array/extract_variation5.phpt +++ b/ext/standard/tests/array/extract_variation5.phpt @@ -32,7 +32,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation6.phpt b/ext/standard/tests/array/extract_variation6.phpt index 7eac67e16e..0c2243949a 100644 --- a/ext/standard/tests/array/extract_variation6.phpt +++ b/ext/standard/tests/array/extract_variation6.phpt @@ -16,7 +16,7 @@ var_dump($a); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) string(3) "aaa" int(1) diff --git a/ext/standard/tests/array/extract_variation7.phpt b/ext/standard/tests/array/extract_variation7.phpt index 653941dc9b..8104450df2 100644 --- a/ext/standard/tests/array/extract_variation7.phpt +++ b/ext/standard/tests/array/extract_variation7.phpt @@ -15,7 +15,7 @@ var_dump ( extract($b, EXTR_PREFIX_ALL, "diff")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing for EXTR_PREFIX_ALL called twice with same prefix string *** int(5) int(11) diff --git a/ext/standard/tests/array/extract_variation8.phpt b/ext/standard/tests/array/extract_variation8.phpt index 0d15fd494e..de9271a1cb 100644 --- a/ext/standard/tests/array/extract_variation8.phpt +++ b/ext/standard/tests/array/extract_variation8.phpt @@ -18,7 +18,7 @@ var_dump ( extract($var1)); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing for Numerical prefixes *** int(3) int(1) diff --git a/ext/standard/tests/array/in_array_variation1.phpt b/ext/standard/tests/array/in_array_variation1.phpt index 470738bcf5..45f18d0a10 100644 --- a/ext/standard/tests/array/in_array_variation1.phpt +++ b/ext/standard/tests/array/in_array_variation1.phpt @@ -61,7 +61,7 @@ foreach($arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing in_array() with different needle values *** -- Iteration 1 -- bool(false) diff --git a/ext/standard/tests/array/in_array_variation2.phpt b/ext/standard/tests/array/in_array_variation2.phpt index ee1267f4e2..1f42bb3f07 100644 --- a/ext/standard/tests/array/in_array_variation2.phpt +++ b/ext/standard/tests/array/in_array_variation2.phpt @@ -49,7 +49,7 @@ foreach($array_type as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing in_array() with different haystack values *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt index 789dbd6923..8301571940 100644 --- a/ext/standard/tests/array/in_array_variation4.phpt +++ b/ext/standard/tests/array/in_array_variation4.phpt @@ -58,7 +58,7 @@ var_dump( in_array('123abc', array(123), TRUE) ); // false in strict mode echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing resource type with in_array() *** bool(true) bool(false) diff --git a/ext/standard/tests/array/key_basic.phpt b/ext/standard/tests/array/key_basic.phpt index 8fdca1966c..c626fd6872 100644 --- a/ext/standard/tests/array/key_basic.phpt +++ b/ext/standard/tests/array/key_basic.phpt @@ -30,7 +30,7 @@ next($array); var_dump(key($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : basic functionality *** -- Initial Position: -- diff --git a/ext/standard/tests/array/key_exists_basic.phpt b/ext/standard/tests/array/key_exists_basic.phpt index 40d982da21..ebb5c25dd2 100644 --- a/ext/standard/tests/array/key_exists_basic.phpt +++ b/ext/standard/tests/array/key_exists_basic.phpt @@ -9,7 +9,7 @@ echo "*** test key_exists() by calling it with its expected arguments ***\n"; $a = array('bar' => 1); var_dump(key_exists('bar', $a)); var_dump(key_exists('foo', $a)); ---EXPECTF-- +--EXPECT-- *** test key_exists() by calling it with its expected arguments *** bool(true) bool(false) diff --git a/ext/standard/tests/array/key_exists_variation1.phpt b/ext/standard/tests/array/key_exists_variation1.phpt index 94ea8d45f7..65031f8240 100644 --- a/ext/standard/tests/array/key_exists_variation1.phpt +++ b/ext/standard/tests/array/key_exists_variation1.phpt @@ -9,7 +9,7 @@ echo "*** test key_exists() by calling it with its expected arguments ***\n"; $a = array('bar' => 1, 'foo' => array('bar' => 2, 'baz' => 3)); var_dump(key_exists('baz', $a)); var_dump(key_exists('baz', $a['foo'])); ---EXPECTF-- +--EXPECT-- *** test key_exists() by calling it with its expected arguments *** bool(false) bool(true) diff --git a/ext/standard/tests/array/key_exists_variation2.phpt b/ext/standard/tests/array/key_exists_variation2.phpt index 5f5ab86a4f..3409f36455 100644 --- a/ext/standard/tests/array/key_exists_variation2.phpt +++ b/ext/standard/tests/array/key_exists_variation2.phpt @@ -55,7 +55,7 @@ var_dump(key_exists(0, $h)); $i = array('foo' => 'baz', $st); var_dump(key_exists(0, $i)); ---EXPECTF-- +--EXPECT-- *** test key_exists() by using mixed type of arrays *** bool(false) integer diff --git a/ext/standard/tests/array/key_variation2.phpt b/ext/standard/tests/array/key_variation2.phpt index 35389062bb..912f9a69cb 100644 --- a/ext/standard/tests/array/key_variation2.phpt +++ b/ext/standard/tests/array/key_variation2.phpt @@ -104,7 +104,7 @@ foreach($inputs as $key => $input) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/key_variation3.phpt b/ext/standard/tests/array/key_variation3.phpt index a231917814..916e99af38 100644 --- a/ext/standard/tests/array/key_variation3.phpt +++ b/ext/standard/tests/array/key_variation3.phpt @@ -31,7 +31,7 @@ echo "\$array2: "; var_dump(key($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/key_variation4.phpt b/ext/standard/tests/array/key_variation4.phpt index 147d55aa13..6698d6385a 100644 --- a/ext/standard/tests/array/key_variation4.phpt +++ b/ext/standard/tests/array/key_variation4.phpt @@ -45,7 +45,7 @@ var_dump(key($multi_array[3][3][3])); var_dump(key($multi_array[3][3][3][1])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : usage variations *** -- Two Dimensional Array -- diff --git a/ext/standard/tests/array/krsort_basic.phpt b/ext/standard/tests/array/krsort_basic.phpt index 27361eb96d..6a3a40e3ad 100644 --- a/ext/standard/tests/array/krsort_basic.phpt +++ b/ext/standard/tests/array/krsort_basic.phpt @@ -75,7 +75,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : basic functionality *** -- Testing krsort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/krsort_variation10.phpt index f56d2870b8..467fb88e4d 100644 --- a/ext/standard/tests/array/krsort_variation10.phpt +++ b/ext/standard/tests/array/krsort_variation10.phpt @@ -54,7 +54,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying heredoc string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation11.phpt b/ext/standard/tests/array/krsort_variation11.phpt index 0cfa4821a2..f16e438335 100644 --- a/ext/standard/tests/array/krsort_variation11.phpt +++ b/ext/standard/tests/array/krsort_variation11.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying boolean value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation3.phpt b/ext/standard/tests/array/krsort_variation3.phpt index 8f411a9739..0707c610cb 100644 --- a/ext/standard/tests/array/krsort_variation3.phpt +++ b/ext/standard/tests/array/krsort_variation3.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various integer/float arrays -- diff --git a/ext/standard/tests/array/krsort_variation4.phpt b/ext/standard/tests/array/krsort_variation4.phpt index 3df924ac82..5643b39f58 100644 --- a/ext/standard/tests/array/krsort_variation4.phpt +++ b/ext/standard/tests/array/krsort_variation4.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt index 0fa1e9c68f..2fa16c6e73 100644 --- a/ext/standard/tests/array/krsort_variation5.phpt +++ b/ext/standard/tests/array/krsort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/krsort_variation6.phpt b/ext/standard/tests/array/krsort_variation6.phpt index 167d0ee7d6..72f4e41720 100644 --- a/ext/standard/tests/array/krsort_variation6.phpt +++ b/ext/standard/tests/array/krsort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation7.phpt b/ext/standard/tests/array/krsort_variation7.phpt index 9ba3fc5447..b0512935dc 100644 --- a/ext/standard/tests/array/krsort_variation7.phpt +++ b/ext/standard/tests/array/krsort_variation7.phpt @@ -54,7 +54,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/krsort_variation8.phpt Binary files differindex f5a40cbeed..3dd33157ec 100644 --- a/ext/standard/tests/array/krsort_variation8.phpt +++ b/ext/standard/tests/array/krsort_variation8.phpt diff --git a/ext/standard/tests/array/krsort_variation9.phpt b/ext/standard/tests/array/krsort_variation9.phpt index 1b8ae5dd36..f3e510f8be 100644 --- a/ext/standard/tests/array/krsort_variation9.phpt +++ b/ext/standard/tests/array/krsort_variation9.phpt @@ -48,7 +48,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various arrays with/without key values -- diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/ksort_basic.phpt index dd9f7a2158..59241bb6c8 100644 --- a/ext/standard/tests/array/ksort_basic.phpt +++ b/ext/standard/tests/array/ksort_basic.phpt @@ -73,7 +73,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : basic functionality *** -- Testing ksort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/ksort_variation10.phpt index 051bc30615..844685b36a 100644 --- a/ext/standard/tests/array/ksort_variation10.phpt +++ b/ext/standard/tests/array/ksort_variation10.phpt @@ -39,7 +39,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/ksort_variation11.phpt index 347df65c4f..758821303b 100644 --- a/ext/standard/tests/array/ksort_variation11.phpt +++ b/ext/standard/tests/array/ksort_variation11.phpt @@ -54,7 +54,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying heredoc string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation3.phpt b/ext/standard/tests/array/ksort_variation3.phpt index 4029b9b8d3..691672f780 100644 --- a/ext/standard/tests/array/ksort_variation3.phpt +++ b/ext/standard/tests/array/ksort_variation3.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various integer/float arrays -- diff --git a/ext/standard/tests/array/ksort_variation4.phpt b/ext/standard/tests/array/ksort_variation4.phpt index d6b3f482bf..46e330229e 100644 --- a/ext/standard/tests/array/ksort_variation4.phpt +++ b/ext/standard/tests/array/ksort_variation4.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying boolean value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt index 6e6a38b0a5..bc0c4be3b8 100644 --- a/ext/standard/tests/array/ksort_variation5.phpt +++ b/ext/standard/tests/array/ksort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/ksort_variation6.phpt index 1243ab1236..32fd973d8f 100644 --- a/ext/standard/tests/array/ksort_variation6.phpt +++ b/ext/standard/tests/array/ksort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/ksort_variation7.phpt index a0f454bbd1..18dc3a03ab 100644 --- a/ext/standard/tests/array/ksort_variation7.phpt +++ b/ext/standard/tests/array/ksort_variation7.phpt @@ -54,7 +54,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/ksort_variation8.phpt Binary files differindex f827883ce9..ca9dfdbe9e 100644 --- a/ext/standard/tests/array/ksort_variation8.phpt +++ b/ext/standard/tests/array/ksort_variation8.phpt diff --git a/ext/standard/tests/array/ksort_variation9.phpt b/ext/standard/tests/array/ksort_variation9.phpt index 8aa1e2f29d..e78ea3bef0 100644 --- a/ext/standard/tests/array/ksort_variation9.phpt +++ b/ext/standard/tests/array/ksort_variation9.phpt @@ -47,7 +47,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various arrays with/without key values -- diff --git a/ext/standard/tests/array/natcasesort_basic.phpt b/ext/standard/tests/array/natcasesort_basic.phpt index 2c173a6bec..ba23353503 100644 --- a/ext/standard/tests/array/natcasesort_basic.phpt +++ b/ext/standard/tests/array/natcasesort_basic.phpt @@ -23,7 +23,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : basic functionality *** -- Before sorting: -- diff --git a/ext/standard/tests/array/natcasesort_variation10.phpt b/ext/standard/tests/array/natcasesort_variation10.phpt index cffa007b74..15fbfd911b 100644 --- a/ext/standard/tests/array/natcasesort_variation10.phpt +++ b/ext/standard/tests/array/natcasesort_variation10.phpt @@ -28,7 +28,7 @@ echo key($array_arg) . " => " . current ($array_arg) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variations *** -- Initial Position of Internal Pointer: -- diff --git a/ext/standard/tests/array/natcasesort_variation11.phpt b/ext/standard/tests/array/natcasesort_variation11.phpt index 98158f15d0..ac19cb3950 100644 --- a/ext/standard/tests/array/natcasesort_variation11.phpt +++ b/ext/standard/tests/array/natcasesort_variation11.phpt @@ -112,7 +112,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/natcasesort_variation3.phpt index 452e886995..be7495418d 100644 --- a/ext/standard/tests/array/natcasesort_variation3.phpt +++ b/ext/standard/tests/array/natcasesort_variation3.phpt @@ -42,7 +42,7 @@ foreach ($inputs as $array_arg) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/natcasesort_variation4.phpt b/ext/standard/tests/array/natcasesort_variation4.phpt index d7dee1e8e7..472cfe1dc4 100644 --- a/ext/standard/tests/array/natcasesort_variation4.phpt +++ b/ext/standard/tests/array/natcasesort_variation4.phpt @@ -33,7 +33,7 @@ foreach ($inputs as $array_arg) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** bool(true) array(11) { diff --git a/ext/standard/tests/array/natcasesort_variation5.phpt b/ext/standard/tests/array/natcasesort_variation5.phpt index 867d0b89e4..71559afa23 100644 --- a/ext/standard/tests/array/natcasesort_variation5.phpt +++ b/ext/standard/tests/array/natcasesort_variation5.phpt @@ -19,7 +19,7 @@ var_dump($unsorted_hex_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** bool(true) array(11) { diff --git a/ext/standard/tests/array/natcasesort_variation6.phpt b/ext/standard/tests/array/natcasesort_variation6.phpt index 1d151d80d3..e87fb27a64 100644 --- a/ext/standard/tests/array/natcasesort_variation6.phpt +++ b/ext/standard/tests/array/natcasesort_variation6.phpt @@ -29,7 +29,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** -- Initial test -- diff --git a/ext/standard/tests/array/natcasesort_variation7.phpt b/ext/standard/tests/array/natcasesort_variation7.phpt index 91be7e262f..713f7c959c 100644 --- a/ext/standard/tests/array/natcasesort_variation7.phpt +++ b/ext/standard/tests/array/natcasesort_variation7.phpt @@ -22,7 +22,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variations *** array(5) { [0]=> diff --git a/ext/standard/tests/array/natcasesort_variation8.phpt b/ext/standard/tests/array/natcasesort_variation8.phpt index fbced4a229..48f347837c 100644 --- a/ext/standard/tests/array/natcasesort_variation8.phpt +++ b/ext/standard/tests/array/natcasesort_variation8.phpt @@ -20,7 +20,7 @@ var_dump($unsorted_oct_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** bool(true) array(9) { diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/natcasesort_variation9.phpt Binary files differindex cc40378238..dc5b5f4203 100644 --- a/ext/standard/tests/array/natcasesort_variation9.phpt +++ b/ext/standard/tests/array/natcasesort_variation9.phpt diff --git a/ext/standard/tests/array/next_basic.phpt b/ext/standard/tests/array/next_basic.phpt index fe8b70c88b..e502d8646e 100644 --- a/ext/standard/tests/array/next_basic.phpt +++ b/ext/standard/tests/array/next_basic.phpt @@ -24,7 +24,7 @@ echo key($array) . " => " . current($array) . "\n"; var_dump(next($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing next() : basic functionality *** 0 => zero string(3) "one" diff --git a/ext/standard/tests/array/next_variation2.phpt b/ext/standard/tests/array/next_variation2.phpt index e7505096d9..1ecde7efce 100644 --- a/ext/standard/tests/array/next_variation2.phpt +++ b/ext/standard/tests/array/next_variation2.phpt @@ -26,7 +26,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(next($array_arg[0])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing next() : usage variations *** -- Pass a two-dimensional array as $array_arg -- diff --git a/ext/standard/tests/array/prev_basic.phpt b/ext/standard/tests/array/prev_basic.phpt index 8c1450dd3c..f3c91cafc3 100644 --- a/ext/standard/tests/array/prev_basic.phpt +++ b/ext/standard/tests/array/prev_basic.phpt @@ -34,7 +34,7 @@ for ($i = $length; $i > 0; $i--) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing prev() : basic functionality *** 2 => two string(3) "one" diff --git a/ext/standard/tests/array/prev_variation2.phpt b/ext/standard/tests/array/prev_variation2.phpt index 0ce087781e..8e8ee4d673 100644 --- a/ext/standard/tests/array/prev_variation2.phpt +++ b/ext/standard/tests/array/prev_variation2.phpt @@ -30,7 +30,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(prev($array_arg[0])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing prev() : usage variations *** -- Pass a two-dimensional array as $array_arg -- diff --git a/ext/standard/tests/array/range.phpt b/ext/standard/tests/array/range.phpt index 9fd0f5ed45..ebb496c74a 100644 --- a/ext/standard/tests/array/range.phpt +++ b/ext/standard/tests/array/range.phpt @@ -48,7 +48,7 @@ var_dump( range("abcd", "mnop", 2) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing range() function on basic operations *** -- Integers as Low and High -- diff --git a/ext/standard/tests/array/range_variation.phpt b/ext/standard/tests/array/range_variation.phpt index e97d918d9b..f7fc9e0815 100644 --- a/ext/standard/tests/array/range_variation.phpt +++ b/ext/standard/tests/array/range_variation.phpt @@ -22,7 +22,7 @@ var_dump( range( 1, 5, array(1, 2) ) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing range() with various low and high values *** -- creating an array with low = 'ABCD' and high = 'ABCD' -- array(1) { diff --git a/ext/standard/tests/array/range_variation1.phpt b/ext/standard/tests/array/range_variation1.phpt index 6e57f73127..0747fab336 100644 --- a/ext/standard/tests/array/range_variation1.phpt +++ b/ext/standard/tests/array/range_variation1.phpt @@ -20,7 +20,7 @@ var_dump( range(-2147483649, -2147483647) ); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing max/outof range values *** array(2) { [0]=> diff --git a/ext/standard/tests/array/range_variation1_64bit.phpt b/ext/standard/tests/array/range_variation1_64bit.phpt index a14dae987f..555dbc2e1a 100644 --- a/ext/standard/tests/array/range_variation1_64bit.phpt +++ b/ext/standard/tests/array/range_variation1_64bit.phpt @@ -20,7 +20,7 @@ var_dump( range(-2147483649, -2147483647) ); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing max/outof range values *** array(2) { [0]=> diff --git a/ext/standard/tests/array/reset_basic.phpt b/ext/standard/tests/array/reset_basic.phpt index d376e68a21..52e3cf55f4 100644 --- a/ext/standard/tests/array/reset_basic.phpt +++ b/ext/standard/tests/array/reset_basic.phpt @@ -28,7 +28,7 @@ echo "\n-- Call to reset() --\n"; var_dump(reset($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing reset() : basic functionality *** -- Initial Position: -- diff --git a/ext/standard/tests/array/reset_variation2.phpt b/ext/standard/tests/array/reset_variation2.phpt index 1384affa94..6ecc1ad683 100644 --- a/ext/standard/tests/array/reset_variation2.phpt +++ b/ext/standard/tests/array/reset_variation2.phpt @@ -23,7 +23,7 @@ unset($array[0]); var_dump(reset($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing reset() : usage variations *** -- Initial Position: -- diff --git a/ext/standard/tests/array/reset_variation3.phpt b/ext/standard/tests/array/reset_variation3.phpt index 29f965abe1..7ac859c1c3 100644 --- a/ext/standard/tests/array/reset_variation3.phpt +++ b/ext/standard/tests/array/reset_variation3.phpt @@ -39,7 +39,7 @@ echo "\$array2: "; var_dump(current($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing reset() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/rsort_basic.phpt b/ext/standard/tests/array/rsort_basic.phpt index 34fcbb7034..724aa2d3a8 100644 --- a/ext/standard/tests/array/rsort_basic.phpt +++ b/ext/standard/tests/array/rsort_basic.phpt @@ -71,7 +71,7 @@ var_dump( $temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : basic functionality *** -- Testing rsort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation10.phpt b/ext/standard/tests/array/rsort_variation10.phpt index ccf886b070..bcb184e84e 100644 --- a/ext/standard/tests/array/rsort_variation10.phpt +++ b/ext/standard/tests/array/rsort_variation10.phpt @@ -34,7 +34,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Sort flag = default -- diff --git a/ext/standard/tests/array/rsort_variation11.phpt b/ext/standard/tests/array/rsort_variation11.phpt Binary files differindex a2f0fdc3e4..076a906599 100644 --- a/ext/standard/tests/array/rsort_variation11.phpt +++ b/ext/standard/tests/array/rsort_variation11.phpt diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/rsort_variation3.phpt index f8c002a6f7..6f92407587 100644 --- a/ext/standard/tests/array/rsort_variation3.phpt +++ b/ext/standard/tests/array/rsort_variation3.phpt @@ -60,7 +60,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/rsort_variation4.phpt index 226284d329..08ce8a66d5 100644 --- a/ext/standard/tests/array/rsort_variation4.phpt +++ b/ext/standard/tests/array/rsort_variation4.phpt @@ -35,7 +35,7 @@ var_dump( $temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/rsort_variation5.phpt index c0184e83b9..62e9f10aef 100644 --- a/ext/standard/tests/array/rsort_variation5.phpt +++ b/ext/standard/tests/array/rsort_variation5.phpt @@ -52,7 +52,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/rsort_variation6.phpt b/ext/standard/tests/array/rsort_variation6.phpt index 559a1ebaf7..d593573adb 100644 --- a/ext/standard/tests/array/rsort_variation6.phpt +++ b/ext/standard/tests/array/rsort_variation6.phpt @@ -34,7 +34,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation7.phpt b/ext/standard/tests/array/rsort_variation7.phpt index a996bf6db3..14eab635d0 100644 --- a/ext/standard/tests/array/rsort_variation7.phpt +++ b/ext/standard/tests/array/rsort_variation7.phpt @@ -39,7 +39,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation8.phpt b/ext/standard/tests/array/rsort_variation8.phpt index a4f94b5f0f..28bfe2c5a5 100644 --- a/ext/standard/tests/array/rsort_variation8.phpt +++ b/ext/standard/tests/array/rsort_variation8.phpt @@ -51,7 +51,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/rsort_variation9.phpt b/ext/standard/tests/array/rsort_variation9.phpt index 023d401314..9d0d917b88 100644 --- a/ext/standard/tests/array/rsort_variation9.phpt +++ b/ext/standard/tests/array/rsort_variation9.phpt @@ -54,7 +54,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt index b56682c31a..bbcbe11091 100644 --- a/ext/standard/tests/array/sizeof_basic2.phpt +++ b/ext/standard/tests/array/sizeof_basic2.phpt @@ -67,7 +67,7 @@ var_dump( sizeof($mixed_array, COUNT_RECURSIVE) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : basic functionality *** -- Testing sizeof() with integer array in default, COUNT_NORMAL, COUNT_RECURSIVE modes -- default mode: int(4) diff --git a/ext/standard/tests/array/sizeof_object1.phpt b/ext/standard/tests/array/sizeof_object1.phpt index e040585585..43b49e5693 100644 --- a/ext/standard/tests/array/sizeof_object1.phpt +++ b/ext/standard/tests/array/sizeof_object1.phpt @@ -35,7 +35,7 @@ var_dump( sizeof($obj, COUNT_RECURSIVE) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : object functionality *** -- Testing sizeof() with an object which implements Countable interface -- -- Testing sizeof() in default mode -- diff --git a/ext/standard/tests/array/sizeof_variation2.phpt b/ext/standard/tests/array/sizeof_variation2.phpt index a224579780..8bd74a0207 100644 --- a/ext/standard/tests/array/sizeof_variation2.phpt +++ b/ext/standard/tests/array/sizeof_variation2.phpt @@ -59,7 +59,7 @@ for($i = 0; $i < count($values); $i++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : usage variations *** --- Testing sizeof() with different array values for 'var' argument --- -- Iteration 1 -- diff --git a/ext/standard/tests/array/sizeof_variation3.phpt b/ext/standard/tests/array/sizeof_variation3.phpt index ba8afb83e6..b78b620d7d 100644 --- a/ext/standard/tests/array/sizeof_variation3.phpt +++ b/ext/standard/tests/array/sizeof_variation3.phpt @@ -25,7 +25,7 @@ var_dump( sizeof($array4, COUNT_RECURSIVE) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : usage variations *** -- Testing sizeof() for infinite recursion with arrays as argument in COUNT_RECURSIVE mode -- int(13) diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort_basic.phpt index 460b572fc1..df37b2d1d5 100644 --- a/ext/standard/tests/array/sort_basic.phpt +++ b/ext/standard/tests/array/sort_basic.phpt @@ -76,7 +76,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : basic functionality *** -- Testing sort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation10.phpt b/ext/standard/tests/array/sort_variation10.phpt index 0a5a58044a..9f76968a03 100644 --- a/ext/standard/tests/array/sort_variation10.phpt +++ b/ext/standard/tests/array/sort_variation10.phpt @@ -38,7 +38,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation11.phpt b/ext/standard/tests/array/sort_variation11.phpt Binary files differindex bcab4bc998..4faec0196b 100644 --- a/ext/standard/tests/array/sort_variation11.phpt +++ b/ext/standard/tests/array/sort_variation11.phpt diff --git a/ext/standard/tests/array/sort_variation4.phpt b/ext/standard/tests/array/sort_variation4.phpt index 82e3d9708f..f4f6d783c1 100644 --- a/ext/standard/tests/array/sort_variation4.phpt +++ b/ext/standard/tests/array/sort_variation4.phpt @@ -41,7 +41,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() :usage variations *** -- Testing sort() by supplying reference variable array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort_variation5.phpt index a06c22c751..0395d0c97f 100644 --- a/ext/standard/tests/array/sort_variation5.phpt +++ b/ext/standard/tests/array/sort_variation5.phpt @@ -56,7 +56,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/sort_variation6.phpt b/ext/standard/tests/array/sort_variation6.phpt index 7a93f0e5fe..cf094e864b 100644 --- a/ext/standard/tests/array/sort_variation6.phpt +++ b/ext/standard/tests/array/sort_variation6.phpt @@ -37,7 +37,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation7.phpt b/ext/standard/tests/array/sort_variation7.phpt index 19d888a76a..f61ee46e54 100644 --- a/ext/standard/tests/array/sort_variation7.phpt +++ b/ext/standard/tests/array/sort_variation7.phpt @@ -41,7 +41,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying bool value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation8.phpt b/ext/standard/tests/array/sort_variation8.phpt index 9a330313f9..17228f28ac 100644 --- a/ext/standard/tests/array/sort_variation8.phpt +++ b/ext/standard/tests/array/sort_variation8.phpt @@ -55,7 +55,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/sort_variation9.phpt b/ext/standard/tests/array/sort_variation9.phpt index faab1666c4..53e5679600 100644 --- a/ext/standard/tests/array/sort_variation9.phpt +++ b/ext/standard/tests/array/sort_variation9.phpt @@ -52,7 +52,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various arrays with key values -- diff --git a/ext/standard/tests/array/uasort_basic1.phpt b/ext/standard/tests/array/uasort_basic1.phpt index 70dd04c0c9..c0dfefd836 100644 --- a/ext/standard/tests/array/uasort_basic1.phpt +++ b/ext/standard/tests/array/uasort_basic1.phpt @@ -55,7 +55,7 @@ var_dump($string_key_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : basic functionality *** -- Numeric array with default keys -- bool(true) diff --git a/ext/standard/tests/array/uasort_basic2.phpt b/ext/standard/tests/array/uasort_basic2.phpt index c5ca0f13c8..de0275c15a 100644 --- a/ext/standard/tests/array/uasort_basic2.phpt +++ b/ext/standard/tests/array/uasort_basic2.phpt @@ -49,7 +49,7 @@ var_dump($int_values3); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : basic functionality with duplicate values *** -- Numeric array with increasing values -- bool(true) diff --git a/ext/standard/tests/array/uasort_object1.phpt b/ext/standard/tests/array/uasort_object1.phpt index 5d5b0b52c2..020b0d3c0b 100644 --- a/ext/standard/tests/array/uasort_object1.phpt +++ b/ext/standard/tests/array/uasort_object1.phpt @@ -92,7 +92,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : object functionality *** bool(true) array(4) { diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/uasort_variation10.phpt index e0c5e72f7e..15b62930c3 100644 --- a/ext/standard/tests/array/uasort_variation10.phpt +++ b/ext/standard/tests/array/uasort_variation10.phpt @@ -55,7 +55,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : 'array_arg' with elements as reference *** -- Sorting 'array_arg' containing different references -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation11.phpt b/ext/standard/tests/array/uasort_variation11.phpt index 50357dec5c..c0afb8df5f 100644 --- a/ext/standard/tests/array/uasort_variation11.phpt +++ b/ext/standard/tests/array/uasort_variation11.phpt @@ -47,7 +47,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : sorting different associative arrays *** -- Array with duplicate keys -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt Binary files differindex 9147d59916..8fe5f27821 100644 --- a/ext/standard/tests/array/uasort_variation3.phpt +++ b/ext/standard/tests/array/uasort_variation3.phpt diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/uasort_variation4.phpt index 8f0a2db077..613edd4684 100644 --- a/ext/standard/tests/array/uasort_variation4.phpt +++ b/ext/standard/tests/array/uasort_variation4.phpt @@ -67,7 +67,7 @@ var_dump($empty_array); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : different numeric arrays as 'array_arg' *** -- Sorting Integer array -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation6.phpt b/ext/standard/tests/array/uasort_variation6.phpt index 1c0b927764..46d5e24aa4 100644 --- a/ext/standard/tests/array/uasort_variation6.phpt +++ b/ext/standard/tests/array/uasort_variation6.phpt @@ -50,7 +50,7 @@ var_dump( uasort($temp_array, 'cmp_function') ); // expecting: bool(true) var_dump($temp_array); ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : sorting array having different subarrays *** bool(true) array(8) { diff --git a/ext/standard/tests/array/uasort_variation7.phpt b/ext/standard/tests/array/uasort_variation7.phpt index e37d9efe6b..48028dbcd8 100644 --- a/ext/standard/tests/array/uasort_variation7.phpt +++ b/ext/standard/tests/array/uasort_variation7.phpt @@ -39,7 +39,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : anonymous function as 'cmp_function' *** -- Anonymous 'cmp_function' with parameters passed by value -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation9.phpt b/ext/standard/tests/array/uasort_variation9.phpt index 85578b0207..b8c5598d84 100644 --- a/ext/standard/tests/array/uasort_variation9.phpt +++ b/ext/standard/tests/array/uasort_variation9.phpt @@ -46,7 +46,7 @@ var_dump($string_values); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : 'cmp_function' with reference arguments *** -- Passing integer values to 'cmp_function' -- bool(true) diff --git a/ext/standard/tests/array/usort_basic.phpt b/ext/standard/tests/array/usort_basic.phpt index eaf30188de..64351f707c 100644 --- a/ext/standard/tests/array/usort_basic.phpt +++ b/ext/standard/tests/array/usort_basic.phpt @@ -54,7 +54,7 @@ var_dump( usort($string_key_arg, 'cmp') ); var_dump($string_key_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : basic functionality *** -- Numeric array with default keys -- diff --git a/ext/standard/tests/array/usort_variation10.phpt b/ext/standard/tests/array/usort_variation10.phpt index b343419ce1..0aeed40292 100644 --- a/ext/standard/tests/array/usort_variation10.phpt +++ b/ext/standard/tests/array/usort_variation10.phpt @@ -42,7 +42,7 @@ var_dump( usort($array_arg, 'cmp') ); var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Array with duplicate keys -- diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/usort_variation3.phpt index 3758fe9c9a..5d21776060 100644 --- a/ext/standard/tests/array/usort_variation3.phpt +++ b/ext/standard/tests/array/usort_variation3.phpt @@ -75,7 +75,7 @@ echo "\n-- Sorted array after usort() function call --\n"; var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** bool(true) diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/usort_variation4.phpt index 36624b7c3c..a5d14daab2 100644 --- a/ext/standard/tests/array/usort_variation4.phpt +++ b/ext/standard/tests/array/usort_variation4.phpt @@ -67,7 +67,7 @@ var_dump( usort($empty_array, 'cmp_function') ); var_dump($empty_array); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Sorting Integer array -- diff --git a/ext/standard/tests/array/usort_variation6.phpt b/ext/standard/tests/array/usort_variation6.phpt index 3eb2eaa852..10b1e9929d 100644 --- a/ext/standard/tests/array/usort_variation6.phpt +++ b/ext/standard/tests/array/usort_variation6.phpt @@ -54,7 +54,7 @@ echo "-- Array after call to usort() --\n"; var_dump($array_args[5]); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Pass usort() a two-dimensional array -- diff --git a/ext/standard/tests/array/usort_variation7.phpt b/ext/standard/tests/array/usort_variation7.phpt index 171e751df2..55c4efa037 100644 --- a/ext/standard/tests/array/usort_variation7.phpt +++ b/ext/standard/tests/array/usort_variation7.phpt @@ -38,7 +38,7 @@ var_dump( usort($array_arg, $cmp_function) ); var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Anonymous 'cmp_function' with parameters passed by value -- diff --git a/ext/standard/tests/array/usort_variation9.phpt b/ext/standard/tests/array/usort_variation9.phpt index 6a067992e7..977c709149 100644 --- a/ext/standard/tests/array/usort_variation9.phpt +++ b/ext/standard/tests/array/usort_variation9.phpt @@ -46,7 +46,7 @@ var_dump( usort($array_arg, 'cmp_function') ); var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Sorting $array_arg containing different references -- |