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 | |
| 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')
1098 files changed, 1053 insertions, 1053 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 -- diff --git a/ext/standard/tests/assert/assert_basic1.phpt b/ext/standard/tests/assert/assert_basic1.phpt index 8aed519246..e803bb0ccc 100644 --- a/ext/standard/tests/assert/assert_basic1.phpt +++ b/ext/standard/tests/assert/assert_basic1.phpt @@ -22,7 +22,7 @@ var_dump($r2=assert($sa)); //Non string assert var_dump($r2=assert(0)); var_dump($r2=assert(1)); ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/assert/assert_basic4.phpt b/ext/standard/tests/assert/assert_basic4.phpt index 2f11234594..6c2baab437 100644 --- a/ext/standard/tests/assert/assert_basic4.phpt +++ b/ext/standard/tests/assert/assert_basic4.phpt @@ -24,7 +24,7 @@ echo "Initial values: ini.get(\"assert.bail\") => [".ini_get("assert.bail")."]\n echo "Initial values: ini.get(\"assert.quiet_eval\") => [".ini_get("assert.quiet_eval")."]\n"; echo "Initial values: ini.get(\"assert.callback\") => [".ini_get("assert.callback")."]\n\n"; ---EXPECTF-- +--EXPECT-- Initial values: assert_options(ASSERT_ACTIVE) => [0] Initial values: assert_options(ASSERT_WARNING) => [0] Initial values: assert_options(ASSERT_BAIL) => [0] diff --git a/ext/standard/tests/class_object/class_exists_basic_001.phpt b/ext/standard/tests/class_object/class_exists_basic_001.phpt index 208a895e6b..6d24ef979f 100644 --- a/ext/standard/tests/class_object/class_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/class_exists_basic_001.phpt @@ -31,7 +31,7 @@ var_dump( class_exists('stdclass') ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing class_exists() : basic functionality *** Calling class_exists() on non-existent class with autoload explicitly enabled: In autoload(C) diff --git a/ext/standard/tests/class_object/class_exists_variation_003.phpt b/ext/standard/tests/class_object/class_exists_variation_003.phpt index 0745601452..72182c8cbb 100644 --- a/ext/standard/tests/class_object/class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_003.phpt @@ -13,6 +13,6 @@ var_dump(class_exists('casesensitivitytest')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- bool(true) Done
\ No newline at end of file diff --git a/ext/standard/tests/class_object/forward_static_call_001.phpt b/ext/standard/tests/class_object/forward_static_call_001.phpt index 2b3a8dd059..0fac78f4ea 100644 --- a/ext/standard/tests/class_object/forward_static_call_001.phpt +++ b/ext/standard/tests/class_object/forward_static_call_001.phpt @@ -58,7 +58,7 @@ C::test3(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- A - B diff --git a/ext/standard/tests/class_object/forward_static_call_003.phpt b/ext/standard/tests/class_object/forward_static_call_003.phpt index 2ea102e5d2..ea56f8d2e7 100644 --- a/ext/standard/tests/class_object/forward_static_call_003.phpt +++ b/ext/standard/tests/class_object/forward_static_call_003.phpt @@ -39,7 +39,7 @@ C::test(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- A - B diff --git a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt index b2b87af4ec..7d2151c9de 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt @@ -35,7 +35,7 @@ var_dump( get_class_methods("NonExistent") ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_class_methods() : basic functionality *** Argument is class name: array(3) { diff --git a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt index 441bb45d6d..387cfd88fc 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt @@ -66,7 +66,7 @@ X::testFromX(); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Accessing D from global scope: array(4) { [0]=> diff --git a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt index b64f702b85..c74acccdc2 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt @@ -40,7 +40,7 @@ var_dump(get_class_methods("C")); C::testFromC(); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Accessing I from global scope: array(1) { [0]=> diff --git a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt index 60b944c69c..7dee5140a3 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt @@ -18,7 +18,7 @@ var_dump( get_class_methods('CasesensitivitytesT') ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_class_methods() : usage variations *** array(1) { [0]=> diff --git a/ext/standard/tests/class_object/get_class_variation_002.phpt b/ext/standard/tests/class_object/get_class_variation_002.phpt index 1ee3529818..640bbb7f88 100644 --- a/ext/standard/tests/class_object/get_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_variation_002.phpt @@ -13,6 +13,6 @@ var_dump(get_class(new casesensitivitytest)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- string(19) "caseSensitivityTest" Done
\ No newline at end of file diff --git a/ext/standard/tests/class_object/get_class_vars_variation2.phpt b/ext/standard/tests/class_object/get_class_vars_variation2.phpt index fad5716745..726bb53ea1 100644 --- a/ext/standard/tests/class_object/get_class_vars_variation2.phpt +++ b/ext/standard/tests/class_object/get_class_vars_variation2.phpt @@ -75,7 +75,7 @@ echo "\n-- From a child's static context --\n"; Child::testStatic(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_class_vars() : testing visibility -- From global context -- diff --git a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt index 3853bb6229..60a46c37d0 100644 --- a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt @@ -25,7 +25,7 @@ var_dump(in_array('AutoLoaded', get_declared_classes())); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_declared_classes() : testing autoloaded classes *** -- before instance is declared -- diff --git a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt index 12c92df7fa..219dde98ac 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt @@ -25,7 +25,7 @@ var_dump(in_array('AutoInterface', get_declared_interfaces())); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_declared_interfaces() : autoloading of interfaces *** -- before interface is used -- diff --git a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt index 6ea3edfa79..4cb848d398 100644 --- a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt @@ -29,7 +29,7 @@ var_dump(in_array('AutoTrait', get_declared_traits())); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_declared_traits() : testing autoloaded traits *** -- before instance is declared -- diff --git a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt index 38ed74fb07..dde26e1a21 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt @@ -58,7 +58,7 @@ A::test($b); echo "\n---( Unrelated class: )---\n"; X::test($b); ?> ---EXPECTF-- +--EXPECT-- ---( Global scope: )--- array(1) { diff --git a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt index 910926bc1f..8d7c45958e 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt @@ -37,7 +37,7 @@ echo "\n---( Superclass: )---\n"; $b->testA($b); ?> ---EXPECTF-- +--EXPECT-- ---( Declaring class: )--- B::testB diff --git a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt index 89fbc53e93..d0bf806763 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt @@ -15,6 +15,6 @@ Class A { $a = new A; var_dump(get_object_vars($a)); ?> ---EXPECTF-- +--EXPECT-- array(0) { }
\ No newline at end of file diff --git a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt index 73478de79a..ef227cd8a2 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt @@ -23,7 +23,7 @@ $arr['val'] = 'changed.val'; var_dump($arr, $obj, $a); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(2) { diff --git a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt index 6f2e32805b..7ffff750b2 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt @@ -20,7 +20,7 @@ var_dump(get_parent_class(new CasesensitivitytestCHILD)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_parent_class() : variation *** string(19) "caseSensitivityTest" string(19) "caseSensitivityTest" diff --git a/ext/standard/tests/class_object/interface_exists_variation3.phpt b/ext/standard/tests/class_object/interface_exists_variation3.phpt index 5119945bac..f6ec16d63d 100644 --- a/ext/standard/tests/class_object/interface_exists_variation3.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation3.phpt @@ -23,7 +23,7 @@ var_dump(interface_exists("AutoInterface", true)); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing interface_exists() : autoloaded interface *** -- no autoloading -- diff --git a/ext/standard/tests/class_object/interface_exists_variation4.phpt b/ext/standard/tests/class_object/interface_exists_variation4.phpt index ca787396f7..4b61269664 100644 --- a/ext/standard/tests/class_object/interface_exists_variation4.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation4.phpt @@ -19,7 +19,7 @@ var_dump(interface_exists("AutoInterface")); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing interface_exists() : test autoload default value *** bool(true) diff --git a/ext/standard/tests/class_object/is_a.phpt b/ext/standard/tests/class_object/is_a.phpt index 99794cafb2..644df705c7 100644 --- a/ext/standard/tests/class_object/is_a.phpt +++ b/ext/standard/tests/class_object/is_a.phpt @@ -81,7 +81,7 @@ $t->test(); ?> ---EXPECTF-- +--EXPECT-- >>> With Defined class is_a( OBJECT:base, base) = yes is_a( STRING:base, base) = no diff --git a/ext/standard/tests/class_object/is_a_variation_003.phpt b/ext/standard/tests/class_object/is_a_variation_003.phpt index 16ec1a6622..5cf33ebdd2 100644 --- a/ext/standard/tests/class_object/is_a_variation_003.phpt +++ b/ext/standard/tests/class_object/is_a_variation_003.phpt @@ -17,7 +17,7 @@ var_dump(is_a(new caseSensitivityTestChild, 'caseSensitivityTEST')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_a() : usage variations *** bool(true) Done diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt index d4aef12349..3497ecc1f8 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt @@ -19,7 +19,7 @@ var_dump(is_subclass_of('caseSensitivityTestCHILD', 'caseSensitivityTEST')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing is_subclass_of() : usage variations *** *** Testing is_a() : usage variations *** bool(true) diff --git a/ext/standard/tests/class_object/method_exists_basic_001.phpt b/ext/standard/tests/class_object/method_exists_basic_001.phpt index 2f11e4c46e..44eaefbf56 100644 --- a/ext/standard/tests/class_object/method_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_001.phpt @@ -49,7 +49,7 @@ foreach ($methods as $method) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- ---(Using string class name)--- Does C::inherit_pub exist? bool(true) diff --git a/ext/standard/tests/class_object/method_exists_basic_002.phpt b/ext/standard/tests/class_object/method_exists_basic_002.phpt index f6b62aa265..6a17786b32 100644 --- a/ext/standard/tests/class_object/method_exists_basic_002.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_002.phpt @@ -22,7 +22,7 @@ var_dump(method_exists(new stdclass, "nonexistent")); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- ---(Internal classes, using string class name)--- Does exception::getmessage exist? bool(true) Does stdclass::nonexistent exist? bool(false) diff --git a/ext/standard/tests/class_object/method_exists_basic_003.phpt b/ext/standard/tests/class_object/method_exists_basic_003.phpt index 3ac1795149..c10763267c 100644 --- a/ext/standard/tests/class_object/method_exists_basic_003.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_003.phpt @@ -16,7 +16,7 @@ var_dump(method_exists('UndefC', 'func')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- In autoload(UndefC) bool(false) Done diff --git a/ext/standard/tests/class_object/method_exists_variation_003.phpt b/ext/standard/tests/class_object/method_exists_variation_003.phpt index debe5a35e9..f82dc01b9c 100644 --- a/ext/standard/tests/class_object/method_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_003.phpt @@ -19,7 +19,7 @@ var_dump(method_exists('casesensiTivitytest', 'myMetHOD')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing method_exists() : variation *** bool(true) bool(true) diff --git a/ext/standard/tests/class_object/property_exists_variation1.phpt b/ext/standard/tests/class_object/property_exists_variation1.phpt index 1830440621..1a9ff32659 100644 --- a/ext/standard/tests/class_object/property_exists_variation1.phpt +++ b/ext/standard/tests/class_object/property_exists_variation1.phpt @@ -22,7 +22,7 @@ var_dump(property_exists("AutoTest", "foo")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing property_exists() : class auto loading *** testing property in autoloaded class diff --git a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt index 6a8e55bda0..6548c32687 100644 --- a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt @@ -13,6 +13,6 @@ var_dump(trait_exists('casesensitivitytest')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- bool(true) Done
\ No newline at end of file diff --git a/ext/standard/tests/class_object/trait_exists_basic_001.phpt b/ext/standard/tests/class_object/trait_exists_basic_001.phpt index 6e1d45227d..d587ec7d78 100644 --- a/ext/standard/tests/class_object/trait_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_basic_001.phpt @@ -33,7 +33,7 @@ var_dump( trait_exists('MyTrait') ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing trait_exists() : basic functionality *** Calling trait_exists() on non-existent trait with autoload explicitly enabled: In autoload(C) diff --git a/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt b/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt index 58504e4604..b8db266b3d 100644 --- a/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt +++ b/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt @@ -6,7 +6,7 @@ var_dump(crypt("test", "$23$04$1234567890123456789012345")); var_dump(crypt("test", "$20$04$1234567890123456789012345")); var_dump(crypt("test", "$2g$04$1234567890123456789012345")); ?> ---EXPECTF-- +--EXPECT-- string(2) "*0" string(2) "*0" string(2) "*0" diff --git a/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt b/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt index f5ae7c8291..03c36b175b 100644 --- a/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt +++ b/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt @@ -10,7 +10,7 @@ var_dump(crypt("test", "$2a$03$1234567891234567891234567")); var_dump(crypt("test", "$2a$32$1234567891234567891234567")); var_dump(crypt("test", "$2a$40$1234567891234567891234567")); ?> ---EXPECTF-- +--EXPECT-- string(2) "*0" string(2) "*0" string(2) "*0" diff --git a/ext/standard/tests/dir/dir_bug73971.phpt b/ext/standard/tests/dir/dir_bug73971.phpt index 86cb29ac58..3649b74329 100644 --- a/ext/standard/tests/dir/dir_bug73971.phpt +++ b/ext/standard/tests/dir/dir_bug73971.phpt @@ -39,7 +39,7 @@ $filename = $base . DIRECTORY_SEPARATOR . str_repeat('テスト', 48); rmdir($filename); rmdir($base); ?> ---EXPECTF-- +--EXPECT-- string(432) "テストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテスト" test dir() diff --git a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt index bde6d6f1c8..513a22b0cc 100644 --- a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt @@ -45,7 +45,7 @@ foreach($entries as $entry) { $path = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation2'; rmdir($path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Pass an empty directory to readdir() -- diff --git a/ext/standard/tests/dir/readdir_variation2.phpt b/ext/standard/tests/dir/readdir_variation2.phpt index c689ed90ee..ac6d37aa15 100644 --- a/ext/standard/tests/dir/readdir_variation2.phpt +++ b/ext/standard/tests/dir/readdir_variation2.phpt @@ -39,7 +39,7 @@ foreach($entries as $entry) { $path = dirname(__FILE__) . '/readdir_variation2'; rmdir($path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Pass an empty directory to readdir() -- diff --git a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt index a00e83769f..2d1e6a6fba 100644 --- a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt @@ -57,7 +57,7 @@ $path_sub = $path_top . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™sub_folder'; rmdir($path_sub); rmdir($path_top); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** array(5) { [0]=> diff --git a/ext/standard/tests/dir/readdir_variation3.phpt b/ext/standard/tests/dir/readdir_variation3.phpt index 4e73e741ec..8925b20ab4 100644 --- a/ext/standard/tests/dir/readdir_variation3.phpt +++ b/ext/standard/tests/dir/readdir_variation3.phpt @@ -51,7 +51,7 @@ $path_sub = $path_top . '/sub_folder'; rmdir($path_sub); rmdir($path_top); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** array(5) { [0]=> diff --git a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt index db5de28302..f439920ada 100644 --- a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt @@ -67,7 +67,7 @@ closedir(); $dir_path = dirname(__FILE__) . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation6"; rmdir($dir_path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Reading Directory Contents with Previous Handle -- diff --git a/ext/standard/tests/dir/readdir_variation6.phpt b/ext/standard/tests/dir/readdir_variation6.phpt index eec673e73c..0da7fbd8be 100644 --- a/ext/standard/tests/dir/readdir_variation6.phpt +++ b/ext/standard/tests/dir/readdir_variation6.phpt @@ -61,7 +61,7 @@ closedir(); $dir_path = dirname(__FILE__) . "/readdir_variation6"; rmdir($dir_path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Reading Directory Contents with Previous Handle -- diff --git a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt index a089a0afa3..f1cc3e11c8 100644 --- a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt @@ -43,7 +43,7 @@ delete_files($directory, 3, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); $directory = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_basic'; rmdir($directory); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : basic functionality *** -- scandir() with mandatory arguments -- diff --git a/ext/standard/tests/dir/scandir_basic.phpt b/ext/standard/tests/dir/scandir_basic.phpt index 7a044da529..668f659851 100644 --- a/ext/standard/tests/dir/scandir_basic.phpt +++ b/ext/standard/tests/dir/scandir_basic.phpt @@ -37,7 +37,7 @@ delete_files($directory, 3); $directory = dirname(__FILE__) . '/scandir_basic'; rmdir($directory); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : basic functionality *** -- scandir() with mandatory arguments -- diff --git a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt index b031a91505..e30994261f 100644 --- a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt @@ -52,7 +52,7 @@ delete_files($dir, 2, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); $dir = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_variation10'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- SCANDIR_SORT_ASCENDING: 0 SCANDIR_SORT_DESCENDING: 1 SCANDIR_SORT_NONE: 2 diff --git a/ext/standard/tests/dir/scandir_variation10.phpt b/ext/standard/tests/dir/scandir_variation10.phpt index 412836b2ba..958079dcb9 100644 --- a/ext/standard/tests/dir/scandir_variation10.phpt +++ b/ext/standard/tests/dir/scandir_variation10.phpt @@ -46,7 +46,7 @@ delete_files($dir, 2); $dir = dirname(__FILE__) . '/scandir_variation10'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- SCANDIR_SORT_ASCENDING: 0 SCANDIR_SORT_DESCENDING: 1 SCANDIR_SORT_NONE: 2 diff --git a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt index 4c85dd75cf..73064d779f 100644 --- a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt @@ -71,7 +71,7 @@ $dir_path = dirname(__FILE__); rmdir("$dir_path/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_two"); rmdir("$dir_path/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one"); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- $path = './ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one': -- diff --git a/ext/standard/tests/dir/scandir_variation4.phpt b/ext/standard/tests/dir/scandir_variation4.phpt index f756cf1ee6..09dedfffd2 100644 --- a/ext/standard/tests/dir/scandir_variation4.phpt +++ b/ext/standard/tests/dir/scandir_variation4.phpt @@ -65,7 +65,7 @@ $dir_path = dirname(__FILE__); rmdir("$dir_path/level_one/level_two"); rmdir("$dir_path/level_one"); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- $path = './level_one': -- diff --git a/ext/standard/tests/dir/scandir_variation7.phpt b/ext/standard/tests/dir/scandir_variation7.phpt index c7f77651d3..6ef4b67ce9 100644 --- a/ext/standard/tests/dir/scandir_variation7.phpt +++ b/ext/standard/tests/dir/scandir_variation7.phpt @@ -74,7 +74,7 @@ foreach ($permission_values as $perm) { $dir_path = dirname(__FILE__) . "/scandir_variation7"; rmdir($dir_path); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt index 686eca43a6..031b4389af 100644 --- a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt @@ -43,7 +43,7 @@ delete_files($dir, 2, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); $dir = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_variation9'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** array(4) { [0]=> diff --git a/ext/standard/tests/dir/scandir_variation9.phpt b/ext/standard/tests/dir/scandir_variation9.phpt index 2b1904c98f..0435a8c3f3 100644 --- a/ext/standard/tests/dir/scandir_variation9.phpt +++ b/ext/standard/tests/dir/scandir_variation9.phpt @@ -37,7 +37,7 @@ delete_files($dir, 2); $dir = dirname(__FILE__) . '/scandir_variation9'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** array(4) { [0]=> diff --git a/ext/standard/tests/file/006_basic.phpt b/ext/standard/tests/file/006_basic.phpt index 213442c15f..73a70e358f 100644 --- a/ext/standard/tests/file/006_basic.phpt +++ b/ext/standard/tests/file/006_basic.phpt @@ -49,7 +49,7 @@ echo "Done\n"; unlink(dirname(__FILE__)."/perm.tmp"); rmdir(dirname(__FILE__)."/perm"); ?> ---EXPECTF-- +--EXPECT-- *** Testing fileperms(), chmod() with files and dirs *** bool(true) 100755 diff --git a/ext/standard/tests/file/006_variation1.phpt b/ext/standard/tests/file/006_variation1.phpt index b752d21fea..7ede7b8bbc 100644 --- a/ext/standard/tests/file/006_variation1.phpt +++ b/ext/standard/tests/file/006_variation1.phpt @@ -61,7 +61,7 @@ chmod(dirname(__FILE__)."/006_variation1", 0777); unlink(dirname(__FILE__)."/006_variation1.tmp"); rmdir(dirname(__FILE__)."/006_variation1"); ?> ---EXPECTF-- +--EXPECT-- *** Testing fileperms() & chmod() : usage variations *** -- Testing all permission from octal 0000 to octal 0777 on file and dir -- -- Iteration 1 -- diff --git a/ext/standard/tests/file/basename_bug66395-win32.phpt b/ext/standard/tests/file/basename_bug66395-win32.phpt index a9580dc09e..b4ad18dd28 100644 --- a/ext/standard/tests/file/basename_bug66395-win32.phpt +++ b/ext/standard/tests/file/basename_bug66395-win32.phpt @@ -10,7 +10,7 @@ echo basename("y:file.txt", ".txt") . "\n"; echo basename("notdriveletter:file.txt") . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- file.txt file.txt file diff --git a/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt b/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt index 0ebe996cd5..4dc05dbeb1 100644 --- a/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt +++ b/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt @@ -20,7 +20,7 @@ echo basename("a:\\b:\\c:d:hello\\world:c:\$DATA") . "\n"; echo basename("a:\\b:\\c:d:hello\\d:world:c:\$DATA") . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- y y notdriveletter:file.txt diff --git a/ext/standard/tests/file/bug35781.phpt b/ext/standard/tests/file/bug35781.phpt index 5dc684a65d..cc3ae14e4c 100644 --- a/ext/standard/tests/file/bug35781.phpt +++ b/ext/standard/tests/file/bug35781.phpt @@ -18,7 +18,7 @@ var_dump(file_get_contents($filename)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(15) "Guvf vf n grfg " Done diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt index 2b59f50750..1de5d7f89b 100644 --- a/ext/standard/tests/file/bug38450.phpt +++ b/ext/standard/tests/file/bug38450.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug38450_1.phpt b/ext/standard/tests/file/bug38450_1.phpt index 07ca7166f3..e4f1af68f8 100644 --- a/ext/standard/tests/file/bug38450_1.phpt +++ b/ext/standard/tests/file/bug38450_1.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug39551.phpt b/ext/standard/tests/file/bug39551.phpt index c047a306ec..e03a2bf931 100644 --- a/ext/standard/tests/file/bug39551.phpt +++ b/ext/standard/tests/file/bug39551.phpt @@ -20,5 +20,5 @@ stream_get_contents($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/standard/tests/file/bug39673.phpt b/ext/standard/tests/file/bug39673.phpt index 00c29b28da..820664184f 100644 --- a/ext/standard/tests/file/bug39673.phpt +++ b/ext/standard/tests/file/bug39673.phpt @@ -28,7 +28,7 @@ foreach ($offsets as $offset) { @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) int(13824) int(0) diff --git a/ext/standard/tests/file/bug41815.phpt b/ext/standard/tests/file/bug41815.phpt index f77468d96d..5dbafac225 100644 --- a/ext/standard/tests/file/bug41815.phpt +++ b/ext/standard/tests/file/bug41815.phpt @@ -22,6 +22,6 @@ fclose($reader); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- OK Done diff --git a/ext/standard/tests/file/bug44034.phpt b/ext/standard/tests/file/bug44034.phpt index 863bf57e05..887b9eb08e 100644 --- a/ext/standard/tests/file/bug44034.phpt +++ b/ext/standard/tests/file/bug44034.phpt @@ -15,7 +15,7 @@ foreach($urls as $url) { var_dump(file($url, FILE_IGNORE_NEW_LINES)); } ?> ---EXPECTF-- +--EXPECT-- data://text/plain,foo\r\nbar\r\n array(2) { [0]=> diff --git a/ext/standard/tests/file/bug46347.phpt b/ext/standard/tests/file/bug46347.phpt index e942c71ba3..903a6e35cc 100644 --- a/ext/standard/tests/file/bug46347.phpt +++ b/ext/standard/tests/file/bug46347.phpt @@ -17,7 +17,7 @@ var_dump(parse_ini_file($file)); <?php unlink(__DIR__.'/parse.ini'); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["part1.*.part2"]=> string(1) "1" diff --git a/ext/standard/tests/file/bug49047.phpt b/ext/standard/tests/file/bug49047.phpt index d0805a16fd..6fc8a11e23 100644 --- a/ext/standard/tests/file/bug49047.phpt +++ b/ext/standard/tests/file/bug49047.phpt @@ -13,5 +13,5 @@ if ($t2 != $t) echo "failed (got $t2, expecting $t)\n"; rmdir($testdir); echo "Ok."; ?> ---EXPECTF-- +--EXPECT-- Ok. diff --git a/ext/standard/tests/file/bug51094.phpt b/ext/standard/tests/file/bug51094.phpt index f35dfb6d54..aa6ed93f50 100644 --- a/ext/standard/tests/file/bug51094.phpt +++ b/ext/standard/tests/file/bug51094.phpt @@ -13,7 +13,7 @@ $ini = parse_ini_string('ini=ini"raw', null, INI_SCANNER_RAW); var_dump($ini['ini']); $ini = parse_ini_string("ini=\r\niniraw", null, INI_SCANNER_RAW); var_dump($ini['ini']); ---EXPECTF-- +--EXPECT-- string(7) "ini;raw" string(4) ""ini" string(3) "ini" diff --git a/ext/standard/tests/file/bug63512.phpt b/ext/standard/tests/file/bug63512.phpt index 049db26588..34c55d4ceb 100644 --- a/ext/standard/tests/file/bug63512.phpt +++ b/ext/standard/tests/file/bug63512.phpt @@ -13,7 +13,7 @@ $array = parse_ini_string(' d = INSTALL_ROOT "INSTALL_ROOT"', false, INI_SCANNER_RAW); var_dump($array); ---EXPECTF-- +--EXPECT-- array(7) { ["int"]=> string(3) "123" diff --git a/ext/standard/tests/file/bug65272.phpt b/ext/standard/tests/file/bug65272.phpt index 3a772a8037..c6c6aa136e 100644 --- a/ext/standard/tests/file/bug65272.phpt +++ b/ext/standard/tests/file/bug65272.phpt @@ -23,7 +23,7 @@ echo "Done\n"; $file = dirname(__FILE__)."/flock_bug65272.dat"; unlink($file); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(false) int(1) diff --git a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt index abfb3e6f4c..f990b5b56b 100644 --- a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt @@ -52,7 +52,7 @@ rmdir($test_dirname); unlink($filepath); ?> ---EXPECTF-- +--EXPECT-- chmod() on a path containing .. and . bool(true) bool(true) diff --git a/ext/standard/tests/file/chmod_variation2-win32.phpt b/ext/standard/tests/file/chmod_variation2-win32.phpt index bc379ffcf7..9689852f51 100644 --- a/ext/standard/tests/file/chmod_variation2-win32.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32.phpt @@ -52,7 +52,7 @@ rmdir($test_dirname); unlink($filepath); ?> ---EXPECTF-- +--EXPECT-- chmod() on a path containing .. and . bool(true) bool(true) diff --git a/ext/standard/tests/file/chroot_001.phpt b/ext/standard/tests/file/chroot_001.phpt index b42b17b892..7fda0b3654 100644 --- a/ext/standard/tests/file/chroot_001.phpt +++ b/ext/standard/tests/file/chroot_001.phpt @@ -23,7 +23,7 @@ var_dump(realpath(".")); <?php rmdir("chroot_001_x"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt index c5cbc84254..b4aa19d1c2 100644 --- a/ext/standard/tests/file/copy_variation10.phpt +++ b/ext/standard/tests/file/copy_variation10.phpt @@ -29,7 +29,7 @@ echo "*** Done ***\n"; unlink(dirname(__FILE__)."/copy_variation10.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test copy(): Trying to create a copy of file with the same source name *** bool(false) bool(true) diff --git a/ext/standard/tests/file/copy_variation18.phpt b/ext/standard/tests/file/copy_variation18.phpt index 53467af8a3..564b34bf0c 100644 --- a/ext/standard/tests/file/copy_variation18.phpt +++ b/ext/standard/tests/file/copy_variation18.phpt @@ -49,7 +49,7 @@ unlink(dirname(__FILE__)."/copy_copy_variation18.tmp"); unlink(dirname(__FILE__)."/copy_variation18.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test copy() function: stat of file before and after copy *** Copy operation => bool(true) Comparing the stats of file before and after copy operation => bool(true) diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt index 56f797bc95..181da9a5f9 100644 --- a/ext/standard/tests/file/copy_variation3.phpt +++ b/ext/standard/tests/file/copy_variation3.phpt @@ -75,7 +75,7 @@ echo "*** Done ***\n"; unlink(dirname(__FILE__)."/copy_variation3.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test copy() function: destination file names containing whitespaces *** Size of the source file before copy operation => int(1500) diff --git a/ext/standard/tests/file/copy_variation8.phpt b/ext/standard/tests/file/copy_variation8.phpt index 63f57f3a25..805fa9dd13 100644 --- a/ext/standard/tests/file/copy_variation8.phpt +++ b/ext/standard/tests/file/copy_variation8.phpt @@ -75,7 +75,7 @@ rmdir($base_dir); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing copy() function: copying links across different directories *** -- Iteration 1 -- diff --git a/ext/standard/tests/file/dirname_basic-win32.phpt b/ext/standard/tests/file/dirname_basic-win32.phpt index 61a6e33f5a..f3b3902b0d 100644 --- a/ext/standard/tests/file/dirname_basic-win32.phpt +++ b/ext/standard/tests/file/dirname_basic-win32.phpt @@ -58,7 +58,7 @@ foreach ($paths as $path) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing dirname() : basic functionality *** string(0) "" string(1) "." diff --git a/ext/standard/tests/file/dirname_basic.phpt b/ext/standard/tests/file/dirname_basic.phpt index 8f1944e2c7..ba131d1662 100644 --- a/ext/standard/tests/file/dirname_basic.phpt +++ b/ext/standard/tests/file/dirname_basic.phpt @@ -58,7 +58,7 @@ foreach ($paths as $path) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing dirname() : basic functionality *** string(0) "" string(1) "." diff --git a/ext/standard/tests/file/fflush_basic.phpt b/ext/standard/tests/file/fflush_basic.phpt index f375c4f079..962c774637 100644 --- a/ext/standard/tests/file/fflush_basic.phpt +++ b/ext/standard/tests/file/fflush_basic.phpt @@ -44,7 +44,7 @@ $filename = "$file_path/fflush_basic.tmp"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): writing to a file and reading the contents *** int(63) bool(true) diff --git a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt index 80b8dedb65..12c34cb2f5 100644 --- a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt @@ -63,7 +63,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with various types of files *** -- Iteration 1 with file containing empty Data-- -- File opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation1-win32.phpt b/ext/standard/tests/file/fflush_variation1-win32.phpt index 0b6b096a34..109e531b95 100644 --- a/ext/standard/tests/file/fflush_variation1-win32.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32.phpt @@ -63,7 +63,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with various types of files *** -- Iteration 1 with file containing empty Data-- -- File opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation1.phpt b/ext/standard/tests/file/fflush_variation1.phpt index 2ecf7ea919..4b77195a0e 100644 --- a/ext/standard/tests/file/fflush_variation1.phpt +++ b/ext/standard/tests/file/fflush_variation1.phpt @@ -64,7 +64,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with various types of files *** -- Iteration 1 with file containing empty Data-- -- File opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation2.phpt b/ext/standard/tests/file/fflush_variation2.phpt index 651c716439..9dfa17c43c 100644 --- a/ext/standard/tests/file/fflush_variation2.phpt +++ b/ext/standard/tests/file/fflush_variation2.phpt @@ -65,7 +65,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with soft links to files opened in diff modes *** -- Iteration 1 with file containing empty data -- -- link opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation3.phpt b/ext/standard/tests/file/fflush_variation3.phpt index 6dfd49bc40..0f27413930 100644 --- a/ext/standard/tests/file/fflush_variation3.phpt +++ b/ext/standard/tests/file/fflush_variation3.phpt @@ -65,7 +65,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with hard links to files opened in diff modes *** -- Iteration 1 with file containing empty data -- bool(true) diff --git a/ext/standard/tests/file/fflush_variation4.phpt b/ext/standard/tests/file/fflush_variation4.phpt index f98616c3d8..ce6536ae2f 100644 --- a/ext/standard/tests/file/fflush_variation4.phpt +++ b/ext/standard/tests/file/fflush_variation4.phpt @@ -40,7 +40,7 @@ foreach( $file_modes as $mode ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with file handles of files opened in various read modes *** -- Iteration 1 with file opened in r mode -- bool(true) diff --git a/ext/standard/tests/file/fgetc_variation1.phpt b/ext/standard/tests/file/fgetc_variation1.phpt index 03258cac5d..c86241a976 100644 --- a/ext/standard/tests/file/fgetc_variation1.phpt +++ b/ext/standard/tests/file/fgetc_variation1.phpt @@ -46,7 +46,7 @@ echo "Done\n"; <?php unlink( dirname(__FILE__)."/fgetc_variation1.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetc() : usage variations *** -- Testing fgetc() with file whose file pointer is pointing to EOF -- -- File opened in mode : r -- diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt index 64efaa6cfd..fcea7f0d86 100644 --- a/ext/standard/tests/file/fgetc_variation3.phpt +++ b/ext/standard/tests/file/fgetc_variation3.phpt @@ -49,7 +49,7 @@ foreach ($file_modes as $file_mode ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetc() with file opened in write only mode *** -- File opened in mode : w -- bool(true) diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt index cb6f0cdce5..7c4ea4fa0f 100644 --- a/ext/standard/tests/file/fgetc_variation4.phpt +++ b/ext/standard/tests/file/fgetc_variation4.phpt @@ -50,7 +50,7 @@ foreach ($file_modes as $file_mode ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetc() : usage variations *** -- Testing fgetc() with files opened with different read modes -- -- File opened in mode : a+ -- diff --git a/ext/standard/tests/file/fgets_basic.phpt b/ext/standard/tests/file/fgets_basic.phpt index 9865f1fc9a..60a57a8dae 100644 --- a/ext/standard/tests/file/fgets_basic.phpt +++ b/ext/standard/tests/file/fgets_basic.phpt @@ -49,7 +49,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : basic functionality *** -- Testing fgets() with file opened using mode r -- diff --git a/ext/standard/tests/file/fgets_variation1.phpt b/ext/standard/tests/file/fgets_variation1.phpt index 68a20e8992..a51ca6c81c 100644 --- a/ext/standard/tests/file/fgets_variation1.phpt +++ b/ext/standard/tests/file/fgets_variation1.phpt @@ -48,7 +48,7 @@ foreach ($file_modes as $file_mode ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() with file opened in write only mode *** -- File opened in mode : w -- bool(true) diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt index b39ba0c6af..09b20fcb23 100644 --- a/ext/standard/tests/file/fgets_variation3.phpt +++ b/ext/standard/tests/file/fgets_variation3.phpt @@ -63,7 +63,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt index b5786df58c..40223d3cdf 100644 --- a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt @@ -65,7 +65,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation4-win32.phpt b/ext/standard/tests/file/fgets_variation4-win32.phpt index 6d2bbf6caf..c95ca287bd 100644 --- a/ext/standard/tests/file/fgets_variation4-win32.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32.phpt @@ -65,7 +65,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation4.phpt b/ext/standard/tests/file/fgets_variation4.phpt index 4ffa3f1975..1843c2e8b5 100644 --- a/ext/standard/tests/file/fgets_variation4.phpt +++ b/ext/standard/tests/file/fgets_variation4.phpt @@ -65,7 +65,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation5.phpt b/ext/standard/tests/file/fgets_variation5.phpt index 4a1ed9f039..1907f541e2 100644 --- a/ext/standard/tests/file/fgets_variation5.phpt +++ b/ext/standard/tests/file/fgets_variation5.phpt @@ -54,7 +54,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation6-win32.phpt b/ext/standard/tests/file/fgets_variation6-win32.phpt index 0334050aaa..fa01154bcf 100644 --- a/ext/standard/tests/file/fgets_variation6-win32.phpt +++ b/ext/standard/tests/file/fgets_variation6-win32.phpt @@ -61,7 +61,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation6.phpt b/ext/standard/tests/file/fgets_variation6.phpt index 69215d9020..52da7094dd 100644 --- a/ext/standard/tests/file/fgets_variation6.phpt +++ b/ext/standard/tests/file/fgets_variation6.phpt @@ -61,7 +61,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgetss1.phpt b/ext/standard/tests/file/fgetss1.phpt index 58dd00c11a..66985453df 100644 --- a/ext/standard/tests/file/fgetss1.phpt +++ b/ext/standard/tests/file/fgetss1.phpt @@ -36,7 +36,7 @@ echo "Done\n"; $filename = dirname(__FILE__)."/fgetss1.html"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- string(21) "askasdfasdf<b>aaaaaa " string(6) "dddddd" diff --git a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt index 7edf7bcbd1..783e6c3edd 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt @@ -76,7 +76,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : basic operations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_basic2-win32.phpt b/ext/standard/tests/file/fgetss_basic2-win32.phpt index ca6f40cb94..1fac3afb15 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32.phpt @@ -76,7 +76,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : basic operations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_basic2.phpt b/ext/standard/tests/file/fgetss_basic2.phpt index 86be24810e..8ce08bbd81 100644 --- a/ext/standard/tests/file/fgetss_basic2.phpt +++ b/ext/standard/tests/file/fgetss_basic2.phpt @@ -74,7 +74,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : basic operations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt index 5a0556a198..51c15fff96 100644 --- a/ext/standard/tests/file/fgetss_variation1.phpt +++ b/ext/standard/tests/file/fgetss_variation1.phpt @@ -73,7 +73,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using w mode -- diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt index a436e8c4b3..aef653a406 100644 --- a/ext/standard/tests/file/fgetss_variation2.phpt +++ b/ext/standard/tests/file/fgetss_variation2.phpt @@ -69,7 +69,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using r mode -- diff --git a/ext/standard/tests/file/fgetss_variation3.phpt b/ext/standard/tests/file/fgetss_variation3.phpt index e6f63c310f..9a771aa442 100644 --- a/ext/standard/tests/file/fgetss_variation3.phpt +++ b/ext/standard/tests/file/fgetss_variation3.phpt @@ -76,7 +76,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt index b93bc6afd0..dd497a4d0c 100644 --- a/ext/standard/tests/file/fgetss_variation4.phpt +++ b/ext/standard/tests/file/fgetss_variation4.phpt @@ -73,7 +73,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using r mode -- diff --git a/ext/standard/tests/file/fgetss_variation5.phpt b/ext/standard/tests/file/fgetss_variation5.phpt index c499d598b2..76a5f16458 100644 --- a/ext/standard/tests/file/fgetss_variation5.phpt +++ b/ext/standard/tests/file/fgetss_variation5.phpt @@ -77,7 +77,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/file_basic.phpt b/ext/standard/tests/file/file_basic.phpt index 97a592fd0c..d271c216f6 100644 --- a/ext/standard/tests/file/file_basic.phpt +++ b/ext/standard/tests/file/file_basic.phpt @@ -28,7 +28,7 @@ foreach( $filetypes as $type ) { echo "\n--- Done ---"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file() with basic types of files *** Array ( diff --git a/ext/standard/tests/file/file_exists_variation1.phpt b/ext/standard/tests/file/file_exists_variation1.phpt index 35c86a2808..2e8fd58d8e 100644 --- a/ext/standard/tests/file/file_exists_variation1.phpt +++ b/ext/standard/tests/file/file_exists_variation1.phpt @@ -20,7 +20,7 @@ var_dump(file_exists('|')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file_exists() : usage variations *** bool(false) bool(false) diff --git a/ext/standard/tests/file/file_get_contents_basic.phpt b/ext/standard/tests/file/file_get_contents_basic.phpt index 413909b450..267f86e3f6 100644 --- a/ext/standard/tests/file/file_get_contents_basic.phpt +++ b/ext/standard/tests/file/file_get_contents_basic.phpt @@ -30,7 +30,7 @@ delete_files($file_path, 1); echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing the basic functionality of the file_get_contents() function *** -- Testing with simple valid data file -- string(100) "text text text text text text text text text text text text text text text text text text text text " diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt index edfad0d945..3d5a688b9b 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt @@ -39,7 +39,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/file_put_contents.tmp"); unlink($file_path."/file_put_contents1.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing the basic functionality of file_put_contents() and file_get_contents() functions *** -- Testing with simple valid data file -- string(100) "text text text text text text text text text text text text text text text text text text text text " diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt index 1bac1c9864..694f930352 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt @@ -41,7 +41,7 @@ echo "--- Done ---"; $file_path = dirname(__FILE__); unlink($file_path."/file_put_contents_variation1.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing with variations in the arguments values *** string(100) "text text text text text text text text text text text text text text text text text text text text " string(100) "text text text text text text text text text text text text text text text text text text text text " diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt index fc2281dca0..63fe4ea365 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt @@ -46,7 +46,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/file_get_contents_variation2/file_get_contents_variation2.tmp"); rmdir($file_path."/file_get_contents_variation2"); ?> ---EXPECTF-- +--EXPECT-- *** Testing with variation in use_include_path argument *** string(240) "text text text text text text text text text text text text text text text text text text text text 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222221 Data1 in an array2 Data2 in an array" string(240) "text text text text text text text text text text text text text text text text text text text text 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222221 Data1 in an array2 Data2 in an array" diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt index 7e500e8c56..09d33f9f32 100644 --- a/ext/standard/tests/file/file_get_contents_variation9.phpt +++ b/ext/standard/tests/file/file_get_contents_variation9.phpt @@ -46,7 +46,7 @@ unlink($filename); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file_get_contents() : variation *** string(330) "Here is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of data" string(330) "Here is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of data" diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt index 35d193095c..a0d275ccc5 100644 --- a/ext/standard/tests/file/file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_put_contents_variation1.phpt @@ -32,7 +32,7 @@ unlink($filename); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing file_put_contents() : variation *** int(25) int(18) diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt index 506575fde7..9629d37aa9 100644 --- a/ext/standard/tests/file/file_variation.phpt +++ b/ext/standard/tests/file/file_variation.phpt @@ -64,7 +64,7 @@ unlink($file_path."/file3_variation.tmp"); rmdir($file_path."/file_variation"); ?> ---EXPECTF-- +--EXPECT-- *** Using various flags values with different data in a file --Iteration 1 -- array(1) { diff --git a/ext/standard/tests/file/file_variation9.phpt b/ext/standard/tests/file/file_variation9.phpt index 9ddd1e6209..623fa56409 100644 --- a/ext/standard/tests/file/file_variation9.phpt +++ b/ext/standard/tests/file/file_variation9.phpt @@ -32,7 +32,7 @@ foreach ($contents as $content) { echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file() : variation *** array(2) { [0]=> diff --git a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt index 14975feb49..d4ec8e571e 100644 --- a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt @@ -29,7 +29,7 @@ for($size = 1; $size <10000; $size = $size+1000) echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Checking filesize() with different size of files *** int(1024) diff --git a/ext/standard/tests/file/filesize_variation1-win32.phpt b/ext/standard/tests/file/filesize_variation1-win32.phpt index e9ff053361..3c2841afe0 100644 --- a/ext/standard/tests/file/filesize_variation1-win32.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32.phpt @@ -29,7 +29,7 @@ for($size = 1; $size <10000; $size = $size+1000) echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Checking filesize() with different size of files *** int(1024) diff --git a/ext/standard/tests/file/filesize_variation2-win32.phpt b/ext/standard/tests/file/filesize_variation2-win32.phpt index 544e3aa408..7322b78aae 100644 --- a/ext/standard/tests/file/filesize_variation2-win32.phpt +++ b/ext/standard/tests/file/filesize_variation2-win32.phpt @@ -64,7 +64,7 @@ unlink($file_path."/filesize_variation2/filesize_variation2_sub/filesize_variati rmdir($file_path."/filesize_variation2/filesize_variation2_sub"); rmdir($file_path."/filesize_variation2"); ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Testing size of a dir, sub-dir and file with filesize() *** diff --git a/ext/standard/tests/file/filesize_variation4-win32.phpt b/ext/standard/tests/file/filesize_variation4-win32.phpt index 5f20f4210d..5b6aec9fe9 100644 --- a/ext/standard/tests/file/filesize_variation4-win32.phpt +++ b/ext/standard/tests/file/filesize_variation4-win32.phpt @@ -83,7 +83,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/filesize_variation4.tmp"); unlink($file_path."/filesize_variation4_empty.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Testing filesize() with data written using different file modes and by creating holes in file *** diff --git a/ext/standard/tests/file/filesize_variation4.phpt b/ext/standard/tests/file/filesize_variation4.phpt index 29f85fc243..ffea82c234 100644 --- a/ext/standard/tests/file/filesize_variation4.phpt +++ b/ext/standard/tests/file/filesize_variation4.phpt @@ -85,7 +85,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/filesize_variation4.tmp"); unlink($file_path."/filesize_variation4_empty.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Testing filesize() with data written using different file modes and by creating holes in file *** diff --git a/ext/standard/tests/file/filetype_basic.phpt b/ext/standard/tests/file/filetype_basic.phpt index 4a6d3b2bc2..0cb1e7361a 100644 --- a/ext/standard/tests/file/filetype_basic.phpt +++ b/ext/standard/tests/file/filetype_basic.phpt @@ -15,7 +15,7 @@ print( filetype(".") )."\n"; echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filetype() with files and dirs *** file dir diff --git a/ext/standard/tests/file/filetype_variation.phpt b/ext/standard/tests/file/filetype_variation.phpt index 3308cee20d..e09af42570 100644 --- a/ext/standard/tests/file/filetype_variation.phpt +++ b/ext/standard/tests/file/filetype_variation.phpt @@ -61,7 +61,7 @@ unlink($file3); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filetype() with various types *** -- Checking with files -- file diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt index 125b48c02c..b6a2961843 100644 --- a/ext/standard/tests/file/filetype_variation2.phpt +++ b/ext/standard/tests/file/filetype_variation2.phpt @@ -23,7 +23,7 @@ echo "-- Checking for char --\n"; print( filetype("/dev/null") )."\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- Checking for char -- char ===DONE=== diff --git a/ext/standard/tests/file/filetype_variation3.phpt b/ext/standard/tests/file/filetype_variation3.phpt index 9a1a68f784..5b453d7788 100644 --- a/ext/standard/tests/file/filetype_variation3.phpt +++ b/ext/standard/tests/file/filetype_variation3.phpt @@ -23,7 +23,7 @@ echo "-- Checking for block --\n"; print( filetype("/dev/ram0") )."\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- Checking for block -- block ===DONE=== diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt index d218cee5ef..bb27cb439f 100644 --- a/ext/standard/tests/file/flock_basic.phpt +++ b/ext/standard/tests/file/flock_basic.phpt @@ -30,7 +30,7 @@ rmdir("$file_path/dir"); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing flock() fun with file and dir *** bool(true) bool(true) diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt index af67ab402a..02cb0ff282 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -64,7 +64,7 @@ fclose($fp); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing flock() fun with the various operation and wouldblock values *** --- Outer iteration 0 --- diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index 1fccbb70a9..ecfac73007 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -123,7 +123,7 @@ function test_fopen($mode) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- --- testing include path --- diff --git a/ext/standard/tests/file/fopen_variation6.phpt b/ext/standard/tests/file/fopen_variation6.phpt index 3a99212afe..258fa7f073 100644 --- a/ext/standard/tests/file/fopen_variation6.phpt +++ b/ext/standard/tests/file/fopen_variation6.phpt @@ -37,7 +37,7 @@ unlink($absfile); unlink($relfile); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing fopen() : variation *** This is an absolute file This is a relative file diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index eecaec7b4c..02637c2106 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -122,7 +122,7 @@ function test_fopen($mode) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- --- testing include path --- diff --git a/ext/standard/tests/file/fpassthru_basic.phpt b/ext/standard/tests/file/fpassthru_basic.phpt index 8924b27dd2..7389bd2105 100644 --- a/ext/standard/tests/file/fpassthru_basic.phpt +++ b/ext/standard/tests/file/fpassthru_basic.phpt @@ -62,7 +62,7 @@ echo "*** Done ***\n"; <?php unlink(dirname(__FILE__)."/passthru.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test basic functionality of fpassthru() function *** -- Before seek operation -- diff --git a/ext/standard/tests/file/fpassthru_variation.phpt b/ext/standard/tests/file/fpassthru_variation.phpt index 749eefb4c8..2c9e6e6cd3 100644 --- a/ext/standard/tests/file/fpassthru_variation.phpt +++ b/ext/standard/tests/file/fpassthru_variation.phpt @@ -71,7 +71,7 @@ unlink($file_name); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fpassthru() function with files *** --- Testing with different offsets --- diff --git a/ext/standard/tests/file/fread_basic.phpt b/ext/standard/tests/file/fread_basic.phpt index 44e534241c..4cdeffb5ab 100644 --- a/ext/standard/tests/file/fread_basic.phpt +++ b/ext/standard/tests/file/fread_basic.phpt @@ -99,7 +99,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() basic operations *** -- Testing fread) with file having data of type numeric -- diff --git a/ext/standard/tests/file/fread_variation1.phpt b/ext/standard/tests/file/fread_variation1.phpt index c46dbe2a3c..b782536a57 100644 --- a/ext/standard/tests/file/fread_variation1.phpt +++ b/ext/standard/tests/file/fread_variation1.phpt @@ -104,7 +104,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation2.phpt b/ext/standard/tests/file/fread_variation2.phpt index 23813a6672..9375b7a1db 100644 --- a/ext/standard/tests/file/fread_variation2.phpt +++ b/ext/standard/tests/file/fread_variation2.phpt @@ -103,7 +103,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation3-win32-mb.phpt b/ext/standard/tests/file/fread_variation3-win32-mb.phpt index a39842ce5b..537b525f76 100644 --- a/ext/standard/tests/file/fread_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/fread_variation3-win32-mb.phpt @@ -109,7 +109,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation3-win32.phpt b/ext/standard/tests/file/fread_variation3-win32.phpt index 5491555d1f..295663c539 100644 --- a/ext/standard/tests/file/fread_variation3-win32.phpt +++ b/ext/standard/tests/file/fread_variation3-win32.phpt @@ -109,7 +109,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation3.phpt b/ext/standard/tests/file/fread_variation3.phpt index 949e7b8869..5d66b54bec 100644 --- a/ext/standard/tests/file/fread_variation3.phpt +++ b/ext/standard/tests/file/fread_variation3.phpt @@ -109,7 +109,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation4-win32.phpt b/ext/standard/tests/file/fread_variation4-win32.phpt index 77d733a50e..6601f5aebc 100644 --- a/ext/standard/tests/file/fread_variation4-win32.phpt +++ b/ext/standard/tests/file/fread_variation4-win32.phpt @@ -107,7 +107,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation4.phpt b/ext/standard/tests/file/fread_variation4.phpt index fdff8de704..fb290b104c 100644 --- a/ext/standard/tests/file/fread_variation4.phpt +++ b/ext/standard/tests/file/fread_variation4.phpt @@ -107,7 +107,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fscanf_variation1.phpt b/ext/standard/tests/file/fscanf_variation1.phpt index b0c41e5f84..64d778916f 100644 --- a/ext/standard/tests/file/fscanf_variation1.phpt +++ b/ext/standard/tests/file/fscanf_variation1.phpt @@ -38,7 +38,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_variation1.tmp"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- *** Testing fscanf(): for its return type without third argument *** bool(true) array(1) { diff --git a/ext/standard/tests/file/fscanf_variation55.phpt b/ext/standard/tests/file/fscanf_variation55.phpt index 1777f797b2..a0f9b709e8 100644 --- a/ext/standard/tests/file/fscanf_variation55.phpt +++ b/ext/standard/tests/file/fscanf_variation55.phpt @@ -94,7 +94,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_variation55.tmp"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- *** Test fscanf(): tracking file pointer along with reading data from file *** *** File opened in r mode *** diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt index a9a54aba14..4a14b334b6 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt @@ -60,7 +60,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt index 1bd95c3450..fda4de5f40 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt @@ -71,7 +71,7 @@ foreach($file_content_types as $file_content_type){ } //end of File content type loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt index e25ebe0946..58bb65ef86 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt @@ -71,7 +71,7 @@ foreach($file_content_types as $file_content_type){ } //end of File content type loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt index ede0c43245..6974b5262e 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type){ } //end of File content type loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt index 7f6b2b4a8b..5c96fa0275 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt @@ -59,7 +59,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : default whence & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt index cb51150dcf..e30a6bba06 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : default whence & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt index c2179fcaee..4957868723 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : default whence & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt index 4b84d409f2..7dc9256340 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt @@ -60,7 +60,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all r and a modes *** *** Testing fseek() with whence = SEEK_SET *** diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt index 1bb55b53b3..aa6e5f4104 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt index 3c84f3eb7c..71573087ee 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt index 75f281291d..ff1d8c8710 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt @@ -59,7 +59,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_CUR & all r and a modes *** -- File having data of type text_with_new_line -- -- File opened in mode r -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt index 8c84e7e386..02c230f819 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_CUR & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt index 4de9b3f688..18821c86f2 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_CUR & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt index f0e8e4619f..49deec5a15 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt @@ -60,7 +60,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt index c6ba6c430f..2503422195 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt index b4a0fa97f3..144d9f6d1b 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_variation3.phpt b/ext/standard/tests/file/fseek_variation3.phpt index edb0b3a3b0..99d6077b41 100644 --- a/ext/standard/tests/file/fseek_variation3.phpt +++ b/ext/standard/tests/file/fseek_variation3.phpt @@ -39,7 +39,7 @@ unlink($outputfile); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek() : variation - beyond file boundaries *** --- fseek beyond start of file --- int(-1) diff --git a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt index 36994cb182..e097b342f4 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation1-win32.phpt b/ext/standard/tests/file/ftruncate_variation1-win32.phpt index dbf1896d27..58dfd296ed 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation1.phpt b/ext/standard/tests/file/ftruncate_variation1.phpt index cf51e2092c..c6d28d7e6d 100644 --- a/ext/standard/tests/file/ftruncate_variation1.phpt +++ b/ext/standard/tests/file/ftruncate_variation1.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation2-win32.phpt b/ext/standard/tests/file/ftruncate_variation2-win32.phpt index 7b2e0b42ee..535881206a 100644 --- a/ext/standard/tests/file/ftruncate_variation2-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation2-win32.phpt @@ -69,7 +69,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation2.phpt b/ext/standard/tests/file/ftruncate_variation2.phpt index e01a167a38..2b907f595b 100644 --- a/ext/standard/tests/file/ftruncate_variation2.phpt +++ b/ext/standard/tests/file/ftruncate_variation2.phpt @@ -69,7 +69,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation3-win32.phpt b/ext/standard/tests/file/ftruncate_variation3-win32.phpt index d9aa40e6e7..4eba4a7a08 100644 --- a/ext/standard/tests/file/ftruncate_variation3-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation3-win32.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation3.phpt b/ext/standard/tests/file/ftruncate_variation3.phpt index cdbeb8e57f..27fbe33bbc 100644 --- a/ext/standard/tests/file/ftruncate_variation3.phpt +++ b/ext/standard/tests/file/ftruncate_variation3.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation5-win32.phpt b/ext/standard/tests/file/ftruncate_variation5-win32.phpt index eb45ffcdac..64bed969c9 100644 --- a/ext/standard/tests/file/ftruncate_variation5-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation5-win32.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation5.phpt b/ext/standard/tests/file/ftruncate_variation5.phpt index 5d282d13de..0716693cd1 100644 --- a/ext/standard/tests/file/ftruncate_variation5.phpt +++ b/ext/standard/tests/file/ftruncate_variation5.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation6-win32.phpt b/ext/standard/tests/file/ftruncate_variation6-win32.phpt index 0815092e2b..4b88ee8dd6 100644 --- a/ext/standard/tests/file/ftruncate_variation6-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation6-win32.phpt @@ -74,7 +74,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation6.phpt b/ext/standard/tests/file/ftruncate_variation6.phpt index e9d5eb3c94..69dee82b70 100644 --- a/ext/standard/tests/file/ftruncate_variation6.phpt +++ b/ext/standard/tests/file/ftruncate_variation6.phpt @@ -74,7 +74,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation7-win32.phpt b/ext/standard/tests/file/ftruncate_variation7-win32.phpt index dc3a4cc10b..09158ca490 100644 --- a/ext/standard/tests/file/ftruncate_variation7-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation7-win32.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation7.phpt b/ext/standard/tests/file/ftruncate_variation7.phpt index 5b38adf8bf..0ee558f0f9 100644 --- a/ext/standard/tests/file/ftruncate_variation7.phpt +++ b/ext/standard/tests/file/ftruncate_variation7.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt index a65d81efb8..cdc5d86ff9 100644 --- a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt @@ -75,7 +75,7 @@ foreach($file_content_types as $file_content_type) { } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() basic operations *** -- Testing fwrite() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_basic-win32.phpt b/ext/standard/tests/file/fwrite_basic-win32.phpt index 81d9360276..d21887873e 100644 --- a/ext/standard/tests/file/fwrite_basic-win32.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32.phpt @@ -75,7 +75,7 @@ foreach($file_content_types as $file_content_type) { } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() basic operations *** -- Testing fwrite() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_basic.phpt b/ext/standard/tests/file/fwrite_basic.phpt index c568b7c874..b0cb93212b 100644 --- a/ext/standard/tests/file/fwrite_basic.phpt +++ b/ext/standard/tests/file/fwrite_basic.phpt @@ -75,7 +75,7 @@ foreach($file_content_types as $file_content_type) { } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() basic operations *** -- Testing fwrite() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt index e43a04dfd6..79a5cf1d9c 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt @@ -78,7 +78,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation1-win32.phpt b/ext/standard/tests/file/fwrite_variation1-win32.phpt index 1091aeb60b..644e71c44b 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32.phpt @@ -78,7 +78,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation1.phpt b/ext/standard/tests/file/fwrite_variation1.phpt index 44f69392e4..f6cf927621 100644 --- a/ext/standard/tests/file/fwrite_variation1.phpt +++ b/ext/standard/tests/file/fwrite_variation1.phpt @@ -76,7 +76,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation2-win32.phpt b/ext/standard/tests/file/fwrite_variation2-win32.phpt index 8545db9691..a2e2d8d9e9 100644 --- a/ext/standard/tests/file/fwrite_variation2-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation2-win32.phpt @@ -87,7 +87,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation2.phpt b/ext/standard/tests/file/fwrite_variation2.phpt index 34804b6959..47a352e28a 100644 --- a/ext/standard/tests/file/fwrite_variation2.phpt +++ b/ext/standard/tests/file/fwrite_variation2.phpt @@ -86,7 +86,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation3-win32.phpt b/ext/standard/tests/file/fwrite_variation3-win32.phpt index 125f88df7e..b04ffd75ba 100644 --- a/ext/standard/tests/file/fwrite_variation3-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation3-win32.phpt @@ -79,7 +79,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation3.phpt b/ext/standard/tests/file/fwrite_variation3.phpt index 7d635fdae9..ca60ef438e 100644 --- a/ext/standard/tests/file/fwrite_variation3.phpt +++ b/ext/standard/tests/file/fwrite_variation3.phpt @@ -80,7 +80,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation4-win32.phpt b/ext/standard/tests/file/fwrite_variation4-win32.phpt index ed2114e272..247ee4e13a 100644 --- a/ext/standard/tests/file/fwrite_variation4-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation4-win32.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation4.phpt b/ext/standard/tests/file/fwrite_variation4.phpt index eefc2f8837..701950dc65 100644 --- a/ext/standard/tests/file/fwrite_variation4.phpt +++ b/ext/standard/tests/file/fwrite_variation4.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/is_dir_basic.phpt b/ext/standard/tests/file/is_dir_basic.phpt index 7265d50e6d..c3d659b564 100644 --- a/ext/standard/tests/file/is_dir_basic.phpt +++ b/ext/standard/tests/file/is_dir_basic.phpt @@ -31,7 +31,7 @@ $dir_name = $file_path."/is_dir_basic"; rmdir($dir_name); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_dir(): basic functionality *** bool(true) bool(true) diff --git a/ext/standard/tests/file/is_dir_variation1.phpt b/ext/standard/tests/file/is_dir_variation1.phpt index 1a0b55669f..96bafacfda 100644 --- a/ext/standard/tests/file/is_dir_variation1.phpt +++ b/ext/standard/tests/file/is_dir_variation1.phpt @@ -32,7 +32,7 @@ $dir_name = $file_path."/is_dir_variation1"; rmdir($dir_name."/is_dir_variation1_sub"); rmdir($dir_name); ?> ---EXPECTF-- +--EXPECT-- -- Testing is_dir() with an empty dir -- bool(true) -- Testing is_dir() with a subdir in base dir -- diff --git a/ext/standard/tests/file/is_executable_basic-win32-mb.phpt b/ext/standard/tests/file/is_executable_basic-win32-mb.phpt index eb71c63bd3..e681ad6324 100644 --- a/ext/standard/tests/file/is_executable_basic-win32-mb.phpt +++ b/ext/standard/tests/file/is_executable_basic-win32-mb.phpt @@ -35,7 +35,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_executable_basic-win32.phpt b/ext/standard/tests/file/is_executable_basic-win32.phpt index 1462368b8a..7096285ef1 100644 --- a/ext/standard/tests/file/is_executable_basic-win32.phpt +++ b/ext/standard/tests/file/is_executable_basic-win32.phpt @@ -35,7 +35,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_executable_basic.phpt b/ext/standard/tests/file/is_executable_basic.phpt index c0a04e64bb..a93cd6920c 100644 --- a/ext/standard/tests/file/is_executable_basic.phpt +++ b/ext/standard/tests/file/is_executable_basic.phpt @@ -47,7 +47,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_executable_variation2.phpt b/ext/standard/tests/file/is_executable_variation2.phpt index fc804d652a..6edd2dd744 100644 --- a/ext/standard/tests/file/is_executable_variation2.phpt +++ b/ext/standard/tests/file/is_executable_variation2.phpt @@ -80,7 +80,7 @@ echo "Done\n"; <?php rmdir(dirname(__FILE__)."/is_executable_variation2/"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): usage variations *** *** Testing is_executable() on directory without execute permission *** diff --git a/ext/standard/tests/file/is_file_basic.phpt b/ext/standard/tests/file/is_file_basic.phpt index f8c06a0f04..7b8e778a7f 100644 --- a/ext/standard/tests/file/is_file_basic.phpt +++ b/ext/standard/tests/file/is_file_basic.phpt @@ -35,7 +35,7 @@ $file_path = dirname(__FILE__); $file_name = $file_path."/is_file_basic.tmp"; unlink($file_name); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_file(): basic functionality *** bool(true) bool(false) diff --git a/ext/standard/tests/file/is_file_variation1.phpt b/ext/standard/tests/file/is_file_variation1.phpt index 92bff954c6..e3c230b26c 100644 --- a/ext/standard/tests/file/is_file_variation1.phpt +++ b/ext/standard/tests/file/is_file_variation1.phpt @@ -43,7 +43,7 @@ unlink($file_path."/is_file_variation1.tmp"); echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- -- Testing is_file() with file containing data -- bool(true) diff --git a/ext/standard/tests/file/is_file_variation2.phpt b/ext/standard/tests/file/is_file_variation2.phpt index dbe74da617..7ab44da7ff 100644 --- a/ext/standard/tests/file/is_file_variation2.phpt +++ b/ext/standard/tests/file/is_file_variation2.phpt @@ -38,7 +38,7 @@ unlink($file_path."/is_file_variation2_link.tmp"); unlink($file_path."/is_file_variation2.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_file() with links *** bool(true) bool(true) diff --git a/ext/standard/tests/file/is_readable_basic-win32-mb.phpt b/ext/standard/tests/file/is_readable_basic-win32-mb.phpt index 2950dfa590..d10342b5e3 100644 --- a/ext/standard/tests/file/is_readable_basic-win32-mb.phpt +++ b/ext/standard/tests/file/is_readable_basic-win32-mb.phpt @@ -37,7 +37,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): basic functionality *** -- Changing mode of file to 0 -- bool(true) diff --git a/ext/standard/tests/file/is_readable_basic-win32.phpt b/ext/standard/tests/file/is_readable_basic-win32.phpt index 67f57686fc..d4e0538d79 100644 --- a/ext/standard/tests/file/is_readable_basic-win32.phpt +++ b/ext/standard/tests/file/is_readable_basic-win32.phpt @@ -37,7 +37,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): basic functionality *** -- Changing mode of file to 0 -- bool(true) diff --git a/ext/standard/tests/file/is_readable_basic.phpt b/ext/standard/tests/file/is_readable_basic.phpt index 4d5febfb3d..2bca150744 100644 --- a/ext/standard/tests/file/is_readable_basic.phpt +++ b/ext/standard/tests/file/is_readable_basic.phpt @@ -47,7 +47,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_readable_variation2.phpt b/ext/standard/tests/file/is_readable_variation2.phpt index e1faf55997..ac54735b19 100644 --- a/ext/standard/tests/file/is_readable_variation2.phpt +++ b/ext/standard/tests/file/is_readable_variation2.phpt @@ -79,7 +79,7 @@ echo "Done\n"; <?php rmdir(dirname(__FILE__)."/is_readable_variation2/"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): usage variations *** *** Testing is_readable() on directory without read permission *** diff --git a/ext/standard/tests/file/is_writable_basic.phpt b/ext/standard/tests/file/is_writable_basic.phpt index 86599b473b..6c447f4256 100644 --- a/ext/standard/tests/file/is_writable_basic.phpt +++ b/ext/standard/tests/file/is_writable_basic.phpt @@ -47,7 +47,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_writable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_writable_variation2.phpt b/ext/standard/tests/file/is_writable_variation2.phpt index f56219ce40..efe35a0335 100644 --- a/ext/standard/tests/file/is_writable_variation2.phpt +++ b/ext/standard/tests/file/is_writable_variation2.phpt @@ -85,7 +85,7 @@ echo "Done\n"; <?php rmdir(dirname(__FILE__)."/is_writable_variation2/"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_writable(): usage variations *** *** Testing is_writable() on directory without write permission *** diff --git a/ext/standard/tests/file/lchgrp_basic.phpt b/ext/standard/tests/file/lchgrp_basic.phpt index 1713bef9b4..c844471240 100644 --- a/ext/standard/tests/file/lchgrp_basic.phpt +++ b/ext/standard/tests/file/lchgrp_basic.phpt @@ -28,7 +28,7 @@ unlink($filename); unlink($symlink); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/lchown_basic.phpt b/ext/standard/tests/file/lchown_basic.phpt index f2aff597c5..57476131c7 100644 --- a/ext/standard/tests/file/lchown_basic.phpt +++ b/ext/standard/tests/file/lchown_basic.phpt @@ -35,7 +35,7 @@ unlink($filename); unlink($symlink); ?> ---EXPECTF-- +--EXPECT-- *** Testing lchown() : basic functionality *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation1.phpt b/ext/standard/tests/file/lstat_stat_variation1.phpt index 30ce9b7217..cf8213a8e4 100644 --- a/ext/standard/tests/file/lstat_stat_variation1.phpt +++ b/ext/standard/tests/file/lstat_stat_variation1.phpt @@ -51,7 +51,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation1a.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for files after being renamed *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation10.phpt b/ext/standard/tests/file/lstat_stat_variation10.phpt index 51ebc25e71..fe36697237 100644 --- a/ext/standard/tests/file/lstat_stat_variation10.phpt +++ b/ext/standard/tests/file/lstat_stat_variation10.phpt @@ -49,7 +49,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation10"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on directory after using is_dir() on it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation11.phpt b/ext/standard/tests/file/lstat_stat_variation11.phpt index a75504b479..08a51c8423 100644 --- a/ext/standard/tests/file/lstat_stat_variation11.phpt +++ b/ext/standard/tests/file/lstat_stat_variation11.phpt @@ -50,7 +50,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation11.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on a file after using is_file() on it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation12.phpt b/ext/standard/tests/file/lstat_stat_variation12.phpt index 8e1edd66c7..3051210001 100644 --- a/ext/standard/tests/file/lstat_stat_variation12.phpt +++ b/ext/standard/tests/file/lstat_stat_variation12.phpt @@ -56,7 +56,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation12_link.tmp"); unlink("$file_path/lstat_stat_variation12.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on a link after using is_link() on it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation13.phpt b/ext/standard/tests/file/lstat_stat_variation13.phpt index 288e0b5ecf..e190f465aa 100644 --- a/ext/standard/tests/file/lstat_stat_variation13.phpt +++ b/ext/standard/tests/file/lstat_stat_variation13.phpt @@ -49,7 +49,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation13.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Checking stat() on a file opened using read/write mode *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation14.phpt b/ext/standard/tests/file/lstat_stat_variation14.phpt index 517f77e3f5..a515058421 100644 --- a/ext/standard/tests/file/lstat_stat_variation14.phpt +++ b/ext/standard/tests/file/lstat_stat_variation14.phpt @@ -52,7 +52,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation14_hard.tmp"); unlink("$file_path/lstat_stat_variation14.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Checking lstat() and stat() on hard link *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation15.phpt b/ext/standard/tests/file/lstat_stat_variation15.phpt index 8b67338abb..6a8dcb7146 100644 --- a/ext/standard/tests/file/lstat_stat_variation15.phpt +++ b/ext/standard/tests/file/lstat_stat_variation15.phpt @@ -54,7 +54,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation15_link.tmp"); unlink("$file_path/lstat_stat_variation15.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() on a link after changing its access permission *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation16.phpt b/ext/standard/tests/file/lstat_stat_variation16.phpt index 9f1276548f..31c0e13ee6 100644 --- a/ext/standard/tests/file/lstat_stat_variation16.phpt +++ b/ext/standard/tests/file/lstat_stat_variation16.phpt @@ -48,7 +48,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation16.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() on a file after changing its access permission *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation17.phpt b/ext/standard/tests/file/lstat_stat_variation17.phpt index f2306de792..78d4090870 100644 --- a/ext/standard/tests/file/lstat_stat_variation17.phpt +++ b/ext/standard/tests/file/lstat_stat_variation17.phpt @@ -47,7 +47,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation17"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() on a dir after changing its access permission *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation2.phpt b/ext/standard/tests/file/lstat_stat_variation2.phpt index e7d704a20b..9f9e75ba2b 100644 --- a/ext/standard/tests/file/lstat_stat_variation2.phpt +++ b/ext/standard/tests/file/lstat_stat_variation2.phpt @@ -52,7 +52,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation1a"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for directory after being renamed *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation21.phpt b/ext/standard/tests/file/lstat_stat_variation21.phpt index 8620ab00d7..833cf1dabb 100644 --- a/ext/standard/tests/file/lstat_stat_variation21.phpt +++ b/ext/standard/tests/file/lstat_stat_variation21.phpt @@ -55,7 +55,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation21.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on file by truncating it to given size *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation4.phpt b/ext/standard/tests/file/lstat_stat_variation4.phpt index 259beca006..1fccb95816 100644 --- a/ext/standard/tests/file/lstat_stat_variation4.phpt +++ b/ext/standard/tests/file/lstat_stat_variation4.phpt @@ -55,7 +55,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation4.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for file after using touch() on the file *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation5.phpt b/ext/standard/tests/file/lstat_stat_variation5.phpt index d0c096ef19..b828c855a3 100644 --- a/ext/standard/tests/file/lstat_stat_variation5.phpt +++ b/ext/standard/tests/file/lstat_stat_variation5.phpt @@ -56,7 +56,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation5"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for directory after using touch() on the directory *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation6.phpt b/ext/standard/tests/file/lstat_stat_variation6.phpt index 7e557d034a..3d5cc218ab 100644 --- a/ext/standard/tests/file/lstat_stat_variation6.phpt +++ b/ext/standard/tests/file/lstat_stat_variation6.phpt @@ -69,7 +69,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation6.tmp"); unlink("$file_path/lstat_stat_variation_link6.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() for link after using touch() on the link *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation7.phpt b/ext/standard/tests/file/lstat_stat_variation7.phpt index 5a1e1c3994..8aa11a3443 100644 --- a/ext/standard/tests/file/lstat_stat_variation7.phpt +++ b/ext/standard/tests/file/lstat_stat_variation7.phpt @@ -48,7 +48,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation7.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on file after data is written in it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation8.phpt b/ext/standard/tests/file/lstat_stat_variation8.phpt index b0f170d1f2..d799befd60 100644 --- a/ext/standard/tests/file/lstat_stat_variation8.phpt +++ b/ext/standard/tests/file/lstat_stat_variation8.phpt @@ -53,7 +53,7 @@ unlink("$file_path/lstat_stat_variation8/lstat_stat_variation8a.tmp"); rmdir("$file_path/lstat_stat_variation8/lstat_stat_variation8_subdir/"); rmdir("$file_path/lstat_stat_variation8"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on dir after subdir and file is created in it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation9.phpt b/ext/standard/tests/file/lstat_stat_variation9.phpt index 63c6ff8a76..3c30ae914e 100644 --- a/ext/standard/tests/file/lstat_stat_variation9.phpt +++ b/ext/standard/tests/file/lstat_stat_variation9.phpt @@ -59,7 +59,7 @@ $file_path = dirname(__FILE__); $dirname = "$file_path/lstat_stat_variation9"; rmdir($dirname); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for comparing stats after the deletion of subdir and file *** bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-001.phpt b/ext/standard/tests/file/mkdir-001.phpt index d1a7cebfa7..23823b2ae7 100644 --- a/ext/standard/tests/file/mkdir-001.phpt +++ b/ext/standard/tests/file/mkdir-001.phpt @@ -20,7 +20,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-001")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-003.phpt b/ext/standard/tests/file/mkdir-003.phpt index fdd49f340f..fe14bef23d 100644 --- a/ext/standard/tests/file/mkdir-003.phpt +++ b/ext/standard/tests/file/mkdir-003.phpt @@ -17,7 +17,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-003")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-004.phpt b/ext/standard/tests/file/mkdir-004.phpt index 45c275106a..51e4e55617 100644 --- a/ext/standard/tests/file/mkdir-004.phpt +++ b/ext/standard/tests/file/mkdir-004.phpt @@ -17,7 +17,7 @@ var_dump(rmdir("/testdir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-005.phpt b/ext/standard/tests/file/mkdir-005.phpt index af2387ca73..161f8d0630 100644 --- a/ext/standard/tests/file/mkdir-005.phpt +++ b/ext/standard/tests/file/mkdir-005.phpt @@ -18,7 +18,7 @@ var_dump(rmdir("./testdir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir_rmdir_variation1.phpt b/ext/standard/tests/file/mkdir_rmdir_variation1.phpt index 5dc7a7a4d3..7a1a5c7583 100644 --- a/ext/standard/tests/file/mkdir_rmdir_variation1.phpt +++ b/ext/standard/tests/file/mkdir_rmdir_variation1.phpt @@ -38,7 +38,7 @@ for($mode = 0000; $mode <= 0777; $mode++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mkdir() and rmdir() for different permissions *** -- Changing mode of directory to 0 -- bool(true) diff --git a/ext/standard/tests/file/parse_ini_file.phpt b/ext/standard/tests/file/parse_ini_file.phpt index db14c7a9b4..439fcaf301 100644 --- a/ext/standard/tests/file/parse_ini_file.phpt +++ b/ext/standard/tests/file/parse_ini_file.phpt @@ -217,7 +217,7 @@ echo "*** Done **\n"; <?php unlink(dirname(__FILE__)."/parse.ini"); ?> ---EXPECTF-- +--EXPECT-- *** Test parse_ini_file() function: with various keys and values given in parse.ini file *** -- ini file without process_sections optional arg -- Array diff --git a/ext/standard/tests/file/pathinfo_basic1-win32.phpt b/ext/standard/tests/file/pathinfo_basic1-win32.phpt index f783a6b179..2adf90bc94 100644 --- a/ext/standard/tests/file/pathinfo_basic1-win32.phpt +++ b/ext/standard/tests/file/pathinfo_basic1-win32.phpt @@ -71,7 +71,7 @@ foreach($paths as $path) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/file/pathinfo_basic1.phpt b/ext/standard/tests/file/pathinfo_basic1.phpt index c57774a141..ed2a138c1f 100644 --- a/ext/standard/tests/file/pathinfo_basic1.phpt +++ b/ext/standard/tests/file/pathinfo_basic1.phpt @@ -71,7 +71,7 @@ foreach($paths as $path) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt index 3ec7eec358..4087c6d445 100644 --- a/ext/standard/tests/file/pathinfo_basic2.phpt +++ b/ext/standard/tests/file/pathinfo_basic2.phpt @@ -48,7 +48,7 @@ foreach($paths as $path) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- string(1) "." diff --git a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt index 7e0a0e0c54..b321ba3f38 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt @@ -59,7 +59,7 @@ var_dump( is_int($return_value_pclose) ); echo "\n--- Done ---"; ?> ---EXPECTF-- +--EXPECT-- *** Testing popen(): reading from the pipe *** Sample String ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™ *** Testing popen(): writing to the pipe *** diff --git a/ext/standard/tests/file/popen_pclose_basic-win32.phpt b/ext/standard/tests/file/popen_pclose_basic-win32.phpt index 6351d866f3..ea82c7781f 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt @@ -59,7 +59,7 @@ var_dump( is_int($return_value_pclose) ); echo "\n--- Done ---"; ?> ---EXPECTF-- +--EXPECT-- *** Testing popen(): reading from the pipe *** Sample String *** Testing popen(): writing to the pipe *** diff --git a/ext/standard/tests/file/popen_pclose_basic.phpt b/ext/standard/tests/file/popen_pclose_basic.phpt index 55a87bb02a..812a24e5ff 100644 --- a/ext/standard/tests/file/popen_pclose_basic.phpt +++ b/ext/standard/tests/file/popen_pclose_basic.phpt @@ -72,7 +72,7 @@ unlink($dirpath."/popen_basic1.tmp"); rmdir($dirpath); ?> ---EXPECTF-- +--EXPECT-- *** Testing popen() and pclose() with different processes *** -- Testing popen(): reading from the pipe -- popen_basic.tmp diff --git a/ext/standard/tests/file/readfile_variation2.phpt b/ext/standard/tests/file/readfile_variation2.phpt index 0c43bf5661..2fe1475501 100644 --- a/ext/standard/tests/file/readfile_variation2.phpt +++ b/ext/standard/tests/file/readfile_variation2.phpt @@ -64,7 +64,7 @@ echo "Done\n"; $file_path = dirname(__FILE__); unlink("$file_path/readfile_variation2.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing readfile() on soft link *** bool(true) line diff --git a/ext/standard/tests/file/rename_variation1-win32.phpt b/ext/standard/tests/file/rename_variation1-win32.phpt index 0955096d76..519801fbda 100644 --- a/ext/standard/tests/file/rename_variation1-win32.phpt +++ b/ext/standard/tests/file/rename_variation1-win32.phpt @@ -63,7 +63,7 @@ unlink($file_path."/rename_variation_link.tmp"); unlink($file_path."/rename_variation.tmp"); rmdir($file_path."/rename_variation_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() : renaming directory across directories *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/file/rename_variation1.phpt b/ext/standard/tests/file/rename_variation1.phpt index 54338d7460..74c5988491 100644 --- a/ext/standard/tests/file/rename_variation1.phpt +++ b/ext/standard/tests/file/rename_variation1.phpt @@ -54,7 +54,7 @@ echo "Done\n"; $file_path = dirname(__FILE__); rmdir($file_path."/rename_variation1_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() : renaming directory across directories *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/file/rename_variation2-win32.phpt b/ext/standard/tests/file/rename_variation2-win32.phpt index 9627a9fa53..193bb28f1f 100644 --- a/ext/standard/tests/file/rename_variation2-win32.phpt +++ b/ext/standard/tests/file/rename_variation2-win32.phpt @@ -49,7 +49,7 @@ unlink($file_path."/rename_variation2_link.tmp"); unlink($file_path."/rename_variation2.tmp"); rmdir($file_path."/rename_variation2_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() by renaming a file and directory to numeric name *** bool(true) bool(false) diff --git a/ext/standard/tests/file/rename_variation2.phpt b/ext/standard/tests/file/rename_variation2.phpt index 1e0a5d9edd..c4b575e922 100644 --- a/ext/standard/tests/file/rename_variation2.phpt +++ b/ext/standard/tests/file/rename_variation2.phpt @@ -52,7 +52,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/rename_variation2.tmp"); rmdir($file_path."/rename_variation2_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() on soft links *** bool(true) bool(true) diff --git a/ext/standard/tests/file/rename_variation3.phpt b/ext/standard/tests/file/rename_variation3.phpt index 7c47040729..d76cdd09ef 100644 --- a/ext/standard/tests/file/rename_variation3.phpt +++ b/ext/standard/tests/file/rename_variation3.phpt @@ -47,7 +47,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/rename_variation3_hard_link1.tmp"); rmdir($file_path."/rename_variation3_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() on hard links *** bool(true) bool(true) diff --git a/ext/standard/tests/file/rename_variation4.phpt b/ext/standard/tests/file/rename_variation4.phpt index 69753bc322..b6cab73d60 100644 --- a/ext/standard/tests/file/rename_variation4.phpt +++ b/ext/standard/tests/file/rename_variation4.phpt @@ -40,7 +40,7 @@ echo "Done\n"; $file_path = dirname(__FILE__); rmdir($file_path."/12345"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() by renaming a file, link and directory to numeric name *** bool(true) bool(false) diff --git a/ext/standard/tests/file/stat_variation1-win32-mb.phpt b/ext/standard/tests/file/stat_variation1-win32-mb.phpt index dcba28698f..d49f5244f7 100644 --- a/ext/standard/tests/file/stat_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/stat_variation1-win32-mb.phpt @@ -77,7 +77,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation1a_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"); rmdir("$file_path/stat_variation1a_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file and directory ater renaming them *** -- Testing stat() for files after being renamed -- bool(true) diff --git a/ext/standard/tests/file/stat_variation1-win32.phpt b/ext/standard/tests/file/stat_variation1-win32.phpt index abbc88f945..0dcf271d99 100644 --- a/ext/standard/tests/file/stat_variation1-win32.phpt +++ b/ext/standard/tests/file/stat_variation1-win32.phpt @@ -77,7 +77,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation1a.tmp"); rmdir("$file_path/stat_variation1a"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file and directory ater renaming them *** -- Testing stat() for files after being renamed -- bool(true) diff --git a/ext/standard/tests/file/stat_variation2-win32.phpt b/ext/standard/tests/file/stat_variation2-win32.phpt index 2bd9f80c50..b6a9300bb4 100644 --- a/ext/standard/tests/file/stat_variation2-win32.phpt +++ b/ext/standard/tests/file/stat_variation2-win32.phpt @@ -54,7 +54,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); unlink("$file_path/stat_variation2.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): writing to a file *** -- Testing stat() on file after data is written in it -- bool(true) diff --git a/ext/standard/tests/file/stat_variation3-win32.phpt b/ext/standard/tests/file/stat_variation3-win32.phpt index e248116486..e472a006ed 100644 --- a/ext/standard/tests/file/stat_variation3-win32.phpt +++ b/ext/standard/tests/file/stat_variation3-win32.phpt @@ -65,7 +65,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); rmdir("$file_path/stat_variation3"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): with creating & deleting subdir/file *** -- Testing stat() on dir after subdir and file is created in it -- diff --git a/ext/standard/tests/file/stat_variation4-win32.phpt b/ext/standard/tests/file/stat_variation4-win32.phpt index a0ffed285f..0b3c66ad5c 100644 --- a/ext/standard/tests/file/stat_variation4-win32.phpt +++ b/ext/standard/tests/file/stat_variation4-win32.phpt @@ -75,7 +75,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation4.tmp"); rmdir("$file_path/stat_variation4"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file and directory after accessing it with is_dir() and is_file() functions *** -- Testing on Directory -- diff --git a/ext/standard/tests/file/stat_variation5-win32.phpt b/ext/standard/tests/file/stat_variation5-win32.phpt index 038b9b64eb..a28cc76d54 100644 --- a/ext/standard/tests/file/stat_variation5-win32.phpt +++ b/ext/standard/tests/file/stat_variation5-win32.phpt @@ -55,7 +55,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); unlink("$file_path/stat_variation5.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on a file with read/write permission *** bool(true) diff --git a/ext/standard/tests/file/stat_variation6-win32.phpt b/ext/standard/tests/file/stat_variation6-win32.phpt index 3dae75b2e6..d30b8fd8d7 100644 --- a/ext/standard/tests/file/stat_variation6-win32.phpt +++ b/ext/standard/tests/file/stat_variation6-win32.phpt @@ -74,7 +74,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation6.tmp"); rmdir("$file_path/stat_variation6"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on file with miscelleneous file permission and content *** bool(true) diff --git a/ext/standard/tests/file/stat_variation8-win32.phpt b/ext/standard/tests/file/stat_variation8-win32.phpt index 079bd0d73a..23d0159e79 100644 --- a/ext/standard/tests/file/stat_variation8-win32.phpt +++ b/ext/standard/tests/file/stat_variation8-win32.phpt @@ -66,7 +66,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); unlink("$file_path/stat_variation8.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file by truncating it to given size *** bool(true) bool(true) diff --git a/ext/standard/tests/file/stream_rfc2397_003.phpt b/ext/standard/tests/file/stream_rfc2397_003.phpt index 7cc31fe599..c92142d22a 100644 --- a/ext/standard/tests/file/stream_rfc2397_003.phpt +++ b/ext/standard/tests/file/stream_rfc2397_003.phpt @@ -30,7 +30,7 @@ foreach($streams as $original => $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(12) "A brief note" string(40) "select_vcount,fcol_from_fieldtable/local" string(13) "foobar foobar" diff --git a/ext/standard/tests/file/stream_rfc2397_004.phpt b/ext/standard/tests/file/stream_rfc2397_004.phpt index 1a8da936b3..0f64ec16af 100644 --- a/ext/standard/tests/file/stream_rfc2397_004.phpt +++ b/ext/standard/tests/file/stream_rfc2397_004.phpt @@ -22,7 +22,7 @@ foreach($streams as $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(5) ";test" string(4) "test" string(4) "test" diff --git a/ext/standard/tests/file/stream_rfc2397_005.phpt b/ext/standard/tests/file/stream_rfc2397_005.phpt index 8fa1c16b0c..e2d58b4424 100644 --- a/ext/standard/tests/file/stream_rfc2397_005.phpt +++ b/ext/standard/tests/file/stream_rfc2397_005.phpt @@ -25,7 +25,7 @@ foreach($streams as $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(12) "A brief note" string(40) "select_vcount,fcol_from_fieldtable/local" string(13) "foobar foobar" diff --git a/ext/standard/tests/file/stream_rfc2397_007.phpt b/ext/standard/tests/file/stream_rfc2397_007.phpt index b62f19cd37..48c7cdb3f1 100644 --- a/ext/standard/tests/file/stream_rfc2397_007.phpt +++ b/ext/standard/tests/file/stream_rfc2397_007.phpt @@ -81,7 +81,7 @@ foreach($streams as $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===data:,012345=== int(0) bool(false) diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt index 21c9b57654..dc353e5097 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt @@ -113,7 +113,7 @@ unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Accessing and updating data of file through soft link *** bool(true) diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt index f58937cd12..74f03e2097 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt @@ -91,7 +91,7 @@ unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Accessing and updating data of file through hard link *** -- Access data of the file through the hard link -- diff --git a/ext/standard/tests/file/touch_variation1.phpt b/ext/standard/tests/file/touch_variation1.phpt index dba41a6077..18f9d033b8 100644 --- a/ext/standard/tests/file/touch_variation1.phpt +++ b/ext/standard/tests/file/touch_variation1.phpt @@ -29,7 +29,7 @@ var_dump(fileatime($filename)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) int(101) int(101) diff --git a/ext/standard/tests/file/umask_variation1.phpt b/ext/standard/tests/file/umask_variation1.phpt index 29fe92e556..b44e1ef3c9 100644 --- a/ext/standard/tests/file/umask_variation1.phpt +++ b/ext/standard/tests/file/umask_variation1.phpt @@ -57,7 +57,7 @@ for($mask = 0000; $mask <= 0350; $mask++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing umask() on file and directory *** -- Setting umask to 000 -- File permission : 666 diff --git a/ext/standard/tests/file/umask_variation2.phpt b/ext/standard/tests/file/umask_variation2.phpt index 85b1a67f53..bb2dbb3255 100644 --- a/ext/standard/tests/file/umask_variation2.phpt +++ b/ext/standard/tests/file/umask_variation2.phpt @@ -57,7 +57,7 @@ for($mask = 0351; $mask <= 0777; $mask++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing umask() on file and directory *** -- Setting umask to 351 -- File permission : 426 diff --git a/ext/standard/tests/file/unlink_basic.phpt b/ext/standard/tests/file/unlink_basic.phpt index 97e6aa6dfd..172ad0551a 100644 --- a/ext/standard/tests/file/unlink_basic.phpt +++ b/ext/standard/tests/file/unlink_basic.phpt @@ -32,7 +32,7 @@ var_dump( file_exists($filename) ); // confirm file doesnt exist echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on a file *** bool(true) bool(false) diff --git a/ext/standard/tests/file/unlink_variation2.phpt b/ext/standard/tests/file/unlink_variation2.phpt index 0068dbfe17..0044cbe303 100644 --- a/ext/standard/tests/file/unlink_variation2.phpt +++ b/ext/standard/tests/file/unlink_variation2.phpt @@ -24,7 +24,7 @@ fclose($fp); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on a file which is in use *** bool(true) bool(false) diff --git a/ext/standard/tests/file/unlink_variation3.phpt b/ext/standard/tests/file/unlink_variation3.phpt index 96f21b2cc7..b332ab7b27 100644 --- a/ext/standard/tests/file/unlink_variation3.phpt +++ b/ext/standard/tests/file/unlink_variation3.phpt @@ -45,7 +45,7 @@ var_dump( file_exists($filename) ); // confirm file is deleted echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on soft and hard links *** -- Testing unlink() on soft link -- bool(true) diff --git a/ext/standard/tests/file/unlink_variation5.phpt b/ext/standard/tests/file/unlink_variation5.phpt index 51bb2c7b93..071b14086a 100644 --- a/ext/standard/tests/file/unlink_variation5.phpt +++ b/ext/standard/tests/file/unlink_variation5.phpt @@ -34,7 +34,7 @@ for($mode = 0000; $mode <= 0777; $mode++ ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on a file *** File permission : 0 bool(true) diff --git a/ext/standard/tests/file/unlink_variation6.phpt b/ext/standard/tests/file/unlink_variation6.phpt index ede9ada092..558d32a483 100644 --- a/ext/standard/tests/file/unlink_variation6.phpt +++ b/ext/standard/tests/file/unlink_variation6.phpt @@ -33,7 +33,7 @@ function f_exists($file) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing unlink() : variation: contexts and relative files *** subdir/testfile.txt exists bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt index 5ea66058ea..53b6f40b19 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt @@ -35,7 +35,7 @@ var_dump(rmdir($dest_dir)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt index 6eb484fcd0..6285e1a6ac 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt @@ -25,7 +25,7 @@ unlink($testFile); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Generating a file with a path length of 259 characters... Opening file... OK ===DONE=== diff --git a/ext/standard/tests/filters/bug50363.phpt b/ext/standard/tests/filters/bug50363.phpt index 3395edebc4..c6fd0dc079 100644 --- a/ext/standard/tests/filters/bug50363.phpt +++ b/ext/standard/tests/filters/bug50363.phpt @@ -12,6 +12,6 @@ rewind($b); fpassthru($b); ?> ---EXPECTF-- +--EXPECT-- Sauvegarderéussi(e) não NÃO Sauvegarderéussi(e) não NÃO diff --git a/ext/standard/tests/filters/stream_filter_remove_basic.phpt b/ext/standard/tests/filters/stream_filter_remove_basic.phpt index 6ca84fef41..3744b72467 100644 --- a/ext/standard/tests/filters/stream_filter_remove_basic.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_basic.phpt @@ -39,7 +39,7 @@ $file = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; unlink( $file ); ?> ---EXPECTF-- +--EXPECT-- *** Testing stream_filter_remove() : basic functionality *** bool(true) Grfgvat gur ebg13 svygre juvpu fuvsgf fbzr guvatf nebhaq. diff --git a/ext/standard/tests/general_functions/boolval.phpt b/ext/standard/tests/general_functions/boolval.phpt index 9d0eac4ebd..3c998520ff 100644 --- a/ext/standard/tests/general_functions/boolval.phpt +++ b/ext/standard/tests/general_functions/boolval.phpt @@ -15,7 +15,7 @@ Testing boolval() var_dump(boolval(new stdClass())); var_dump(boolval(STDIN)); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/bug34794.phpt b/ext/standard/tests/general_functions/bug34794.phpt index 1b25bc28c4..fb95a6267f 100644 --- a/ext/standard/tests/general_functions/bug34794.phpt +++ b/ext/standard/tests/general_functions/bug34794.phpt @@ -26,7 +26,7 @@ proc_close($process2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Opening process 1 Opening process 2 Closing process 1 diff --git a/ext/standard/tests/general_functions/bug36011.phpt b/ext/standard/tests/general_functions/bug36011.phpt index 08a45014f2..248608e008 100644 --- a/ext/standard/tests/general_functions/bug36011.phpt +++ b/ext/standard/tests/general_functions/bug36011.phpt @@ -37,7 +37,7 @@ TestClass::whee5(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- TestClass::test() TestClass::test() TestClass::test() diff --git a/ext/standard/tests/general_functions/bug40398.phpt b/ext/standard/tests/general_functions/bug40398.phpt index 11fdde2c51..e92be5bedc 100644 --- a/ext/standard/tests/general_functions/bug40398.phpt +++ b/ext/standard/tests/general_functions/bug40398.phpt @@ -74,7 +74,7 @@ new Derived_6('6'); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Base::__construct(1) Base::__construct(2) Base::__construct(3) diff --git a/ext/standard/tests/general_functions/bug40752.phpt b/ext/standard/tests/general_functions/bug40752.phpt index 30ed8a4aa7..9500573e8d 100644 --- a/ext/standard/tests/general_functions/bug40752.phpt +++ b/ext/standard/tests/general_functions/bug40752.phpt @@ -22,7 +22,7 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["foo"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug41445.phpt b/ext/standard/tests/general_functions/bug41445.phpt index 23888df7d7..000e9d347d 100644 --- a/ext/standard/tests/general_functions/bug41445.phpt +++ b/ext/standard/tests/general_functions/bug41445.phpt @@ -35,7 +35,7 @@ var_dump(parse_ini_file($file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { ["001099030277"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug41445_1.phpt b/ext/standard/tests/general_functions/bug41445_1.phpt index 4698de436a..120d9400b6 100644 --- a/ext/standard/tests/general_functions/bug41445_1.phpt +++ b/ext/standard/tests/general_functions/bug41445_1.phpt @@ -25,7 +25,7 @@ var_dump(parse_ini_file($file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { ["2454.33"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug44667.phpt b/ext/standard/tests/general_functions/bug44667.phpt index 49183cc580..53290a7a30 100644 --- a/ext/standard/tests/general_functions/bug44667.phpt +++ b/ext/standard/tests/general_functions/bug44667.phpt @@ -28,6 +28,6 @@ echo "Result is: ", $result, "\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Result is: Hello Done diff --git a/ext/standard/tests/general_functions/bug48660.phpt b/ext/standard/tests/general_functions/bug48660.phpt index 4c1492a18d..d92958fc42 100644 --- a/ext/standard/tests/general_functions/bug48660.phpt +++ b/ext/standard/tests/general_functions/bug48660.phpt @@ -25,7 +25,7 @@ var_dump(parse_ini_file($ini_location, true, INI_SCANNER_NORMAL)); ?> --CLEAN-- <?php @unlink(dirname(__FILE__) . '/bug48660.tmp'); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["cases"]=> array(5) { diff --git a/ext/standard/tests/general_functions/bug49692.phpt b/ext/standard/tests/general_functions/bug49692.phpt index 80a1612d9e..4512732caf 100644 --- a/ext/standard/tests/general_functions/bug49692.phpt +++ b/ext/standard/tests/general_functions/bug49692.phpt @@ -8,7 +8,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com> var_dump(parse_ini_file('bug49692.ini', true)); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["sitemap"]=> array(2) { diff --git a/ext/standard/tests/general_functions/bug66094.phpt b/ext/standard/tests/general_functions/bug66094.phpt index 8b33a4f4c3..ecc13ab07a 100644 --- a/ext/standard/tests/general_functions/bug66094.phpt +++ b/ext/standard/tests/general_functions/bug66094.phpt @@ -7,6 +7,6 @@ register_tick_function($closure = function () { echo "Tick!\n"; }); unregister_tick_function($closure); echo "done"; ?> ---EXPECTF-- +--EXPECT-- Tick! done diff --git a/ext/standard/tests/general_functions/closures_001.phpt b/ext/standard/tests/general_functions/closures_001.phpt index b4fc898fd2..3a077f2db6 100644 --- a/ext/standard/tests/general_functions/closures_001.phpt +++ b/ext/standard/tests/general_functions/closures_001.phpt @@ -6,6 +6,6 @@ register_shutdown_function(function () { echo "Hello World!\n"; }); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done Hello World! diff --git a/ext/standard/tests/general_functions/connection_aborted.phpt b/ext/standard/tests/general_functions/connection_aborted.phpt index 79618c2aa1..5932095f09 100644 --- a/ext/standard/tests/general_functions/connection_aborted.phpt +++ b/ext/standard/tests/general_functions/connection_aborted.phpt @@ -6,5 +6,5 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p <?php var_dump(connection_aborted()); ?> ---EXPECTF-- +--EXPECT-- int(0) diff --git a/ext/standard/tests/general_functions/connection_status.phpt b/ext/standard/tests/general_functions/connection_status.phpt index 5e0677fe27..97e0f05684 100644 --- a/ext/standard/tests/general_functions/connection_status.phpt +++ b/ext/standard/tests/general_functions/connection_status.phpt @@ -6,5 +6,5 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p <?php var_dump(connection_status() == CONNECTION_NORMAL); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt b/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt index 7d2a029b47..5254e5d57a 100644 --- a/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt @@ -29,7 +29,7 @@ foreach ($data AS $value) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing escapeshellcmd() basic operations *** -- Test 1 -- string(5) "^"abc" diff --git a/ext/standard/tests/general_functions/get_cfg_var_basic.phpt b/ext/standard/tests/general_functions/get_cfg_var_basic.phpt index 3fb0056553..541865a7b3 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_basic.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_basic.phpt @@ -17,7 +17,7 @@ var_dump(get_cfg_var( 'session.serialize_handler' ) ); var_dump(get_cfg_var( 'session.save_handler' ) ); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments *** string(1) "0" string(3) "php" diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt index 68495a13d9..195affe4fc 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt @@ -27,7 +27,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt index d1fb5e7dda..1a99242ba6 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt @@ -32,7 +32,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with emptyUnsetUndefNull values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt index 8dac4f8a40..03270ce3f4 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt @@ -28,7 +28,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with float values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt index 392abb32c5..d2a90bce05 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt @@ -27,7 +27,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt index 3b5b08c6d5..d6bdf693e8 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt @@ -31,7 +31,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with unknown string values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt index f743e7456c..b273e512d0 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt @@ -11,5 +11,5 @@ echo "*** Test by calling method or function with deprecated option ***\n"; var_dump(get_cfg_var( 'magic_quotes_gpc' ) ); ?> ---EXPECTF-- +--EXPECT-- Fatal error: Directive 'magic_quotes_gpc' is no longer available in PHP in Unknown on line 0 diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt index 6e0ffc51f0..00a24597f8 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt @@ -30,7 +30,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument with array of valid parameters *** string(1) "0" string(3) "php" diff --git a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt index 544887129f..9de39c18d0 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt @@ -29,7 +29,7 @@ if ($n2 == $n1 + 1 && array_key_exists("USER_CONSTANT", $arr2)) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_defined_constants() : basic functionality *** string(5) "array" string(5) "array" diff --git a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt index d87eb4c0c8..2dbe332ccc 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt @@ -16,7 +16,7 @@ var_dump(in_array("cos", $result)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Simple testcase for get_extension_funcs() function string(5) "array" bool(true) diff --git a/ext/standard/tests/general_functions/getenv.phpt b/ext/standard/tests/general_functions/getenv.phpt index 006378a337..bba12a905a 100644 --- a/ext/standard/tests/general_functions/getenv.phpt +++ b/ext/standard/tests/general_functions/getenv.phpt @@ -10,7 +10,7 @@ var_dump(getenv()["FOO"]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(3) "bar" string(3) "bar" Done diff --git a/ext/standard/tests/general_functions/getservbyname_variation10.phpt b/ext/standard/tests/general_functions/getservbyname_variation10.phpt index c7ed144f10..4779efdcaf 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation10.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation10.phpt @@ -32,7 +32,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with emptyUnsetUndefNull values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation11.phpt b/ext/standard/tests/general_functions/getservbyname_variation11.phpt index 3c410c55b6..3478c36eb6 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation11.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation11.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with float values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation12.phpt b/ext/standard/tests/general_functions/getservbyname_variation12.phpt index 7e5323cca8..37a54ce32a 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation12.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation12.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with int values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation14.phpt b/ext/standard/tests/general_functions/getservbyname_variation14.phpt index d93b53ece4..986d7d5973 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation14.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation14.phpt @@ -25,7 +25,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with string values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation2.phpt b/ext/standard/tests/general_functions/getservbyname_variation2.phpt index 877c1d12af..7c00b1e7f7 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation2.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation2.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation3.phpt b/ext/standard/tests/general_functions/getservbyname_variation3.phpt index d34259d2a2..6602ce0bfc 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation3.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation3.phpt @@ -26,7 +26,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with emptyUnsetUndefNull values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation4.phpt b/ext/standard/tests/general_functions/getservbyname_variation4.phpt index 6033c94363..6c8de4b875 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation4.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation4.phpt @@ -22,7 +22,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with float values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation5.phpt b/ext/standard/tests/general_functions/getservbyname_variation5.phpt index 1d3b8f6d74..f06a6ec884 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation5.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation5.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation7.phpt b/ext/standard/tests/general_functions/getservbyname_variation7.phpt index a0e223c50d..5fb67cb84e 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation7.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation7.phpt @@ -25,7 +25,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with string values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation9.phpt b/ext/standard/tests/general_functions/getservbyname_variation9.phpt index eef2744c26..720dbf0fbc 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation9.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation9.phpt @@ -26,7 +26,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with boolean values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index 440443bca2..6265d0a373 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index 18b05b6a97..ba3a0dbfec 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -187,7 +187,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt index f00d04ef88..29c1463fb1 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt @@ -184,7 +184,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt index 6ff891391f..6f7cc23df4 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt @@ -209,7 +209,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt index 7c43b8e318..9af1bfbaa8 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt index 9e5ce2e600..5217121385 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt @@ -181,7 +181,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt index c4246b4204..8431cb802f 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt index 5e568fe7aa..e64dd08b80 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/intval_binary_prefix.phpt b/ext/standard/tests/general_functions/intval_binary_prefix.phpt index e5b8214881..47b8d05386 100644 --- a/ext/standard/tests/general_functions/intval_binary_prefix.phpt +++ b/ext/standard/tests/general_functions/intval_binary_prefix.phpt @@ -65,7 +65,7 @@ foreach ($badInputs as $input) { print '--- Done ---'; ?> ---EXPECTF-- +--EXPECT-- --- Good Inputs - Base = 0 --- int(2147483647) int(2147483647) diff --git a/ext/standard/tests/general_functions/is_callable_basic2.phpt b/ext/standard/tests/general_functions/is_callable_basic2.phpt index 1e6b2a97cc..06941832db 100644 --- a/ext/standard/tests/general_functions/is_callable_basic2.phpt +++ b/ext/standard/tests/general_functions/is_callable_basic2.phpt @@ -125,7 +125,7 @@ foreach($objects as $object) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing is_callable() on objects *** ** Testing behavior of is_callable() on static methods ** diff --git a/ext/standard/tests/general_functions/is_callable_variation1.phpt b/ext/standard/tests/general_functions/is_callable_variation1.phpt index cd76f161ed..022c5a4549 100644 --- a/ext/standard/tests/general_functions/is_callable_variation1.phpt +++ b/ext/standard/tests/general_functions/is_callable_variation1.phpt @@ -60,7 +60,7 @@ check_iscallable($undef_functions); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing is_callable() on undefined functions *** -- Iteration 1 -- bool(false) diff --git a/ext/standard/tests/general_functions/parse_ini_basic.phpt b/ext/standard/tests/general_functions/parse_ini_basic.phpt index 0c0591e7eb..f5a18c457e 100644 --- a/ext/standard/tests/general_functions/parse_ini_basic.phpt +++ b/ext/standard/tests/general_functions/parse_ini_basic.phpt @@ -14,7 +14,7 @@ var_dump(parse_ini_file($ini_file, 1)); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- array(26) { ["basic"]=> array(15) { diff --git a/ext/standard/tests/general_functions/parse_ini_booleans.phpt b/ext/standard/tests/general_functions/parse_ini_booleans.phpt index 7b012c50f6..530e186a99 100644 --- a/ext/standard/tests/general_functions/parse_ini_booleans.phpt +++ b/ext/standard/tests/general_functions/parse_ini_booleans.phpt @@ -10,7 +10,7 @@ var_dump(parse_ini_file($ini_file, 1)); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { ["error_reporting values"]=> array(6) { diff --git a/ext/standard/tests/general_functions/parse_ini_string_001.phpt b/ext/standard/tests/general_functions/parse_ini_string_001.phpt index c5e70cb900..e5e402b8fc 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_001.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_001.phpt @@ -207,7 +207,7 @@ print_r($ini_array); echo "*** Done **\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test parse_ini_string() function: with various keys and values given in string *** -- ini string without process_sections optional arg -- Array diff --git a/ext/standard/tests/general_functions/parse_ini_string_003.phpt b/ext/standard/tests/general_functions/parse_ini_string_003.phpt index 570570dbfe..9c0b1308d1 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_003.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_003.phpt @@ -17,7 +17,7 @@ var_dump(parse_ini_string($contents, false, INI_SCANNER_TYPED)); ?> Done ---EXPECTF-- +--EXPECT-- array(4) { ["foo"]=> int(1) diff --git a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt index 157ad74783..539eea202e 100644 --- a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt +++ b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt @@ -86,7 +86,7 @@ foreach ($p as $test => $data) { print (($wp = get_priority_from_wmic()) === $data[0] ? 'Passed' : 'Failed (' . $wp . ')') . PHP_EOL; } ?> ---EXPECTF-- +--EXPECT-- Testing 'Idle' (10): Passed Testing 'Below normal' (5): Passed Testing 'Normal' (0): Passed diff --git a/ext/standard/tests/general_functions/proc_nice_basic.phpt b/ext/standard/tests/general_functions/proc_nice_basic.phpt index 12469bf4eb..d14a5f62a9 100644 --- a/ext/standard/tests/general_functions/proc_nice_basic.phpt +++ b/ext/standard/tests/general_functions/proc_nice_basic.phpt @@ -28,5 +28,5 @@ if(substr(strtoupper(PHP_OS), 0, 3) == 'WIN') die('skip. not for Windows'); $niceAfter = getNice($pid); var_dump($niceBefore == ($niceAfter - $delta)); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/standard/tests/general_functions/proc_nice_variation2.phpt b/ext/standard/tests/general_functions/proc_nice_variation2.phpt index 42cbf9e00f..f1f93be221 100644 --- a/ext/standard/tests/general_functions/proc_nice_variation2.phpt +++ b/ext/standard/tests/general_functions/proc_nice_variation2.phpt @@ -29,7 +29,7 @@ foreach ( $variation_array as $var ) { var_dump(proc_nice( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(true) bool(true) diff --git a/ext/standard/tests/general_functions/proc_open_pipes2.phpt b/ext/standard/tests/general_functions/proc_open_pipes2.phpt index a232d53dd7..bc8f29b6fe 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes2.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes2.phpt @@ -22,7 +22,7 @@ include dirname(__FILE__) . "/proc_open_pipes.inc"; unlink_sleep_script(); ?> ---EXPECTF-- +--EXPECT-- int(0) array(0) { } diff --git a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt index eb5187b205..08ac2f1d01 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt @@ -35,7 +35,7 @@ var_dump(putenv('FOO=°¡a°¡°¡°¡°¡'), getenv("FOO")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) string(2) "°¡" bool(true) diff --git a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt index 70f5d08cea..76c6db5468 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt @@ -24,7 +24,7 @@ var_dump(putenv('FOO=å•Šaå•Šå•Šå•Šå•Š'), getenv("FOO")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) string(3) "å•Š" bool(true) diff --git a/ext/standard/tests/general_functions/var_export_basic8.phpt b/ext/standard/tests/general_functions/var_export_basic8.phpt index 6e6263d2ad..f71c095f96 100644 --- a/ext/standard/tests/general_functions/var_export_basic8.phpt +++ b/ext/standard/tests/general_functions/var_export_basic8.phpt @@ -28,7 +28,7 @@ var_export($b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- Var export on a simple object -- stdClass::__set_state(array( 'a' => 1, diff --git a/ext/standard/tests/general_functions/var_export_bug66179.phpt b/ext/standard/tests/general_functions/var_export_bug66179.phpt index 15952199e5..07ca3c5571 100644 --- a/ext/standard/tests/general_functions/var_export_bug66179.phpt +++ b/ext/standard/tests/general_functions/var_export_bug66179.phpt @@ -19,7 +19,7 @@ var_export(10000000000000000.0); echo PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- 1.0 123.0 -1.0 diff --git a/ext/standard/tests/image/getimagesize_jpgapp.phpt b/ext/standard/tests/image/getimagesize_jpgapp.phpt index 8e179d2551..c3ebcef282 100644 --- a/ext/standard/tests/image/getimagesize_jpgapp.phpt +++ b/ext/standard/tests/image/getimagesize_jpgapp.phpt @@ -30,7 +30,7 @@ foreach ($arr as $key => $value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- APP1 - length: 1717; md5: 02cbf4ba6640c131422483138c968516 APP2 - length: 7275; md5: f5036ccca2031e8bf932bcbd4aca4355 APP13 - length: 42; md5: 2202998bd05e78bcb419f08c070d6f61 diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt index 8fa690c27f..8c37da7665 100644 --- a/ext/standard/tests/image/getimagesize_variation4.phpt +++ b/ext/standard/tests/image/getimagesize_variation4.phpt @@ -19,7 +19,7 @@ var_dump( getimagesize(dirname(__FILE__)."/test13pix.swf", $info) ); var_dump( $info ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getimagesize() : variation *** array(5) { [0]=> diff --git a/ext/standard/tests/image/getimagesize_variation_005.phpt b/ext/standard/tests/image/getimagesize_variation_005.phpt index 6f0ad8f190..f5f2b83da2 100644 --- a/ext/standard/tests/image/getimagesize_variation_005.phpt +++ b/ext/standard/tests/image/getimagesize_variation_005.phpt @@ -19,7 +19,7 @@ var_dump( getimagesize(dirname(__FILE__)."/test13pix.swf", $info) ); var_dump( $info ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getimagesize() : basic functionality *** array(5) { [0]=> diff --git a/ext/standard/tests/image/iptcembed_001.phpt b/ext/standard/tests/image/iptcembed_001.phpt index feadddea1b..a8ca381ce8 100644 --- a/ext/standard/tests/image/iptcembed_001.phpt +++ b/ext/standard/tests/image/iptcembed_001.phpt @@ -13,6 +13,6 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) Done diff --git a/ext/standard/tests/mail/bug69874.phpt b/ext/standard/tests/mail/bug69874.phpt index a952a73bdc..14a4b452df 100644 --- a/ext/standard/tests/mail/bug69874.phpt +++ b/ext/standard/tests/mail/bug69874.phpt @@ -32,7 +32,7 @@ unlink($outFile); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing mail() : send email without additional headers *** bool(true) To: user@company.com diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt index 0f6ecbc09b..bc62b38752 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -32,7 +32,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing abs() : basic functionality *** int(23) int(23) diff --git a/ext/standard/tests/math/atan2_basic.phpt b/ext/standard/tests/math/atan2_basic.phpt index 65a0622c6a..8312bb2890 100644 --- a/ext/standard/tests/math/atan2_basic.phpt +++ b/ext/standard/tests/math/atan2_basic.phpt @@ -38,7 +38,7 @@ for ($i = 0; $i < count($valuesy); $i++) { } } ?> ---EXPECTF-- +--EXPECT-- Y:23 X:23 float(0.78539816339745) Y:23 X:-23 float(2.3561944901923) Y:23 X:23.45 float(0.77571063007847) diff --git a/ext/standard/tests/math/base_convert_basic.phpt b/ext/standard/tests/math/base_convert_basic.phpt index 69a2667a24..0da1d1f77c 100644 --- a/ext/standard/tests/math/base_convert_basic.phpt +++ b/ext/standard/tests/math/base_convert_basic.phpt @@ -29,7 +29,7 @@ for ($f= 0; $f < count($frombase); $f++) { } ?> ---EXPECTF-- +--EXPECT-- ...from base is 2 ......to base is 2 .........value= 10 res = 10 diff --git a/ext/standard/tests/math/bindec_basic.phpt b/ext/standard/tests/math/bindec_basic.phpt index 9fcca4a7ee..d746b8a1ca 100644 --- a/ext/standard/tests/math/bindec_basic.phpt +++ b/ext/standard/tests/math/bindec_basic.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(455) int(0) int(32766) diff --git a/ext/standard/tests/math/bindec_basic_64bit.phpt b/ext/standard/tests/math/bindec_basic_64bit.phpt index 949c19eea3..3641f0bc41 100644 --- a/ext/standard/tests/math/bindec_basic_64bit.phpt +++ b/ext/standard/tests/math/bindec_basic_64bit.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(455) int(0) int(32766) diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index e90afd3388..922d0b14f0 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -43,7 +43,7 @@ for ($i = 0; $i < count($values); $i++) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing ceil() : basic functionality *** float(0) float(0) diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt index 572a04245e..00ed582559 100644 --- a/ext/standard/tests/math/decbin_basic.phpt +++ b/ext/standard/tests/math/decbin_basic.phpt @@ -23,7 +23,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- string(4) "1010" string(12) "111101101110" string(12) "111101101110" diff --git a/ext/standard/tests/math/dechex_basic.phpt b/ext/standard/tests/math/dechex_basic.phpt index ac53a97b34..c842bf7984 100644 --- a/ext/standard/tests/math/dechex_basic.phpt +++ b/ext/standard/tests/math/dechex_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(1) "a" string(3) "f6e" string(3) "f6e" diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt index 3a5011b973..a3dd741b41 100644 --- a/ext/standard/tests/math/decoct_basic.phpt +++ b/ext/standard/tests/math/decoct_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(2) "12" string(4) "7556" string(4) "7556" diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt index 135705507c..21f7413d82 100644 --- a/ext/standard/tests/math/exp_basic.phpt +++ b/ext/standard/tests/math/exp_basic.phpt @@ -27,7 +27,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- -- Iteration 1 -- float(22026.465794807) diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt index 320b01a27d..7853aeb20c 100644 --- a/ext/standard/tests/math/expm1_basic.phpt +++ b/ext/standard/tests/math/expm1_basic.phpt @@ -34,7 +34,7 @@ foreach($values as $value) { }; ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing expm1() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt index 2b6d2f75c8..034f55f00e 100644 --- a/ext/standard/tests/math/floor_basic.phpt +++ b/ext/standard/tests/math/floor_basic.phpt @@ -39,7 +39,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing floor() : basic functionality *** -- floor 0 -- diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt index c29abca9d2..003a49498e 100644 --- a/ext/standard/tests/math/fmod_basic.phpt +++ b/ext/standard/tests/math/fmod_basic.phpt @@ -38,7 +38,7 @@ for ($i = 0; $i < count($values1); $i++) { } } ?> ---EXPECTF-- +--EXPECT-- iteration 0 float(0) diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt index 1c42ae7e40..796c4e9bae 100644 --- a/ext/standard/tests/math/hexdec_basic.phpt +++ b/ext/standard/tests/math/hexdec_basic.phpt @@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(18433668) int(126895953) float(142929835591) diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt index f1a2028b5c..8c2942fb71 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -34,7 +34,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing hexdec() : basic functionality *** -- hexdec 1194684 -- diff --git a/ext/standard/tests/math/intdiv_64bit.phpt b/ext/standard/tests/math/intdiv_64bit.phpt index c674dd3b85..acc7f4ef98 100644 --- a/ext/standard/tests/math/intdiv_64bit.phpt +++ b/ext/standard/tests/math/intdiv_64bit.phpt @@ -11,5 +11,5 @@ if (PHP_INT_SIZE !== 8) { // (int)(PHP_INT_MAX / 3) gives a different result var_dump(intdiv(PHP_INT_MAX, 3)); ?> ---EXPECTF-- +--EXPECT-- int(3074457345618258602)
\ No newline at end of file diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt index 85d2685273..3b80c969d9 100644 --- a/ext/standard/tests/math/is_finite_basic.phpt +++ b/ext/standard/tests/math/is_finite_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt index ca79922287..2ae5679285 100644 --- a/ext/standard/tests/math/is_infinite_basic.phpt +++ b/ext/standard/tests/math/is_infinite_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt index fb10737cea..a7998e1314 100644 --- a/ext/standard/tests/math/is_nan_basic.phpt +++ b/ext/standard/tests/math/is_nan_basic.phpt @@ -25,7 +25,7 @@ for ($i = 0; $i < count($values); $i++) { ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/math/log1p_basic.phpt b/ext/standard/tests/math/log1p_basic.phpt index b28941860f..b6d14a26e7 100644 --- a/ext/standard/tests/math/log1p_basic.phpt +++ b/ext/standard/tests/math/log1p_basic.phpt @@ -35,7 +35,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing log1p() : basic functionality *** LOG1p tests diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt index e2f9c9fe7d..1b0b628d51 100644 --- a/ext/standard/tests/math/log_basic.phpt +++ b/ext/standard/tests/math/log_basic.phpt @@ -30,7 +30,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- LOG tests...no base float(3.1354942159291) float(NAN) diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt index 0f7b8a8b6e..5ffa059c3f 100644 --- a/ext/standard/tests/math/mt_rand_basic.phpt +++ b/ext/standard/tests/math/mt_rand_basic.phpt @@ -79,7 +79,7 @@ for ($x = 0; $x < count($min); $x++) { } } ?> ---EXPECTF-- +--EXPECT-- mt_rand() tests with default min and max value (i.e 0 thru 2147483647) PASSED: range min = 0 max = 2147483647 diff --git a/ext/standard/tests/math/mt_rand_value.phpt b/ext/standard/tests/math/mt_rand_value.phpt index cf7b9f00b6..ab6d732709 100644 --- a/ext/standard/tests/math/mt_rand_value.phpt +++ b/ext/standard/tests/math/mt_rand_value.phpt @@ -37,7 +37,7 @@ echo $x.PHP_EOL; */ ?> ---EXPECTF-- +--EXPECT-- 1614640687 1711027313 857485497 diff --git a/ext/standard/tests/math/mt_srand_basic.phpt b/ext/standard/tests/math/mt_srand_basic.phpt index e28b1b9eae..a3a34ab73b 100644 --- a/ext/standard/tests/math/mt_srand_basic.phpt +++ b/ext/standard/tests/math/mt_srand_basic.phpt @@ -13,7 +13,7 @@ var_dump(mt_srand(true)); var_dump(mt_srand(false)); var_dump(mt_srand(NULL)); ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/ext/standard/tests/math/number_format_basic.phpt b/ext/standard/tests/math/number_format_basic.phpt index 7f5f4beb25..330a71b4a7 100644 --- a/ext/standard/tests/math/number_format_basic.phpt +++ b/ext/standard/tests/math/number_format_basic.phpt @@ -39,7 +39,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- number_format tests.....default string(5) "1,235" string(6) "-1,235" diff --git a/ext/standard/tests/math/number_format_multichar.phpt b/ext/standard/tests/math/number_format_multichar.phpt index ae36d12c73..2141cc20a4 100644 --- a/ext/standard/tests/math/number_format_multichar.phpt +++ b/ext/standard/tests/math/number_format_multichar.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- number_format tests.....multiple character decimal point string(13) "1 234·57" string(14) "-1 234·57" diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt index 8fd57ecfef..ff584f2514 100644 --- a/ext/standard/tests/math/octdec_basic.phpt +++ b/ext/standard/tests/math/octdec_basic.phpt @@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(14489) int(253) int(36947879) diff --git a/ext/standard/tests/math/octdec_basic_64bit.phpt b/ext/standard/tests/math/octdec_basic_64bit.phpt index 98996dc182..c77ca722bb 100644 --- a/ext/standard/tests/math/octdec_basic_64bit.phpt +++ b/ext/standard/tests/math/octdec_basic_64bit.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing octdec() : basic functionality *** int(14489) int(253) diff --git a/ext/standard/tests/math/pi_basic.phpt b/ext/standard/tests/math/pi_basic.phpt index fec5691371..b4d6c8ebe9 100644 --- a/ext/standard/tests/math/pi_basic.phpt +++ b/ext/standard/tests/math/pi_basic.phpt @@ -9,6 +9,6 @@ echo M_PI, "\n"; // N.B pi() ignores all specified arguments no error // messages are produced if arguments are spcified. ?> ---EXPECTF-- +--EXPECT-- 3.1415926535898 3.1415926535898 diff --git a/ext/standard/tests/math/pow_basic_64bit.phpt b/ext/standard/tests/math/pow_basic_64bit.phpt index 898f6efa33..fd583a0243 100644 --- a/ext/standard/tests/math/pow_basic_64bit.phpt +++ b/ext/standard/tests/math/pow_basic_64bit.phpt @@ -47,7 +47,7 @@ foreach($bases as $base) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- Base = 23 ..... Exponent = 0 Result = 1 ..... Exponent = 1 Result = 23 diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt index d4b94ec056..72ab13fc3e 100644 --- a/ext/standard/tests/math/round_basic.phpt +++ b/ext/standard/tests/math/round_basic.phpt @@ -45,7 +45,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing round() : basic functionality *** round: 123456789 ...with precision 2-> float(123456789) diff --git a/ext/standard/tests/math/srand_basic.phpt b/ext/standard/tests/math/srand_basic.phpt index b56ad10ac0..a3788cdf45 100644 --- a/ext/standard/tests/math/srand_basic.phpt +++ b/ext/standard/tests/math/srand_basic.phpt @@ -21,7 +21,7 @@ var_dump(srand(false)); var_dump(srand(NULL)); ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing srand() : basic functionality *** NULL NULL diff --git a/ext/standard/tests/misc/get_browser_basic.phpt b/ext/standard/tests/misc/get_browser_basic.phpt index 60638e005e..69db7345a5 100644 --- a/ext/standard/tests/misc/get_browser_basic.phpt +++ b/ext/standard/tests/misc/get_browser_basic.phpt @@ -33,7 +33,7 @@ for( $x = 0; $x < 20; $x++) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_browser() : basic functionality *** array(35) { ["browser_name_regex"]=> diff --git a/ext/standard/tests/misc/get_browser_variation1.phpt b/ext/standard/tests/misc/get_browser_variation1.phpt index ac485155a9..6cc77e6765 100644 --- a/ext/standard/tests/misc/get_browser_variation1.phpt +++ b/ext/standard/tests/misc/get_browser_variation1.phpt @@ -34,7 +34,7 @@ for( $x = 20; $x < $count; $x++) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_browser() : variation functionality: extra browser names *** array(35) { ["browser_name_regex"]=> diff --git a/ext/standard/tests/network/http-stream.phpt b/ext/standard/tests/network/http-stream.phpt index 1186060096..45c5cb636b 100644 --- a/ext/standard/tests/network/http-stream.phpt +++ b/ext/standard/tests/network/http-stream.phpt @@ -20,5 +20,5 @@ $e = $d->load("http://127.0.0.1:12342/news.rss"); echo "ALIVE\n"; http_server_kill($pid); ?> ---EXPECTF-- +--EXPECT-- ALIVE diff --git a/ext/standard/tests/serialize/bug26762.phpt b/ext/standard/tests/serialize/bug26762.phpt index dd779780f4..74aeb46e80 100644 --- a/ext/standard/tests/serialize/bug26762.phpt +++ b/ext/standard/tests/serialize/bug26762.phpt @@ -22,5 +22,5 @@ catch (Exception $e) { } ?> ---EXPECTF-- +--EXPECT-- string(3) "FOO" diff --git a/ext/standard/tests/serialize/bug64354_1.phpt b/ext/standard/tests/serialize/bug64354_1.phpt index e85749bcbe..ae6f0383d2 100644 --- a/ext/standard/tests/serialize/bug64354_1.phpt +++ b/ext/standard/tests/serialize/bug64354_1.phpt @@ -20,6 +20,6 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(6) "Failed" string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug64354_2.phpt b/ext/standard/tests/serialize/bug64354_2.phpt index 41a455b54a..a9a252d09a 100644 --- a/ext/standard/tests/serialize/bug64354_2.phpt +++ b/ext/standard/tests/serialize/bug64354_2.phpt @@ -20,5 +20,5 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug64354_3.phpt b/ext/standard/tests/serialize/bug64354_3.phpt index 3ce61152d6..c7eea59be5 100644 --- a/ext/standard/tests/serialize/bug64354_3.phpt +++ b/ext/standard/tests/serialize/bug64354_3.phpt @@ -25,5 +25,5 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug68594.phpt b/ext/standard/tests/serialize/bug68594.phpt index 60fc7a76ab..fbf9310d0b 100644 --- a/ext/standard/tests/serialize/bug68594.phpt +++ b/ext/standard/tests/serialize/bug68594.phpt @@ -19,5 +19,5 @@ for ($i=4; $i<100; $i++) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/standard/tests/serialize/bug68976.phpt b/ext/standard/tests/serialize/bug68976.phpt index a79a953a4a..15bad692ed 100644 --- a/ext/standard/tests/serialize/bug68976.phpt +++ b/ext/standard/tests/serialize/bug68976.phpt @@ -26,7 +26,7 @@ for($i = 0; $i < 5; $i++) { var_dump($data); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(2) { [0]=> object(evilClass)#1 (0) { diff --git a/ext/standard/tests/serialize/bug71940.phpt b/ext/standard/tests/serialize/bug71940.phpt index c391ba6603..75d227d7c4 100644 --- a/ext/standard/tests/serialize/bug71940.phpt +++ b/ext/standard/tests/serialize/bug71940.phpt @@ -43,7 +43,7 @@ $serialized = serialize([$entry1, $entry2]); print_r(unserialize($serialized)); ?> ---EXPECTF-- +--EXPECT-- Array ( [0] => Entry Object diff --git a/ext/standard/tests/serialize/bug72229.phpt b/ext/standard/tests/serialize/bug72229.phpt index 17c393c7d4..68727ad104 100644 --- a/ext/standard/tests/serialize/bug72229.phpt +++ b/ext/standard/tests/serialize/bug72229.phpt @@ -22,7 +22,7 @@ print_r($Obj1); $Obj2->arr2[0] = 50; print_r($Obj2); ?> ---EXPECTF-- +--EXPECT-- C1 Object ( [arr1] => Array diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt index 51acfc4b46..4b142344f9 100644 --- a/ext/standard/tests/serialize/serialization_arrays_001.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt @@ -35,7 +35,7 @@ var_dump($arr_asso); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- --- Testing Circular reference of an array --- -- Normal array -- string(238) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;R:8;}}" diff --git a/ext/standard/tests/serialize/serialization_arrays_002.phpt b/ext/standard/tests/serialize/serialization_arrays_002.phpt index c62ff6a91c..b7348b969b 100644 --- a/ext/standard/tests/serialize/serialization_arrays_002.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_002.phpt @@ -100,7 +100,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- No references: diff --git a/ext/standard/tests/serialize/serialization_arrays_003.phpt b/ext/standard/tests/serialize/serialization_arrays_003.phpt index 8d664fccf3..08f5ead4e5 100644 --- a/ext/standard/tests/serialize/serialization_arrays_003.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_003.phpt @@ -70,7 +70,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- 0 refs external: diff --git a/ext/standard/tests/serialize/serialization_arrays_004.phpt b/ext/standard/tests/serialize/serialization_arrays_004.phpt index 55d849c972..7ebacce98d 100644 --- a/ext/standard/tests/serialize/serialization_arrays_004.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_004.phpt @@ -51,7 +51,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- 1 refs container: array(3) { [0]=> diff --git a/ext/standard/tests/serialize/serialization_arrays_005.phpt b/ext/standard/tests/serialize/serialization_arrays_005.phpt index 10e33129f8..a22c04b8be 100644 --- a/ext/standard/tests/serialize/serialization_arrays_005.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_005.phpt @@ -78,7 +78,7 @@ $a[1] = &$c; check($c); ?> ---EXPECTF-- +--EXPECT-- --- Nested array references 1 element in containing array: array(3) { [0]=> diff --git a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt Binary files differindex 548a67345f..0d800d1516 100644 --- a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt +++ b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt index 6b826a398b..ec3713e844 100644 --- a/ext/standard/tests/serialize/serialization_objects_004.phpt +++ b/ext/standard/tests/serialize/serialization_objects_004.phpt @@ -39,7 +39,7 @@ var_dump(serialize(array($x, $x))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- string(37) "a:2:{i:0;O:8:"stdClass":0:{}i:1;r:2;}" string(22) "a:2:{i:0;i:1;i:1;i:1;}" string(30) "a:2:{i:0;s:1:"a";i:1;s:1:"a";}" diff --git a/ext/standard/tests/serialize/serialization_objects_010.phpt b/ext/standard/tests/serialize/serialization_objects_010.phpt index 0fbf0723df..25a7f24d27 100644 --- a/ext/standard/tests/serialize/serialization_objects_010.phpt +++ b/ext/standard/tests/serialize/serialization_objects_010.phpt @@ -32,6 +32,6 @@ try { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- C::serialize() must return a string or NULL Done
\ No newline at end of file diff --git a/ext/standard/tests/serialize/serialization_precision_001.phpt b/ext/standard/tests/serialize/serialization_precision_001.phpt index eb633beb74..0be0c68a89 100644 --- a/ext/standard/tests/serialize/serialization_precision_001.phpt +++ b/ext/standard/tests/serialize/serialization_precision_001.phpt @@ -17,5 +17,5 @@ serialize_precision=10 var_dump(serialize(0.1)); ?> ---EXPECTF-- +--EXPECT-- string(6) "d:0.1;"
\ No newline at end of file diff --git a/ext/standard/tests/serialize/serialization_precision_002.phpt b/ext/standard/tests/serialize/serialization_precision_002.phpt index 653fabea36..91091e72a2 100644 --- a/ext/standard/tests/serialize/serialization_precision_002.phpt +++ b/ext/standard/tests/serialize/serialization_precision_002.phpt @@ -17,5 +17,5 @@ serialize_precision=75 var_dump(serialize(0.1)); ?> ---EXPECTF-- +--EXPECT-- string(60) "d:0.1000000000000000055511151231257827021181583404541015625;"
\ No newline at end of file diff --git a/ext/standard/tests/streams/bug48309.phpt b/ext/standard/tests/streams/bug48309.phpt index bb2d9d28f7..300926be51 100644 --- a/ext/standard/tests/streams/bug48309.phpt +++ b/ext/standard/tests/streams/bug48309.phpt @@ -24,7 +24,7 @@ echo "\n"; var_dump(stream_get_contents($tmp)); ?> ---EXPECTF-- +--EXPECT-- -- stream_copy_to_stream() -- te string(2) "st" diff --git a/ext/standard/tests/streams/bug49936.phpt b/ext/standard/tests/streams/bug49936.phpt index d98db1d799..dccf87474c 100644 --- a/ext/standard/tests/streams/bug49936.phpt +++ b/ext/standard/tests/streams/bug49936.phpt @@ -15,7 +15,7 @@ var_dump(@opendir($dir)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(false) bool(false) ===DONE=== diff --git a/ext/standard/tests/streams/bug67626.phpt b/ext/standard/tests/streams/bug67626.phpt index 67c2c3f8e0..fefe6c1f0a 100644 --- a/ext/standard/tests/streams/bug67626.phpt +++ b/ext/standard/tests/streams/bug67626.phpt @@ -40,6 +40,6 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- stream_read_exception stream_write_exception
\ No newline at end of file diff --git a/ext/standard/tests/streams/bug70198.phpt b/ext/standard/tests/streams/bug70198.phpt index bfba808769..fd02b8c0bc 100644 --- a/ext/standard/tests/streams/bug70198.phpt +++ b/ext/standard/tests/streams/bug70198.phpt @@ -55,7 +55,7 @@ proc_close($srv_proc); unlink($srv_fl); ?> ==DONE== ---EXPECTF-- +--EXPECT-- int(0) ==DONE== diff --git a/ext/standard/tests/streams/bug71245.phpt b/ext/standard/tests/streams/bug71245.phpt index e1d82f65f9..c9cad0c6d7 100644 --- a/ext/standard/tests/streams/bug71245.phpt +++ b/ext/standard/tests/streams/bug71245.phpt @@ -18,7 +18,7 @@ $context = stream_context_create($httpContext); $headers = ["Host: bad.com"]; print_r(stream_context_get_options($context)); ?> ---EXPECTF-- +--EXPECT-- Array ( [http] => Array diff --git a/ext/standard/tests/streams/bug71323.phpt b/ext/standard/tests/streams/bug71323.phpt index 29d784719f..12d06cd874 100644 --- a/ext/standard/tests/streams/bug71323.phpt +++ b/ext/standard/tests/streams/bug71323.phpt @@ -8,7 +8,7 @@ $file = 'data:text/plain;z=y;uri=eviluri;mediatype=wut?;mediatype2=hello,somedat $meta = stream_get_meta_data(fopen($file, "r")); var_dump($meta); ?> ---EXPECTF-- +--EXPECT-- array(10) { ["mediatype"]=> string(10) "text/plain" diff --git a/ext/standard/tests/streams/bug72853.phpt b/ext/standard/tests/streams/bug72853.phpt index 48bd60e7a6..8de0264ac0 100644 --- a/ext/standard/tests/streams/bug72853.phpt +++ b/ext/standard/tests/streams/bug72853.phpt @@ -24,7 +24,7 @@ while ($outs = fgets($pipes[1], 1024)) { var_dump(stream_get_meta_data($pipes[1])); proc_close($p); ?> ---EXPECTF-- +--EXPECT-- array(7) { ["timed_out"]=> bool(false) diff --git a/ext/standard/tests/streams/bug74090.phpt b/ext/standard/tests/streams/bug74090.phpt index 370dd13f1b..47efc2c7cd 100644 --- a/ext/standard/tests/streams/bug74090.phpt +++ b/ext/standard/tests/streams/bug74090.phpt @@ -17,6 +17,6 @@ var_dump(strlen($ret) > 0); stream_socket_shutdown($fd,STREAM_SHUT_RDWR);
?>
==DONE==
---EXPECTF--
+--EXPECT--
bool(true)
==DONE==
diff --git a/ext/standard/tests/streams/user_streams_consumed_bug.phpt b/ext/standard/tests/streams/user_streams_consumed_bug.phpt index 147a7bd0a7..ebfa1f095d 100644 --- a/ext/standard/tests/streams/user_streams_consumed_bug.phpt +++ b/ext/standard/tests/streams/user_streams_consumed_bug.phpt @@ -24,7 +24,7 @@ stream_filter_append(STDOUT, "intercept_filter"); $out = fwrite(STDOUT, "Goodbye\n"); var_dump($out); ---EXPECTF-- +--EXPECT-- Hello int(6) Goodbye diff --git a/ext/standard/tests/strings/005.phpt b/ext/standard/tests/strings/005.phpt index a69ff49425..ebfbe221d8 100644 --- a/ext/standard/tests/strings/005.phpt +++ b/ext/standard/tests/strings/005.phpt @@ -16,7 +16,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- hello int(8192) bool(false) diff --git a/ext/standard/tests/strings/addcslashes_002.phpt b/ext/standard/tests/strings/addcslashes_002.phpt index eb46803bbe..fa5b3028fb 100644 --- a/ext/standard/tests/strings/addcslashes_002.phpt +++ b/ext/standard/tests/strings/addcslashes_002.phpt @@ -24,7 +24,7 @@ var_dump( addcslashes($obj, "b") ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing addcslashes() with ASCII code between 0 and 31 *** string(44) "goodyear12345NULL\000truefalse\a\v\f\b\n\r\t" diff --git a/ext/standard/tests/strings/addcslashes_003.phpt b/ext/standard/tests/strings/addcslashes_003.phpt Binary files differindex f1d658135b..7c97adfa2d 100644 --- a/ext/standard/tests/strings/addcslashes_003.phpt +++ b/ext/standard/tests/strings/addcslashes_003.phpt diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt index 0912d34e48..eeb5627067 100644 --- a/ext/standard/tests/strings/addslashes_basic.phpt +++ b/ext/standard/tests/strings/addslashes_basic.phpt @@ -29,7 +29,7 @@ foreach( $str_array as $str ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing addslashes() : basic functionality *** string(16) "How\'s everybody" string(17) "Are you \"JOHN\"?" diff --git a/ext/standard/tests/strings/basename_basic.phpt b/ext/standard/tests/strings/basename_basic.phpt Binary files differindex fa0d410e5f..31299276b3 100644 --- a/ext/standard/tests/strings/basename_basic.phpt +++ b/ext/standard/tests/strings/basename_basic.phpt diff --git a/ext/standard/tests/strings/basename_invalid_path.phpt b/ext/standard/tests/strings/basename_invalid_path.phpt index b632efa845..8928fa1aeb 100644 --- a/ext/standard/tests/strings/basename_invalid_path.phpt +++ b/ext/standard/tests/strings/basename_invalid_path.phpt @@ -17,6 +17,6 @@ var_dump(basename(chr(-1))); echo "Done\n"; ---EXPECTF-- +--EXPECT-- string(0) "" Done diff --git a/ext/standard/tests/strings/basename_variation.phpt b/ext/standard/tests/strings/basename_variation.phpt index 1efd8c701a..a0e8ebc744 100644 --- a/ext/standard/tests/strings/basename_variation.phpt +++ b/ext/standard/tests/strings/basename_variation.phpt @@ -86,7 +86,7 @@ check_basename( $file_path_variations ); echo "Done\n"; ---EXPECTF-- +--EXPECT-- *** Testing possible variations in path and suffix *** --Iteration 1-- diff --git a/ext/standard/tests/strings/bug38322.phpt b/ext/standard/tests/strings/bug38322.phpt index 79f66f1fa0..fd7165894c 100644 --- a/ext/standard/tests/strings/bug38322.phpt +++ b/ext/standard/tests/strings/bug38322.phpt @@ -8,6 +8,6 @@ var_dump(sscanf("a ",'%1$s',$str)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) Done diff --git a/ext/standard/tests/strings/bug39032.phpt b/ext/standard/tests/strings/bug39032.phpt index dbd39ec9d8..1628b9df7d 100644 --- a/ext/standard/tests/strings/bug39032.phpt +++ b/ext/standard/tests/strings/bug39032.phpt @@ -10,7 +10,7 @@ var_dump(strcspn(chr(1),"qweqwe")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) int(0) int(1) diff --git a/ext/standard/tests/strings/bug39621.phpt b/ext/standard/tests/strings/bug39621.phpt Binary files differindex 1a33147b68..f1973eeaf4 100644 --- a/ext/standard/tests/strings/bug39621.phpt +++ b/ext/standard/tests/strings/bug39621.phpt diff --git a/ext/standard/tests/strings/bug40637.phpt b/ext/standard/tests/strings/bug40637.phpt index 5669083aa6..bdd5a0f816 100644 --- a/ext/standard/tests/strings/bug40637.phpt +++ b/ext/standard/tests/strings/bug40637.phpt @@ -8,6 +8,6 @@ var_dump(strip_tags($html)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(4) "Text" Done diff --git a/ext/standard/tests/strings/bug42107.phpt b/ext/standard/tests/strings/bug42107.phpt index d97f8917e2..aa39da801e 100644 --- a/ext/standard/tests/strings/bug42107.phpt +++ b/ext/standard/tests/strings/bug42107.phpt @@ -15,7 +15,7 @@ var_dump(sscanf('one two', '%1$d %2$d')); var_dump(sscanf('one two', '%1$d')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(3) "one" diff --git a/ext/standard/tests/strings/bug43957.phpt b/ext/standard/tests/strings/bug43957.phpt index 0380787b73..b74b83a137 100644 --- a/ext/standard/tests/strings/bug43957.phpt +++ b/ext/standard/tests/strings/bug43957.phpt @@ -4,5 +4,5 @@ Bug #43957 (utf8_decode() bogus conversion on multibyte indicator near end of st <?php echo utf8_decode('abc'.chr(0xe0)); ?> ---EXPECTF-- +--EXPECT-- abc? diff --git a/ext/standard/tests/strings/bug53319.phpt b/ext/standard/tests/strings/bug53319.phpt index 0bcc06d5ec..bae7e88b9e 100644 --- a/ext/standard/tests/strings/bug53319.phpt +++ b/ext/standard/tests/strings/bug53319.phpt @@ -10,7 +10,7 @@ var_dump(strip_tags($str)); var_dump(strip_tags('<a/b>', '<a>')); ?> ---EXPECTF-- +--EXPECT-- string(47) "USD<input type="text"/>CDN<input type="text" />" bool(true) string(6) "USDCDN" diff --git a/ext/standard/tests/strings/bug64879.phpt b/ext/standard/tests/strings/bug64879.phpt index 1df90c6d85..ac19ce6a04 100644 --- a/ext/standard/tests/strings/bug64879.phpt +++ b/ext/standard/tests/strings/bug64879.phpt @@ -8,5 +8,5 @@ quoted_printable_encode(str_repeat("\xf4", 100000)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/standard/tests/strings/bug65769.phpt b/ext/standard/tests/strings/bug65769.phpt index 1a81d487c9..2c8b2b801b 100644 --- a/ext/standard/tests/strings/bug65769.phpt +++ b/ext/standard/tests/strings/bug65769.phpt @@ -31,7 +31,7 @@ foreach ($locales as $locale) { ?> +++DONE+++ ---EXPECTF-- +--EXPECT-- string(19) "Swedish_Sweden.1252" string(1) "," string(1) " " diff --git a/ext/standard/tests/strings/bug65947.phpt b/ext/standard/tests/strings/bug65947.phpt index 956aa6049a..2656a1b7f1 100644 --- a/ext/standard/tests/strings/bug65947.phpt +++ b/ext/standard/tests/strings/bug65947.phpt @@ -13,5 +13,5 @@ if ($filename != $b2) print "BUG"; else print "OKEY"; ---EXPECTF-- +--EXPECT-- OKEY diff --git a/ext/standard/tests/strings/bug68710.phpt b/ext/standard/tests/strings/bug68710.phpt index 729a12011b..5eeb09b3d6 100644 --- a/ext/standard/tests/strings/bug68710.phpt +++ b/ext/standard/tests/strings/bug68710.phpt @@ -21,5 +21,5 @@ for ($i=4; $i<100; $i++) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/standard/tests/strings/bug70720.phpt b/ext/standard/tests/strings/bug70720.phpt index 6cdc600c2d..d7f64e0874 100644 --- a/ext/standard/tests/strings/bug70720.phpt +++ b/ext/standard/tests/strings/bug70720.phpt @@ -9,7 +9,7 @@ var_dump(strip_tags('<?xml $xml->test(); ?> this is a test')); /* "->" case in HTML */ var_dump(strip_tags("<span class=sf-dump-> this is a test</span>")); ?> ---EXPECTF-- +--EXPECT-- string(15) " this is a test" string(15) " this is a test" string(15) " this is a test" diff --git a/ext/standard/tests/strings/chop_basic.phpt b/ext/standard/tests/strings/chop_basic.phpt Binary files differindex 99a03cb0f1..7b68ca28d0 100644 --- a/ext/standard/tests/strings/chop_basic.phpt +++ b/ext/standard/tests/strings/chop_basic.phpt diff --git a/ext/standard/tests/strings/chop_variation3.phpt b/ext/standard/tests/strings/chop_variation3.phpt Binary files differindex 9509fb80a4..36f81d34c8 100644 --- a/ext/standard/tests/strings/chop_variation3.phpt +++ b/ext/standard/tests/strings/chop_variation3.phpt diff --git a/ext/standard/tests/strings/chop_variation4.phpt b/ext/standard/tests/strings/chop_variation4.phpt Binary files differindex cd269dfa58..2d67ed06e1 100644 --- a/ext/standard/tests/strings/chop_variation4.phpt +++ b/ext/standard/tests/strings/chop_variation4.phpt diff --git a/ext/standard/tests/strings/chop_variation5.phpt b/ext/standard/tests/strings/chop_variation5.phpt index 8f283e3c3f..7d915c2c86 100644 --- a/ext/standard/tests/strings/chop_variation5.phpt +++ b/ext/standard/tests/strings/chop_variation5.phpt @@ -25,7 +25,7 @@ echo "*** Testing chop() : with miscellaneous arguments ***\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing chop() : with miscellaneous arguments *** string(9) "chop test" string(12) "chop test " diff --git a/ext/standard/tests/strings/chr_basic.phpt b/ext/standard/tests/strings/chr_basic.phpt index 378b4027a1..bce4184d42 100644 --- a/ext/standard/tests/strings/chr_basic.phpt +++ b/ext/standard/tests/strings/chr_basic.phpt @@ -16,7 +16,7 @@ echo "World"; echo "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing chr() : basic functionality *** Hello World diff --git a/ext/standard/tests/strings/chr_variation1.phpt b/ext/standard/tests/strings/chr_variation1.phpt index 03adc49d47..3da03316c9 100644 --- a/ext/standard/tests/strings/chr_variation1.phpt +++ b/ext/standard/tests/strings/chr_variation1.phpt @@ -78,7 +78,7 @@ fclose($file_handle); //closing the file handle ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing chr() function: with unexpected inputs for 'ascii' argument *** -- Iteration 1 -- string(2) "00" diff --git a/ext/standard/tests/strings/chunk_split_basic.phpt b/ext/standard/tests/strings/chunk_split_basic.phpt index 14ad782ac0..da4720a187 100644 --- a/ext/standard/tests/strings/chunk_split_basic.phpt +++ b/ext/standard/tests/strings/chunk_split_basic.phpt @@ -37,7 +37,7 @@ var_dump( chunk_split($str) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : basic functionality *** -- Testing chunk_split() with all possible arguments -- string(15) "Te##st##in##g##" diff --git a/ext/standard/tests/strings/chunk_split_variation10.phpt b/ext/standard/tests/strings/chunk_split_variation10.phpt index 36b9fe8a05..99bb623c33 100644 --- a/ext/standard/tests/strings/chunk_split_variation10.phpt +++ b/ext/standard/tests/strings/chunk_split_variation10.phpt @@ -51,7 +51,7 @@ for($count = 0; $count < count($values); $count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : different single quoted strings as 'ending' *** -- Iteration 0 -- string(73) "This is to test chunk_split() with various 'single quoted' ending string." diff --git a/ext/standard/tests/strings/chunk_split_variation11.phpt b/ext/standard/tests/strings/chunk_split_variation11.phpt index 418e607f4c..c08a0c3d88 100644 --- a/ext/standard/tests/strings/chunk_split_variation11.phpt +++ b/ext/standard/tests/strings/chunk_split_variation11.phpt @@ -43,7 +43,7 @@ for($count = 0; $count < count($values); $count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : different values for 'ending' with heredoc 'str'*** -- Iteration 1 -- string(113) "This is heredoc string with and diff --git a/ext/standard/tests/strings/chunk_split_variation12.phpt b/ext/standard/tests/strings/chunk_split_variation12.phpt index e90287546a..6a025f1abb 100644 --- a/ext/standard/tests/strings/chunk_split_variation12.phpt +++ b/ext/standard/tests/strings/chunk_split_variation12.phpt @@ -83,7 +83,7 @@ foreach($heredoc_arr as $value) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : different heredoc strings for 'ending' argument *** -- Iteration 1 -- string(102) "This is str to check with heredoc ending.This contains, diff --git a/ext/standard/tests/strings/chunk_split_variation13.phpt b/ext/standard/tests/strings/chunk_split_variation13.phpt index 3cbcbe466d..38b8f9568a 100644 --- a/ext/standard/tests/strings/chunk_split_variation13.phpt +++ b/ext/standard/tests/strings/chunk_split_variation13.phpt @@ -28,7 +28,7 @@ for($count = 0; $count < count($values); $count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : default 'chunklen' with long string 'str' *** -- Iteration 0 -- string(85) "1234567890123456789012345678901234567890123456789012345678901234567890123456 diff --git a/ext/standard/tests/strings/chunk_split_variation4.phpt b/ext/standard/tests/strings/chunk_split_variation4.phpt index cfa62698b9..9f9a8b75ba 100644 --- a/ext/standard/tests/strings/chunk_split_variation4.phpt +++ b/ext/standard/tests/strings/chunk_split_variation4.phpt @@ -84,7 +84,7 @@ foreach($heredoc_arr as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : heredoc strings as 'str' argument *** -- Iteration 1 -- string(2) " diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt index 705bb31fca..ccfc08a569 100644 --- a/ext/standard/tests/strings/chunk_split_variation6.phpt +++ b/ext/standard/tests/strings/chunk_split_variation6.phpt @@ -45,7 +45,7 @@ for($count = 0;$count < count($values);$count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : with different single quoted 'str' *** -- Iteration 0 -- string(3) "):(" diff --git a/ext/standard/tests/strings/chunk_split_variation7.phpt b/ext/standard/tests/strings/chunk_split_variation7.phpt Binary files differindex a27ff3cacd..0cd3bec922 100644 --- a/ext/standard/tests/strings/chunk_split_variation7.phpt +++ b/ext/standard/tests/strings/chunk_split_variation7.phpt diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt Binary files differindex 5601bbc1e2..c7989b0539 100644 --- a/ext/standard/tests/strings/chunk_split_variation9.phpt +++ b/ext/standard/tests/strings/chunk_split_variation9.phpt diff --git a/ext/standard/tests/strings/convert_cyr_string_basic.phpt b/ext/standard/tests/strings/convert_cyr_string_basic.phpt index e29ad330ce..e38fb3f639 100644 --- a/ext/standard/tests/strings/convert_cyr_string_basic.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_basic.phpt @@ -26,7 +26,7 @@ for ($i = 128; $i < 256; $i++) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing convert_cyr_string() : basic functionality *** -- First try some simple English text -- diff --git a/ext/standard/tests/strings/convert_uudecode_basic.phpt b/ext/standard/tests/strings/convert_uudecode_basic.phpt index 6e334a9815..1d7e373512 100644 --- a/ext/standard/tests/strings/convert_uudecode_basic.phpt +++ b/ext/standard/tests/strings/convert_uudecode_basic.phpt @@ -48,7 +48,7 @@ echo "TEST PASSED\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing convert_uudecode() : basic functionality *** TEST PASSED ===DONE=== diff --git a/ext/standard/tests/strings/count_chars_basic.phpt b/ext/standard/tests/strings/count_chars_basic.phpt index f28fa63b20..f74496214a 100644 --- a/ext/standard/tests/strings/count_chars_basic.phpt +++ b/ext/standard/tests/strings/count_chars_basic.phpt @@ -23,7 +23,7 @@ var_dump(bin2hex(count_chars($string, 4))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing count_chars() : basic functionality *** array(256) { [0]=> diff --git a/ext/standard/tests/strings/crc32_basic.phpt b/ext/standard/tests/strings/crc32_basic.phpt index 52a3f89f4a..3aa780d113 100644 --- a/ext/standard/tests/strings/crc32_basic.phpt +++ b/ext/standard/tests/strings/crc32_basic.phpt @@ -34,7 +34,7 @@ printf("%u\n", crc32($str) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing crc32() : basic functionality *** bool(true) 256895812 diff --git a/ext/standard/tests/strings/crc32_variation2.phpt b/ext/standard/tests/strings/crc32_variation2.phpt index 6d57a94453..7473194f1b 100644 --- a/ext/standard/tests/strings/crc32_variation2.phpt +++ b/ext/standard/tests/strings/crc32_variation2.phpt @@ -72,7 +72,7 @@ foreach($string_array as $str) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing crc32() : with different strings in single quotes *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/crc32_variation4.phpt b/ext/standard/tests/strings/crc32_variation4.phpt index 35c3b0a719..00b47dc190 100644 --- a/ext/standard/tests/strings/crc32_variation4.phpt +++ b/ext/standard/tests/strings/crc32_variation4.phpt @@ -88,7 +88,7 @@ foreach($heredoc_strings as $str) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing crc32() : with different heredoc strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/crypt_sha256.phpt b/ext/standard/tests/strings/crypt_sha256.phpt index a29bbf3c88..37bc31bd8b 100644 --- a/ext/standard/tests/strings/crypt_sha256.phpt +++ b/ext/standard/tests/strings/crypt_sha256.phpt @@ -59,6 +59,6 @@ Expected: <$t[2]> Got <$res>\n"; } echo "Passes.";?> ---EXPECTF-- +--EXPECT-- Passes. diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt index 3d51f4aafa..615376e6b2 100644 --- a/ext/standard/tests/strings/crypt_sha512.phpt +++ b/ext/standard/tests/strings/crypt_sha512.phpt @@ -60,6 +60,6 @@ Got <$res>\n"; } echo "Passes."; ?> ---EXPECTF-- +--EXPECT-- Passes. diff --git a/ext/standard/tests/strings/crypt_variation1.phpt b/ext/standard/tests/strings/crypt_variation1.phpt index 6e0d3fe121..3315f035ed 100644 --- a/ext/standard/tests/strings/crypt_variation1.phpt +++ b/ext/standard/tests/strings/crypt_variation1.phpt @@ -17,7 +17,7 @@ $b = str_repeat("A", 4096); echo crypt("A", "$5$" . $b)."\n"; ?> ---EXPECTF-- +--EXPECT-- $5$AAAAAAAAAAAAAAAA$frotiiztWZiwcncxnY5tWG9Ida2WOZEximjLXCleQu6 $5$AAAAAAAAAAAAAAAA$frotiiztWZiwcncxnY5tWG9Ida2WOZEximjLXCleQu6 $5$AAAAAAAAAAAAAAAA$frotiiztWZiwcncxnY5tWG9Ida2WOZEximjLXCleQu6 diff --git a/ext/standard/tests/strings/explode.phpt b/ext/standard/tests/strings/explode.phpt index 4c7a3fe45a..20c2a25470 100644 --- a/ext/standard/tests/strings/explode.phpt +++ b/ext/standard/tests/strings/explode.phpt @@ -32,7 +32,7 @@ var_dump(explode(":","a lazy dog:jumps:over:",-40000000000000)); var_dump(explode(":^:","a lazy dog:^:jumps::over:^:",-1)); var_dump(explode(":^:","a lazy dog:^:jumps::over:^:",-2)); ?> ---EXPECTF-- +--EXPECT-- array ( 0 => 'a', 1 => 'b' . "\0" . 'd', diff --git a/ext/standard/tests/strings/explode_bug.phpt b/ext/standard/tests/strings/explode_bug.phpt index 9766f0b8f4..22d92ea7f5 100644 --- a/ext/standard/tests/strings/explode_bug.phpt +++ b/ext/standard/tests/strings/explode_bug.phpt @@ -8,7 +8,7 @@ memory_limit=256M $res = explode(str_repeat("A",145999999),1); var_dump($res); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(1) "1" diff --git a/ext/standard/tests/strings/fprintf_variation_001.phpt b/ext/standard/tests/strings/fprintf_variation_001.phpt index f08d5cbee7..3a935107a7 100644 --- a/ext/standard/tests/strings/fprintf_variation_001.phpt +++ b/ext/standard/tests/strings/fprintf_variation_001.phpt @@ -38,7 +38,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with floats *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/fprintf_variation_002.phpt b/ext/standard/tests/strings/fprintf_variation_002.phpt index fb3ab6c14a..49e62e2b74 100644 --- a/ext/standard/tests/strings/fprintf_variation_002.phpt +++ b/ext/standard/tests/strings/fprintf_variation_002.phpt @@ -38,7 +38,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with integers *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/fprintf_variation_003.phpt b/ext/standard/tests/strings/fprintf_variation_003.phpt index c312c49d67..b4860879b0 100644 --- a/ext/standard/tests/strings/fprintf_variation_003.phpt +++ b/ext/standard/tests/strings/fprintf_variation_003.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with binary *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt index 448f5281d5..ba8e525c3f 100644 --- a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with binary *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_005.phpt b/ext/standard/tests/strings/fprintf_variation_005.phpt index 75636ac98e..0967b77cd8 100644 --- a/ext/standard/tests/strings/fprintf_variation_005.phpt +++ b/ext/standard/tests/strings/fprintf_variation_005.phpt @@ -32,7 +32,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for scientific type *** 0.000000e+0 diff --git a/ext/standard/tests/strings/fprintf_variation_006.phpt b/ext/standard/tests/strings/fprintf_variation_006.phpt index d7a3278577..8a66fb9fb4 100644 --- a/ext/standard/tests/strings/fprintf_variation_006.phpt +++ b/ext/standard/tests/strings/fprintf_variation_006.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for unsigned integers *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt index d68683e3ee..fe4cc91dd7 100644 --- a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for unsigned integers *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_007.phpt b/ext/standard/tests/strings/fprintf_variation_007.phpt index cb09084b73..16d39bbde3 100644 --- a/ext/standard/tests/strings/fprintf_variation_007.phpt +++ b/ext/standard/tests/strings/fprintf_variation_007.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for octals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt index c8481e9fd2..55cd946a3b 100644 --- a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for octals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_008.phpt b/ext/standard/tests/strings/fprintf_variation_008.phpt index f91e7a1a99..d2187c7ccd 100644 --- a/ext/standard/tests/strings/fprintf_variation_008.phpt +++ b/ext/standard/tests/strings/fprintf_variation_008.phpt @@ -34,7 +34,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for hexadecimals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt index f619510227..9d326a91c1 100644 --- a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt @@ -34,7 +34,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for hexadecimals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_009.phpt b/ext/standard/tests/strings/fprintf_variation_009.phpt index 40f36bb5f0..e36c0e8c0f 100644 --- a/ext/standard/tests/strings/fprintf_variation_009.phpt +++ b/ext/standard/tests/strings/fprintf_variation_009.phpt @@ -38,7 +38,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for string types *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/get_html_translation_table_basic3.phpt b/ext/standard/tests/strings/get_html_translation_table_basic3.phpt index 4e1cdddd29..9fe832eab2 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic3.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic3.phpt @@ -33,7 +33,7 @@ var_dump( $tt ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_html_translation_table() : basic functionality *** -- with table = HTML_SPECIALCHARS & quote_style = ENT_COMPAT -- array(4) { diff --git a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt index 1a908efdb4..7ff0aa9a41 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt @@ -24,7 +24,7 @@ var_dump( $tt ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_html_translation_table() : basic functionality/Windows-1252 *** -- with table = HTML_ENTITIES -- array(125) { diff --git a/ext/standard/tests/strings/get_meta_tags.phpt b/ext/standard/tests/strings/get_meta_tags.phpt index f086b99b76..1fb9bf41a1 100644 --- a/ext/standard/tests/strings/get_meta_tags.phpt +++ b/ext/standard/tests/strings/get_meta_tags.phpt @@ -55,7 +55,7 @@ foreach ($array as $html) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(4) { ["author"]=> string(4) "name" diff --git a/ext/standard/tests/strings/hebrev_basic.phpt b/ext/standard/tests/strings/hebrev_basic.phpt index 2f53c6fc29..5cdd86ca36 100644 --- a/ext/standard/tests/strings/hebrev_basic.phpt +++ b/ext/standard/tests/strings/hebrev_basic.phpt @@ -17,7 +17,7 @@ var_dump(hebrev($hebrew_text, 15)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing hebrev() : basic functionality *** string(109) ".The hebrev function converts logical Hebrew text to visual text .The function tries to avoid breaking words diff --git a/ext/standard/tests/strings/hebrevc_basic.phpt b/ext/standard/tests/strings/hebrevc_basic.phpt index 9d9a7137c2..2eaa6d712c 100644 --- a/ext/standard/tests/strings/hebrevc_basic.phpt +++ b/ext/standard/tests/strings/hebrevc_basic.phpt @@ -17,7 +17,7 @@ var_dump(hebrevc($hebrew_text, 15)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing hebrevc() : basic functionality *** string(239) ".The hebrevc function converts logical Hebrew text to visual text<br /> ) This function is similar to hebrev() with the difference that it converts newlines<br /> diff --git a/ext/standard/tests/strings/hex2bin_basic.phpt b/ext/standard/tests/strings/hex2bin_basic.phpt index 8f3437d5e5..c8c54d24b1 100644 --- a/ext/standard/tests/strings/hex2bin_basic.phpt +++ b/ext/standard/tests/strings/hex2bin_basic.phpt @@ -11,7 +11,7 @@ var_dump(bin2hex(hex2bin('123abc')) == '123abc'); var_dump(bin2hex(hex2bin('FFFFFF')) == 'ffffff'); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/strings/htmlentities-utf-2.phpt b/ext/standard/tests/strings/htmlentities-utf-2.phpt index 81c974cbf8..e6aa817276 100644 --- a/ext/standard/tests/strings/htmlentities-utf-2.phpt +++ b/ext/standard/tests/strings/htmlentities-utf-2.phpt @@ -17,7 +17,7 @@ foreach($strings as $string) { var_dump(bin2hex($ent_encoded)); } ?> ---EXPECTF-- +--EXPECT-- string(8) "266c743b" string(8) "266c743b" string(0) "" diff --git a/ext/standard/tests/strings/htmlentities-utf.phpt b/ext/standard/tests/strings/htmlentities-utf.phpt index 0dc5b8030c..dafec86b9a 100644 --- a/ext/standard/tests/strings/htmlentities-utf.phpt +++ b/ext/standard/tests/strings/htmlentities-utf.phpt @@ -17,7 +17,7 @@ foreach($strings as $string) { var_dump(bin2hex($ent_encoded)); } ?> ---EXPECTF-- +--EXPECT-- string(8) "266c743b" string(8) "266c743b" string(0) "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt index dc027398d5..9dba3c87c5 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt @@ -29,7 +29,7 @@ var_dump( htmlspecialchars_decode($double_quote_string, ENT_QUOTES) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : basic functionality *** string(92) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" string(92) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt index b36556f1a2..007ff9e209 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt @@ -71,7 +71,7 @@ for($index =0; $index < count($res_heredoc_strings); $index ++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : usage variations *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt index e51e904fea..95889b3527 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt @@ -35,7 +35,7 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : usage variations *** -- Iteration 1 -- string(90) "Roy's height > Sam's \$height... 1111 ≈ 0000 = 0000... " double quote string "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt index 307cfe6d90..ad86639576 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -34,7 +34,7 @@ foreach($strings as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : usage variations *** -- Iteration 1 -- string(89) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt Binary files differindex 7b1295c54e..eb94c9f5ca 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt diff --git a/ext/standard/tests/strings/http_build_query_variation1.phpt b/ext/standard/tests/strings/http_build_query_variation1.phpt index 56d81c9fdd..4a70404ce0 100644 --- a/ext/standard/tests/strings/http_build_query_variation1.phpt +++ b/ext/standard/tests/strings/http_build_query_variation1.phpt @@ -25,6 +25,6 @@ $obj->sort = 'desc,name'; echo http_build_query($obj) . PHP_EOL; echo http_build_query(new UrlBuilder()); ?> ---EXPECTF-- +--EXPECT-- name=homepage&page=1&sort=desc%2Cname name=homepage&page=1 diff --git a/ext/standard/tests/strings/http_build_query_variation2.phpt b/ext/standard/tests/strings/http_build_query_variation2.phpt index ca1d8f459a..689db9e1fa 100644 --- a/ext/standard/tests/strings/http_build_query_variation2.phpt +++ b/ext/standard/tests/strings/http_build_query_variation2.phpt @@ -34,6 +34,6 @@ $mDimensional = array( echo http_build_query($mDimensional) . PHP_EOL; echo http_build_query($mDimensional, 'prefix_'); ?> ---EXPECTF-- +--EXPECT-- 0=20&5=13&9%5B1%5D=val1&9%5B3%5D=val2&9%5Bstring%5D=string&name=homepage&page=10&sort%5B0%5D=desc&sort%5Badmin%5D%5B0%5D=admin1&sort%5Badmin%5D%5Badmin2%5D%5Bwho%5D=admin2&sort%5Badmin%5D%5Badmin2%5D%5B2%5D=test prefix_0=20&prefix_5=13&prefix_9%5B1%5D=val1&prefix_9%5B3%5D=val2&prefix_9%5Bstring%5D=string&name=homepage&page=10&sort%5B0%5D=desc&sort%5Badmin%5D%5B0%5D=admin1&sort%5Badmin%5D%5Badmin2%5D%5Bwho%5D=admin2&sort%5Badmin%5D%5Badmin2%5D%5B2%5D=test diff --git a/ext/standard/tests/strings/http_build_query_variation3.phpt b/ext/standard/tests/strings/http_build_query_variation3.phpt index 350f3c8661..d6d50d1e85 100644 --- a/ext/standard/tests/strings/http_build_query_variation3.phpt +++ b/ext/standard/tests/strings/http_build_query_variation3.phpt @@ -18,6 +18,6 @@ $oDimensional = array( echo http_build_query($oDimensional, '', ini_get('arg_separator.output'), PHP_QUERY_RFC1738) . PHP_EOL; echo http_build_query($oDimensional, '', ini_get('arg_separator.output'), PHP_QUERY_RFC3986); ?> ---EXPECTF-- +--EXPECT-- name=main+page&sort=desc%2Cadmin&equation=10+%2B+10+-+5 name=main%20page&sort=desc%2Cadmin&equation=10%20%2B%2010%20-%205 diff --git a/ext/standard/tests/strings/join_basic.phpt b/ext/standard/tests/strings/join_basic.phpt index 164c4613a0..1bf9a89c9a 100644 --- a/ext/standard/tests/strings/join_basic.phpt +++ b/ext/standard/tests/strings/join_basic.phpt @@ -34,7 +34,7 @@ var_dump( join($glue, $pieces) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing join() : basic functionality *** string(7) "1,2,3,4" string(30) "Red, Green, Blue, Black, White" diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt Binary files differindex 621b69521c..412f36cda0 100644 --- a/ext/standard/tests/strings/join_variation6.phpt +++ b/ext/standard/tests/strings/join_variation6.phpt diff --git a/ext/standard/tests/strings/md5_basic1.phpt b/ext/standard/tests/strings/md5_basic1.phpt index af91ade73f..86377e227d 100644 --- a/ext/standard/tests/strings/md5_basic1.phpt +++ b/ext/standard/tests/strings/md5_basic1.phpt @@ -11,7 +11,7 @@ echo "*** Testing md5() : basic functionality ***\n"; var_dump(md5("apple")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing md5() : basic functionality *** string(32) "1f3870be274f6c49b3e31a0c6728957f" ===DONE=== diff --git a/ext/standard/tests/strings/moneyformat.phpt b/ext/standard/tests/strings/moneyformat.phpt index 39245772bc..8adc2e3ade 100644 --- a/ext/standard/tests/strings/moneyformat.phpt +++ b/ext/standard/tests/strings/moneyformat.phpt @@ -15,5 +15,5 @@ if (setlocale(LC_MONETARY, 'en_US') === false) { setlocale(LC_MONETARY, 'en_US'); var_dump( money_format("X%nY", 3.1415)); ?> ---EXPECTF-- +--EXPECT-- string(7) "X$3.14Y" diff --git a/ext/standard/tests/strings/nl2br_variation1.phpt b/ext/standard/tests/strings/nl2br_variation1.phpt index ab15ca1fe4..21268d0329 100644 --- a/ext/standard/tests/strings/nl2br_variation1.phpt +++ b/ext/standard/tests/strings/nl2br_variation1.phpt @@ -45,7 +45,7 @@ foreach( $strings as $str ){ } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** -- Iteration 1 -- string(17) "Hello<br /> diff --git a/ext/standard/tests/strings/nl2br_variation2.phpt b/ext/standard/tests/strings/nl2br_variation2.phpt index a4423df319..79be6f5f03 100644 --- a/ext/standard/tests/strings/nl2br_variation2.phpt +++ b/ext/standard/tests/strings/nl2br_variation2.phpt @@ -43,7 +43,7 @@ foreach( $strings as $str ){ } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** -- Iteration 1 -- string(2) "\n" diff --git a/ext/standard/tests/strings/nl2br_variation3.phpt b/ext/standard/tests/strings/nl2br_variation3.phpt index b1341d13d6..587518d1ee 100644 --- a/ext/standard/tests/strings/nl2br_variation3.phpt +++ b/ext/standard/tests/strings/nl2br_variation3.phpt @@ -34,7 +34,7 @@ var_dump(nl2br($heredoc_str2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** string(147) "<br /> <br /> diff --git a/ext/standard/tests/strings/nl2br_variation4.phpt b/ext/standard/tests/strings/nl2br_variation4.phpt index 63931afaf0..04244dccce 100644 --- a/ext/standard/tests/strings/nl2br_variation4.phpt +++ b/ext/standard/tests/strings/nl2br_variation4.phpt @@ -28,7 +28,7 @@ foreach( $strings as $str ){ } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** string(29) "<html>Hello<br />world</html>" string(19) "<html><br /></html>" diff --git a/ext/standard/tests/strings/nl_langinfo_basic.phpt b/ext/standard/tests/strings/nl_langinfo_basic.phpt index 370177ba8a..7502e2d471 100644 --- a/ext/standard/tests/strings/nl_langinfo_basic.phpt +++ b/ext/standard/tests/strings/nl_langinfo_basic.phpt @@ -27,7 +27,7 @@ var_dump(nl_langinfo(RADIXCHAR)); setlocale(LC_ALL, $original); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing nl_langinfo() : basic functionality *** string(3) "Mon" string(9) "Wednesday" diff --git a/ext/standard/tests/strings/number_format_basic.phpt b/ext/standard/tests/strings/number_format_basic.phpt index 94b8482eef..0e467b70d0 100644 --- a/ext/standard/tests/strings/number_format_basic.phpt +++ b/ext/standard/tests/strings/number_format_basic.phpt @@ -48,7 +48,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing number_format() : basic functionality *** -- number_format tests.....default -- diff --git a/ext/standard/tests/strings/pack.phpt b/ext/standard/tests/strings/pack.phpt index 449451c1aa..97a6a687c5 100644 --- a/ext/standard/tests/strings/pack.phpt +++ b/ext/standard/tests/strings/pack.phpt @@ -97,7 +97,7 @@ print_r(unpack("v", pack("v", -1000))); print_r(unpack("v", pack("v", -64434))); print_r(unpack("v", pack("v", -65535))); ?> ---EXPECTF-- +--EXPECT-- Array ( [1] => h diff --git a/ext/standard/tests/strings/pack64.phpt b/ext/standard/tests/strings/pack64.phpt index 9bc24928fe..cccdc1ba6e 100644 --- a/ext/standard/tests/strings/pack64.phpt +++ b/ext/standard/tests/strings/pack64.phpt @@ -32,7 +32,7 @@ print_r(unpack("q", pack("q", 0x8000000000000002))); print_r(unpack("q", pack("q", -1))); print_r(unpack("q", pack("q", 0x8000000000000000))); ?> ---EXPECTF-- +--EXPECT-- Array ( [1] => 281474976710654 diff --git a/ext/standard/tests/strings/pack_float.phpt b/ext/standard/tests/strings/pack_float.phpt index 088b508bc0..4cfeb92e4b 100644 --- a/ext/standard/tests/strings/pack_float.phpt +++ b/ext/standard/tests/strings/pack_float.phpt @@ -113,7 +113,7 @@ var_dump( ); ?> ---EXPECTF-- +--EXPECT-- string(6) "pack e" string(16) "0000000000000000" string(16) "0000000000000000" diff --git a/ext/standard/tests/strings/printf_basic1.phpt b/ext/standard/tests/strings/printf_basic1.phpt index e6fd1d991f..db6edf6374 100644 --- a/ext/standard/tests/strings/printf_basic1.phpt +++ b/ext/standard/tests/strings/printf_basic1.phpt @@ -41,7 +41,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using string format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic2.phpt b/ext/standard/tests/strings/printf_basic2.phpt index 195f7cb58f..f57b263fbf 100644 --- a/ext/standard/tests/strings/printf_basic2.phpt +++ b/ext/standard/tests/strings/printf_basic2.phpt @@ -41,7 +41,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using integer format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic3.phpt b/ext/standard/tests/strings/printf_basic3.phpt index 1e51d41fc5..2fd6050da2 100644 --- a/ext/standard/tests/strings/printf_basic3.phpt +++ b/ext/standard/tests/strings/printf_basic3.phpt @@ -55,7 +55,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using float format *** -- Calling printf() with no arguments-- diff --git a/ext/standard/tests/strings/printf_basic4.phpt b/ext/standard/tests/strings/printf_basic4.phpt index 9de0497674..da8f29e795 100644 --- a/ext/standard/tests/strings/printf_basic4.phpt +++ b/ext/standard/tests/strings/printf_basic4.phpt @@ -40,7 +40,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using bool format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic5.phpt b/ext/standard/tests/strings/printf_basic5.phpt index 57b17d4945..3cdcc1abf4 100644 --- a/ext/standard/tests/strings/printf_basic5.phpt +++ b/ext/standard/tests/strings/printf_basic5.phpt @@ -40,7 +40,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using char format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic6.phpt b/ext/standard/tests/strings/printf_basic6.phpt index 95b9d4a042..b3872efdd0 100644 --- a/ext/standard/tests/strings/printf_basic6.phpt +++ b/ext/standard/tests/strings/printf_basic6.phpt @@ -39,7 +39,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using exponential format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic7.phpt b/ext/standard/tests/strings/printf_basic7.phpt index a43fcf2da1..f7e0d2b4f6 100644 --- a/ext/standard/tests/strings/printf_basic7.phpt +++ b/ext/standard/tests/strings/printf_basic7.phpt @@ -47,7 +47,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using unsigned format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic8.phpt b/ext/standard/tests/strings/printf_basic8.phpt index 4127bc637f..626797ffbf 100644 --- a/ext/standard/tests/strings/printf_basic8.phpt +++ b/ext/standard/tests/strings/printf_basic8.phpt @@ -46,7 +46,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using octal format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic9.phpt b/ext/standard/tests/strings/printf_basic9.phpt index 9b441b2ccf..db1ebba2f7 100644 --- a/ext/standard/tests/strings/printf_basic9.phpt +++ b/ext/standard/tests/strings/printf_basic9.phpt @@ -56,7 +56,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using hexadecimal format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt index 5b15388d08..d58d3f9056 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt @@ -19,7 +19,7 @@ var_dump(bin2hex(quoted_printable_decode($str))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing quoted_printable_decode() : basic functionality *** string(76) "fa776f772d666163746f72c1d0d5ddc5ceced9c50a20d4cfd2c7cfd7d9c520d0d2cfc5cbd4d9" ===DONE=== diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt index 9a2f23c464..413ae21fd2 100644 --- a/ext/standard/tests/strings/quotemeta_basic.phpt +++ b/ext/standard/tests/strings/quotemeta_basic.phpt @@ -15,7 +15,7 @@ var_dump(quotemeta("(100 + 50) * 10")); var_dump(quotemeta("\+*?[^]($)")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing quotemeta() : basic functionality *** string(20) "Hello how are you \?" string(19) "\(100 \+ 50\) \* 10" diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt index 44cbe1bda7..2b12d26d14 100644 --- a/ext/standard/tests/strings/setlocale_variation3.phpt +++ b/ext/standard/tests/strings/setlocale_variation3.phpt @@ -53,7 +53,7 @@ if($locale_info_before == $locale_info_after){ echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setlocale() : usage variations - setting system locale = 0 *** Locale info, before setting the locale array(18) { diff --git a/ext/standard/tests/strings/setlocale_variation4.phpt b/ext/standard/tests/strings/setlocale_variation4.phpt index 7b27c106d9..47ae8fcc97 100644 --- a/ext/standard/tests/strings/setlocale_variation4.phpt +++ b/ext/standard/tests/strings/setlocale_variation4.phpt @@ -51,7 +51,7 @@ if($locale_info_before != $locale_info_after){ echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setlocale() : usage variations - Setting system locale = null *** Locale info, before setting the locale array(18) { diff --git a/ext/standard/tests/strings/setlocale_variation5.phpt b/ext/standard/tests/strings/setlocale_variation5.phpt index 40eda3780b..85d06e1a74 100644 --- a/ext/standard/tests/strings/setlocale_variation5.phpt +++ b/ext/standard/tests/strings/setlocale_variation5.phpt @@ -55,7 +55,7 @@ if($locale_info_before != $locale_info_after){ echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setlocale() : usage variations - setting system locale = "" *** Locale info, before setting the locale array(18) { diff --git a/ext/standard/tests/strings/show_source_basic.phpt b/ext/standard/tests/strings/show_source_basic.phpt index cfd998fe96..c4c2bd83f2 100644 --- a/ext/standard/tests/strings/show_source_basic.phpt +++ b/ext/standard/tests/strings/show_source_basic.phpt @@ -19,7 +19,7 @@ if ( $foo == 'bar' ) show_source(__FILE__); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments *** <code><span style="color: #000000"> <span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">) <br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">'baz'</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */<br /> <br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">?><br /></span> diff --git a/ext/standard/tests/strings/show_source_variation1.phpt b/ext/standard/tests/strings/show_source_variation1.phpt index a9993ed457..568b842338 100644 --- a/ext/standard/tests/strings/show_source_variation1.phpt +++ b/ext/standard/tests/strings/show_source_variation1.phpt @@ -19,7 +19,7 @@ echo $baz; show_source(__FILE__); echo $foo; ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments and php output *** baz <code><span style="color: #000000"> diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt index 06ef66c2d2..8224d0eee6 100644 --- a/ext/standard/tests/strings/show_source_variation2.phpt +++ b/ext/standard/tests/strings/show_source_variation2.phpt @@ -19,7 +19,7 @@ $source = show_source(__FILE__, true); var_dump($source); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments and output to variable *** string(1987) "<code><span style="color: #000000"> <span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments and output to variable ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">) <br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */ <br /></span><span style="color: #0000BB">$source </span><span style="color: #007700">= </span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">, </span><span style="color: #0000BB">true</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$source</span><span style="color: #007700">);<br /></span><span style="color: #0000BB">?><br /></span> diff --git a/ext/standard/tests/strings/similar_text_basic.phpt b/ext/standard/tests/strings/similar_text_basic.phpt index 37b6527180..ad8807f102 100644 --- a/ext/standard/tests/strings/similar_text_basic.phpt +++ b/ext/standard/tests/strings/similar_text_basic.phpt @@ -27,7 +27,7 @@ similar_text("abcdefghabcdef", "zzzzabcdefggg", $percent); var_dump($percent); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- int(3) int(0) int(1) diff --git a/ext/standard/tests/strings/sprintf_basic1.phpt b/ext/standard/tests/strings/sprintf_basic1.phpt index b1c6194f06..18317373f4 100644 --- a/ext/standard/tests/strings/sprintf_basic1.phpt +++ b/ext/standard/tests/strings/sprintf_basic1.phpt @@ -32,7 +32,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using string format *** string(6) "format" string(13) "arg1 argument" diff --git a/ext/standard/tests/strings/sprintf_basic2.phpt b/ext/standard/tests/strings/sprintf_basic2.phpt index 94b177f5a3..16c035f34b 100644 --- a/ext/standard/tests/strings/sprintf_basic2.phpt +++ b/ext/standard/tests/strings/sprintf_basic2.phpt @@ -33,7 +33,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using integer format *** string(6) "format" string(3) "111" diff --git a/ext/standard/tests/strings/sprintf_basic3.phpt b/ext/standard/tests/strings/sprintf_basic3.phpt index 52582abbe1..e6cd477bfa 100644 --- a/ext/standard/tests/strings/sprintf_basic3.phpt +++ b/ext/standard/tests/strings/sprintf_basic3.phpt @@ -41,7 +41,7 @@ var_dump( sprintf($format33, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using float format *** string(6) "format" string(9) "11.110000" diff --git a/ext/standard/tests/strings/sprintf_basic4.phpt b/ext/standard/tests/strings/sprintf_basic4.phpt index ee0a4b5654..5dd5dd26b6 100644 --- a/ext/standard/tests/strings/sprintf_basic4.phpt +++ b/ext/standard/tests/strings/sprintf_basic4.phpt @@ -33,7 +33,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using bool format *** string(6) "format" string(1) "1" diff --git a/ext/standard/tests/strings/sprintf_basic5.phpt b/ext/standard/tests/strings/sprintf_basic5.phpt index 7f06cbe47e..8ccb899b2f 100644 --- a/ext/standard/tests/strings/sprintf_basic5.phpt +++ b/ext/standard/tests/strings/sprintf_basic5.phpt @@ -33,7 +33,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using char format *** string(6) "format" string(1) "A" diff --git a/ext/standard/tests/strings/sprintf_basic6.phpt b/ext/standard/tests/strings/sprintf_basic6.phpt index c6d691cec5..882aacc107 100644 --- a/ext/standard/tests/strings/sprintf_basic6.phpt +++ b/ext/standard/tests/strings/sprintf_basic6.phpt @@ -32,7 +32,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using exponential format *** string(6) "format" string(11) "1.000000e+3" diff --git a/ext/standard/tests/strings/sprintf_basic7.phpt b/ext/standard/tests/strings/sprintf_basic7.phpt index 56bae8bd8d..9554ca1f59 100644 --- a/ext/standard/tests/strings/sprintf_basic7.phpt +++ b/ext/standard/tests/strings/sprintf_basic7.phpt @@ -39,7 +39,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using unsigned format *** string(6) "format" string(10) "4294966185" diff --git a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt index 035661db61..b00c05bc8f 100644 --- a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt @@ -35,7 +35,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using unsigned format *** string(6) "format" string(20) "18446744073709550505" diff --git a/ext/standard/tests/strings/sprintf_basic8.phpt b/ext/standard/tests/strings/sprintf_basic8.phpt index 925689939c..538122101d 100644 --- a/ext/standard/tests/strings/sprintf_basic8.phpt +++ b/ext/standard/tests/strings/sprintf_basic8.phpt @@ -38,7 +38,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using octal format *** string(6) "format" string(2) "21" diff --git a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt index 9c7e1e6535..2facb3f896 100644 --- a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt @@ -34,7 +34,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using octal format *** string(6) "format" string(2) "21" diff --git a/ext/standard/tests/strings/sprintf_basic9.phpt b/ext/standard/tests/strings/sprintf_basic9.phpt index 1e16bf810c..9271bf92c9 100644 --- a/ext/standard/tests/strings/sprintf_basic9.phpt +++ b/ext/standard/tests/strings/sprintf_basic9.phpt @@ -42,7 +42,7 @@ var_dump( sprintf($format33, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using hexadecimal format *** string(6) "format" string(1) "b" diff --git a/ext/standard/tests/strings/sprintf_variation10.phpt b/ext/standard/tests/strings/sprintf_variation10.phpt index 3880b212df..2b338b238a 100644 --- a/ext/standard/tests/strings/sprintf_variation10.phpt +++ b/ext/standard/tests/strings/sprintf_variation10.phpt @@ -52,7 +52,7 @@ foreach($integer_values as $int_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation12.phpt b/ext/standard/tests/strings/sprintf_variation12.phpt index b1b186c449..b11e5f5eb2 100644 --- a/ext/standard/tests/strings/sprintf_variation12.phpt +++ b/ext/standard/tests/strings/sprintf_variation12.phpt @@ -48,7 +48,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with arrays *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation13.phpt b/ext/standard/tests/strings/sprintf_variation13.phpt index 60ae89c610..ce1567a24d 100644 --- a/ext/standard/tests/strings/sprintf_variation13.phpt +++ b/ext/standard/tests/strings/sprintf_variation13.phpt @@ -53,7 +53,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation14.phpt b/ext/standard/tests/strings/sprintf_variation14.phpt index 40704d2899..8c1278e9e0 100644 --- a/ext/standard/tests/strings/sprintf_variation14.phpt +++ b/ext/standard/tests/strings/sprintf_variation14.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt Binary files differindex 3769ae90d9..1ec44a6d03 100644 --- a/ext/standard/tests/strings/sprintf_variation15.phpt +++ b/ext/standard/tests/strings/sprintf_variation15.phpt diff --git a/ext/standard/tests/strings/sprintf_variation16.phpt b/ext/standard/tests/strings/sprintf_variation16.phpt index 57965315ee..c89b651fdf 100644 --- a/ext/standard/tests/strings/sprintf_variation16.phpt +++ b/ext/standard/tests/strings/sprintf_variation16.phpt @@ -48,7 +48,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index 960bcd0e78..40fc7d9757 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -47,7 +47,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation19.phpt b/ext/standard/tests/strings/sprintf_variation19.phpt index fb3f90585e..916896e5fa 100644 --- a/ext/standard/tests/strings/sprintf_variation19.phpt +++ b/ext/standard/tests/strings/sprintf_variation19.phpt @@ -51,7 +51,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation20.phpt b/ext/standard/tests/strings/sprintf_variation20.phpt index fc82fefa2a..6ac7cbb18a 100644 --- a/ext/standard/tests/strings/sprintf_variation20.phpt +++ b/ext/standard/tests/strings/sprintf_variation20.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation21.phpt b/ext/standard/tests/strings/sprintf_variation21.phpt Binary files differindex 20aa1e9d58..083f3827fe 100644 --- a/ext/standard/tests/strings/sprintf_variation21.phpt +++ b/ext/standard/tests/strings/sprintf_variation21.phpt diff --git a/ext/standard/tests/strings/sprintf_variation22.phpt b/ext/standard/tests/strings/sprintf_variation22.phpt Binary files differindex 8684765250..ef92e521e8 100644 --- a/ext/standard/tests/strings/sprintf_variation22.phpt +++ b/ext/standard/tests/strings/sprintf_variation22.phpt diff --git a/ext/standard/tests/strings/sprintf_variation24.phpt b/ext/standard/tests/strings/sprintf_variation24.phpt Binary files differindex 6bb3e0e370..3d874b5cbd 100644 --- a/ext/standard/tests/strings/sprintf_variation24.phpt +++ b/ext/standard/tests/strings/sprintf_variation24.phpt diff --git a/ext/standard/tests/strings/sprintf_variation25.phpt b/ext/standard/tests/strings/sprintf_variation25.phpt Binary files differindex 456344c3f0..1525a41cd5 100644 --- a/ext/standard/tests/strings/sprintf_variation25.phpt +++ b/ext/standard/tests/strings/sprintf_variation25.phpt diff --git a/ext/standard/tests/strings/sprintf_variation26.phpt b/ext/standard/tests/strings/sprintf_variation26.phpt Binary files differindex b5881ea5ea..580796add0 100644 --- a/ext/standard/tests/strings/sprintf_variation26.phpt +++ b/ext/standard/tests/strings/sprintf_variation26.phpt diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt Binary files differindex 88602dbdb2..01bb956384 100644 --- a/ext/standard/tests/strings/sprintf_variation27.phpt +++ b/ext/standard/tests/strings/sprintf_variation27.phpt diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt index e295fc8181..1474aad1bd 100644 --- a/ext/standard/tests/strings/sprintf_variation28.phpt +++ b/ext/standard/tests/strings/sprintf_variation28.phpt @@ -57,7 +57,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt index f4d8125e98..c13d5b9b8c 100644 --- a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt @@ -53,7 +53,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation29.phpt b/ext/standard/tests/strings/sprintf_variation29.phpt index 87ee835b76..641db49518 100644 --- a/ext/standard/tests/strings/sprintf_variation29.phpt +++ b/ext/standard/tests/strings/sprintf_variation29.phpt @@ -47,7 +47,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt index 53b4561375..6e7303521c 100644 --- a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt @@ -43,7 +43,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation3.phpt b/ext/standard/tests/strings/sprintf_variation3.phpt index 2649c1e8ed..ab4fbb1caf 100644 --- a/ext/standard/tests/strings/sprintf_variation3.phpt +++ b/ext/standard/tests/strings/sprintf_variation3.phpt @@ -50,7 +50,7 @@ foreach($valid_ints as $int_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt index a081273a22..59a9cfcbc1 100644 --- a/ext/standard/tests/strings/sprintf_variation31.phpt +++ b/ext/standard/tests/strings/sprintf_variation31.phpt @@ -46,7 +46,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation32.phpt b/ext/standard/tests/strings/sprintf_variation32.phpt index 6caf8ee6a3..ee72d0521c 100644 --- a/ext/standard/tests/strings/sprintf_variation32.phpt +++ b/ext/standard/tests/strings/sprintf_variation32.phpt @@ -52,7 +52,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation33.phpt b/ext/standard/tests/strings/sprintf_variation33.phpt index e903108f9e..acd4781c02 100644 --- a/ext/standard/tests/strings/sprintf_variation33.phpt +++ b/ext/standard/tests/strings/sprintf_variation33.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt index db905ebd18..ce2d01ca12 100644 --- a/ext/standard/tests/strings/sprintf_variation34.phpt +++ b/ext/standard/tests/strings/sprintf_variation34.phpt @@ -57,7 +57,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt index a4914664a2..2d095cd739 100644 --- a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt @@ -53,7 +53,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation35.phpt b/ext/standard/tests/strings/sprintf_variation35.phpt index ca6ba891dd..c658a767bf 100644 --- a/ext/standard/tests/strings/sprintf_variation35.phpt +++ b/ext/standard/tests/strings/sprintf_variation35.phpt @@ -52,7 +52,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt index 09ae50498e..64beaf1368 100644 --- a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt @@ -48,7 +48,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation37.phpt b/ext/standard/tests/strings/sprintf_variation37.phpt index d1ecbfc0dc..4406be95d9 100644 --- a/ext/standard/tests/strings/sprintf_variation37.phpt +++ b/ext/standard/tests/strings/sprintf_variation37.phpt @@ -45,7 +45,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation38.phpt b/ext/standard/tests/strings/sprintf_variation38.phpt index f9b4a7f6ab..79948b24af 100644 --- a/ext/standard/tests/strings/sprintf_variation38.phpt +++ b/ext/standard/tests/strings/sprintf_variation38.phpt @@ -51,7 +51,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation39.phpt b/ext/standard/tests/strings/sprintf_variation39.phpt index dac4346176..f3d0f8c21d 100644 --- a/ext/standard/tests/strings/sprintf_variation39.phpt +++ b/ext/standard/tests/strings/sprintf_variation39.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation4.phpt b/ext/standard/tests/strings/sprintf_variation4.phpt index 7fc66f910e..848e26de13 100644 --- a/ext/standard/tests/strings/sprintf_variation4.phpt +++ b/ext/standard/tests/strings/sprintf_variation4.phpt @@ -52,7 +52,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt index 774650a32c..65f78fa7a2 100644 --- a/ext/standard/tests/strings/sprintf_variation40.phpt +++ b/ext/standard/tests/strings/sprintf_variation40.phpt @@ -58,7 +58,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt index fffe6155fe..e4d36f439f 100644 --- a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt @@ -54,7 +54,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation41.phpt b/ext/standard/tests/strings/sprintf_variation41.phpt index 219ea0f025..713df9a2a3 100644 --- a/ext/standard/tests/strings/sprintf_variation41.phpt +++ b/ext/standard/tests/strings/sprintf_variation41.phpt @@ -56,7 +56,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt index 1435d02cb2..79e6275fcb 100644 --- a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt @@ -52,7 +52,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation43.phpt b/ext/standard/tests/strings/sprintf_variation43.phpt index 86527a52d4..a828e6b892 100644 --- a/ext/standard/tests/strings/sprintf_variation43.phpt +++ b/ext/standard/tests/strings/sprintf_variation43.phpt @@ -47,7 +47,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation44.phpt b/ext/standard/tests/strings/sprintf_variation44.phpt index fd4e0bc5a6..73e786e3df 100644 --- a/ext/standard/tests/strings/sprintf_variation44.phpt +++ b/ext/standard/tests/strings/sprintf_variation44.phpt @@ -60,7 +60,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt index 096e7e6499..1be1db709c 100644 --- a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt @@ -56,7 +56,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation45.phpt b/ext/standard/tests/strings/sprintf_variation45.phpt index e8219fc95e..85dcfceab7 100644 --- a/ext/standard/tests/strings/sprintf_variation45.phpt +++ b/ext/standard/tests/strings/sprintf_variation45.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation46.phpt b/ext/standard/tests/strings/sprintf_variation46.phpt index 9b8892d7d0..11bdb23cf6 100644 --- a/ext/standard/tests/strings/sprintf_variation46.phpt +++ b/ext/standard/tests/strings/sprintf_variation46.phpt @@ -51,7 +51,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation47.phpt b/ext/standard/tests/strings/sprintf_variation47.phpt index 4a100ef7dc..78d68fa4f4 100644 --- a/ext/standard/tests/strings/sprintf_variation47.phpt +++ b/ext/standard/tests/strings/sprintf_variation47.phpt @@ -53,7 +53,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation49.phpt b/ext/standard/tests/strings/sprintf_variation49.phpt index 554b43ac1e..d4807b1a2a 100644 --- a/ext/standard/tests/strings/sprintf_variation49.phpt +++ b/ext/standard/tests/strings/sprintf_variation49.phpt @@ -48,7 +48,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt index 21bb391b2e..a5fd306fd5 100644 --- a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt @@ -48,7 +48,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation50.phpt b/ext/standard/tests/strings/sprintf_variation50.phpt index 62bae0e22a..fc27b2c932 100644 --- a/ext/standard/tests/strings/sprintf_variation50.phpt +++ b/ext/standard/tests/strings/sprintf_variation50.phpt @@ -53,7 +53,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation51.phpt b/ext/standard/tests/strings/sprintf_variation51.phpt index d988aa70ef..9ee693e142 100644 --- a/ext/standard/tests/strings/sprintf_variation51.phpt +++ b/ext/standard/tests/strings/sprintf_variation51.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation53.phpt b/ext/standard/tests/strings/sprintf_variation53.phpt index 427d0d9364..87c91389e6 100644 --- a/ext/standard/tests/strings/sprintf_variation53.phpt +++ b/ext/standard/tests/strings/sprintf_variation53.phpt @@ -32,7 +32,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : with white spaces in format strings *** string(4) "1234" string(4) "1234" diff --git a/ext/standard/tests/strings/sprintf_variation6.phpt b/ext/standard/tests/strings/sprintf_variation6.phpt index 362c90d0a7..c41db4e637 100644 --- a/ext/standard/tests/strings/sprintf_variation6.phpt +++ b/ext/standard/tests/strings/sprintf_variation6.phpt @@ -48,7 +48,7 @@ foreach($array_types as $arr) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with arrays *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation7.phpt b/ext/standard/tests/strings/sprintf_variation7.phpt index 30e9aa54f1..b7ce8d94d2 100644 --- a/ext/standard/tests/strings/sprintf_variation7.phpt +++ b/ext/standard/tests/strings/sprintf_variation7.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation8.phpt b/ext/standard/tests/strings/sprintf_variation8.phpt index 9bec938836..7fd608b819 100644 --- a/ext/standard/tests/strings/sprintf_variation8.phpt +++ b/ext/standard/tests/strings/sprintf_variation8.phpt @@ -54,7 +54,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation9.phpt b/ext/standard/tests/strings/sprintf_variation9.phpt index 6511d1ad6e..6be495aa42 100644 --- a/ext/standard/tests/strings/sprintf_variation9.phpt +++ b/ext/standard/tests/strings/sprintf_variation9.phpt @@ -64,7 +64,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/str_replace_array_refs.phpt b/ext/standard/tests/strings/str_replace_array_refs.phpt index 102bcfa8fe..f45ea59c64 100644 --- a/ext/standard/tests/strings/str_replace_array_refs.phpt +++ b/ext/standard/tests/strings/str_replace_array_refs.phpt @@ -11,7 +11,7 @@ $numeric = &$ref['numeric']; var_dump(str_replace(array_keys($data), $data, "a numeric")); var_dump($numeric); var_dump($data['numeric']); ---EXPECTF-- +--EXPECT-- string(3) "b 1" int(1) int(1) diff --git a/ext/standard/tests/strings/str_replace_array_refs2.phpt b/ext/standard/tests/strings/str_replace_array_refs2.phpt index 788c738344..2050711493 100644 --- a/ext/standard/tests/strings/str_replace_array_refs2.phpt +++ b/ext/standard/tests/strings/str_replace_array_refs2.phpt @@ -22,6 +22,6 @@ $array = ['x' => 'property']; $array = $closure($array, ['x'], 'a'); var_dump(str_replace(array_keys($array), $array, "x property")); ---EXPECTF-- +--EXPECT-- string(10) "a property" string(10) "a property" diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt index 321a2bf1b7..696d380932 100644 --- a/ext/standard/tests/strings/str_rot13_basic.phpt +++ b/ext/standard/tests/strings/str_rot13_basic.phpt @@ -37,7 +37,7 @@ if (strcmp($str, $decode) == 0) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing str_rot13() : basic functionality *** Basic tests diff --git a/ext/standard/tests/strings/str_split_basic.phpt b/ext/standard/tests/strings/str_split_basic.phpt index 3a38b9d544..72617cea9e 100644 --- a/ext/standard/tests/strings/str_split_basic.phpt +++ b/ext/standard/tests/strings/str_split_basic.phpt @@ -26,7 +26,7 @@ var_dump( str_split($str) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing str_split() : basic functionality *** -- With all possible arguments -- array(5) { diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt Binary files differindex 1e7be76c3a..cbdad94854 100644 --- a/ext/standard/tests/strings/str_split_variation3.phpt +++ b/ext/standard/tests/strings/str_split_variation3.phpt diff --git a/ext/standard/tests/strings/str_split_variation4.phpt b/ext/standard/tests/strings/str_split_variation4.phpt index 617e932a52..e06c7025d6 100644 --- a/ext/standard/tests/strings/str_split_variation4.phpt +++ b/ext/standard/tests/strings/str_split_variation4.phpt @@ -43,7 +43,7 @@ for($count = 0; $count < count($values); $count++) { } echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing str_split() : single quoted strings for 'str' *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt index 4e4df4f6c3..3f8e640f89 100644 --- a/ext/standard/tests/strings/str_split_variation5.phpt +++ b/ext/standard/tests/strings/str_split_variation5.phpt @@ -86,7 +86,7 @@ foreach($heredoc_array as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing str_split() : heredoc strings as 'str' argument *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/strings/strcspn_basic.phpt b/ext/standard/tests/strings/strcspn_basic.phpt index 232b105f88..7ed9847edf 100644 --- a/ext/standard/tests/strings/strcspn_basic.phpt +++ b/ext/standard/tests/strings/strcspn_basic.phpt @@ -33,7 +33,7 @@ var_dump( strcspn($str, $mask) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : basic functionality *** int(2) int(2) diff --git a/ext/standard/tests/strings/strcspn_variation10.phpt b/ext/standard/tests/strings/strcspn_variation10.phpt index 37bb00ec14..c82d9970fa 100644 --- a/ext/standard/tests/strings/strcspn_variation10.phpt +++ b/ext/standard/tests/strings/strcspn_variation10.phpt @@ -63,7 +63,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different mask strings and default start and len arguments *** -- Itearation 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation11.phpt b/ext/standard/tests/strings/strcspn_variation11.phpt index 28f1dbe458..f970f6e3e9 100644 --- a/ext/standard/tests/strings/strcspn_variation11.phpt +++ b/ext/standard/tests/strings/strcspn_variation11.phpt @@ -77,7 +77,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start and default len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation12.phpt b/ext/standard/tests/strings/strcspn_variation12.phpt index b6f8cac081..f187788d94 100644 --- a/ext/standard/tests/strings/strcspn_variation12.phpt +++ b/ext/standard/tests/strings/strcspn_variation12.phpt @@ -79,7 +79,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation5.phpt b/ext/standard/tests/strings/strcspn_variation5.phpt Binary files differindex a3dfa5177f..9b40bad2d7 100644 --- a/ext/standard/tests/strings/strcspn_variation5.phpt +++ b/ext/standard/tests/strings/strcspn_variation5.phpt diff --git a/ext/standard/tests/strings/strcspn_variation6.phpt b/ext/standard/tests/strings/strcspn_variation6.phpt index 92fa3d0951..712f139c55 100644 --- a/ext/standard/tests/strings/strcspn_variation6.phpt +++ b/ext/standard/tests/strings/strcspn_variation6.phpt @@ -88,7 +88,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different mask strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation7.phpt b/ext/standard/tests/strings/strcspn_variation7.phpt index ae01f91be3..3c32fee7de 100644 --- a/ext/standard/tests/strings/strcspn_variation7.phpt +++ b/ext/standard/tests/strings/strcspn_variation7.phpt @@ -103,7 +103,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation8.phpt b/ext/standard/tests/strings/strcspn_variation8.phpt index 6b662ecdec..fff6e1ab0c 100644 --- a/ext/standard/tests/strings/strcspn_variation8.phpt +++ b/ext/standard/tests/strings/strcspn_variation8.phpt @@ -109,7 +109,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation9.phpt b/ext/standard/tests/strings/strcspn_variation9.phpt Binary files differindex e7650844da..d235dc4d19 100644 --- a/ext/standard/tests/strings/strcspn_variation9.phpt +++ b/ext/standard/tests/strings/strcspn_variation9.phpt diff --git a/ext/standard/tests/strings/strip_tags_basic1.phpt b/ext/standard/tests/strings/strip_tags_basic1.phpt index 6d98f47258..d6d5d6e479 100644 --- a/ext/standard/tests/strings/strip_tags_basic1.phpt +++ b/ext/standard/tests/strings/strip_tags_basic1.phpt @@ -42,7 +42,7 @@ foreach($string_array as $string) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : basic functionality *** -- Iteration 1 -- string(5) "hello" diff --git a/ext/standard/tests/strings/strip_tags_basic2.phpt b/ext/standard/tests/strings/strip_tags_basic2.phpt index 4d61c94b54..e9a48af79d 100644 --- a/ext/standard/tests/strings/strip_tags_basic2.phpt +++ b/ext/standard/tests/strings/strip_tags_basic2.phpt @@ -38,7 +38,7 @@ foreach($allowed_tags_array as $tags) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : basic functionality *** -- Iteration 1 -- string(33) "<html>helloworldOther text</html>" diff --git a/ext/standard/tests/strings/strip_tags_variation10.phpt b/ext/standard/tests/strings/strip_tags_variation10.phpt index a70695b456..eef338fa9c 100644 --- a/ext/standard/tests/strings/strip_tags_variation10.phpt +++ b/ext/standard/tests/strings/strip_tags_variation10.phpt @@ -38,7 +38,7 @@ foreach($single_quote_string as $string_value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(51) "<html> \$ -> This represents the dollar sign</html>" diff --git a/ext/standard/tests/strings/strip_tags_variation11.phpt b/ext/standard/tests/strings/strip_tags_variation11.phpt index 3b47b5c6b1..e592166d5f 100644 --- a/ext/standard/tests/strings/strip_tags_variation11.phpt +++ b/ext/standard/tests/strings/strip_tags_variation11.phpt @@ -28,7 +28,7 @@ foreach($string_array as $string) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : obscure functionality *** -- Iteration 1 -- string(12) "hello world" diff --git a/ext/standard/tests/strings/strip_tags_variation4.phpt b/ext/standard/tests/strings/strip_tags_variation4.phpt index ab01979b78..2118d58959 100644 --- a/ext/standard/tests/strings/strip_tags_variation4.phpt +++ b/ext/standard/tests/strings/strip_tags_variation4.phpt @@ -45,7 +45,7 @@ foreach($strings as $string_value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(32) "hello world... strip_tags_test" diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index 20b5693905..de8f3aa962 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -77,7 +77,7 @@ for($index =0; $index < count($res_heredoc_strings); $index ++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/strip_tags_variation6.phpt b/ext/standard/tests/strings/strip_tags_variation6.phpt index c838970868..b066e718b3 100644 --- a/ext/standard/tests/strings/strip_tags_variation6.phpt +++ b/ext/standard/tests/strings/strip_tags_variation6.phpt @@ -34,7 +34,7 @@ foreach($strings as $value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(18) " I am html string " diff --git a/ext/standard/tests/strings/strip_tags_variation7.phpt b/ext/standard/tests/strings/strip_tags_variation7.phpt index 784122eaaf..5ff9177b18 100644 --- a/ext/standard/tests/strings/strip_tags_variation7.phpt +++ b/ext/standard/tests/strings/strip_tags_variation7.phpt @@ -43,7 +43,7 @@ foreach($strings as $string_value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(43) "<abc>hello</abc> world... strip_tags_test" diff --git a/ext/standard/tests/strings/strip_tags_variation8.phpt b/ext/standard/tests/strings/strip_tags_variation8.phpt index 53482f7494..f3c5a17136 100644 --- a/ext/standard/tests/strings/strip_tags_variation8.phpt +++ b/ext/standard/tests/strings/strip_tags_variation8.phpt @@ -38,7 +38,7 @@ foreach($quotes as $string_value) } echo "Done"; ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(33) "hello world... strip_tags_test " diff --git a/ext/standard/tests/strings/strip_tags_variation9.phpt b/ext/standard/tests/strings/strip_tags_variation9.phpt index 5edf078dc8..843653c208 100644 --- a/ext/standard/tests/strings/strip_tags_variation9.phpt +++ b/ext/standard/tests/strings/strip_tags_variation9.phpt @@ -36,7 +36,7 @@ foreach($double_quote_string as $string_value) } echo "Done"; ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(50) "<html> $ -> This represents the dollar sign</html>" diff --git a/ext/standard/tests/strings/stripos_basic1.phpt b/ext/standard/tests/strings/stripos_basic1.phpt index cffbdba1b5..a9424b60c3 100644 --- a/ext/standard/tests/strings/stripos_basic1.phpt +++ b/ext/standard/tests/strings/stripos_basic1.phpt @@ -32,7 +32,7 @@ var_dump( stripos($heredoc_str, $heredoc_str) ); var_dump( stripos("Hello, World", "ooo") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: basic functionality *** -- With default arguments -- int(0) diff --git a/ext/standard/tests/strings/stripos_basic2.phpt b/ext/standard/tests/strings/stripos_basic2.phpt index 226d3f61d2..b2dbece174 100644 --- a/ext/standard/tests/strings/stripos_basic2.phpt +++ b/ext/standard/tests/strings/stripos_basic2.phpt @@ -43,7 +43,7 @@ var_dump( stripos("Hello, World", "o", -4) ); var_dump( stripos("Hello, World", "o", -3) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: basic functionality *** -- With all arguments -- int(0) diff --git a/ext/standard/tests/strings/stripos_variation1.phpt b/ext/standard/tests/strings/stripos_variation1.phpt index 7aeda4082c..ba02430c68 100644 --- a/ext/standard/tests/strings/stripos_variation1.phpt +++ b/ext/standard/tests/strings/stripos_variation1.phpt @@ -81,7 +81,7 @@ for($index=0; $index<count($needle); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with double quoted strings *** -- Iteration 1 -- int(2) diff --git a/ext/standard/tests/strings/stripos_variation12.phpt b/ext/standard/tests/strings/stripos_variation12.phpt index bd0d8aeb8f..1e09b044ca 100644 --- a/ext/standard/tests/strings/stripos_variation12.phpt +++ b/ext/standard/tests/strings/stripos_variation12.phpt @@ -28,7 +28,7 @@ for($index = 0; $index < count($haystacks); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test stripos() function: binary safe *** int(5) int(5) diff --git a/ext/standard/tests/strings/stripos_variation13.phpt b/ext/standard/tests/strings/stripos_variation13.phpt index 3c4508f083..694827051f 100644 --- a/ext/standard/tests/strings/stripos_variation13.phpt +++ b/ext/standard/tests/strings/stripos_variation13.phpt @@ -30,7 +30,7 @@ for($index = 0; $index < count($needles); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test stripos() function: binary safe *** int(1) int(1) diff --git a/ext/standard/tests/strings/stripos_variation2.phpt b/ext/standard/tests/strings/stripos_variation2.phpt index c7f3db4005..97a9864509 100644 --- a/ext/standard/tests/strings/stripos_variation2.phpt +++ b/ext/standard/tests/strings/stripos_variation2.phpt @@ -83,7 +83,7 @@ for($index=0; $index<count($needle); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with single quoted strings *** -- Iteration 1 -- int(2) diff --git a/ext/standard/tests/strings/stripos_variation3.phpt b/ext/standard/tests/strings/stripos_variation3.phpt index 40cdea48fe..fc678a7267 100644 --- a/ext/standard/tests/strings/stripos_variation3.phpt +++ b/ext/standard/tests/strings/stripos_variation3.phpt @@ -26,7 +26,7 @@ var_dump( stripos($multi_line_str, " ") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing multi lines -- int(14) diff --git a/ext/standard/tests/strings/stripos_variation4.phpt b/ext/standard/tests/strings/stripos_variation4.phpt index 8249ef0f60..5c4028ec45 100644 --- a/ext/standard/tests/strings/stripos_variation4.phpt +++ b/ext/standard/tests/strings/stripos_variation4.phpt @@ -28,7 +28,7 @@ var_dump( stripos($special_chars_str, "(special)") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing special chars -- int(0) diff --git a/ext/standard/tests/strings/stripos_variation5.phpt b/ext/standard/tests/strings/stripos_variation5.phpt index 900fe04bb7..8cfc3f9194 100644 --- a/ext/standard/tests/strings/stripos_variation5.phpt +++ b/ext/standard/tests/strings/stripos_variation5.phpt @@ -24,7 +24,7 @@ var_dump( stripos($control_char_str, "\t", 15) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing escape characters -- int(12) diff --git a/ext/standard/tests/strings/stripos_variation6.phpt b/ext/standard/tests/strings/stripos_variation6.phpt index c69ee174d1..151b145229 100644 --- a/ext/standard/tests/strings/stripos_variation6.phpt +++ b/ext/standard/tests/strings/stripos_variation6.phpt @@ -25,7 +25,7 @@ var_dump( stripos($quote_char_str, 'things', 0) ); var_dump( stripos($quote_char_str, "things", 20) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing quote & slash chars -- int(88) diff --git a/ext/standard/tests/strings/stripos_variation8.phpt b/ext/standard/tests/strings/stripos_variation8.phpt index cbf96bf12a..a0ae75dd1f 100644 --- a/ext/standard/tests/strings/stripos_variation8.phpt +++ b/ext/standard/tests/strings/stripos_variation8.phpt @@ -35,7 +35,7 @@ for($index = 0; $index < count($needles); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: strings repetitive chars *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/stripslashes_basic.phpt b/ext/standard/tests/strings/stripslashes_basic.phpt Binary files differindex 548aee5376..c7027e932f 100644 --- a/ext/standard/tests/strings/stripslashes_basic.phpt +++ b/ext/standard/tests/strings/stripslashes_basic.phpt diff --git a/ext/standard/tests/strings/stripslashes_variation2.phpt b/ext/standard/tests/strings/stripslashes_variation2.phpt Binary files differindex c86cd5890c..c3c58f9c42 100644 --- a/ext/standard/tests/strings/stripslashes_variation2.phpt +++ b/ext/standard/tests/strings/stripslashes_variation2.phpt diff --git a/ext/standard/tests/strings/stripslashes_variation3.phpt b/ext/standard/tests/strings/stripslashes_variation3.phpt index 2ccf97ffd2..830d798c4a 100644 --- a/ext/standard/tests/strings/stripslashes_variation3.phpt +++ b/ext/standard/tests/strings/stripslashes_variation3.phpt @@ -59,7 +59,7 @@ foreach( $str_array as $str ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripslashes() : with strings containing newline and tab characters *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/stripslashes_variation4.phpt b/ext/standard/tests/strings/stripslashes_variation4.phpt index eccca6a64d..d78076e22c 100644 --- a/ext/standard/tests/strings/stripslashes_variation4.phpt +++ b/ext/standard/tests/strings/stripslashes_variation4.phpt @@ -38,7 +38,7 @@ foreach( $str_array as $arr ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripslashes() : with double dimensional arrays *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/stristr_basic.phpt b/ext/standard/tests/strings/stristr_basic.phpt index 0d2171496c..274438a86e 100644 --- a/ext/standard/tests/strings/stristr_basic.phpt +++ b/ext/standard/tests/strings/stristr_basic.phpt @@ -21,7 +21,7 @@ var_dump( stristr("Test String", "String", false) ); var_dump( stristr("Test String", "String", true) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing stristr() : basic functionality *** string(11) "Test string" string(6) "stRIng" diff --git a/ext/standard/tests/strings/strlen_basic.phpt b/ext/standard/tests/strings/strlen_basic.phpt index 3ed2b97e56..9e2605a670 100644 --- a/ext/standard/tests/strings/strlen_basic.phpt +++ b/ext/standard/tests/strings/strlen_basic.phpt @@ -15,7 +15,7 @@ var_dump(strlen("")); var_dump(strlen("\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strlen() : basic functionality *** int(6) int(7) diff --git a/ext/standard/tests/strings/strnatcmp_leftalign.phpt b/ext/standard/tests/strings/strnatcmp_leftalign.phpt index 70d469dfa2..fde2f164b9 100644 --- a/ext/standard/tests/strings/strnatcmp_leftalign.phpt +++ b/ext/standard/tests/strings/strnatcmp_leftalign.phpt @@ -21,7 +21,7 @@ $str2 = " 00"; var_dump( strnatcmp( $str1, $str2) ); ?> ---EXPECTF-- +--EXPECT-- -- Testing strnatcmp() function whitespace, left-align, digit -- -- Leading whitespace, digits, string 1 longer -- int(1) diff --git a/ext/standard/tests/strings/strncasecmp_variation1.phpt b/ext/standard/tests/strings/strncasecmp_variation1.phpt index bcc6ad3d06..eabc164481 100644 --- a/ext/standard/tests/strings/strncasecmp_variation1.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation1.phpt @@ -23,7 +23,7 @@ for($ASCII = 97; $ASCII <= 122; $ASCII++) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with alphabets *** -- Passing upper-case letters for 'str1' -- int(0) diff --git a/ext/standard/tests/strings/strncasecmp_variation3.phpt b/ext/standard/tests/strings/strncasecmp_variation3.phpt index 8409260b2e..5db892cfa1 100644 --- a/ext/standard/tests/strings/strncasecmp_variation3.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation3.phpt @@ -20,7 +20,7 @@ for($len = strlen($str1); $len >= 0; $len--) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with different lengths *** int(0) int(0) diff --git a/ext/standard/tests/strings/strncasecmp_variation6.phpt b/ext/standard/tests/strings/strncasecmp_variation6.phpt index 56276e9554..5c6bdf6d22 100644 --- a/ext/standard/tests/strings/strncasecmp_variation6.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation6.phpt @@ -31,7 +31,7 @@ var_dump( strncasecmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with binary inputs *** -- Checking with all 256 characters given, in binary format -- diff --git a/ext/standard/tests/strings/strncasecmp_variation7.phpt b/ext/standard/tests/strings/strncasecmp_variation7.phpt index e22fad7659..0c711ea42f 100644 --- a/ext/standard/tests/strings/strncasecmp_variation7.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation7.phpt @@ -20,7 +20,7 @@ var_dump( strncasecmp($str3, "Hello,world", 12) ); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with null terminated strings and binary inputs *** int(5) int(-119) diff --git a/ext/standard/tests/strings/strncasecmp_variation9.phpt b/ext/standard/tests/strings/strncasecmp_variation9.phpt index 0d713032e0..9841bb4e47 100644 --- a/ext/standard/tests/strings/strncasecmp_variation9.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation9.phpt @@ -73,7 +73,7 @@ for($index1 = 0; $index1 < count($strings); $index1++) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with here-doc strings *** int(0) int(63) diff --git a/ext/standard/tests/strings/strncmp_variation6.phpt b/ext/standard/tests/strings/strncmp_variation6.phpt index b3b918920e..e34d42cefc 100644 --- a/ext/standard/tests/strings/strncmp_variation6.phpt +++ b/ext/standard/tests/strings/strncmp_variation6.phpt @@ -32,7 +32,7 @@ var_dump( strncmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: int echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncmp() function: with binary inputs *** -- Checking with all 256 characters given, in binary format -- diff --git a/ext/standard/tests/strings/strncmp_variation7.phpt b/ext/standard/tests/strings/strncmp_variation7.phpt index 35d11d981a..6634b22c4e 100644 --- a/ext/standard/tests/strings/strncmp_variation7.phpt +++ b/ext/standard/tests/strings/strncmp_variation7.phpt @@ -18,7 +18,7 @@ var_dump( strncmp($str1, $str2, 12) ); //expected: int(5); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncmp() function: Checking with the null terminated strings *** int(5) *** Done *** diff --git a/ext/standard/tests/strings/strncmp_variation9.phpt b/ext/standard/tests/strings/strncmp_variation9.phpt index 282f241849..1c83e80f09 100644 --- a/ext/standard/tests/strings/strncmp_variation9.phpt +++ b/ext/standard/tests/strings/strncmp_variation9.phpt @@ -52,7 +52,7 @@ for($index1 = 0; $index1 < count($strings); $index1++) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncmp() function: with different input strings *** int(0) int(0) diff --git a/ext/standard/tests/strings/strrchr.phpt b/ext/standard/tests/strings/strrchr.phpt index 5a1fe12a82..e98119ad8b 100644 --- a/ext/standard/tests/strings/strrchr.phpt +++ b/ext/standard/tests/strings/strrchr.phpt @@ -12,7 +12,7 @@ var_dump(strrchr("test".chr(0)."string", "t")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt index b5bfe2d9c2..5c3be8c121 100644 --- a/ext/standard/tests/strings/strrchr_basic.phpt +++ b/ext/standard/tests/strings/strrchr_basic.phpt @@ -37,7 +37,7 @@ var_dump( strrchr("Hello, World", "ooo") ); var_dump( strrchr("Hello, World", "Zzzz") ); //non-existent needle in haystack echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: basic functionality *** string(12) "Hello, World" string(12) "Hello, World" diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt Binary files differindex 91290ecf93..0cfcf25be1 100644 --- a/ext/standard/tests/strings/strrchr_variation1.phpt +++ b/ext/standard/tests/strings/strrchr_variation1.phpt diff --git a/ext/standard/tests/strings/strrchr_variation12.phpt b/ext/standard/tests/strings/strrchr_variation12.phpt Binary files differindex c31e0c86ce..a17902604a 100644 --- a/ext/standard/tests/strings/strrchr_variation12.phpt +++ b/ext/standard/tests/strings/strrchr_variation12.phpt diff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt index 0b15ceeeb2..f5ec1259e7 100644 --- a/ext/standard/tests/strings/strrchr_variation2.phpt +++ b/ext/standard/tests/strings/strrchr_variation2.phpt @@ -81,7 +81,7 @@ for($index=0; $index<count($needle); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with various single quoted strings *** -- Iteration 1 -- string(22) "lo123456he \x234 \101 " diff --git a/ext/standard/tests/strings/strrchr_variation3.phpt b/ext/standard/tests/strings/strrchr_variation3.phpt index 1d0aa30091..947d613ee2 100644 --- a/ext/standard/tests/strings/strrchr_variation3.phpt +++ b/ext/standard/tests/strings/strrchr_variation3.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(19) "ing heredoc syntax." bool(false) diff --git a/ext/standard/tests/strings/strrchr_variation4.phpt b/ext/standard/tests/strings/strrchr_variation4.phpt index 8b2c10bf25..8c385e5cb8 100644 --- a/ext/standard/tests/strings/strrchr_variation4.phpt +++ b/ext/standard/tests/strings/strrchr_variation4.phpt @@ -38,7 +38,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(24) "!$#$^^&*(special) chars." diff --git a/ext/standard/tests/strings/strrchr_variation5.phpt b/ext/standard/tests/strings/strrchr_variation5.phpt index 1ef23911e9..6d768e06bb 100644 --- a/ext/standard/tests/strings/strrchr_variation5.phpt +++ b/ext/standard/tests/strings/strrchr_variation5.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(32) " st
ch
using scape \seque diff --git a/ext/standard/tests/strings/strrchr_variation6.phpt b/ext/standard/tests/strings/strrchr_variation6.phpt index ba0ffadbd7..fff943b179 100644 --- a/ext/standard/tests/strings/strrchr_variation6.phpt +++ b/ext/standard/tests/strings/strrchr_variation6.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(3) "te'" string(32) "" diff --git a/ext/standard/tests/strings/strrchr_variation7.phpt b/ext/standard/tests/strings/strrchr_variation7.phpt index ed5acdc045..d60b2e6711 100644 --- a/ext/standard/tests/strings/strrchr_variation7.phpt +++ b/ext/standard/tests/strings/strrchr_variation7.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrchr_variation8.phpt b/ext/standard/tests/strings/strrchr_variation8.phpt index 3e298a0b3a..31a727ed6f 100644 --- a/ext/standard/tests/strings/strrchr_variation8.phpt +++ b/ext/standard/tests/strings/strrchr_variation8.phpt @@ -30,7 +30,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrev_basic.phpt b/ext/standard/tests/strings/strrev_basic.phpt index 2cde4cdf89..390b78648b 100644 --- a/ext/standard/tests/strings/strrev_basic.phpt +++ b/ext/standard/tests/strings/strrev_basic.phpt @@ -32,7 +32,7 @@ var_dump( strrev('Hello, World\n') ); var_dump( strrev($heredoc) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrev() : basic functionality *** string(12) "dlroW ,olleH" string(12) "dlroW ,olleH" diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt Binary files differindex f2334f5a53..ce0588d750 100644 --- a/ext/standard/tests/strings/strrev_variation1.phpt +++ b/ext/standard/tests/strings/strrev_variation1.phpt diff --git a/ext/standard/tests/strings/strrev_variation2.phpt b/ext/standard/tests/strings/strrev_variation2.phpt Binary files differindex 41e54d53c6..87c64ec794 100644 --- a/ext/standard/tests/strings/strrev_variation2.phpt +++ b/ext/standard/tests/strings/strrev_variation2.phpt diff --git a/ext/standard/tests/strings/strrev_variation3.phpt b/ext/standard/tests/strings/strrev_variation3.phpt Binary files differindex 8ab3e25b66..af1d276ea6 100644 --- a/ext/standard/tests/strings/strrev_variation3.phpt +++ b/ext/standard/tests/strings/strrev_variation3.phpt diff --git a/ext/standard/tests/strings/strripos_variation1.phpt b/ext/standard/tests/strings/strripos_variation1.phpt index b8a8943d09..5eb2fdfe0c 100644 --- a/ext/standard/tests/strings/strripos_variation1.phpt +++ b/ext/standard/tests/strings/strripos_variation1.phpt @@ -74,7 +74,7 @@ foreach ($needles as $needle) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strripos() function: with double quoted strings *** -- Iteration 1 -- int(28) diff --git a/ext/standard/tests/strings/strripos_variation4.phpt b/ext/standard/tests/strings/strripos_variation4.phpt index c355330cab..ef872d7c76 100644 --- a/ext/standard/tests/strings/strripos_variation4.phpt +++ b/ext/standard/tests/strings/strripos_variation4.phpt @@ -28,7 +28,7 @@ var_dump( strripos($special_chars_str, "(speCIal)") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strripos() function: with heredoc strings *** -- With heredoc string containing special chars -- int(0) diff --git a/ext/standard/tests/strings/strripos_variation5.phpt b/ext/standard/tests/strings/strripos_variation5.phpt index 5f6df79903..7530a9f446 100644 --- a/ext/standard/tests/strings/strripos_variation5.phpt +++ b/ext/standard/tests/strings/strripos_variation5.phpt @@ -24,7 +24,7 @@ var_dump( strripos($control_char_str, "\t", 15) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strripos() function: with heredoc strings *** -- With heredoc string containing escape characters -- int(13) diff --git a/ext/standard/tests/strings/strrpos_basic1.phpt b/ext/standard/tests/strings/strrpos_basic1.phpt index 26497fb3ff..e8fc24ade3 100644 --- a/ext/standard/tests/strings/strrpos_basic1.phpt +++ b/ext/standard/tests/strings/strrpos_basic1.phpt @@ -30,7 +30,7 @@ var_dump( strrpos($heredoc_str, $heredoc_str) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: basic functionality *** -- With default arguments -- int(0) diff --git a/ext/standard/tests/strings/strrpos_basic2.phpt b/ext/standard/tests/strings/strrpos_basic2.phpt index a65bbf3fd2..4698aafebf 100644 --- a/ext/standard/tests/strings/strrpos_basic2.phpt +++ b/ext/standard/tests/strings/strrpos_basic2.phpt @@ -32,7 +32,7 @@ var_dump( strrpos("Hello, World", "o", 6) ); var_dump( strrpos("Hello, World", "o", 10) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: basic functionality *** -- With all arguments -- int(0) diff --git a/ext/standard/tests/strings/strrpos_variation1.phpt b/ext/standard/tests/strings/strrpos_variation1.phpt index a7ef3e9b05..6f94bd84ca 100644 --- a/ext/standard/tests/strings/strrpos_variation1.phpt +++ b/ext/standard/tests/strings/strrpos_variation1.phpt @@ -72,7 +72,7 @@ for($index=0; $index<count($needle); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with double quoted strings *** -- Iteration 1 -- int(28) diff --git a/ext/standard/tests/strings/strrpos_variation12.phpt b/ext/standard/tests/strings/strrpos_variation12.phpt index 87ac3b2f84..b46f2e98ef 100644 --- a/ext/standard/tests/strings/strrpos_variation12.phpt +++ b/ext/standard/tests/strings/strrpos_variation12.phpt @@ -28,7 +28,7 @@ for($index = 0; $index < count($haystacks); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test strrpos() function: binary safe *** int(5) int(5) diff --git a/ext/standard/tests/strings/strrpos_variation13.phpt b/ext/standard/tests/strings/strrpos_variation13.phpt index f85c3c454f..2772a2315a 100644 --- a/ext/standard/tests/strings/strrpos_variation13.phpt +++ b/ext/standard/tests/strings/strrpos_variation13.phpt @@ -30,7 +30,7 @@ for($index = 0; $index < count($needles); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test strrpos() function: binary safe *** int(1) int(1) diff --git a/ext/standard/tests/strings/strrpos_variation2.phpt b/ext/standard/tests/strings/strrpos_variation2.phpt index 53645866be..2f4540f1c2 100644 --- a/ext/standard/tests/strings/strrpos_variation2.phpt +++ b/ext/standard/tests/strings/strrpos_variation2.phpt @@ -73,7 +73,7 @@ for($index=0; $index<count($needle); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with single quoted strings *** -- Iteration 1 -- int(32) diff --git a/ext/standard/tests/strings/strrpos_variation3.phpt b/ext/standard/tests/strings/strrpos_variation3.phpt index a0a0d270e8..a920225947 100644 --- a/ext/standard/tests/strings/strrpos_variation3.phpt +++ b/ext/standard/tests/strings/strrpos_variation3.phpt @@ -26,7 +26,7 @@ var_dump( strrpos($multi_line_str, " ") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing multi lines -- int(44) diff --git a/ext/standard/tests/strings/strrpos_variation4.phpt b/ext/standard/tests/strings/strrpos_variation4.phpt index 1ccf529856..40ac17affe 100644 --- a/ext/standard/tests/strings/strrpos_variation4.phpt +++ b/ext/standard/tests/strings/strrpos_variation4.phpt @@ -28,7 +28,7 @@ var_dump( strrpos($special_chars_str, "(special)") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing special chars -- int(0) diff --git a/ext/standard/tests/strings/strrpos_variation5.phpt b/ext/standard/tests/strings/strrpos_variation5.phpt index f9537da0e2..0d985d86b4 100644 --- a/ext/standard/tests/strings/strrpos_variation5.phpt +++ b/ext/standard/tests/strings/strrpos_variation5.phpt @@ -24,7 +24,7 @@ var_dump( strrpos($control_char_str, "\t", 15) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing escape characters -- int(13) diff --git a/ext/standard/tests/strings/strrpos_variation6.phpt b/ext/standard/tests/strings/strrpos_variation6.phpt index c879a91209..ba5c5a1a40 100644 --- a/ext/standard/tests/strings/strrpos_variation6.phpt +++ b/ext/standard/tests/strings/strrpos_variation6.phpt @@ -25,7 +25,7 @@ var_dump( strrpos($quote_char_str, 'things', 0) ); var_dump( strrpos($quote_char_str, "things", 20) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing quote & slash chars -- int(88) diff --git a/ext/standard/tests/strings/strrpos_variation7.phpt b/ext/standard/tests/strings/strrpos_variation7.phpt index 239dc246bc..9c487d1e62 100644 --- a/ext/standard/tests/strings/strrpos_variation7.phpt +++ b/ext/standard/tests/strings/strrpos_variation7.phpt @@ -22,7 +22,7 @@ var_dump( strrpos($empty_string, NULL) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With empty heredoc string -- bool(false) diff --git a/ext/standard/tests/strings/strrpos_variation8.phpt b/ext/standard/tests/strings/strrpos_variation8.phpt index eac7d8ff83..d69e49f1d4 100644 --- a/ext/standard/tests/strings/strrpos_variation8.phpt +++ b/ext/standard/tests/strings/strrpos_variation8.phpt @@ -24,7 +24,7 @@ for($offset = -1; $offset <= strlen($haystack); $offset++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: strings repetitive chars *** -- Iteration 1 -- int(4) diff --git a/ext/standard/tests/strings/strspn_basic.phpt b/ext/standard/tests/strings/strspn_basic.phpt index d9b1a33881..dd43470826 100644 --- a/ext/standard/tests/strings/strspn_basic.phpt +++ b/ext/standard/tests/strings/strspn_basic.phpt @@ -33,7 +33,7 @@ var_dump( strspn($str, $mask) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : basic functionality *** int(11) int(11) diff --git a/ext/standard/tests/strings/strspn_variation10.phpt b/ext/standard/tests/strings/strspn_variation10.phpt index 318d16ccfb..6c87eb01db 100644 --- a/ext/standard/tests/strings/strspn_variation10.phpt +++ b/ext/standard/tests/strings/strspn_variation10.phpt @@ -65,7 +65,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different mask strings and default start and len arguments *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation11.phpt b/ext/standard/tests/strings/strspn_variation11.phpt index 209981e69a..8f85e979a7 100644 --- a/ext/standard/tests/strings/strspn_variation11.phpt +++ b/ext/standard/tests/strings/strspn_variation11.phpt @@ -77,7 +77,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start and default len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation12.phpt b/ext/standard/tests/strings/strspn_variation12.phpt index 9e2eaf010d..df353ec040 100644 --- a/ext/standard/tests/strings/strspn_variation12.phpt +++ b/ext/standard/tests/strings/strspn_variation12.phpt @@ -79,7 +79,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation5.phpt b/ext/standard/tests/strings/strspn_variation5.phpt Binary files differindex 514af55319..04ac841ef7 100644 --- a/ext/standard/tests/strings/strspn_variation5.phpt +++ b/ext/standard/tests/strings/strspn_variation5.phpt diff --git a/ext/standard/tests/strings/strspn_variation6.phpt b/ext/standard/tests/strings/strspn_variation6.phpt index 413198d1c0..3e039909e0 100644 --- a/ext/standard/tests/strings/strspn_variation6.phpt +++ b/ext/standard/tests/strings/strspn_variation6.phpt @@ -90,7 +90,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different mask strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation7.phpt b/ext/standard/tests/strings/strspn_variation7.phpt index d0ebee3c92..b3a4dbe7c3 100644 --- a/ext/standard/tests/strings/strspn_variation7.phpt +++ b/ext/standard/tests/strings/strspn_variation7.phpt @@ -103,7 +103,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation8.phpt b/ext/standard/tests/strings/strspn_variation8.phpt index 3e9e9ddd8c..0033aea837 100644 --- a/ext/standard/tests/strings/strspn_variation8.phpt +++ b/ext/standard/tests/strings/strspn_variation8.phpt @@ -111,7 +111,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation9.phpt b/ext/standard/tests/strings/strspn_variation9.phpt Binary files differindex 14af0ca0af..5ec2330e25 100644 --- a/ext/standard/tests/strings/strspn_variation9.phpt +++ b/ext/standard/tests/strings/strspn_variation9.phpt diff --git a/ext/standard/tests/strings/strtok_basic.phpt b/ext/standard/tests/strings/strtok_basic.phpt index 6ba48f41e3..3cb687295e 100644 --- a/ext/standard/tests/strings/strtok_basic.phpt +++ b/ext/standard/tests/strings/strtok_basic.phpt @@ -31,7 +31,7 @@ for( $i = 2; $i <=7; $i++ ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : basic functionality *** The Input string is: diff --git a/ext/standard/tests/strings/strtok_variation3.phpt b/ext/standard/tests/strings/strtok_variation3.phpt index 3026d86a01..d26947afde 100644 --- a/ext/standard/tests/strings/strtok_variation3.phpt +++ b/ext/standard/tests/strings/strtok_variation3.phpt @@ -67,7 +67,7 @@ foreach($heredoc_strings as $string) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with heredoc strings *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation4.phpt b/ext/standard/tests/strings/strtok_variation4.phpt index 6f4fa6621b..5db1d39650 100644 --- a/ext/standard/tests/strings/strtok_variation4.phpt +++ b/ext/standard/tests/strings/strtok_variation4.phpt @@ -41,7 +41,7 @@ foreach( $strings_with_nulls as $string ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with embedded nulls in the strings *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation5.phpt b/ext/standard/tests/strings/strtok_variation5.phpt index c49f7ded9f..699c7a9695 100644 --- a/ext/standard/tests/strings/strtok_variation5.phpt +++ b/ext/standard/tests/strings/strtok_variation5.phpt @@ -57,7 +57,7 @@ foreach( $string_array as $string ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with miscellaneous inputs *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation6.phpt b/ext/standard/tests/strings/strtok_variation6.phpt index 73ea3667eb..4b379ec86f 100644 --- a/ext/standard/tests/strings/strtok_variation6.phpt +++ b/ext/standard/tests/strings/strtok_variation6.phpt @@ -47,7 +47,7 @@ foreach( $string_array as $string ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with invalid escape sequences in token *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation7.phpt b/ext/standard/tests/strings/strtok_variation7.phpt index 28cbf7d917..9a88c93668 100644 --- a/ext/standard/tests/strings/strtok_variation7.phpt +++ b/ext/standard/tests/strings/strtok_variation7.phpt @@ -37,7 +37,7 @@ for( $count = 1; $count <=10; $count++ ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with modification of input string in between tokenising *** *** Testing strtok() when string being tokenised is prefixed with another string in between the process *** diff --git a/ext/standard/tests/strings/strtr_basic.phpt b/ext/standard/tests/strings/strtr_basic.phpt index 2892ab0082..8f4ccdc326 100644 --- a/ext/standard/tests/strings/strtr_basic.phpt +++ b/ext/standard/tests/strings/strtr_basic.phpt @@ -37,7 +37,7 @@ var_dump( strtr('test strtr', $trans2_arr) ); var_dump( strtr($heredoc_str, $trans1_arr) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : basic functionality *** string(10) "TesT sTrTr" string(10) "TesT sTrTr" diff --git a/ext/standard/tests/strings/strtr_variation1.phpt b/ext/standard/tests/strings/strtr_variation1.phpt index 640194fd48..44326ad4aa 100644 --- a/ext/standard/tests/strings/strtr_variation1.phpt +++ b/ext/standard/tests/strings/strtr_variation1.phpt @@ -56,7 +56,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : numeric & regular double quoted strings *** -- Iteration 1 -- string(3) "abc" diff --git a/ext/standard/tests/strings/strtr_variation2.phpt b/ext/standard/tests/strings/strtr_variation2.phpt index 5772f01fc4..1ca96af3bf 100644 --- a/ext/standard/tests/strings/strtr_variation2.phpt +++ b/ext/standard/tests/strings/strtr_variation2.phpt @@ -60,7 +60,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : string containing special chars for 'str' arg *** -- Iteration 1 -- string(1) "s" diff --git a/ext/standard/tests/strings/strtr_variation3.phpt b/ext/standard/tests/strings/strtr_variation3.phpt index fe546dc8ce..9feb237645 100644 --- a/ext/standard/tests/strings/strtr_variation3.phpt +++ b/ext/standard/tests/strings/strtr_variation3.phpt @@ -65,7 +65,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : string containing escape sequences for 'str' arg *** -- Iteration 1 -- string(9) "SesSTsttE" diff --git a/ext/standard/tests/strings/strtr_variation4.phpt b/ext/standard/tests/strings/strtr_variation4.phpt index faec849830..899a17af85 100644 --- a/ext/standard/tests/strings/strtr_variation4.phpt +++ b/ext/standard/tests/strings/strtr_variation4.phpt @@ -53,7 +53,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : empty string & null for 'str' arg *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt index c099058b99..70a12c7f36 100644 --- a/ext/standard/tests/strings/strval_basic.phpt +++ b/ext/standard/tests/strings/strval_basic.phpt @@ -47,7 +47,7 @@ foreach($values as $value) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strval() : basic variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strval_variation2.phpt b/ext/standard/tests/strings/strval_variation2.phpt index da74973c5e..beeb8c9283 100644 --- a/ext/standard/tests/strings/strval_variation2.phpt +++ b/ext/standard/tests/strings/strval_variation2.phpt @@ -61,7 +61,7 @@ echo "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strval() : usage variations - Pass all valid char codes *** 000102030405060708090a0b0c0d0e0f 101112131415161718191a1b1c1d1e1f diff --git a/ext/standard/tests/strings/substr_count_basic.phpt b/ext/standard/tests/strings/substr_count_basic.phpt index c7c96fd55b..a3b3553dfc 100644 --- a/ext/standard/tests/strings/substr_count_basic.phpt +++ b/ext/standard/tests/strings/substr_count_basic.phpt @@ -24,7 +24,7 @@ var_dump(substr_count($a, "bca", -200, -50)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- ***Testing basic operations *** bool(false) bool(false) diff --git a/ext/standard/tests/strings/substr_count_variation_002.phpt b/ext/standard/tests/strings/substr_count_variation_002.phpt index f8b62bd837..a1310a22b5 100644 --- a/ext/standard/tests/strings/substr_count_variation_002.phpt +++ b/ext/standard/tests/strings/substr_count_variation_002.phpt @@ -34,7 +34,7 @@ var_dump(substr_count($str, "0")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing possible variations *** -- complex strings containing other than 7-bit chars -- diff --git a/ext/standard/tests/strings/substr_replace_array.phpt b/ext/standard/tests/strings/substr_replace_array.phpt index dbb8b17147..240e8c108c 100644 --- a/ext/standard/tests/strings/substr_replace_array.phpt +++ b/ext/standard/tests/strings/substr_replace_array.phpt @@ -9,7 +9,7 @@ $newarr = substr_replace($arr, 'zzz', 0, -2); print_r($newarr); ?> ---EXPECTF-- +--EXPECT-- Array ( [abc] => zzzkk diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt index bba0d9bc4a..b0e3be80a7 100644 --- a/ext/standard/tests/strings/ucwords_basic.phpt +++ b/ext/standard/tests/strings/ucwords_basic.phpt @@ -41,7 +41,7 @@ for($index = 0; $index < count($str_array); $index++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : basic functionality *** -- Iteration 1 -- string(15) "Testing Ucwords" diff --git a/ext/standard/tests/strings/ucwords_variation2.phpt b/ext/standard/tests/strings/ucwords_variation2.phpt index 4c24d97a0d..b224caf491 100644 --- a/ext/standard/tests/strings/ucwords_variation2.phpt +++ b/ext/standard/tests/strings/ucwords_variation2.phpt @@ -69,7 +69,7 @@ for($index =0; $index < count($heredoc_strings); $index ++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : usage variations *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/ucwords_variation3.phpt b/ext/standard/tests/strings/ucwords_variation3.phpt index e6f7c405ac..8b38bb9401 100644 --- a/ext/standard/tests/strings/ucwords_variation3.phpt +++ b/ext/standard/tests/strings/ucwords_variation3.phpt @@ -56,7 +56,7 @@ for($index = 0; $index < count($str_array); $index++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : usage variations *** -- Iteration 1 -- string(18) "Testing Ucwords" diff --git a/ext/standard/tests/strings/ucwords_variation4.phpt b/ext/standard/tests/strings/ucwords_variation4.phpt index 2e7092da73..023efd3d46 100644 --- a/ext/standard/tests/strings/ucwords_variation4.phpt +++ b/ext/standard/tests/strings/ucwords_variation4.phpt @@ -63,7 +63,7 @@ for($index = 0; $index < count($str_array); $index++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : usage variations *** -- Iteration 1 -- string(18) "Testing Ucwords" diff --git a/ext/standard/tests/strings/unpack_bug68225.phpt b/ext/standard/tests/strings/unpack_bug68225.phpt index 7f8cdd4701..8d96369691 100644 --- a/ext/standard/tests/strings/unpack_bug68225.phpt +++ b/ext/standard/tests/strings/unpack_bug68225.phpt @@ -16,7 +16,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(1) { ["a"]=> int(1) diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt index 8189aaf0b0..5ba2b91007 100644 --- a/ext/standard/tests/strings/vfprintf_basic.phpt +++ b/ext/standard/tests/strings/vfprintf_basic.phpt @@ -50,7 +50,7 @@ $file = 'vfprintf_test.txt'; unlink( $file ); ?> ---EXPECTF-- +--EXPECT-- *** Testing vfprintf() : basic functionality *** string(17) "Foo is 30 and bar" int(17) diff --git a/ext/standard/tests/strings/vfprintf_variation1.phpt b/ext/standard/tests/strings/vfprintf_variation1.phpt index 316e55ce2e..0d3e70b3fe 100644 --- a/ext/standard/tests/strings/vfprintf_variation1.phpt +++ b/ext/standard/tests/strings/vfprintf_variation1.phpt @@ -63,7 +63,7 @@ $file = 'vfprintf_test.txt'; unlink( $file ); ?> ---EXPECTF-- +--EXPECT-- *** Testing vfprintf() : variation functionality *** string(6) "format" int(6) diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt Binary files differindex 8481b41ade..120e947259 100644 --- a/ext/standard/tests/strings/vfprintf_variation9.phpt +++ b/ext/standard/tests/strings/vfprintf_variation9.phpt diff --git a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt index ac8a5f0dc5..564e6f1168 100644 --- a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt @@ -35,7 +35,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing vprintf() : basic functionality - using unsigned format *** 18446744073709550505 int(20) diff --git a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt index 32dc01bfc1..0101f49e50 100644 --- a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt @@ -80,7 +80,7 @@ foreach($args_array as $args) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing vprintf() : octal formats and non-octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt index 0475d12e69..97bc9dcd8c 100644 --- a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt @@ -50,7 +50,7 @@ foreach($formats as $format) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing vprintf() : unsigned formats and unsigned values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vprintf_variation9.phpt b/ext/standard/tests/strings/vprintf_variation9.phpt Binary files differindex 5ad2db2afa..14609374a8 100644 --- a/ext/standard/tests/strings/vprintf_variation9.phpt +++ b/ext/standard/tests/strings/vprintf_variation9.phpt diff --git a/ext/standard/tests/strings/vsprintf_basic1.phpt b/ext/standard/tests/strings/vsprintf_basic1.phpt index 6639ac3da2..960fcadc3a 100644 --- a/ext/standard/tests/strings/vsprintf_basic1.phpt +++ b/ext/standard/tests/strings/vsprintf_basic1.phpt @@ -25,7 +25,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using string format *** string(3) "one" string(7) "one two" diff --git a/ext/standard/tests/strings/vsprintf_basic2.phpt b/ext/standard/tests/strings/vsprintf_basic2.phpt index 3e78aab761..bd1c3dd519 100644 --- a/ext/standard/tests/strings/vsprintf_basic2.phpt +++ b/ext/standard/tests/strings/vsprintf_basic2.phpt @@ -28,7 +28,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using integer format *** string(3) "111" string(7) "111 222" diff --git a/ext/standard/tests/strings/vsprintf_basic3.phpt b/ext/standard/tests/strings/vsprintf_basic3.phpt index bbb6a3267c..fd0289ede8 100644 --- a/ext/standard/tests/strings/vsprintf_basic3.phpt +++ b/ext/standard/tests/strings/vsprintf_basic3.phpt @@ -34,7 +34,7 @@ var_dump( vsprintf($format33,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using float format *** string(9) "11.110000" string(9) "11.110000" diff --git a/ext/standard/tests/strings/vsprintf_basic4.phpt b/ext/standard/tests/strings/vsprintf_basic4.phpt index a82df93ad3..15f4a1a680 100644 --- a/ext/standard/tests/strings/vsprintf_basic4.phpt +++ b/ext/standard/tests/strings/vsprintf_basic4.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using bool format *** string(1) "1" string(3) "1 0" diff --git a/ext/standard/tests/strings/vsprintf_basic5.phpt b/ext/standard/tests/strings/vsprintf_basic5.phpt index a4a43d0521..3cb5ab15a1 100644 --- a/ext/standard/tests/strings/vsprintf_basic5.phpt +++ b/ext/standard/tests/strings/vsprintf_basic5.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using char format *** string(1) "A" string(3) "A B" diff --git a/ext/standard/tests/strings/vsprintf_basic6.phpt b/ext/standard/tests/strings/vsprintf_basic6.phpt index f6f6ed58a4..74dec1ce74 100644 --- a/ext/standard/tests/strings/vsprintf_basic6.phpt +++ b/ext/standard/tests/strings/vsprintf_basic6.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using exponential format *** string(11) "1.000000e+3" string(23) "1.000000e+3 2.000000e+3" diff --git a/ext/standard/tests/strings/vsprintf_basic7.phpt b/ext/standard/tests/strings/vsprintf_basic7.phpt index c477a20ee7..bb4bc246fe 100644 --- a/ext/standard/tests/strings/vsprintf_basic7.phpt +++ b/ext/standard/tests/strings/vsprintf_basic7.phpt @@ -28,7 +28,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using unsigned format *** string(10) "4294966185" string(21) "4294966185 4293732729" diff --git a/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt index ce26d246d3..fa040715df 100644 --- a/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt @@ -28,7 +28,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using unsigned format *** string(20) "18446744073709550505" string(41) "18446744073709550505 18446744073708317049" diff --git a/ext/standard/tests/strings/vsprintf_basic8.phpt b/ext/standard/tests/strings/vsprintf_basic8.phpt index cd2929e007..3cc02c2e62 100644 --- a/ext/standard/tests/strings/vsprintf_basic8.phpt +++ b/ext/standard/tests/strings/vsprintf_basic8.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using octal format *** string(2) "21" string(6) "21 347" diff --git a/ext/standard/tests/strings/vsprintf_basic9.phpt b/ext/standard/tests/strings/vsprintf_basic9.phpt index 42012a5c8f..571d9ac2de 100644 --- a/ext/standard/tests/strings/vsprintf_basic9.phpt +++ b/ext/standard/tests/strings/vsprintf_basic9.phpt @@ -34,7 +34,7 @@ var_dump( vsprintf($format33,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using hexadecimal format *** string(1) "b" string(1) "B" diff --git a/ext/standard/tests/strings/vsprintf_variation10.phpt b/ext/standard/tests/strings/vsprintf_variation10.phpt Binary files differindex 42ba2679f1..9678398058 100644 --- a/ext/standard/tests/strings/vsprintf_variation10.phpt +++ b/ext/standard/tests/strings/vsprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vsprintf_variation11.phpt b/ext/standard/tests/strings/vsprintf_variation11.phpt index 4cc5b02922..3d5eb1cfc3 100644 --- a/ext/standard/tests/strings/vsprintf_variation11.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11.phpt @@ -56,7 +56,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats with octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt index 841d104b81..6d9c4c4b79 100644 --- a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt @@ -56,7 +56,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats with octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation12.phpt b/ext/standard/tests/strings/vsprintf_variation12.phpt index ab67cc82f9..8437487904 100644 --- a/ext/standard/tests/strings/vsprintf_variation12.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12.phpt @@ -78,7 +78,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats and non-octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt index 530f05b13f..17698497e2 100644 --- a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt @@ -78,7 +78,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats and non-octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation13.phpt b/ext/standard/tests/strings/vsprintf_variation13.phpt index b617975759..6be9d4a9a8 100644 --- a/ext/standard/tests/strings/vsprintf_variation13.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13.phpt @@ -56,7 +56,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats with hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt index 8d2533a8fc..59efbf9d22 100644 --- a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt @@ -56,7 +56,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats with hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation14.phpt b/ext/standard/tests/strings/vsprintf_variation14.phpt index bfe816ee1f..d63165046c 100644 --- a/ext/standard/tests/strings/vsprintf_variation14.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14.phpt @@ -79,7 +79,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats and non-hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt index f1940ef2ee..5f31e385ec 100644 --- a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt @@ -79,7 +79,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats and non-hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt index af55ce966f..35a78200a6 100644 --- a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt @@ -48,7 +48,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : unsigned formats and unsigned values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation16.phpt b/ext/standard/tests/strings/vsprintf_variation16.phpt index 01bcc662d5..8fb03d609d 100644 --- a/ext/standard/tests/strings/vsprintf_variation16.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : unsigned formats and signed & other types of values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt index 91a69c7e70..b138c32614 100644 --- a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : unsigned formats and signed & other types of values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation17.phpt b/ext/standard/tests/strings/vsprintf_variation17.phpt index 88cacdd49a..81dec4d89c 100644 --- a/ext/standard/tests/strings/vsprintf_variation17.phpt +++ b/ext/standard/tests/strings/vsprintf_variation17.phpt @@ -44,7 +44,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : scientific formats and scientific values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation18.phpt b/ext/standard/tests/strings/vsprintf_variation18.phpt index 3d1aeba335..87ba0440e4 100644 --- a/ext/standard/tests/strings/vsprintf_variation18.phpt +++ b/ext/standard/tests/strings/vsprintf_variation18.phpt @@ -67,7 +67,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : scientific formats and non-scientific values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation19.phpt b/ext/standard/tests/strings/vsprintf_variation19.phpt index 8d475b75a3..de56405eed 100644 --- a/ext/standard/tests/strings/vsprintf_variation19.phpt +++ b/ext/standard/tests/strings/vsprintf_variation19.phpt @@ -53,7 +53,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : with white spaces in format strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt index 69145ba963..9385a6e67f 100644 --- a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt @@ -53,7 +53,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : with white spaces in format strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation3.phpt b/ext/standard/tests/strings/vsprintf_variation3.phpt index 2932e15f18..e71bf1c178 100644 --- a/ext/standard/tests/strings/vsprintf_variation3.phpt +++ b/ext/standard/tests/strings/vsprintf_variation3.phpt @@ -53,7 +53,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats with int values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation4.phpt b/ext/standard/tests/strings/vsprintf_variation4.phpt index e3e6737b82..3decee6310 100644 --- a/ext/standard/tests/strings/vsprintf_variation4.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats and non-integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt index c6b6db572c..83f0327423 100644 --- a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats and non-integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation5.phpt b/ext/standard/tests/strings/vsprintf_variation5.phpt index b2bd0d5b79..42db3d4405 100644 --- a/ext/standard/tests/strings/vsprintf_variation5.phpt +++ b/ext/standard/tests/strings/vsprintf_variation5.phpt @@ -53,7 +53,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation6.phpt b/ext/standard/tests/strings/vsprintf_variation6.phpt index 00f9467cf9..f638e51726 100644 --- a/ext/standard/tests/strings/vsprintf_variation6.phpt +++ b/ext/standard/tests/strings/vsprintf_variation6.phpt @@ -67,7 +67,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : float formats and non-float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation9.phpt b/ext/standard/tests/strings/vsprintf_variation9.phpt Binary files differindex c16531b2f5..dcc1102ea0 100644 --- a/ext/standard/tests/strings/vsprintf_variation9.phpt +++ b/ext/standard/tests/strings/vsprintf_variation9.phpt diff --git a/ext/standard/tests/strings/wordwrap_basic.phpt b/ext/standard/tests/strings/wordwrap_basic.phpt index 84a7f7335c..1760a9cc77 100644 --- a/ext/standard/tests/strings/wordwrap_basic.phpt +++ b/ext/standard/tests/strings/wordwrap_basic.phpt @@ -35,7 +35,7 @@ $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing wordwrap() : basic functionality *** string(96) "The quick brown foooooooooox jummmmmmmmmmmmped over the lazzzzzzzzzzzy doooooooooooooooooooooog." diff --git a/ext/standard/tests/strings/wordwrap_variation5.phpt b/ext/standard/tests/strings/wordwrap_variation5.phpt index b0911a899c..ebfffe4040 100644 --- a/ext/standard/tests/strings/wordwrap_variation5.phpt +++ b/ext/standard/tests/strings/wordwrap_variation5.phpt @@ -40,7 +40,7 @@ var_dump( wordwrap($str, $width, $break1, $cut) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing wordwrap() : usage variations *** -- Testing wordwrap() with default break value and single space as value -- diff --git a/ext/standard/tests/time/strptime_basic.phpt b/ext/standard/tests/time/strptime_basic.phpt index 30e3e82cc7..8fbe37cd82 100644 --- a/ext/standard/tests/time/strptime_basic.phpt +++ b/ext/standard/tests/time/strptime_basic.phpt @@ -35,7 +35,7 @@ var_dump(strptime($str, '%A %B %e %R')); setlocale(LC_ALL, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strptime() : basic functionality *** array(9) { ["tm_sec"]=> diff --git a/ext/standard/tests/url/base64_decode_basic_001.phpt b/ext/standard/tests/url/base64_decode_basic_001.phpt index e1469c37e8..516666c53c 100644 --- a/ext/standard/tests/url/base64_decode_basic_001.phpt +++ b/ext/standard/tests/url/base64_decode_basic_001.phpt @@ -16,7 +16,7 @@ var_dump(bin2hex(base64_decode($allbase64, true))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Decode an input string containing the whole base64 alphabet: string(98) "00108310518720928b30d38f41149351559761969b71d79f8218a39259a7a29aabb2dbafc31cb3d35db7e39ebbf3dfbf55" string(98) "00108310518720928b30d38f41149351559761969b71d79f8218a39259a7a29aabb2dbafc31cb3d35db7e39ebbf3dfbf55" diff --git a/ext/standard/tests/url/base64_decode_basic_002.phpt b/ext/standard/tests/url/base64_decode_basic_002.phpt index 1289894f4a..c6afffd389 100644 --- a/ext/standard/tests/url/base64_decode_basic_002.phpt +++ b/ext/standard/tests/url/base64_decode_basic_002.phpt @@ -29,7 +29,7 @@ var_dump(base64_decode($badChars, true)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Decode 'hello world!': string(12) "hello world!" string(12) "hello world!" diff --git a/ext/standard/tests/url/base64_decode_basic_003.phpt b/ext/standard/tests/url/base64_decode_basic_003.phpt index 0407926b02..3bcd51e192 100644 --- a/ext/standard/tests/url/base64_decode_basic_003.phpt +++ b/ext/standard/tests/url/base64_decode_basic_003.phpt @@ -38,7 +38,7 @@ foreach ($data as $a) { } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Test base64_decode (output as JSON): base64 "" non-strict "" strict "" base64 "=" non-strict "" strict false diff --git a/ext/standard/tests/url/base64_encode_basic_001.phpt b/ext/standard/tests/url/base64_encode_basic_001.phpt index 6ab57f4c55..6f5e0a28da 100644 --- a/ext/standard/tests/url/base64_encode_basic_001.phpt +++ b/ext/standard/tests/url/base64_encode_basic_001.phpt @@ -22,7 +22,7 @@ for ($i=0; $i<256; $i++) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing base64_encode() : basic functionality *** 0x0: AA== 0x1: AQ== diff --git a/ext/standard/tests/url/base64_encode_basic_002.phpt b/ext/standard/tests/url/base64_encode_basic_002.phpt index cff8f41425..e2304ec06e 100644 --- a/ext/standard/tests/url/base64_encode_basic_002.phpt +++ b/ext/standard/tests/url/base64_encode_basic_002.phpt @@ -42,7 +42,7 @@ foreach($values as $str) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing base64_encode() : basic functionality *** --- Testing base64_encode() with binary string input --- diff --git a/ext/standard/tests/url/bug53248.phpt b/ext/standard/tests/url/bug53248.phpt index 5e31c510df..5cff9f1c47 100644 --- a/ext/standard/tests/url/bug53248.phpt +++ b/ext/standard/tests/url/bug53248.phpt @@ -7,6 +7,6 @@ var_dump(rawurlencode('A1_-.~')); var_dump(rawurldecode('%41%31%5F%2D%2E%7E')); ?> ---EXPECTF-- +--EXPECT-- string(6) "A1_-.~" string(6) "A1_-.~"
\ No newline at end of file diff --git a/ext/standard/tests/url/bug54180.phpt b/ext/standard/tests/url/bug54180.phpt index 2e64e27d07..815784c28d 100644 --- a/ext/standard/tests/url/bug54180.phpt +++ b/ext/standard/tests/url/bug54180.phpt @@ -7,7 +7,7 @@ var_dump(parse_url("http://example.com/path/script.html?t=1#fragment?data")); var_dump(parse_url("http://example.com/path/script.html#fragment?data")); ?> ---EXPECTF-- +--EXPECT-- array(5) { ["scheme"]=> string(4) "http" diff --git a/ext/standard/tests/url/get_headers_error_003.phpt b/ext/standard/tests/url/get_headers_error_003.phpt index 6c8878513c..81265eecc9 100644 --- a/ext/standard/tests/url/get_headers_error_003.phpt +++ b/ext/standard/tests/url/get_headers_error_003.phpt @@ -22,7 +22,7 @@ echo $headers["X-Request-Method"]."\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- HEAD HEAD Done diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt index bd4bea5b9c..e963da377c 100644 --- a/ext/standard/tests/url/parse_url_basic_001.phpt +++ b/ext/standard/tests/url/parse_url_basic_001.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37: array(1) { ["path"]=> diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt index eae78febed..fafc877502 100644 --- a/ext/standard/tests/url/parse_url_basic_002.phpt +++ b/ext/standard/tests/url/parse_url_basic_002.phpt @@ -21,7 +21,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : string(4) "http" --> http://64.246.30.37/ : string(4) "http" diff --git a/ext/standard/tests/url/parse_url_basic_003.phpt b/ext/standard/tests/url/parse_url_basic_003.phpt index 0ce27b7a2c..76f70da4d8 100644 --- a/ext/standard/tests/url/parse_url_basic_003.phpt +++ b/ext/standard/tests/url/parse_url_basic_003.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : string(12) "64.246.30.37" --> http://64.246.30.37/ : string(12) "64.246.30.37" diff --git a/ext/standard/tests/url/parse_url_basic_004.phpt b/ext/standard/tests/url/parse_url_basic_004.phpt index 92d690ae1d..5dda51372a 100644 --- a/ext/standard/tests/url/parse_url_basic_004.phpt +++ b/ext/standard/tests/url/parse_url_basic_004.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_005.phpt b/ext/standard/tests/url/parse_url_basic_005.phpt index 68162594f1..65ae06a469 100644 --- a/ext/standard/tests/url/parse_url_basic_005.phpt +++ b/ext/standard/tests/url/parse_url_basic_005.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_006.phpt b/ext/standard/tests/url/parse_url_basic_006.phpt index 2628559ee5..3f06a50aef 100644 --- a/ext/standard/tests/url/parse_url_basic_006.phpt +++ b/ext/standard/tests/url/parse_url_basic_006.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_007.phpt b/ext/standard/tests/url/parse_url_basic_007.phpt index 15935bb663..67827e05c0 100644 --- a/ext/standard/tests/url/parse_url_basic_007.phpt +++ b/ext/standard/tests/url/parse_url_basic_007.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : string(12) "64.246.30.37" --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : string(1) "/" diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt index 48ea6b92b2..f2b64da280 100644 --- a/ext/standard/tests/url/parse_url_basic_008.phpt +++ b/ext/standard/tests/url/parse_url_basic_008.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_009.phpt b/ext/standard/tests/url/parse_url_basic_009.phpt index 19527d87ef..c38a69d0dd 100644 --- a/ext/standard/tests/url/parse_url_basic_009.phpt +++ b/ext/standard/tests/url/parse_url_basic_009.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_010.phpt b/ext/standard/tests/url/parse_url_basic_010.phpt index 3bb2dba142..ff509e9744 100644 --- a/ext/standard/tests/url/parse_url_basic_010.phpt +++ b/ext/standard/tests/url/parse_url_basic_010.phpt @@ -19,7 +19,7 @@ foreach(get_defined_constants() as $constantName => $constantValue) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- PHP_URL_SCHEME: 0 PHP_URL_HOST: 1 PHP_URL_PORT: 2 diff --git a/ext/standard/tests/url/parse_url_unterminated.phpt b/ext/standard/tests/url/parse_url_unterminated.phpt index bb0e096856..00cdeab9a9 100644 --- a/ext/standard/tests/url/parse_url_unterminated.phpt +++ b/ext/standard/tests/url/parse_url_unterminated.phpt @@ -22,7 +22,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37: array(1) { ["path"]=> |