diff options
Diffstat (limited to 'ext/standard')
1032 files changed, 502 insertions, 1217 deletions
diff --git a/ext/standard/tests/array/array_change_key_case_variation1.phpt b/ext/standard/tests/array/array_change_key_case_variation1.phpt index 450d8bc0ce..14626deb86 100644 --- a/ext/standard/tests/array/array_change_key_case_variation1.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation1.phpt @@ -94,7 +94,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing array_change_key_case() : usage variations *** @@ -221,4 +220,4 @@ NULL Warning: array_change_key_case() expects parameter 1 to be array, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_change_key_case_variation2.phpt b/ext/standard/tests/array/array_change_key_case_variation2.phpt index 4dd28d9a39..b0b90bd926 100644 --- a/ext/standard/tests/array/array_change_key_case_variation2.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation2.phpt @@ -84,7 +84,6 @@ foreach($inputs as $input) { echo "Done"; ?> - --EXPECTF-- *** Testing array_change_key_case() : usage variations *** 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 83a642dc3e..726b0eb553 100644 --- a/ext/standard/tests/array/array_change_key_case_variation3.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation3.phpt @@ -194,4 +194,4 @@ array(1) { [""]=> string(5) "unset" } -Done
\ No newline at end of file +Done 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 aa4c77fe3a..52017177cc 100644 --- a/ext/standard/tests/array/array_change_key_case_variation4.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation4.phpt @@ -22,7 +22,6 @@ for ($i = -5; $i <=5; $i += 1){ echo "Done"; ?> - --EXPECT-- *** Testing array_change_key_case() : usage variations *** @@ -135,4 +134,4 @@ array(3) { ["THREE"]=> string(5) "trois" } -Done
\ No newline at end of file +Done 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 a86af30472..e39fb1cafe 100644 --- a/ext/standard/tests/array/array_change_key_case_variation5.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation5.phpt @@ -25,7 +25,6 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> - --EXPECT-- *** Testing array_change_key_case() : usage variations *** @@ -43,4 +42,4 @@ ONE => un -- Position of Internal Pointer in Original Array: -- one => un -Done
\ No newline at end of file +Done 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 182927fa26..383993c38c 100644 --- a/ext/standard/tests/array/array_change_key_case_variation6.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation6.phpt @@ -25,7 +25,6 @@ var_dump(array_change_key_case($input['English'], CASE_UPPER)); echo "Done"; ?> - --EXPECT-- *** Testing array_change_key_case() : usage variations *** @@ -69,4 +68,4 @@ array(3) { ["THREE"]=> int(3) } -Done
\ No newline at end of file +Done 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 cd62ae1db7..0f1268dd48 100644 --- a/ext/standard/tests/array/array_change_key_case_variation7.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation7.phpt @@ -28,7 +28,6 @@ var_dump($new_input); echo "Done"; ?> - --EXPECT-- *** Testing array_change_key_case() : usage variations *** @@ -61,4 +60,3 @@ array(3) { string(3) "xyz" } Done - 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 4b82cf6b87..6024225fb1 100644 --- a/ext/standard/tests/array/array_change_key_case_variation8.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation8.phpt @@ -35,7 +35,6 @@ foreach($inputs as $input) { echo "Done"; ?> - --EXPECT-- *** Testing array_change_key_case() : usage variations *** diff --git a/ext/standard/tests/array/array_combine.phpt b/ext/standard/tests/array/array_combine.phpt index 34d4ff85b9..28eb54929e 100644 --- a/ext/standard/tests/array/array_combine.phpt +++ b/ext/standard/tests/array/array_combine.phpt @@ -119,4 +119,4 @@ Array ( [1] => 1 [] => -)
\ No newline at end of file +) diff --git a/ext/standard/tests/array/array_count_values_error.phpt b/ext/standard/tests/array/array_count_values_error.phpt index c66c2a4718..5e0deb1b6d 100644 --- a/ext/standard/tests/array/array_count_values_error.phpt +++ b/ext/standard/tests/array/array_count_values_error.phpt @@ -47,4 +47,4 @@ NULL Warning: array_count_values() expects parameter 1 to be array, int given in %sarray_count_values_error.php on line 26 NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt index 3eb92b49d4..00f13c8a5b 100644 --- a/ext/standard/tests/array/array_count_values_variation.phpt +++ b/ext/standard/tests/array/array_count_values_variation.phpt @@ -32,7 +32,6 @@ echo "\n"; echo "Done"; ?> - --CLEAN-- <?php unlink("array_count_file"); diff --git a/ext/standard/tests/array/array_diff_assoc.phpt b/ext/standard/tests/array/array_diff_assoc.phpt index 509c632ba5..0c615cf012 100644 --- a/ext/standard/tests/array/array_diff_assoc.phpt +++ b/ext/standard/tests/array/array_diff_assoc.phpt @@ -44,6 +44,3 @@ Array ) ) - - - diff --git a/ext/standard/tests/array/array_diff_assoc_error.phpt b/ext/standard/tests/array/array_diff_assoc_error.phpt index e3513a9346..fc8c70c67c 100644 --- a/ext/standard/tests/array/array_diff_assoc_error.phpt +++ b/ext/standard/tests/array/array_diff_assoc_error.phpt @@ -38,4 +38,4 @@ NULL Warning: array_diff_assoc(): at least 2 parameters are required, 1 given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt index 89277f787a..2172e695d3 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt @@ -98,7 +98,6 @@ foreach($inputs as $input) { fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing array_diff_assoc() : usage variations *** @@ -231,4 +230,4 @@ NULL Warning: array_diff_assoc(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt index c5e95ad393..a57f10fce0 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt @@ -98,9 +98,7 @@ foreach($inputs as $input) { fclose($fp); echo "Done"; ?> - --EXPECTF-- - *** Testing array_diff_assoc() : usage variations *** -- Iteration 1 -- @@ -232,4 +230,4 @@ NULL Warning: array_diff_assoc(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation3.phpt b/ext/standard/tests/array/array_diff_assoc_variation3.phpt index 36d31b078b..959ddd5428 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation3.phpt @@ -112,7 +112,6 @@ foreach($inputs as $key => $input) { echo "Done"; ?> --EXPECTF-- - *** Testing array_diff_assoc() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt index d0f70580ff..8cb05f8562 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt @@ -1,7 +1,6 @@ --TEST-- Test array_diff_assoc() function : usage variations - arrays with different data types as keys --FILE-- - <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) * Description: Returns the entries of arr1 that have values which are not present @@ -100,9 +99,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> - --EXPECT-- - *** Testing array_diff_assoc() : usage variations *** -- Iteration 1 -- @@ -174,4 +171,4 @@ array(1) { [""]=> string(5) "unset" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation5.phpt b/ext/standard/tests/array/array_diff_assoc_variation5.phpt index 0039770269..e761a91d92 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation5.phpt @@ -48,7 +48,6 @@ var_dump(array_diff_assoc($arr_default_int, $arr_float, $arr_string, $arr_string echo "Done"; ?> --EXPECT-- - *** Testing array_diff_assoc() : usage variations *** -- Result of comparing integers and floating point numbers: -- array(1) { diff --git a/ext/standard/tests/array/array_diff_assoc_variation6.phpt b/ext/standard/tests/array/array_diff_assoc_variation6.phpt index b8894e5d7e..2ea2c461c6 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation6.phpt @@ -193,4 +193,4 @@ array(1) { [0]=> float(1.0E-11) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation7.phpt b/ext/standard/tests/array/array_diff_assoc_variation7.phpt index 99bfd6638e..0d3caf6c71 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation7.phpt @@ -1,7 +1,6 @@ --TEST-- Test array_diff_assoc() function : usage variations - arrays containing referenced variables --FILE-- - <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) * Description: Returns the entries of $arr1 that have values which are not @@ -46,9 +45,7 @@ var_dump(array_diff_assoc($arr2, $arr1)); echo "Done"; ?> - --EXPECT-- - *** Testing array_diff_assoc() : usage variations *** -- Results when $a = a: -- array(3) { @@ -98,4 +95,4 @@ array(0) { } array(0) { } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation9.phpt b/ext/standard/tests/array/array_diff_assoc_variation9.phpt index bbb5914496..1ef4f73248 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation9.phpt @@ -138,4 +138,4 @@ array(2) { string(1) "c" } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_error.phpt b/ext/standard/tests/array/array_diff_error.phpt index 67c1b6fcc4..25be6e1c55 100644 --- a/ext/standard/tests/array/array_diff_error.phpt +++ b/ext/standard/tests/array/array_diff_error.phpt @@ -37,4 +37,4 @@ NULL Warning: array_diff(): at least 2 parameters are required, 1 given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_key_basic.phpt b/ext/standard/tests/array/array_diff_key_basic.phpt index 40d02d4785..0249e2c27d 100644 --- a/ext/standard/tests/array/array_diff_key_basic.phpt +++ b/ext/standard/tests/array/array_diff_key_basic.phpt @@ -16,4 +16,4 @@ array(2) { int(2) ["purple"]=> int(4) -}
\ No newline at end of file +} diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt index 179b07259a..3e689a0e8f 100644 --- a/ext/standard/tests/array/array_diff_key_variation1.phpt +++ b/ext/standard/tests/array/array_diff_key_variation1.phpt @@ -307,4 +307,4 @@ NULL Warning: array_diff_key(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation3.phpt b/ext/standard/tests/array/array_diff_key_variation3.phpt index cf8ae6db9b..36741dba33 100644 --- a/ext/standard/tests/array/array_diff_key_variation3.phpt +++ b/ext/standard/tests/array/array_diff_key_variation3.phpt @@ -229,4 +229,4 @@ NULL Warning: array_diff_key(): Expected parameter 3 to be an array, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation4.phpt b/ext/standard/tests/array/array_diff_key_variation4.phpt index 80755540f5..c7171dc440 100644 --- a/ext/standard/tests/array/array_diff_key_variation4.phpt +++ b/ext/standard/tests/array/array_diff_key_variation4.phpt @@ -58,4 +58,4 @@ array(1) { [18]=> string(4) "0x12" } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation5.phpt b/ext/standard/tests/array/array_diff_key_variation5.phpt index 0885cfeacf..f5017ba63b 100644 --- a/ext/standard/tests/array/array_diff_key_variation5.phpt +++ b/ext/standard/tests/array/array_diff_key_variation5.phpt @@ -31,4 +31,4 @@ array(2) { } array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation6.phpt b/ext/standard/tests/array/array_diff_key_variation6.phpt index a081571930..7f00c4b3ab 100644 --- a/ext/standard/tests/array/array_diff_key_variation6.phpt +++ b/ext/standard/tests/array/array_diff_key_variation6.phpt @@ -33,4 +33,4 @@ array(3) { } array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation7.phpt b/ext/standard/tests/array/array_diff_key_variation7.phpt index 3b255b8b19..02cf2c9e67 100644 --- a/ext/standard/tests/array/array_diff_key_variation7.phpt +++ b/ext/standard/tests/array/array_diff_key_variation7.phpt @@ -56,4 +56,4 @@ array(1) { } array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation8.phpt b/ext/standard/tests/array/array_diff_key_variation8.phpt index 1a08d78f16..349ebbbc6e 100644 --- a/ext/standard/tests/array/array_diff_key_variation8.phpt +++ b/ext/standard/tests/array/array_diff_key_variation8.phpt @@ -51,4 +51,4 @@ array(1) { string(3) "two" } } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_basic.phpt b/ext/standard/tests/array/array_diff_uassoc_basic.phpt index 419b916fd8..45d386807b 100644 --- a/ext/standard/tests/array/array_diff_uassoc_basic.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_basic.phpt @@ -25,4 +25,4 @@ array(3) { string(4) "blue" [0]=> string(3) "red" -}
\ No newline at end of file +} diff --git a/ext/standard/tests/array/array_diff_uassoc_variation14.phpt b/ext/standard/tests/array/array_diff_uassoc_variation14.phpt index f8fc5a4b4b..eff559e03a 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation14.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation14.phpt @@ -37,4 +37,3 @@ var_dump( array_diff_uassoc($array1, $array2, $value) ); Error: 2 - array_diff_uassoc() expects parameter 3 to be a valid callback, no array or string given, %s(%d) NULL ===DONE=== - diff --git a/ext/standard/tests/array/array_diff_ukey_variation11.phpt b/ext/standard/tests/array/array_diff_ukey_variation11.phpt index 074be3bae8..c759189aa0 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation11.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation11.phpt @@ -41,4 +41,4 @@ Error: 2 - array_diff_ukey() expects parameter 3 to be a valid callback, no arra NULL Error: 2 - array_diff_ukey() expects parameter 4 to be a valid callback, no array or string given, %s(%d) NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt index a501246fa0..5f8183b88d 100644 --- a/ext/standard/tests/array/array_diff_variation2.phpt +++ b/ext/standard/tests/array/array_diff_variation2.phpt @@ -204,4 +204,4 @@ NULL -- Iteration 26 -- Warning: array_diff(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt index 879a3b8aae..b7c842f21b 100644 --- a/ext/standard/tests/array/array_diff_variation3.phpt +++ b/ext/standard/tests/array/array_diff_variation3.phpt @@ -187,4 +187,4 @@ array(1) { [0]=> NULL } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt index d79686ed6f..3b02c21b36 100644 --- a/ext/standard/tests/array/array_diff_variation4.phpt +++ b/ext/standard/tests/array/array_diff_variation4.phpt @@ -181,4 +181,4 @@ array(2) { [1]=> int(2) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_variation5.phpt b/ext/standard/tests/array/array_diff_variation5.phpt index be0340b9f1..8737e7c660 100644 --- a/ext/standard/tests/array/array_diff_variation5.phpt +++ b/ext/standard/tests/array/array_diff_variation5.phpt @@ -116,4 +116,4 @@ array(3) { [2]=> string(4) "3.00" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_variation6.phpt b/ext/standard/tests/array/array_diff_variation6.phpt index 085831c020..3c141216c7 100644 --- a/ext/standard/tests/array/array_diff_variation6.phpt +++ b/ext/standard/tests/array/array_diff_variation6.phpt @@ -43,4 +43,4 @@ array(3) { ["c"]=> int(2) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_variation7.phpt b/ext/standard/tests/array/array_diff_variation7.phpt index 37b819895a..f4368ade6c 100644 --- a/ext/standard/tests/array/array_diff_variation7.phpt +++ b/ext/standard/tests/array/array_diff_variation7.phpt @@ -44,9 +44,7 @@ var_dump(array_diff($arr2, $arr1)); echo "Done"; ?> - --EXPECT-- - *** Testing array_diff() : usage variations *** -- Basic Comparison -- array(3) { @@ -92,4 +90,4 @@ array(0) { } array(0) { } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_fill_keys.phpt b/ext/standard/tests/array/array_fill_keys.phpt index b4d51680ea..12adde72e7 100644 --- a/ext/standard/tests/array/array_fill_keys.phpt +++ b/ext/standard/tests/array/array_fill_keys.phpt @@ -11,7 +11,6 @@ precision=14 var_dump(array_fill_keys(array('test', TRUE, 10, 100), '')); ?> --EXPECTF-- - Warning: array_fill_keys() expects parameter 1 to be array, string given in %s on line %d NULL array(0) { diff --git a/ext/standard/tests/array/array_fill_keys_variation1.phpt b/ext/standard/tests/array/array_fill_keys_variation1.phpt index 234aa6ef69..0af38c7bde 100644 --- a/ext/standard/tests/array/array_fill_keys_variation1.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation1.phpt @@ -76,4 +76,4 @@ array(7) { ["2.4"]=> string(6) "simple" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_fill_keys_variation2.phpt b/ext/standard/tests/array/array_fill_keys_variation2.phpt index de62bf4b30..4a7aef39d2 100644 --- a/ext/standard/tests/array/array_fill_keys_variation2.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation2.phpt @@ -78,4 +78,4 @@ array(2) { ["two"]=> string(3) "bob" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_fill_keys_variation3.phpt b/ext/standard/tests/array/array_fill_keys_variation3.phpt index 6d37a916ba..84cc928cbc 100644 --- a/ext/standard/tests/array/array_fill_keys_variation3.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation3.phpt @@ -51,4 +51,4 @@ array(2) { Warning: array_fill_keys() expects parameter 1 to be array, null given in %sarray_fill_keys_variation3.php on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_fill_keys_variation4.phpt b/ext/standard/tests/array/array_fill_keys_variation4.phpt index 086a10df2a..bd89416d9d 100644 --- a/ext/standard/tests/array/array_fill_keys_variation4.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation4.phpt @@ -88,4 +88,4 @@ array(1) { ["one"]=> NULL } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_intersect_assoc_basic.phpt b/ext/standard/tests/array/array_intersect_assoc_basic.phpt index 6161d9cf0a..17e48b4ba0 100644 --- a/ext/standard/tests/array/array_intersect_assoc_basic.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_basic.phpt @@ -66,4 +66,4 @@ array(0) { } array(0) { } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt index 4f15ff48d1..5e6137d089 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt @@ -51,4 +51,4 @@ array(2) { [1]=> string(5) "world" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt index 911380c25c..df3cbfbcd7 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt @@ -251,4 +251,4 @@ array(0) { } array(0) { } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_intersect_key_basic.phpt b/ext/standard/tests/array/array_intersect_key_basic.phpt index c24a4c1b08..4cf9a596c2 100644 --- a/ext/standard/tests/array/array_intersect_key_basic.phpt +++ b/ext/standard/tests/array/array_intersect_key_basic.phpt @@ -16,4 +16,4 @@ array(2) { int(1) ["green"]=> int(3) -}
\ No newline at end of file +} diff --git a/ext/standard/tests/array/array_intersect_uassoc_basic.phpt b/ext/standard/tests/array/array_intersect_uassoc_basic.phpt index 1a2d57ec3d..a0e8427892 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_basic.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_basic.phpt @@ -21,4 +21,4 @@ var_dump($result); array(1) { ["a"]=> string(5) "green" -}
\ No newline at end of file +} diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt index 064def0f5a..887ad12d9a 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt @@ -110,7 +110,6 @@ fclose($fp); ?> ===DONE=== --EXPECTF-- - *** Testing array_intersect_uassoc() : usage variation *** --int 0-- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt index c880f7a057..fe9a17983f 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt @@ -39,4 +39,4 @@ Error: 2 - array_intersect_uassoc() expects parameter 3 to be a valid callback, NULL Error: 2 - array_intersect_uassoc() expects parameter 4 to be a valid callback, no array or string given, %s(%d) NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt index 4830baaf10..d482e9ffcc 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt @@ -110,7 +110,6 @@ fclose($fp); ?> ===DONE=== --EXPECTF-- - *** Testing array_intersect_uassoc() : usage variation *** --int 0-- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt index e18417aa02..42e53101dc 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt @@ -109,7 +109,6 @@ fclose($fp); ?> ===DONE=== --EXPECTF-- - *** Testing array_intersect_uassoc() : usage variation *** --int 0-- diff --git a/ext/standard/tests/array/array_intersect_ukey_error.phpt b/ext/standard/tests/array/array_intersect_ukey_error.phpt index 793ec3d252..5d1eba819a 100644 --- a/ext/standard/tests/array/array_intersect_ukey_error.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_error.phpt @@ -53,4 +53,4 @@ NULL Warning: array_intersect_ukey(): at least 3 parameters are required, 0 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt index c91a07fc3c..86850094b8 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt @@ -317,4 +317,4 @@ NULL Warning: array_intersect_ukey(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt index 7156bf5404..ca70e5e78a 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt @@ -40,4 +40,4 @@ Error: 2 - array_intersect_ukey() expects parameter 3 to be a valid callback, no NULL Error: 2 - array_intersect_ukey() expects parameter 4 to be a valid callback, no array or string given, %s(%d) NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt index 0688004fba..82b43628e3 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt @@ -317,4 +317,4 @@ NULL Warning: array_intersect_ukey(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation3.phpt b/ext/standard/tests/array/array_intersect_ukey_variation3.phpt index d99059e52d..c897c51e4c 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation3.phpt @@ -287,4 +287,4 @@ NULL Warning: array_intersect_ukey() expects parameter 4 to be a valid callback, no array or string given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt index 38e2e76134..35c0d4a2e6 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt @@ -318,4 +318,4 @@ NULL Warning: array_intersect_ukey(): Expected parameter 3 to be an array, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt index 17b98bb81e..e56d6195d0 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt @@ -60,4 +60,4 @@ array(2) { [1]=> int(2) } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt index 6e57841457..9384c48a46 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt @@ -48,4 +48,4 @@ array(2) { [1]=> float(2) } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt index 6f18ba5694..4f069c0ae8 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt @@ -60,4 +60,4 @@ array(2) { [1]=> string(1) "2" } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt index c686899aad..122d1e4767 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt @@ -36,4 +36,4 @@ Warning: Use of undefined constant unknown_function - assumed 'unknown_function' Warning: array_intersect_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt index 6b9a802af1..f6dddb9e83 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt @@ -58,4 +58,4 @@ array(2) { ["green"]=> int(3) } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_key_exists_basic.phpt b/ext/standard/tests/array/array_key_exists_basic.phpt index 46982b7490..09df218c0f 100644 --- a/ext/standard/tests/array/array_key_exists_basic.phpt +++ b/ext/standard/tests/array/array_key_exists_basic.phpt @@ -26,4 +26,4 @@ echo "Done"; *** Testing array_key_exists() : basic functionality *** bool(true) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_key_exists_error.phpt b/ext/standard/tests/array/array_key_exists_error.phpt index 1691cc5fa1..410ed7fa50 100644 --- a/ext/standard/tests/array/array_key_exists_error.phpt +++ b/ext/standard/tests/array/array_key_exists_error.phpt @@ -28,7 +28,6 @@ var_dump( array_key_exists($key) ); echo "Done"; ?> - --EXPECTF-- *** Testing array_key_exists() : error conditions *** @@ -41,4 +40,4 @@ NULL Warning: array_key_exists() expects exactly 2 parameters, 1 given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_key_exists_object1.phpt b/ext/standard/tests/array/array_key_exists_object1.phpt index cec69df3dc..14453cd934 100644 --- a/ext/standard/tests/array/array_key_exists_object1.phpt +++ b/ext/standard/tests/array/array_key_exists_object1.phpt @@ -46,7 +46,6 @@ var_dump($class2); echo "Done"; ?> - --EXPECT-- *** Testing array_key_exists() : object functionality *** diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt index 2b4897730c..c9c1633591 100644 --- a/ext/standard/tests/array/array_key_exists_object2.phpt +++ b/ext/standard/tests/array/array_key_exists_object2.phpt @@ -48,7 +48,6 @@ var_dump($class2); echo "Done"; ?> - --EXPECT-- *** Testing array_key_exists() : object functionality *** diff --git a/ext/standard/tests/array/array_key_exists_variation1.phpt b/ext/standard/tests/array/array_key_exists_variation1.phpt index b989160db7..c6e8ba7806 100644 --- a/ext/standard/tests/array/array_key_exists_variation1.phpt +++ b/ext/standard/tests/array/array_key_exists_variation1.phpt @@ -98,7 +98,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing array_key_exists() : usage variations *** @@ -200,4 +199,4 @@ bool(false) Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt index 0b0dff3c44..b1e3033002 100644 --- a/ext/standard/tests/array/array_key_exists_variation2.phpt +++ b/ext/standard/tests/array/array_key_exists_variation2.phpt @@ -98,7 +98,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing array_key_exists() : usage variations *** diff --git a/ext/standard/tests/array/array_key_exists_variation3.phpt b/ext/standard/tests/array/array_key_exists_variation3.phpt index 0517d4c24e..867b4d9848 100644 --- a/ext/standard/tests/array/array_key_exists_variation3.phpt +++ b/ext/standard/tests/array/array_key_exists_variation3.phpt @@ -30,7 +30,6 @@ foreach($keys as $key) { echo "Done"; ?> - --EXPECTF-- *** Testing array_key_exists() : usage variations *** @@ -57,4 +56,4 @@ Warning: array_key_exists(): The first argument should be either a string or an bool(false) Cast float to int: bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_key_exists_variation4.phpt b/ext/standard/tests/array/array_key_exists_variation4.phpt index cbbfb5f789..1f651a2c3a 100644 --- a/ext/standard/tests/array/array_key_exists_variation4.phpt +++ b/ext/standard/tests/array/array_key_exists_variation4.phpt @@ -22,7 +22,6 @@ var_dump(array_key_exists('one', $search)); echo "Done"; ?> - --EXPECT-- *** Testing array_key_exists() : usage variations *** diff --git a/ext/standard/tests/array/array_key_exists_variation5.phpt b/ext/standard/tests/array/array_key_exists_variation5.phpt index 53899c675a..2e72ed7ed0 100644 --- a/ext/standard/tests/array/array_key_exists_variation5.phpt +++ b/ext/standard/tests/array/array_key_exists_variation5.phpt @@ -27,7 +27,6 @@ var_dump(array_key_exists(0, $multi_array['sub1'])); echo "Done"; ?> - --EXPECT-- *** Testing array_key_exists() : usage variations *** @@ -36,4 +35,4 @@ bool(false) -- $search arg points to sub-array -- bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_key_exists_variation6.phpt b/ext/standard/tests/array/array_key_exists_variation6.phpt index bcf0adfdfc..a801acdd34 100644 --- a/ext/standard/tests/array/array_key_exists_variation6.phpt +++ b/ext/standard/tests/array/array_key_exists_variation6.phpt @@ -42,7 +42,6 @@ foreach($array as $name => $input) { echo "Done"; ?> - --EXPECT-- *** Testing array_key_exists() : usage variations *** @@ -93,4 +92,4 @@ Iteration 3: bool(true) Iteration 4: bool(true) Iteration 5: bool(true) Iteration 6: bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_key_exists_variation7.phpt b/ext/standard/tests/array/array_key_exists_variation7.phpt index 493291bc9c..09133f6e4d 100644 --- a/ext/standard/tests/array/array_key_exists_variation7.phpt +++ b/ext/standard/tests/array/array_key_exists_variation7.phpt @@ -24,7 +24,6 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> - --EXPECT-- *** Testing array_key_exists() : usage variations *** @@ -33,4 +32,4 @@ bool(true) -- Position of Internal Pointer in Original Array: -- one => un -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_key_exists_variation8.phpt b/ext/standard/tests/array/array_key_exists_variation8.phpt index b44f86b97e..1d98b0eefb 100644 --- a/ext/standard/tests/array/array_key_exists_variation8.phpt +++ b/ext/standard/tests/array/array_key_exists_variation8.phpt @@ -109,7 +109,6 @@ foreach($inputs as $type => $input) { echo "Done"; ?> - --EXPECT-- *** Testing array_key_exists() : usage variations *** @@ -544,4 +543,4 @@ bool(false) bool(true) -- $key arguments are unset data: bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_map_variation1.phpt b/ext/standard/tests/array/array_map_variation1.phpt index cd09be7ba6..cb89ce41d8 100644 --- a/ext/standard/tests/array/array_map_variation1.phpt +++ b/ext/standard/tests/array/array_map_variation1.phpt @@ -21,7 +21,6 @@ var_dump( array_map(null, $arr)); var_dump( array_map(null, $arr, $arr)); echo "Done"; ?> - --EXPECT-- *** Testing array_map() : string keys *** array(1) { @@ -53,4 +52,4 @@ array(1) { string(5) "value" } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_map_variation19.phpt b/ext/standard/tests/array/array_map_variation19.phpt index 1f4d2f5679..b842c8243c 100644 --- a/ext/standard/tests/array/array_map_variation19.phpt +++ b/ext/standard/tests/array/array_map_variation19.phpt @@ -37,4 +37,4 @@ array(2) { &string(10) "original.0" [1]=> string(10) "original.1" -}
\ No newline at end of file +} diff --git a/ext/standard/tests/array/array_map_variation2.phpt b/ext/standard/tests/array/array_map_variation2.phpt index b24aa07bc4..b7d22e0825 100644 --- a/ext/standard/tests/array/array_map_variation2.phpt +++ b/ext/standard/tests/array/array_map_variation2.phpt @@ -25,7 +25,6 @@ $arr[1] = null; echo "Done"; ?> - --EXPECT-- *** Testing array_map() : references *** string(2) "v1" diff --git a/ext/standard/tests/array/array_merge_basic.phpt b/ext/standard/tests/array/array_merge_basic.phpt index 749faab6ae..f78fb744be 100644 --- a/ext/standard/tests/array/array_merge_basic.phpt +++ b/ext/standard/tests/array/array_merge_basic.phpt @@ -24,7 +24,6 @@ var_dump(array_merge($array2, $array1)); echo "Done"; ?> - --EXPECT-- *** Testing array_merge() : basic functionality *** array(6) { @@ -55,4 +54,4 @@ array(6) { [2]=> string(3) "two" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_merge_variation1.phpt b/ext/standard/tests/array/array_merge_variation1.phpt index 6cec33a532..0335fe473b 100644 --- a/ext/standard/tests/array/array_merge_variation1.phpt +++ b/ext/standard/tests/array/array_merge_variation1.phpt @@ -97,7 +97,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing array_merge() : usage variations *** diff --git a/ext/standard/tests/array/array_merge_variation10.phpt b/ext/standard/tests/array/array_merge_variation10.phpt index 37596f4f00..123c08ece1 100644 --- a/ext/standard/tests/array/array_merge_variation10.phpt +++ b/ext/standard/tests/array/array_merge_variation10.phpt @@ -34,7 +34,6 @@ echo key($arr3) . " => " . current ($arr3) . "\n"; echo "Done"; ?> - --EXPECT-- *** Testing array_merge() : usage variations *** @@ -67,4 +66,4 @@ array(9) { $arr1: 0 => zero $arr2: 0 => zero $arr3: 0 => null -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_merge_variation3.phpt b/ext/standard/tests/array/array_merge_variation3.phpt index 89121dd0d0..b8444ffb09 100644 --- a/ext/standard/tests/array/array_merge_variation3.phpt +++ b/ext/standard/tests/array/array_merge_variation3.phpt @@ -121,7 +121,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing array_merge() : usage variations *** @@ -376,4 +375,4 @@ array(3) { [2]=> resource(%d) of type (stream) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_merge_variation4.phpt b/ext/standard/tests/array/array_merge_variation4.phpt index b995625861..f061520d1d 100644 --- a/ext/standard/tests/array/array_merge_variation4.phpt +++ b/ext/standard/tests/array/array_merge_variation4.phpt @@ -365,4 +365,4 @@ array(3) { [""]=> string(5) "unset" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_merge_variation5.phpt b/ext/standard/tests/array/array_merge_variation5.phpt index a409e28617..18e0ce2000 100644 --- a/ext/standard/tests/array/array_merge_variation5.phpt +++ b/ext/standard/tests/array/array_merge_variation5.phpt @@ -23,7 +23,6 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> - --EXPECT-- *** Testing array_merge() : usage variations *** array(7) { @@ -58,4 +57,4 @@ array(7) { [6]=> string(5) "three" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_merge_variation6.phpt b/ext/standard/tests/array/array_merge_variation6.phpt index 1d549c5647..8483a00339 100644 --- a/ext/standard/tests/array/array_merge_variation6.phpt +++ b/ext/standard/tests/array/array_merge_variation6.phpt @@ -23,7 +23,6 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> - --EXPECT-- *** Testing array_merge() : usage variations *** array(5) { @@ -50,4 +49,4 @@ array(5) { ["two"]=> string(4) "deux" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_merge_variation7.phpt b/ext/standard/tests/array/array_merge_variation7.phpt index 7812bb766e..0e52a99f38 100644 --- a/ext/standard/tests/array/array_merge_variation7.phpt +++ b/ext/standard/tests/array/array_merge_variation7.phpt @@ -23,7 +23,6 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> - --EXPECT-- *** Testing array_merge() : usage variations *** array(8) { @@ -62,4 +61,4 @@ array(8) { [5]=> string(4) "bool" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_merge_variation8.phpt b/ext/standard/tests/array/array_merge_variation8.phpt index 38b9142c09..40699b3339 100644 --- a/ext/standard/tests/array/array_merge_variation8.phpt +++ b/ext/standard/tests/array/array_merge_variation8.phpt @@ -25,7 +25,6 @@ var_dump(array_merge($arr2, $arr1[3])); echo "Done"; ?> - --EXPECT-- *** Testing array_merge() : usage variations *** @@ -71,4 +70,4 @@ array(4) { [3]=> int(0) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_merge_variation9.phpt b/ext/standard/tests/array/array_merge_variation9.phpt index 9872ac676b..b23a96ea9c 100644 --- a/ext/standard/tests/array/array_merge_variation9.phpt +++ b/ext/standard/tests/array/array_merge_variation9.phpt @@ -33,7 +33,6 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> - --EXPECT-- *** Testing array_merge() : usage variations *** diff --git a/ext/standard/tests/array/array_multisort_basic1.phpt b/ext/standard/tests/array/array_multisort_basic1.phpt index cb2b4a4c0c..20e90be415 100644 --- a/ext/standard/tests/array/array_multisort_basic1.phpt +++ b/ext/standard/tests/array/array_multisort_basic1.phpt @@ -57,4 +57,4 @@ array(3) { ["row1"]=> int(2) } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/array_multisort_basic2.phpt index 0e5e3df684..e7af3b352f 100644 --- a/ext/standard/tests/array/array_multisort_basic2.phpt +++ b/ext/standard/tests/array/array_multisort_basic2.phpt @@ -41,4 +41,4 @@ array(3) { [2]=> int(2) } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_multisort_error.phpt b/ext/standard/tests/array/array_multisort_error.phpt index 7dcb5c12b5..3e78b78ac0 100644 --- a/ext/standard/tests/array/array_multisort_error.phpt +++ b/ext/standard/tests/array/array_multisort_error.phpt @@ -41,4 +41,4 @@ bool(false) Warning: array_multisort(): Argument #3 is expected to be an array or sorting flag that has not already been specified in %sarray_multisort_error.php on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt index 5e84548d7e..9a33a270f1 100644 --- a/ext/standard/tests/array/array_multisort_variation1.phpt +++ b/ext/standard/tests/array/array_multisort_variation1.phpt @@ -204,4 +204,4 @@ bool(false) --unset var-- Error: 2 - array_multisort(): Argument #1 is expected to be an array or a sort flag, %sarray_multisort_variation1.php(%d) bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_next_error1.phpt b/ext/standard/tests/array/array_next_error1.phpt index a591347e30..124c78106a 100644 --- a/ext/standard/tests/array/array_next_error1.phpt +++ b/ext/standard/tests/array/array_next_error1.phpt @@ -8,6 +8,5 @@ function f() { var_dump(next(f())); ?> --EXPECTF-- - Notice: Only variables should be passed by reference in %s on line %d -int(2)
\ No newline at end of file +int(2) diff --git a/ext/standard/tests/array/array_next_error2.phpt b/ext/standard/tests/array/array_next_error2.phpt index d4f16666ef..d4f10e90e5 100644 --- a/ext/standard/tests/array/array_next_error2.phpt +++ b/ext/standard/tests/array/array_next_error2.phpt @@ -8,5 +8,4 @@ function f() { var_dump(next(array(1, 2))); ?> --EXPECTF-- - -Fatal error: Only variables can be passed by reference in %s on line %d
\ No newline at end of file +Fatal error: Only variables can be passed by reference in %s on line %d diff --git a/ext/standard/tests/array/array_product_variation1.phpt b/ext/standard/tests/array/array_product_variation1.phpt index b8f2013dc3..98c23e4d26 100644 --- a/ext/standard/tests/array/array_product_variation1.phpt +++ b/ext/standard/tests/array/array_product_variation1.phpt @@ -55,4 +55,4 @@ int(0) array int(1) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_product_variation3.phpt b/ext/standard/tests/array/array_product_variation3.phpt index cd3f24afff..a325879e45 100644 --- a/ext/standard/tests/array/array_product_variation3.phpt +++ b/ext/standard/tests/array/array_product_variation3.phpt @@ -45,4 +45,4 @@ float(-1.5) -- Testing array_product() function with negative floats -- float(-9.9999999E+15) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_push_basic.phpt b/ext/standard/tests/array/array_push_basic.phpt index d4e7148aba..697eaccaf2 100644 --- a/ext/standard/tests/array/array_push_basic.phpt +++ b/ext/standard/tests/array/array_push_basic.phpt @@ -29,7 +29,6 @@ var_dump($array_assoc); echo "Done"; ?> - --EXPECT-- *** Testing array_push() : basic functionality *** @@ -60,4 +59,4 @@ array(4) { [1]=> string(4) "four" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_push_error2.phpt b/ext/standard/tests/array/array_push_error2.phpt index c50683b780..3ab60136be 100644 --- a/ext/standard/tests/array/array_push_error2.phpt +++ b/ext/standard/tests/array/array_push_error2.phpt @@ -21,7 +21,6 @@ var_dump($array); echo "Done"; ?> - --EXPECTF-- *** Testing array_push() : error conditions *** @@ -31,4 +30,4 @@ array(1) { [%d]=> string(3) "max" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_push_variation2.phpt b/ext/standard/tests/array/array_push_variation2.phpt index e61d54ee82..f0884639a5 100644 --- a/ext/standard/tests/array/array_push_variation2.phpt +++ b/ext/standard/tests/array/array_push_variation2.phpt @@ -175,4 +175,4 @@ int(3) -- Iteration 25 -- int(3) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_push_variation3.phpt b/ext/standard/tests/array/array_push_variation3.phpt index 74ec771708..ddb258ab8a 100644 --- a/ext/standard/tests/array/array_push_variation3.phpt +++ b/ext/standard/tests/array/array_push_variation3.phpt @@ -67,4 +67,4 @@ array(4) { string(1) "a" } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_push_variation5.phpt b/ext/standard/tests/array/array_push_variation5.phpt index 650dd70c60..b3611d2159 100644 --- a/ext/standard/tests/array/array_push_variation5.phpt +++ b/ext/standard/tests/array/array_push_variation5.phpt @@ -25,7 +25,6 @@ echo key($stack) . " => " . current ($stack) . "\n"; echo "Done"; ?> --EXPECT-- - *** Testing array_push() : usage variations *** -- Call array_push() -- diff --git a/ext/standard/tests/array/array_push_variation6.phpt b/ext/standard/tests/array/array_push_variation6.phpt index c0057268c2..97b9aff140 100644 --- a/ext/standard/tests/array/array_push_variation6.phpt +++ b/ext/standard/tests/array/array_push_variation6.phpt @@ -105,7 +105,6 @@ foreach($inputs as $key => $input) { echo "Done"; ?> - --EXPECT-- *** Testing array_push() : usage variations *** diff --git a/ext/standard/tests/array/array_rand_basic1.phpt b/ext/standard/tests/array/array_rand_basic1.phpt index 46d265aa99..935ea11f5d 100644 --- a/ext/standard/tests/array/array_rand_basic1.phpt +++ b/ext/standard/tests/array/array_rand_basic1.phpt @@ -50,4 +50,3 @@ array(%d) { -- with default argument -- int(%d) Done - diff --git a/ext/standard/tests/array/array_rand_basic2.phpt b/ext/standard/tests/array/array_rand_basic2.phpt index 4ff93c8652..15eacc90e6 100644 --- a/ext/standard/tests/array/array_rand_basic2.phpt +++ b/ext/standard/tests/array/array_rand_basic2.phpt @@ -55,4 +55,3 @@ array(6) { -- with default argument -- string(%d) "%s" Done - diff --git a/ext/standard/tests/array/array_rand_error.phpt b/ext/standard/tests/array/array_rand_error.phpt index 2ffae12178..c82f81584a 100644 --- a/ext/standard/tests/array/array_rand_error.phpt +++ b/ext/standard/tests/array/array_rand_error.phpt @@ -35,4 +35,3 @@ NULL Warning: array_rand() expects at most 2 parameters, 3 given in %s on line %d NULL Done - diff --git a/ext/standard/tests/array/array_rand_variation1.phpt b/ext/standard/tests/array/array_rand_variation1.phpt index 438f2d0884..7aaf48f99f 100644 --- a/ext/standard/tests/array/array_rand_variation1.phpt +++ b/ext/standard/tests/array/array_rand_variation1.phpt @@ -214,4 +214,3 @@ NULL Warning: array_rand() expects parameter 1 to be array, null given in %s on line %d NULL Done - diff --git a/ext/standard/tests/array/array_rand_variation2.phpt b/ext/standard/tests/array/array_rand_variation2.phpt index b2e566d12d..1182d1aeea 100644 --- a/ext/standard/tests/array/array_rand_variation2.phpt +++ b/ext/standard/tests/array/array_rand_variation2.phpt @@ -214,4 +214,3 @@ NULL Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d NULL Done - diff --git a/ext/standard/tests/array/array_rand_variation3.phpt b/ext/standard/tests/array/array_rand_variation3.phpt index 6c656ef55e..e4631977d7 100644 --- a/ext/standard/tests/array/array_rand_variation3.phpt +++ b/ext/standard/tests/array/array_rand_variation3.phpt @@ -147,4 +147,3 @@ array(3) { int(%d) } Done - diff --git a/ext/standard/tests/array/array_rand_variation4.phpt b/ext/standard/tests/array/array_rand_variation4.phpt index 27f1620003..89fd1ec086 100644 --- a/ext/standard/tests/array/array_rand_variation4.phpt +++ b/ext/standard/tests/array/array_rand_variation4.phpt @@ -165,4 +165,3 @@ array\(2\) { string\([0-9]*\) "[#&!N <\n\t'"\0]*[U#$>]*[rL]*[L]*" } Done - diff --git a/ext/standard/tests/array/array_rand_variation5.phpt b/ext/standard/tests/array/array_rand_variation5.phpt index 7c4043e464..30eb7d7801 100644 --- a/ext/standard/tests/array/array_rand_variation5.phpt +++ b/ext/standard/tests/array/array_rand_variation5.phpt @@ -72,4 +72,3 @@ NULL Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d NULL Done - diff --git a/ext/standard/tests/array/array_rand_variation6.phpt b/ext/standard/tests/array/array_rand_variation6.phpt index d60630eb32..ce0bedb362 100644 --- a/ext/standard/tests/array/array_rand_variation6.phpt +++ b/ext/standard/tests/array/array_rand_variation6.phpt @@ -101,4 +101,3 @@ array\(6\) { string\([0-9]*\) "[a-z \n \t \0 0-9 ]*" } Done - diff --git a/ext/standard/tests/array/array_reduce_variation2.phpt b/ext/standard/tests/array/array_reduce_variation2.phpt index 853ceb946b..e8f24199c6 100644 --- a/ext/standard/tests/array/array_reduce_variation2.phpt +++ b/ext/standard/tests/array/array_reduce_variation2.phpt @@ -32,4 +32,4 @@ NULL Warning: array_reduce() expects parameter 1 to be array, object given in %sarray_reduce_variation2.php on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_reduce_variation3.phpt b/ext/standard/tests/array/array_reduce_variation3.phpt index 099af89a9f..01bd6d79d6 100644 --- a/ext/standard/tests/array/array_reduce_variation3.phpt +++ b/ext/standard/tests/array/array_reduce_variation3.phpt @@ -33,4 +33,4 @@ int(1) --- Instance method callback --- int(1) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_shift_basic.phpt b/ext/standard/tests/array/array_shift_basic.phpt index 014240f6bb..0f73c65fac 100644 --- a/ext/standard/tests/array/array_shift_basic.phpt +++ b/ext/standard/tests/array/array_shift_basic.phpt @@ -51,4 +51,4 @@ array(3) { ["four"]=> int(4) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_shift_error.phpt b/ext/standard/tests/array/array_shift_error.phpt index c44124df05..108060f9b1 100644 --- a/ext/standard/tests/array/array_shift_error.phpt +++ b/ext/standard/tests/array/array_shift_error.phpt @@ -37,4 +37,4 @@ NULL Warning: array_shift() expects exactly 1 parameter, 2 given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_shift_variation1.phpt b/ext/standard/tests/array/array_shift_variation1.phpt index 0e1aed52d6..5734da4fb9 100644 --- a/ext/standard/tests/array/array_shift_variation1.phpt +++ b/ext/standard/tests/array/array_shift_variation1.phpt @@ -215,4 +215,4 @@ NULL Warning: array_shift() expects parameter 1 to be array, resource given in %s on line 85 NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_shift_variation2.phpt b/ext/standard/tests/array/array_shift_variation2.phpt index 7f5d618e74..9e37cbb204 100644 --- a/ext/standard/tests/array/array_shift_variation2.phpt +++ b/ext/standard/tests/array/array_shift_variation2.phpt @@ -205,4 +205,4 @@ array(0) { resource(%d) of type (stream) array(0) { } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_shift_variation3.phpt b/ext/standard/tests/array/array_shift_variation3.phpt index 65d2c72dac..6bd8370f13 100644 --- a/ext/standard/tests/array/array_shift_variation3.phpt +++ b/ext/standard/tests/array/array_shift_variation3.phpt @@ -185,4 +185,4 @@ array(0) { string(5) "unset" array(0) { } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_shift_variation4.phpt b/ext/standard/tests/array/array_shift_variation4.phpt index 4ccf9478d6..dc2d2ff700 100644 --- a/ext/standard/tests/array/array_shift_variation4.phpt +++ b/ext/standard/tests/array/array_shift_variation4.phpt @@ -106,4 +106,4 @@ array(3) { int(3) } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_shift_variation6.phpt b/ext/standard/tests/array/array_shift_variation6.phpt index 6b271e0e48..45466adc42 100644 --- a/ext/standard/tests/array/array_shift_variation6.phpt +++ b/ext/standard/tests/array/array_shift_variation6.phpt @@ -80,4 +80,4 @@ array(1) { [0]=> string(3) "two" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_shift_variation7.phpt b/ext/standard/tests/array/array_shift_variation7.phpt index 7217a11a91..38f2341d2b 100644 --- a/ext/standard/tests/array/array_shift_variation7.phpt +++ b/ext/standard/tests/array/array_shift_variation7.phpt @@ -31,4 +31,4 @@ string(2) "un" -- Position of Internal Pointer in Passed Array: -- two => deux -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_shift_variation8.phpt b/ext/standard/tests/array/array_shift_variation8.phpt index a48d907896..64114050a7 100644 --- a/ext/standard/tests/array/array_shift_variation8.phpt +++ b/ext/standard/tests/array/array_shift_variation8.phpt @@ -47,4 +47,4 @@ a = 1, b = 2 -- Reference first element before array_shift: -- a = 2, b = 2 -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_shuffle_basic.phpt b/ext/standard/tests/array/array_shuffle_basic.phpt index 0bfa2e030e..397a38c916 100644 --- a/ext/standard/tests/array/array_shuffle_basic.phpt +++ b/ext/standard/tests/array/array_shuffle_basic.phpt @@ -96,4 +96,4 @@ this should be 0->....0 this should be 4->....4 this should be 400->....400 *** testing pass by reference -test passed
\ No newline at end of file +test passed diff --git a/ext/standard/tests/array/array_slice_basic.phpt b/ext/standard/tests/array/array_slice_basic.phpt index 8c32685d39..d4d2bafa7b 100644 --- a/ext/standard/tests/array/array_slice_basic.phpt +++ b/ext/standard/tests/array/array_slice_basic.phpt @@ -29,7 +29,6 @@ var_dump( array_slice($input, $offset) ); echo "Done"; ?> - --EXPECT-- *** Testing array_slice() : basic functionality *** @@ -48,4 +47,4 @@ array(2) { [1]=> int(4) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_error.phpt b/ext/standard/tests/array/array_slice_error.phpt index 94acd08a96..ff3156a0cc 100644 --- a/ext/standard/tests/array/array_slice_error.phpt +++ b/ext/standard/tests/array/array_slice_error.phpt @@ -40,4 +40,4 @@ NULL Warning: array_slice() expects at least 2 parameters, 1 given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_variation1.phpt b/ext/standard/tests/array/array_slice_variation1.phpt index ccb83ccf57..7b6d712a1f 100644 --- a/ext/standard/tests/array/array_slice_variation1.phpt +++ b/ext/standard/tests/array/array_slice_variation1.phpt @@ -20,7 +20,6 @@ var_dump(array_slice(range(1, 3), 0, $a)); var_dump($a); ?> - --EXPECT-- array(3) { [0]=> diff --git a/ext/standard/tests/array/array_slice_variation10.phpt b/ext/standard/tests/array/array_slice_variation10.phpt index 6a836dc1ee..4f62a82204 100644 --- a/ext/standard/tests/array/array_slice_variation10.phpt +++ b/ext/standard/tests/array/array_slice_variation10.phpt @@ -25,7 +25,6 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> - --EXPECT-- *** Testing array_slice() : usage variations *** @@ -41,4 +40,4 @@ array(2) { -- Position of Internal Pointer in Original Array: -- one => un -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_variation11.phpt b/ext/standard/tests/array/array_slice_variation11.phpt index bb63e9f6e5..93805ac026 100644 --- a/ext/standard/tests/array/array_slice_variation11.phpt +++ b/ext/standard/tests/array/array_slice_variation11.phpt @@ -97,7 +97,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing array_slice() : usage variations *** @@ -224,4 +223,4 @@ NULL Warning: array_slice() expects parameter 1 to be array, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt index da8a00e83f..a76d68e6e0 100644 --- a/ext/standard/tests/array/array_slice_variation2.phpt +++ b/ext/standard/tests/array/array_slice_variation2.phpt @@ -93,7 +93,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing array_slice() : usage variations *** @@ -301,4 +300,4 @@ array(4) { [1]=> int(4) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_variation3.phpt b/ext/standard/tests/array/array_slice_variation3.phpt index de2c3b4d28..6cec0bc4ba 100644 --- a/ext/standard/tests/array/array_slice_variation3.phpt +++ b/ext/standard/tests/array/array_slice_variation3.phpt @@ -81,7 +81,6 @@ foreach($inputs as $input) { echo "Done"; ?> - --EXPECT-- *** Testing array_slice() : usage variations *** @@ -210,4 +209,4 @@ array(2) { [0]=> int(4) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_variation4.phpt b/ext/standard/tests/array/array_slice_variation4.phpt index c640ac7bd2..6591e113af 100644 --- a/ext/standard/tests/array/array_slice_variation4.phpt +++ b/ext/standard/tests/array/array_slice_variation4.phpt @@ -91,7 +91,6 @@ foreach($inputs as $input) { echo "Done"; ?> - --EXPECTF-- *** Testing array_slice() : usage variations *** @@ -324,4 +323,4 @@ array(3) { [1]=> int(3) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_variation5.phpt b/ext/standard/tests/array/array_slice_variation5.phpt index 49e717f855..5f127fd2eb 100644 --- a/ext/standard/tests/array/array_slice_variation5.phpt +++ b/ext/standard/tests/array/array_slice_variation5.phpt @@ -27,7 +27,6 @@ var_dump(array_slice($input, -PHP_INT_MAX)); echo "Done"; ?> - --EXPECT-- *** Testing array_slice() : usage variations *** @@ -188,4 +187,4 @@ array(5) { ["ten"]=> int(10) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_variation6.phpt b/ext/standard/tests/array/array_slice_variation6.phpt index e88939e604..86bde4ae3c 100644 --- a/ext/standard/tests/array/array_slice_variation6.phpt +++ b/ext/standard/tests/array/array_slice_variation6.phpt @@ -28,7 +28,6 @@ var_dump(array_slice($input, $offset, -PHP_INT_MAX)); echo "Done"; ?> - --EXPECT-- *** Testing array_slice() : usage variations *** diff --git a/ext/standard/tests/array/array_slice_variation7.phpt b/ext/standard/tests/array/array_slice_variation7.phpt index 1cd546e63c..e9c1e10d29 100644 --- a/ext/standard/tests/array/array_slice_variation7.phpt +++ b/ext/standard/tests/array/array_slice_variation7.phpt @@ -110,7 +110,6 @@ foreach($inputs as $type => $input) { echo "Done"; ?> - --EXPECT-- *** Testing array_slice() : usage variations *** @@ -297,4 +296,4 @@ array(1) { [""]=> string(5) "unset" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_variation8.phpt b/ext/standard/tests/array/array_slice_variation8.phpt index 99c30e09d7..20fb376567 100644 --- a/ext/standard/tests/array/array_slice_variation8.phpt +++ b/ext/standard/tests/array/array_slice_variation8.phpt @@ -25,7 +25,6 @@ var_dump(array_slice($input[2], 1, 2)); echo "Done"; ?> - --EXPECT-- *** Testing array_slice() : usage variations *** @@ -53,4 +52,4 @@ array(2) { [1]=> string(4) "deux" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_variation9.phpt b/ext/standard/tests/array/array_slice_variation9.phpt index 4abd1afe82..ff203ec622 100644 --- a/ext/standard/tests/array/array_slice_variation9.phpt +++ b/ext/standard/tests/array/array_slice_variation9.phpt @@ -29,7 +29,6 @@ var_dump(array_slice($input, 1, 2, true)); echo "Done"; ?> - --EXPECT-- *** Testing array_slice() : usage variations *** diff --git a/ext/standard/tests/array/array_splice_errors.phpt b/ext/standard/tests/array/array_splice_errors.phpt index 18148fbff2..135a1ed0db 100644 --- a/ext/standard/tests/array/array_splice_errors.phpt +++ b/ext/standard/tests/array/array_splice_errors.phpt @@ -21,7 +21,6 @@ echo "Done\n"; ?> --EXPECTF-- - *** Testing error conditions of array_splice() *** Warning: array_splice() expects at least 2 parameters, 0 given in %s on line %d diff --git a/ext/standard/tests/array/array_splice_variation2.phpt b/ext/standard/tests/array/array_splice_variation2.phpt index 42692918d1..3cdd723770 100644 --- a/ext/standard/tests/array/array_splice_variation2.phpt +++ b/ext/standard/tests/array/array_splice_variation2.phpt @@ -13,7 +13,6 @@ var_dump ($array); echo "Done\n"; ?> --EXPECTF-- - Warning: array_splice() expects at most 4 parameters, 10 given in %s on line %d NULL array(3) { diff --git a/ext/standard/tests/array/array_splice_variation3.phpt b/ext/standard/tests/array/array_splice_variation3.phpt index 9c1a7c86ab..b5a55ca144 100644 --- a/ext/standard/tests/array/array_splice_variation3.phpt +++ b/ext/standard/tests/array/array_splice_variation3.phpt @@ -71,7 +71,6 @@ echo "relative offset - relative length - cut nothing\n"; test_splice (-4,-7); echo "Done\n"; ?> - --EXPECT-- *** array_splice() function : usage variations - lengths and offsets absolute offset - absolute length - cut from beginning diff --git a/ext/standard/tests/array/array_udiff_assoc_error.phpt b/ext/standard/tests/array/array_udiff_assoc_error.phpt index ae7c3b9586..eb66d1eb68 100644 --- a/ext/standard/tests/array/array_udiff_assoc_error.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_error.phpt @@ -39,4 +39,4 @@ NULL Warning: array_udiff_assoc(): at least 3 parameters are required, 2 given in %sarray_udiff_assoc_error.php on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt index 3bb26102b4..4496194b62 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt @@ -225,4 +225,4 @@ NULL Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_uassoc_variation1.php on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt index 33883fa24d..3024246a3d 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt @@ -225,4 +225,4 @@ NULL Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_assoc_variation4.php on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_unshift_basic2.phpt b/ext/standard/tests/array/array_unshift_basic2.phpt index eae951027a..6c4af71b29 100644 --- a/ext/standard/tests/array/array_unshift_basic2.phpt +++ b/ext/standard/tests/array/array_unshift_basic2.phpt @@ -68,4 +68,4 @@ array(7) { [4]=> string(3) "two" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_values_basic.phpt b/ext/standard/tests/array/array_values_basic.phpt index 0a874d2927..f1c8007be4 100644 --- a/ext/standard/tests/array/array_values_basic.phpt +++ b/ext/standard/tests/array/array_values_basic.phpt @@ -22,7 +22,6 @@ var_dump( array_values($input) ); echo "Done"; ?> - --EXPECT-- *** Testing array_values() : basic functionality *** array(5) { @@ -37,4 +36,4 @@ array(5) { [4]=> string(3) "ten" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_values_error.phpt b/ext/standard/tests/array/array_values_error.phpt index 40256185a1..d49f400805 100644 --- a/ext/standard/tests/array/array_values_error.phpt +++ b/ext/standard/tests/array/array_values_error.phpt @@ -25,7 +25,6 @@ var_dump( array_values($input, $extra_arg) ); echo "Done"; ?> - --EXPECTF-- *** Testing array_values() : error conditions *** @@ -39,4 +38,3 @@ NULL Warning: array_values() expects exactly 1 parameter, 2 given in %s on line %d NULL Done - diff --git a/ext/standard/tests/array/array_values_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt index 19d45ee54b..0ee93e2a12 100644 --- a/ext/standard/tests/array/array_values_variation1.phpt +++ b/ext/standard/tests/array/array_values_variation1.phpt @@ -94,7 +94,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing array_values() : usage variations *** @@ -221,4 +220,4 @@ NULL Warning: array_values() expects parameter 1 to be array, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_values_variation2.phpt b/ext/standard/tests/array/array_values_variation2.phpt index 81e575494b..5105168c1e 100644 --- a/ext/standard/tests/array/array_values_variation2.phpt +++ b/ext/standard/tests/array/array_values_variation2.phpt @@ -116,7 +116,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing array_values() : usage variations *** @@ -212,4 +211,4 @@ array(1) { [0]=> resource(%d) of type (stream) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_values_variation3.phpt b/ext/standard/tests/array/array_values_variation3.phpt index 905dc52ad4..7b409c3cde 100644 --- a/ext/standard/tests/array/array_values_variation3.phpt +++ b/ext/standard/tests/array/array_values_variation3.phpt @@ -102,7 +102,6 @@ foreach($inputs as $key => $input) { }; echo "Done"; ?> - --EXPECT-- *** Testing array_values() : usage variations *** @@ -197,4 +196,4 @@ array(1) { [0]=> string(5) "unset" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_values_variation4.phpt b/ext/standard/tests/array/array_values_variation4.phpt index 8aa54f921d..4fe8c9a9cc 100644 --- a/ext/standard/tests/array/array_values_variation4.phpt +++ b/ext/standard/tests/array/array_values_variation4.phpt @@ -31,7 +31,6 @@ var_dump(array_values($input)); echo "Done"; ?> - --EXPECT-- *** Testing array_values() : usage variations *** diff --git a/ext/standard/tests/array/array_values_variation5.phpt b/ext/standard/tests/array/array_values_variation5.phpt index 481e34bf63..c7a2cb7e50 100644 --- a/ext/standard/tests/array/array_values_variation5.phpt +++ b/ext/standard/tests/array/array_values_variation5.phpt @@ -25,7 +25,6 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> - --EXPECT-- *** Testing array_values() : usage variations *** @@ -43,4 +42,4 @@ array(3) { -- Position of Internal Pointer in Original Array: -- one => un -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_values_variation6.phpt b/ext/standard/tests/array/array_values_variation6.phpt index 59187c7c7d..941df4d875 100644 --- a/ext/standard/tests/array/array_values_variation6.phpt +++ b/ext/standard/tests/array/array_values_variation6.phpt @@ -29,7 +29,6 @@ var_dump($result1); echo "Done"; ?> - --EXPECT-- *** Testing array_values() : usage variations *** diff --git a/ext/standard/tests/array/array_values_variation7.phpt b/ext/standard/tests/array/array_values_variation7.phpt index 99866bb06b..6ec1f4c92c 100644 --- a/ext/standard/tests/array/array_values_variation7.phpt +++ b/ext/standard/tests/array/array_values_variation7.phpt @@ -25,7 +25,6 @@ var_dump(array_values($input)); echo "Done"; ?> - --EXPECT-- *** Testing array_values() : usage variations *** @@ -52,4 +51,4 @@ array(4) { [3]=> string(4) "zero" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/arsort_basic.phpt b/ext/standard/tests/array/arsort_basic.phpt index 4f63b6920e..afd8bb8f49 100644 --- a/ext/standard/tests/array/arsort_basic.phpt +++ b/ext/standard/tests/array/arsort_basic.phpt @@ -242,4 +242,4 @@ array(4) { [4]=> int(22) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/arsort_error.phpt b/ext/standard/tests/array/arsort_error.phpt index 5a24815697..83f0f255cb 100644 --- a/ext/standard/tests/array/arsort_error.phpt +++ b/ext/standard/tests/array/arsort_error.phpt @@ -76,4 +76,4 @@ array(2) { [1]=> int(2) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/arsort_object1.phpt index 75cee2de5b..6a1edfd8b5 100644 --- a/ext/standard/tests/array/arsort_object1.phpt +++ b/ext/standard/tests/array/arsort_object1.phpt @@ -90,4 +90,4 @@ echo "Done\n"; Fatal error: Uncaught Error: Class 'for_integer_asort' not found in %sarsort_object1.php:%d Stack trace: #0 {main} - thrown in %sarsort_object1.php on line %d
\ No newline at end of file + thrown in %sarsort_object1.php on line %d diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/arsort_object2.phpt index 338c852446..6e252bc88b 100644 --- a/ext/standard/tests/array/arsort_object2.phpt +++ b/ext/standard/tests/array/arsort_object2.phpt @@ -94,4 +94,4 @@ echo "Done\n"; Fatal error: Uncaught Error: Class 'for_integer_asort' not found in %sarsort_object2.php:%d Stack trace: #0 {main} - thrown in %sarsort_object2.php on line %d
\ No newline at end of file + thrown in %sarsort_object2.php on line %d diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt index 1310590f56..d5547efe95 100644 --- a/ext/standard/tests/array/arsort_variation1.phpt +++ b/ext/standard/tests/array/arsort_variation1.phpt @@ -396,4 +396,4 @@ bool(false) Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/arsort_variation10.phpt index 27ab476bd9..67a0499aa3 100644 --- a/ext/standard/tests/array/arsort_variation10.phpt +++ b/ext/standard/tests/array/arsort_variation10.phpt @@ -111,4 +111,4 @@ array(9) { [-229]=> int(-229) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/arsort_variation4.phpt b/ext/standard/tests/array/arsort_variation4.phpt index d572e4cdaa..fa939472b9 100644 --- a/ext/standard/tests/array/arsort_variation4.phpt +++ b/ext/standard/tests/array/arsort_variation4.phpt @@ -76,4 +76,4 @@ array(3) { [2]=> &int(33) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/arsort_variation6.phpt b/ext/standard/tests/array/arsort_variation6.phpt index ff4704c404..058a5077b1 100644 --- a/ext/standard/tests/array/arsort_variation6.phpt +++ b/ext/standard/tests/array/arsort_variation6.phpt @@ -111,4 +111,4 @@ array(9) { [-682]=> int(-682) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/arsort_variation8.phpt b/ext/standard/tests/array/arsort_variation8.phpt index a8daa349d4..cddcb3c335 100644 --- a/ext/standard/tests/array/arsort_variation8.phpt +++ b/ext/standard/tests/array/arsort_variation8.phpt @@ -177,4 +177,4 @@ array(4) { array(0) { } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/asort_basic.phpt b/ext/standard/tests/array/asort_basic.phpt index 96bf469484..c0ae2bc88d 100644 --- a/ext/standard/tests/array/asort_basic.phpt +++ b/ext/standard/tests/array/asort_basic.phpt @@ -242,4 +242,4 @@ array(4) { [3]=> int(555) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/bug23581.phpt b/ext/standard/tests/array/bug23581.phpt index 06e1e388ef..5cede9a3fa 100644 --- a/ext/standard/tests/array/bug23581.phpt +++ b/ext/standard/tests/array/bug23581.phpt @@ -41,4 +41,3 @@ array(3) { int(9) } } - diff --git a/ext/standard/tests/array/bug31158.phpt b/ext/standard/tests/array/bug31158.phpt index da7a9ec907..d9e65bdde9 100644 --- a/ext/standard/tests/array/bug31158.phpt +++ b/ext/standard/tests/array/bug31158.phpt @@ -16,4 +16,3 @@ echo "ok\n"; --EXPECTF-- Notice: Undefined variable: GLOBALS in %sbug31158.php on line 6 ok - diff --git a/ext/standard/tests/array/bug35821.phpt b/ext/standard/tests/array/bug35821.phpt index be48ca8570..3b1ecb6278 100644 --- a/ext/standard/tests/array/bug35821.phpt +++ b/ext/standard/tests/array/bug35821.phpt @@ -22,7 +22,6 @@ array_map(array('Element', 'CallBack'), $arr); echo "Done\n"; ?> --EXPECTF-- - Fatal error: Uncaught Exception in %s:%d Stack trace: #0 %s(%d): Element->ThrowException() diff --git a/ext/standard/tests/array/bug41686.phpt b/ext/standard/tests/array/bug41686.phpt index 4c41607d34..d293fdf175 100644 --- a/ext/standard/tests/array/bug41686.phpt +++ b/ext/standard/tests/array/bug41686.phpt @@ -53,4 +53,4 @@ array(2) { ["c"]=> int(2) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/bug42850.phpt b/ext/standard/tests/array/bug42850.phpt index 16063bbdfc..e184db8105 100644 --- a/ext/standard/tests/array/bug42850.phpt +++ b/ext/standard/tests/array/bug42850.phpt @@ -22,7 +22,6 @@ function apply_changed(&$input, $key) { } myfunc($data); var_dump($data); - --EXPECT-- array(2) { ["key1"]=> diff --git a/ext/standard/tests/array/bug44181.phpt b/ext/standard/tests/array/bug44181.phpt index 3da73cb1a6..92dda674eb 100644 --- a/ext/standard/tests/array/bug44181.phpt +++ b/ext/standard/tests/array/bug44181.phpt @@ -16,4 +16,3 @@ echo "Done\n"; --EXPECTF-- string(%d) "changed.foo" Done - diff --git a/ext/standard/tests/array/bug44182.phpt b/ext/standard/tests/array/bug44182.phpt index 47f3caafb8..a77ddc42b3 100644 --- a/ext/standard/tests/array/bug44182.phpt +++ b/ext/standard/tests/array/bug44182.phpt @@ -16,4 +16,3 @@ echo "Done\n"; --EXPECTF-- string(%d) "original.foo" Done - diff --git a/ext/standard/tests/array/bug71603.phpt b/ext/standard/tests/array/bug71603.phpt index 0c25be660c..2fa8c0a136 100644 --- a/ext/standard/tests/array/bug71603.phpt +++ b/ext/standard/tests/array/bug71603.phpt @@ -10,6 +10,5 @@ $array = compact('foo_reference'); $foo = 'changed!'; var_dump($array['foo_reference']); - --EXPECT-- string(4) "okey" diff --git a/ext/standard/tests/array/bug72116.phpt b/ext/standard/tests/array/bug72116.phpt index 7951f69130..182f6994a2 100644 --- a/ext/standard/tests/array/bug72116.phpt +++ b/ext/standard/tests/array/bug72116.phpt @@ -15,4 +15,3 @@ array(2) { [1]=> string(1) "a" } - diff --git a/ext/standard/tests/array/count_basic.phpt b/ext/standard/tests/array/count_basic.phpt index f5cff97e0b..3b22c582db 100644 --- a/ext/standard/tests/array/count_basic.phpt +++ b/ext/standard/tests/array/count_basic.phpt @@ -42,4 +42,4 @@ $mode = COUNT_NORMAL: int(3) $mode = 0: int(3) $mode = COUNT_RECURSIVE: int(6) $mode = 1: int(6) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/count_error.phpt b/ext/standard/tests/array/count_error.phpt index 32d15edc6f..8b26086a9d 100644 --- a/ext/standard/tests/array/count_error.phpt +++ b/ext/standard/tests/array/count_error.phpt @@ -38,4 +38,4 @@ NULL Warning: count() expects at most 2 parameters, 3 given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/count_variation1.phpt b/ext/standard/tests/array/count_variation1.phpt index 5152f65445..10406f71ff 100644 --- a/ext/standard/tests/array/count_variation1.phpt +++ b/ext/standard/tests/array/count_variation1.phpt @@ -215,4 +215,4 @@ int(0) Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d int(1) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/each.phpt b/ext/standard/tests/array/each.phpt Binary files differindex 74e571160e..4af2097a7d 100644 --- a/ext/standard/tests/array/each.phpt +++ b/ext/standard/tests/array/each.phpt diff --git a/ext/standard/tests/array/each_error.phpt b/ext/standard/tests/array/each_error.phpt index 88055ce589..e7ee4976ed 100644 --- a/ext/standard/tests/array/each_error.phpt +++ b/ext/standard/tests/array/each_error.phpt @@ -26,7 +26,6 @@ var_dump( each($arr, $extra_arg) ); echo "Done"; ?> - --EXPECTF-- *** Testing each() : error conditions *** @@ -40,4 +39,3 @@ NULL Warning: each() expects exactly 1 parameter, 2 given in %s on line %d NULL Done - diff --git a/ext/standard/tests/array/each_variation1.phpt b/ext/standard/tests/array/each_variation1.phpt index a9e27cf3f9..6b75d5e15c 100644 --- a/ext/standard/tests/array/each_variation1.phpt +++ b/ext/standard/tests/array/each_variation1.phpt @@ -95,7 +95,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing each() : usage variations *** diff --git a/ext/standard/tests/array/each_variation2.phpt b/ext/standard/tests/array/each_variation2.phpt index e3dff968ff..34eeedc9a8 100644 --- a/ext/standard/tests/array/each_variation2.phpt +++ b/ext/standard/tests/array/each_variation2.phpt @@ -117,7 +117,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing each() : usage variations *** diff --git a/ext/standard/tests/array/each_variation3.phpt b/ext/standard/tests/array/each_variation3.phpt index 8a0773f0b5..32342d6d78 100644 --- a/ext/standard/tests/array/each_variation3.phpt +++ b/ext/standard/tests/array/each_variation3.phpt @@ -103,7 +103,6 @@ foreach($inputs as $key => $input) { echo "Done"; ?> - --EXPECTF-- *** Testing each() : usage variations *** diff --git a/ext/standard/tests/array/each_variation4.phpt b/ext/standard/tests/array/each_variation4.phpt index 7cddd3e5c3..64fbb4a8d0 100644 --- a/ext/standard/tests/array/each_variation4.phpt +++ b/ext/standard/tests/array/each_variation4.phpt @@ -29,7 +29,6 @@ var_dump( each($arr1) ); echo "Done"; ?> - --EXPECTF-- *** Testing each() : usage variations *** diff --git a/ext/standard/tests/array/each_variation5.phpt b/ext/standard/tests/array/each_variation5.phpt index b06e344eb8..441882f962 100644 --- a/ext/standard/tests/array/each_variation5.phpt +++ b/ext/standard/tests/array/each_variation5.phpt @@ -32,7 +32,6 @@ var_dump( each($arr[2])); echo "Done"; ?> - --EXPECTF-- *** Testing each() : usage variations *** diff --git a/ext/standard/tests/array/each_variation6.phpt b/ext/standard/tests/array/each_variation6.phpt index c36f9bb881..de52ba5965 100644 --- a/ext/standard/tests/array/each_variation6.phpt +++ b/ext/standard/tests/array/each_variation6.phpt @@ -27,7 +27,6 @@ echo key($arr) . " => " . current($arr) . "\n"; echo "Done"; ?> - --EXPECTF-- *** Testing each() : usage variations *** diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt index 6b9e07ff74..0af5064e82 100644 --- a/ext/standard/tests/array/end_64bit.phpt +++ b/ext/standard/tests/array/end_64bit.phpt @@ -124,12 +124,10 @@ var_dump( end($null_array) ); echo "Done\n"; ?> - --CLEAN-- /* cleaning resource handles */ fclose( $file_handle ); //file resource handle deleted closedir( $dir_handle ); //dir resource handle deleted - --EXPECTF-- *** Testing end() on different arrays *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/extract_error.phpt b/ext/standard/tests/array/extract_error.phpt index 46b71a1466..e8bcf8f5d8 100644 --- a/ext/standard/tests/array/extract_error.phpt +++ b/ext/standard/tests/array/extract_error.phpt @@ -30,7 +30,6 @@ var_dump( extract($arr,EXTR_PREFIX_IF_EXISTS) ); echo "Done\n"; ?> - --EXPECTF-- *** Testing Error Conditions *** diff --git a/ext/standard/tests/array/extract_safety.phpt b/ext/standard/tests/array/extract_safety.phpt index 046ef5e2e2..bebbaa1988 100644 --- a/ext/standard/tests/array/extract_safety.phpt +++ b/ext/standard/tests/array/extract_safety.phpt @@ -15,10 +15,9 @@ debug_zval_dump($GLOBALS["str"]); echo "\nDone"; ?> - --EXPECTF-- string(4) "John" refcount(%d) int(0) string(4) "John" refcount(%d) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/extract_variation1.phpt b/ext/standard/tests/array/extract_variation1.phpt index 0560e9e9c9..a1f1faa303 100644 --- a/ext/standard/tests/array/extract_variation1.phpt +++ b/ext/standard/tests/array/extract_variation1.phpt @@ -16,7 +16,6 @@ debug_zval_dump($str); echo "\nDone"; ?> - --EXPECTF-- int(4) string(4) "John" refcount(%d) diff --git a/ext/standard/tests/array/extract_variation8.phpt b/ext/standard/tests/array/extract_variation8.phpt index a5e3a00eb6..3e6a9ad374 100644 --- a/ext/standard/tests/array/extract_variation8.phpt +++ b/ext/standard/tests/array/extract_variation8.phpt @@ -17,7 +17,6 @@ var_dump ( extract($var1)); echo "\nDone"; ?> - --EXPECT-- *** Testing for Numerical prefixes *** int(3) diff --git a/ext/standard/tests/array/key_exists_variation2.phpt b/ext/standard/tests/array/key_exists_variation2.phpt index a6f82181d3..4a06762410 100644 --- a/ext/standard/tests/array/key_exists_variation2.phpt +++ b/ext/standard/tests/array/key_exists_variation2.phpt @@ -54,7 +54,6 @@ var_dump(key_exists(0, $h)); // stream resource has index = 0, netherless its position is the latest $i = array('foo' => 'baz', $st); var_dump(key_exists(0, $i)); - --EXPECT-- *** test key_exists() by using mixed type of arrays *** bool(false) diff --git a/ext/standard/tests/array/krsort_basic.phpt b/ext/standard/tests/array/krsort_basic.phpt index 16b7e0ca4c..f65fa0a553 100644 --- a/ext/standard/tests/array/krsort_basic.phpt +++ b/ext/standard/tests/array/krsort_basic.phpt @@ -242,4 +242,4 @@ array(4) { [22]=> int(1) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/krsort_variation11.phpt b/ext/standard/tests/array/krsort_variation11.phpt index f16e438335..32ca85c6ec 100644 --- a/ext/standard/tests/array/krsort_variation11.phpt +++ b/ext/standard/tests/array/krsort_variation11.phpt @@ -78,4 +78,4 @@ array(2) { [0]=> bool(false) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/ksort_basic.phpt index 66b213d8c9..ff0469e7a3 100644 --- a/ext/standard/tests/array/ksort_basic.phpt +++ b/ext/standard/tests/array/ksort_basic.phpt @@ -240,4 +240,4 @@ array(4) { [555]=> int(2) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/max_basic.phpt b/ext/standard/tests/array/max_basic.phpt index c880810cb3..16c8ac9330 100644 --- a/ext/standard/tests/array/max_basic.phpt +++ b/ext/standard/tests/array/max_basic.phpt @@ -22,7 +22,6 @@ var_dump(max(0, 1, array(2,3))); echo "\nDone\n"; ?> --EXPECT-- - *** Testing sequences of numbers *** int(2) int(2) diff --git a/ext/standard/tests/array/max_variation1.phpt b/ext/standard/tests/array/max_variation1.phpt index 44fa010c31..6182b824b2 100644 --- a/ext/standard/tests/array/max_variation1.phpt +++ b/ext/standard/tests/array/max_variation1.phpt @@ -22,7 +22,6 @@ var_dump(max(0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 1 echo "\nDone\n"; ?> --EXPECTF-- - *** Testing boundary conditions *** int(2147483646) %s(2147483648) diff --git a/ext/standard/tests/array/max_variation2.phpt b/ext/standard/tests/array/max_variation2.phpt index a020d5e422..15425e47a1 100644 --- a/ext/standard/tests/array/max_variation2.phpt +++ b/ext/standard/tests/array/max_variation2.phpt @@ -29,7 +29,6 @@ echo "\nDone\n"; ?> --EXPECTF-- - *** Testing arrays *** int(2) int(2) diff --git a/ext/standard/tests/array/min_basic.phpt b/ext/standard/tests/array/min_basic.phpt index f76770f40d..8b6b9c4bb3 100644 --- a/ext/standard/tests/array/min_basic.phpt +++ b/ext/standard/tests/array/min_basic.phpt @@ -22,7 +22,6 @@ var_dump(min(0, 1, array(2,3))); echo "\nDone\n"; ?> --EXPECT-- - *** Testing sequences of numbers *** int(1) int(-2) diff --git a/ext/standard/tests/array/min_variation1.phpt b/ext/standard/tests/array/min_variation1.phpt index a9c31f615f..de8f772b42 100644 --- a/ext/standard/tests/array/min_variation1.phpt +++ b/ext/standard/tests/array/min_variation1.phpt @@ -22,7 +22,6 @@ var_dump(min(0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 1 echo "\nDone\n"; ?> --EXPECTF-- - *** Testing boundary conditions *** int(2147483645) int(2147483647) diff --git a/ext/standard/tests/array/min_variation2.phpt b/ext/standard/tests/array/min_variation2.phpt index eff810e869..3c2dc5338f 100644 --- a/ext/standard/tests/array/min_variation2.phpt +++ b/ext/standard/tests/array/min_variation2.phpt @@ -29,7 +29,6 @@ echo "\nDone\n"; ?> --EXPECTF-- - *** Testing arrays *** int(1) int(-2) diff --git a/ext/standard/tests/array/natcasesort_error.phpt b/ext/standard/tests/array/natcasesort_error.phpt index 9ae8691e1e..377a407d72 100644 --- a/ext/standard/tests/array/natcasesort_error.phpt +++ b/ext/standard/tests/array/natcasesort_error.phpt @@ -37,4 +37,4 @@ NULL Warning: natcasesort() expects exactly 1 parameter, 2 given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/natcasesort_object1.phpt b/ext/standard/tests/array/natcasesort_object1.phpt index ec733adaf9..fc116718f4 100644 --- a/ext/standard/tests/array/natcasesort_object1.phpt +++ b/ext/standard/tests/array/natcasesort_object1.phpt @@ -48,7 +48,6 @@ var_dump($unsorted_str_obj); echo "Done"; ?> - --EXPECTF-- *** Testing natcasesort() : object functionality *** @@ -96,4 +95,4 @@ array(8) { string(1) "w" } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/natcasesort_object2.phpt b/ext/standard/tests/array/natcasesort_object2.phpt index 38efefc4a3..3eef437588 100644 --- a/ext/standard/tests/array/natcasesort_object2.phpt +++ b/ext/standard/tests/array/natcasesort_object2.phpt @@ -52,7 +52,6 @@ var_dump($temp_array); echo "Done"; ?> - --EXPECTF-- *** Testing natcasesort() : object functionality *** @@ -96,4 +95,4 @@ array(4) { string(1) "c" } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/natcasesort_variation1.phpt b/ext/standard/tests/array/natcasesort_variation1.phpt index 778d265b85..98d6297a3f 100644 --- a/ext/standard/tests/array/natcasesort_variation1.phpt +++ b/ext/standard/tests/array/natcasesort_variation1.phpt @@ -220,4 +220,3 @@ NULL Warning: natcasesort() expects parameter 1 to be array, resource given in %s on line %d NULL Done - diff --git a/ext/standard/tests/array/natcasesort_variation10.phpt b/ext/standard/tests/array/natcasesort_variation10.phpt index 15fbfd911b..3cfb36e2a4 100644 --- a/ext/standard/tests/array/natcasesort_variation10.phpt +++ b/ext/standard/tests/array/natcasesort_variation10.phpt @@ -27,7 +27,6 @@ echo key($array_arg) . " => " . current ($array_arg) . "\n"; echo "Done"; ?> - --EXPECT-- *** Testing natcasesort() : usage variations *** diff --git a/ext/standard/tests/array/natcasesort_variation11.phpt b/ext/standard/tests/array/natcasesort_variation11.phpt index 531f4ecfab..365600edd7 100644 --- a/ext/standard/tests/array/natcasesort_variation11.phpt +++ b/ext/standard/tests/array/natcasesort_variation11.phpt @@ -111,7 +111,6 @@ foreach($inputs as $input) { echo "Done"; ?> - --EXPECT-- *** Testing natcasesort() : usage variations *** @@ -229,4 +228,4 @@ array(3) { ["hello"]=> string(5) "world" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/natcasesort_variation2.phpt b/ext/standard/tests/array/natcasesort_variation2.phpt index a38dbedfe4..ce34db1246 100644 --- a/ext/standard/tests/array/natcasesort_variation2.phpt +++ b/ext/standard/tests/array/natcasesort_variation2.phpt @@ -117,7 +117,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing natcasesort() : usage variation *** diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/natcasesort_variation3.phpt index 6376524d5b..c3400f4d65 100644 --- a/ext/standard/tests/array/natcasesort_variation3.phpt +++ b/ext/standard/tests/array/natcasesort_variation3.phpt @@ -41,7 +41,6 @@ foreach ($inputs as $array_arg) { echo "Done"; ?> - --EXPECT-- *** Testing natcasesort() : usage variation *** diff --git a/ext/standard/tests/array/natcasesort_variation5.phpt b/ext/standard/tests/array/natcasesort_variation5.phpt index 71559afa23..f2cbd17191 100644 --- a/ext/standard/tests/array/natcasesort_variation5.phpt +++ b/ext/standard/tests/array/natcasesort_variation5.phpt @@ -46,4 +46,4 @@ array(11) { [1]=> int(4095) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/natcasesort_variation6.phpt b/ext/standard/tests/array/natcasesort_variation6.phpt index e87fb27a64..bbbefa799e 100644 --- a/ext/standard/tests/array/natcasesort_variation6.phpt +++ b/ext/standard/tests/array/natcasesort_variation6.phpt @@ -53,4 +53,4 @@ array(3) { [2]=> &int(555) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/natcasesort_variation8.phpt b/ext/standard/tests/array/natcasesort_variation8.phpt index 48f347837c..b0f7cbba50 100644 --- a/ext/standard/tests/array/natcasesort_variation8.phpt +++ b/ext/standard/tests/array/natcasesort_variation8.phpt @@ -43,4 +43,4 @@ array(9) { [0]=> int(669) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/natcasesort_variation9.phpt Binary files differindex 7b806f3977..04b36f3695 100644 --- a/ext/standard/tests/array/natcasesort_variation9.phpt +++ b/ext/standard/tests/array/natcasesort_variation9.phpt diff --git a/ext/standard/tests/array/natsort_basic.phpt b/ext/standard/tests/array/natsort_basic.phpt index e38359fe68..84d408ed3f 100644 --- a/ext/standard/tests/array/natsort_basic.phpt +++ b/ext/standard/tests/array/natsort_basic.phpt @@ -32,4 +32,3 @@ Array [1] => img10.png [0] => img12.png ) - diff --git a/ext/standard/tests/array/prev_error3.phpt b/ext/standard/tests/array/prev_error3.phpt index 8f91507131..6f0beaf115 100644 --- a/ext/standard/tests/array/prev_error3.phpt +++ b/ext/standard/tests/array/prev_error3.phpt @@ -15,5 +15,4 @@ prev - ensure we cannot pass a temporary var_dump(prev(array(1, 2))); ?> --EXPECTF-- - -Fatal error: Only variables can be passed by reference in %s on line %d
\ No newline at end of file +Fatal error: Only variables can be passed by reference in %s on line %d diff --git a/ext/standard/tests/array/rsort_basic.phpt b/ext/standard/tests/array/rsort_basic.phpt index e838a9ce92..2d75287841 100644 --- a/ext/standard/tests/array/rsort_basic.phpt +++ b/ext/standard/tests/array/rsort_basic.phpt @@ -70,7 +70,6 @@ var_dump( $temp_array); echo "Done"; ?> - --EXPECT-- *** Testing rsort() : basic functionality *** @@ -238,4 +237,4 @@ array(4) { [3]=> int(22) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/rsort_error.phpt b/ext/standard/tests/array/rsort_error.phpt index 247ec79cb2..a00ba04469 100644 --- a/ext/standard/tests/array/rsort_error.phpt +++ b/ext/standard/tests/array/rsort_error.phpt @@ -29,7 +29,6 @@ var_dump($array_arg); echo "Done"; ?> - --EXPECTF-- *** Testing rsort() : error conditions *** @@ -48,4 +47,4 @@ array(2) { [1]=> int(2) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/rsort_object1.phpt b/ext/standard/tests/array/rsort_object1.phpt index dbaf1751f0..7477276cd3 100644 --- a/ext/standard/tests/array/rsort_object1.phpt +++ b/ext/standard/tests/array/rsort_object1.phpt @@ -81,7 +81,6 @@ var_dump($temp_array); echo "Done"; ?> - --EXPECTF-- *** Testing rsort() : object functionality *** @@ -240,4 +239,4 @@ array(8) { string(5) "Lemon" } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/rsort_object2.phpt b/ext/standard/tests/array/rsort_object2.phpt index 75a8fbb7ab..b47903b698 100644 --- a/ext/standard/tests/array/rsort_object2.phpt +++ b/ext/standard/tests/array/rsort_object2.phpt @@ -92,7 +92,6 @@ var_dump($temp_array); echo "Done"; ?> - --EXPECTF-- *** Testing rsort() : object functionality *** @@ -255,4 +254,4 @@ array(4) { string(3) "ass" } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/rsort_variation1.phpt b/ext/standard/tests/array/rsort_variation1.phpt index ebc3991edd..5b83c89a29 100644 --- a/ext/standard/tests/array/rsort_variation1.phpt +++ b/ext/standard/tests/array/rsort_variation1.phpt @@ -100,7 +100,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing rsort() : variation *** -- Iteration 1 -- @@ -511,4 +510,4 @@ Flag = SORT_STRING: Warning: rsort() expects parameter 1 to be array, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/rsort_variation10.phpt b/ext/standard/tests/array/rsort_variation10.phpt index eb1326a546..22fe18f4e0 100644 --- a/ext/standard/tests/array/rsort_variation10.phpt +++ b/ext/standard/tests/array/rsort_variation10.phpt @@ -33,7 +33,6 @@ var_dump($temp_array); echo "Done"; ?> - --EXPECT-- *** Testing rsort() : variation *** @@ -105,4 +104,4 @@ array(9) { [8]=> int(-229) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/rsort_variation2.phpt b/ext/standard/tests/array/rsort_variation2.phpt index b6b9c68bbe..d2b3e0e423 100644 --- a/ext/standard/tests/array/rsort_variation2.phpt +++ b/ext/standard/tests/array/rsort_variation2.phpt @@ -106,7 +106,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing rsort() : variation *** diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/rsort_variation3.phpt index dbd1a27820..724764f48b 100644 --- a/ext/standard/tests/array/rsort_variation3.phpt +++ b/ext/standard/tests/array/rsort_variation3.phpt @@ -59,7 +59,6 @@ foreach ($various_arrays as $array) { echo "Done"; ?> - --EXPECT-- *** Testing rsort() : variation *** @@ -322,4 +321,4 @@ array(7) { [6]=> float(-2147483649) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/rsort_variation5.phpt index 2821d21224..f3d7f69041 100644 --- a/ext/standard/tests/array/rsort_variation5.phpt +++ b/ext/standard/tests/array/rsort_variation5.phpt @@ -51,7 +51,6 @@ foreach ($various_arrays as $array) { echo "Done"; ?> - --EXPECT-- *** Testing rsort() : variation *** diff --git a/ext/standard/tests/array/rsort_variation6.phpt b/ext/standard/tests/array/rsort_variation6.phpt index 71280710d0..29c5d3c09d 100644 --- a/ext/standard/tests/array/rsort_variation6.phpt +++ b/ext/standard/tests/array/rsort_variation6.phpt @@ -33,7 +33,6 @@ var_dump($temp_array); echo "Done"; ?> - --EXPECT-- *** Testing rsort() : variation *** @@ -117,4 +116,4 @@ array(11) { [10]=> int(-682) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/rsort_variation7.phpt b/ext/standard/tests/array/rsort_variation7.phpt index f6f92c7ccd..51a0565cdb 100644 --- a/ext/standard/tests/array/rsort_variation7.phpt +++ b/ext/standard/tests/array/rsort_variation7.phpt @@ -38,7 +38,6 @@ var_dump($temp_array); echo "Done"; ?> - --EXPECT-- *** Testing rsort() : variation *** @@ -93,4 +92,4 @@ array(4) { [3]=> bool(false) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/rsort_variation8.phpt b/ext/standard/tests/array/rsort_variation8.phpt index 2cf8dc77f5..8f1ee129c7 100644 --- a/ext/standard/tests/array/rsort_variation8.phpt +++ b/ext/standard/tests/array/rsort_variation8.phpt @@ -50,7 +50,6 @@ foreach ($various_arrays as $array) { echo "Done"; ?> - --EXPECT-- *** Testing rsort() : variation *** @@ -177,4 +176,4 @@ array(4) { array(0) { } } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/shuffle_basic1.phpt b/ext/standard/tests/array/shuffle_basic1.phpt index e29dec9220..efcc21e9df 100644 --- a/ext/standard/tests/array/shuffle_basic1.phpt +++ b/ext/standard/tests/array/shuffle_basic1.phpt @@ -147,4 +147,3 @@ array(9) { string(%d) "%s" } Done - diff --git a/ext/standard/tests/array/shuffle_basic2.phpt b/ext/standard/tests/array/shuffle_basic2.phpt index 8977e349f9..3405eee2d7 100644 --- a/ext/standard/tests/array/shuffle_basic2.phpt +++ b/ext/standard/tests/array/shuffle_basic2.phpt @@ -86,4 +86,3 @@ array(9) { int(%d) } Done - diff --git a/ext/standard/tests/array/shuffle_error.phpt b/ext/standard/tests/array/shuffle_error.phpt index 27bf260949..3c69972261 100644 --- a/ext/standard/tests/array/shuffle_error.phpt +++ b/ext/standard/tests/array/shuffle_error.phpt @@ -51,4 +51,3 @@ array(2) { int(2) } Done - diff --git a/ext/standard/tests/array/shuffle_variation1.phpt b/ext/standard/tests/array/shuffle_variation1.phpt index 9a580959e8..3c0ab5051a 100644 --- a/ext/standard/tests/array/shuffle_variation1.phpt +++ b/ext/standard/tests/array/shuffle_variation1.phpt @@ -211,4 +211,3 @@ bool(false) Warning: shuffle() expects parameter 1 to be array, resource given in %s on line %d bool(false) Done - diff --git a/ext/standard/tests/array/shuffle_variation2.phpt b/ext/standard/tests/array/shuffle_variation2.phpt index b0394338ea..470713227d 100644 --- a/ext/standard/tests/array/shuffle_variation2.phpt +++ b/ext/standard/tests/array/shuffle_variation2.phpt @@ -209,4 +209,3 @@ array(3) { int(%d) } Done - diff --git a/ext/standard/tests/array/shuffle_variation3.phpt b/ext/standard/tests/array/shuffle_variation3.phpt index 68dad4a471..eb93106ab3 100644 --- a/ext/standard/tests/array/shuffle_variation3.phpt +++ b/ext/standard/tests/array/shuffle_variation3.phpt @@ -230,4 +230,3 @@ array(3) { int(-%d) } Done - diff --git a/ext/standard/tests/array/shuffle_variation4.phpt b/ext/standard/tests/array/shuffle_variation4.phpt index 2b5f80b71e..3a29adf618 100644 --- a/ext/standard/tests/array/shuffle_variation4.phpt +++ b/ext/standard/tests/array/shuffle_variation4.phpt @@ -228,4 +228,3 @@ array(3) { NULL } Done - diff --git a/ext/standard/tests/array/shuffle_variation5.phpt b/ext/standard/tests/array/shuffle_variation5.phpt index e7a7db1be5..dd291f610b 100644 --- a/ext/standard/tests/array/shuffle_variation5.phpt +++ b/ext/standard/tests/array/shuffle_variation5.phpt @@ -117,4 +117,3 @@ array\(6\) { string\(8\) "[heredoc 1-5]*" } Done - diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort_basic.phpt index 1f9c8f099f..065889de11 100644 --- a/ext/standard/tests/array/sort_basic.phpt +++ b/ext/standard/tests/array/sort_basic.phpt @@ -243,4 +243,4 @@ array(4) { [3]=> int(555) } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/uksort_basic.phpt b/ext/standard/tests/array/uksort_basic.phpt index f83c0329da..ea6406a87b 100644 --- a/ext/standard/tests/array/uksort_basic.phpt +++ b/ext/standard/tests/array/uksort_basic.phpt @@ -23,4 +23,4 @@ foreach($a as $key => $value) { 1: 2 0: 3 2: 5 -3: 6
\ No newline at end of file +3: 6 diff --git a/ext/standard/tests/array/usort_error1.phpt b/ext/standard/tests/array/usort_error1.phpt index 222b9c62a6..7681e9720b 100644 --- a/ext/standard/tests/array/usort_error1.phpt +++ b/ext/standard/tests/array/usort_error1.phpt @@ -38,4 +38,4 @@ NULL Warning: usort() expects exactly 2 parameters, 1 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/usort_error2.phpt b/ext/standard/tests/array/usort_error2.phpt index d0ccd36221..487f51982d 100644 --- a/ext/standard/tests/array/usort_error2.phpt +++ b/ext/standard/tests/array/usort_error2.phpt @@ -53,4 +53,4 @@ NULL Warning: usort() expects exactly 2 parameters, 3 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/usort_object1.phpt b/ext/standard/tests/array/usort_object1.phpt index 8fccc49047..18ca31890e 100644 --- a/ext/standard/tests/array/usort_object1.phpt +++ b/ext/standard/tests/array/usort_object1.phpt @@ -138,4 +138,4 @@ array(3) { string(5) "apple" } } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/usort_object2.phpt b/ext/standard/tests/array/usort_object2.phpt index 3226741da4..e0c41936d5 100644 --- a/ext/standard/tests/array/usort_object2.phpt +++ b/ext/standard/tests/array/usort_object2.phpt @@ -162,4 +162,4 @@ array(4) { NULL } } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/usort_variation1.phpt b/ext/standard/tests/array/usort_variation1.phpt index 18673f0245..14d740dd86 100644 --- a/ext/standard/tests/array/usort_variation1.phpt +++ b/ext/standard/tests/array/usort_variation1.phpt @@ -233,4 +233,4 @@ NULL Warning: usort() expects parameter 1 to be array, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/usort_variation2.phpt b/ext/standard/tests/array/usort_variation2.phpt index fa5d463ade..9e31b2fcbf 100644 --- a/ext/standard/tests/array/usort_variation2.phpt +++ b/ext/standard/tests/array/usort_variation2.phpt @@ -239,4 +239,4 @@ NULL Warning: usort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/usort_variation5.phpt b/ext/standard/tests/array/usort_variation5.phpt index b8660e1438..2fd3f24ae1 100644 --- a/ext/standard/tests/array/usort_variation5.phpt +++ b/ext/standard/tests/array/usort_variation5.phpt @@ -140,4 +140,4 @@ array(4) { string(%d) "heredoc string with!@# and 123 Test this!!!" } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/usort_variation8.phpt b/ext/standard/tests/array/usort_variation8.phpt index ab3532e8a7..3296c4a36a 100644 --- a/ext/standard/tests/array/usort_variation8.phpt +++ b/ext/standard/tests/array/usort_variation8.phpt @@ -82,4 +82,4 @@ NULL Warning: usort() expects parameter 2 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt index 7303dbb23f..0100229958 100644 --- a/ext/standard/tests/assert/assert04.phpt +++ b/ext/standard/tests/assert/assert04.phpt @@ -45,4 +45,3 @@ Warning: assert_options() expects parameter 1 to be int, string given in %s on l Warning: assert(): assert(0) failed in %s on line %d Warning: assert(): assert(0) failed in %s on line %d - diff --git a/ext/standard/tests/assert/assert_basic4.phpt b/ext/standard/tests/assert/assert_basic4.phpt index e44c9a4c6d..4e78cf9ec1 100644 --- a/ext/standard/tests/assert/assert_basic4.phpt +++ b/ext/standard/tests/assert/assert_basic4.phpt @@ -23,7 +23,6 @@ echo "Initial values: ini.get(\"assert.warning\") => [".ini_get("assert.warning" 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"; - --EXPECT-- Initial values: assert_options(ASSERT_ACTIVE) => [0] Initial values: assert_options(ASSERT_WARNING) => [0] diff --git a/ext/standard/tests/assert/assert_basic6.phpt b/ext/standard/tests/assert/assert_basic6.phpt index eb817db69b..216c85c94b 100644 --- a/ext/standard/tests/assert/assert_basic6.phpt +++ b/ext/standard/tests/assert/assert_basic6.phpt @@ -25,4 +25,3 @@ Deprecated: assert(): Calling assert() with a string argument is deprecated in % f1 called Warning: assert(): 0 is 0: "0 != 0" failed in %s on line 10 - diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt index 1ea52b0b9e..023f6690c5 100644 --- a/ext/standard/tests/assert/assert_variation.phpt +++ b/ext/standard/tests/assert/assert_variation.phpt @@ -69,7 +69,6 @@ var_dump($rao=assert_options(ASSERT_CALLBACK)); echo "ini.get(\"assert.callback\") => [".ini_get("assert.callback")."]\n\n"; var_dump($r2=assert($sa)); echo"\n"; - --EXPECTF-- Initial values: assert_options(ASSERT_CALLBACK) => [f1] Initial values: ini.get("assert.callback") => [f1] diff --git a/ext/standard/tests/bug75220.phpt b/ext/standard/tests/bug75220.phpt index 0fdc6aa79a..ca6c3ef4ea 100644 --- a/ext/standard/tests/bug75220.phpt +++ b/ext/standard/tests/bug75220.phpt @@ -25,4 +25,4 @@ class A extends B --EXPECT-- string(3) "foo" bool(false) -bool(false)
\ No newline at end of file +bool(false) 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 af6d50bef2..098c563c97 100644 --- a/ext/standard/tests/class_object/class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_003.phpt @@ -15,4 +15,4 @@ echo "Done" ?> --EXPECT-- bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_error_001.phpt b/ext/standard/tests/class_object/get_class_error_001.phpt index 34814aecd4..09c46dad2f 100644 --- a/ext/standard/tests/class_object/get_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_error_001.phpt @@ -25,4 +25,4 @@ echo "Done"; Warning: get_class() expects at most 1 parameter, 2 given in %s on line 14 bool(false) -Done
\ No newline at end of file +Done 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 b874295036..843e9f1a53 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 @@ -60,4 +60,4 @@ array(0) { } Argument is non existent class: NULL -Done
\ No newline at end of file +Done 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 e5e94e1c28..8a11eba589 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 @@ -175,4 +175,4 @@ array(4) { [3]=> string(9) "testFromX" } -Done
\ No newline at end of file +Done 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 a77f61819a..c7662f8605 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 @@ -73,4 +73,4 @@ array(5) { [4]=> string(9) "testFromC" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_methods_error_001.phpt b/ext/standard/tests/class_object/get_class_methods_error_001.phpt index 9888c26ae0..ed3db7468d 100644 --- a/ext/standard/tests/class_object/get_class_methods_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_error_001.phpt @@ -38,4 +38,4 @@ NULL Warning: get_class_methods() expects exactly 1 parameter, 2 given in %s on line 22 NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt index abc2395209..16a728e088 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt @@ -174,4 +174,4 @@ NULL Arg value NULL -Done
\ No newline at end of file +Done 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 e6e4305691..23416234f9 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 @@ -24,4 +24,4 @@ array(1) { [0]=> string(8) "MyMeThOd" } -Done
\ No newline at end of file +Done 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 ad7b656382..89edadccc6 100644 --- a/ext/standard/tests/class_object/get_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_variation_002.phpt @@ -15,4 +15,4 @@ echo "Done"; ?> --EXPECT-- string(19) "caseSensitivityTest" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_vars_error.phpt b/ext/standard/tests/class_object/get_class_vars_error.phpt index 0399e6023a..8815070ce5 100644 --- a/ext/standard/tests/class_object/get_class_vars_error.phpt +++ b/ext/standard/tests/class_object/get_class_vars_error.phpt @@ -35,4 +35,4 @@ NULL Warning: get_class_vars() expects exactly 1 parameter, 0 given in %sget_class_vars_error.php on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt index bede42a762..78d27fa3a5 100644 --- a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt @@ -44,4 +44,4 @@ bool(true) -- Ensure userspace interfaces are not listed -- bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt index 0fd665b250..749ee69ab7 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt @@ -44,4 +44,4 @@ bool(false) -- Ensure userspace interfaces are listed -- bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt b/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt index 27962d6c56..8ce2d2df56 100644 --- a/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt @@ -53,4 +53,4 @@ bool(false) -- Ensure userspace classes are not listed -- bool(false) -Done
\ No newline at end of file +Done 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 51a68db2ef..253ebd2be4 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 @@ -59,7 +59,6 @@ echo "\n---( Unrelated class: )---\n"; X::test($b); ?> --EXPECT-- - ---( Global scope: )--- array(1) { ["pub"]=> @@ -104,4 +103,4 @@ X::test array(1) { ["pub"]=> string(6) "B::pub" -}
\ No newline at end of file +} 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 9d9b67cb67..41a1758baa 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 @@ -38,7 +38,6 @@ $b->testA($b); ?> --EXPECT-- - ---( Declaring class: )--- B::testB array(4) { @@ -61,4 +60,4 @@ array(3) { string(6) "B::pub" ["hiddenPriv"]=> string(13) "A::hiddenPriv" -}
\ No newline at end of file +} diff --git a/ext/standard/tests/class_object/get_object_vars_error_001.phpt b/ext/standard/tests/class_object/get_object_vars_error_001.phpt index c25ded8bb2..c6488fe5e6 100644 --- a/ext/standard/tests/class_object/get_object_vars_error_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_error_001.phpt @@ -34,4 +34,4 @@ NULL Warning: get_object_vars() expects exactly 1 parameter, 2 given in %s on line 18 NULL -Done
\ No newline at end of file +Done 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 edf6815083..2a310227a5 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 @@ -17,4 +17,4 @@ var_dump(get_object_vars($a)); ?> --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 8c7cabdc6f..f2a05a5836 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 @@ -44,4 +44,4 @@ object(stdClass)#1 (2) { ["val"]=> string(10) "original.a" } -string(11) "changed.ref"
\ No newline at end of file +string(11) "changed.ref" diff --git a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt index 5ad775ace3..10be39bb7f 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt @@ -207,4 +207,4 @@ Arg value Warning: get_object_vars() expects parameter 1 to be object, null given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_parent_class_error_001.phpt b/ext/standard/tests/class_object/get_parent_class_error_001.phpt index ed0644dce7..c38275fe4c 100644 --- a/ext/standard/tests/class_object/get_parent_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_error_001.phpt @@ -26,4 +26,4 @@ echo "Done"; Warning: get_parent_class() expects at most 1 parameter, 2 given in %s on line 15 NULL -Done
\ No newline at end of file +Done 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 5102220136..68dec50ac4 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 @@ -24,4 +24,4 @@ echo "Done"; *** Testing get_parent_class() : variation *** string(19) "caseSensitivityTest" string(19) "caseSensitivityTest" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/interface_exists_error.phpt b/ext/standard/tests/class_object/interface_exists_error.phpt index 312665267f..1499e42d23 100644 --- a/ext/standard/tests/class_object/interface_exists_error.phpt +++ b/ext/standard/tests/class_object/interface_exists_error.phpt @@ -35,4 +35,4 @@ NULL Warning: interface_exists() expects at most 2 parameters, 3 given in %sinterface_exists_error.php on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/class_object/interface_exists_variation1.phpt b/ext/standard/tests/class_object/interface_exists_variation1.phpt index f265d0085c..3aee5037a5 100644 --- a/ext/standard/tests/class_object/interface_exists_variation1.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation1.phpt @@ -181,4 +181,4 @@ bool(false) --unset var-- bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/class_object/is_a_error_001.phpt b/ext/standard/tests/class_object/is_a_error_001.phpt index 1f72678637..fd8f785bee 100644 --- a/ext/standard/tests/class_object/is_a_error_001.phpt +++ b/ext/standard/tests/class_object/is_a_error_001.phpt @@ -32,7 +32,6 @@ var_dump( is_a($object) ); echo "Done"; ?> --EXPECTF-- - *** Testing is_a() : error conditions *** -- Testing is_a() function with more than expected no. of arguments -- 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 909e2bc09a..9f080ad699 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 @@ -23,4 +23,4 @@ echo "Done" *** Testing is_subclass_of() : usage variations *** *** Testing is_a() : usage variations *** bool(true) -Done
\ No newline at end of file +Done 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 2898dc7fda..2368d1217e 100644 --- a/ext/standard/tests/class_object/method_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_001.phpt @@ -50,7 +50,6 @@ foreach ($methods as $method) { echo "Done"; ?> --EXPECT-- - ---(Using string class name)--- Does C::inherit_pub exist? bool(true) Does C::inherit_prot exist? bool(true) @@ -80,4 +79,4 @@ Does C::static_pub exist? bool(true) Does C::static_prot exist? bool(true) Does C::static_priv exist? bool(true) Does C::non_existent exist? bool(false) -Done
\ No newline at end of file +Done 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 f9c8e7e2c4..36b4a6e692 100644 --- a/ext/standard/tests/class_object/method_exists_basic_002.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_002.phpt @@ -30,4 +30,4 @@ Does stdclass::nonexistent exist? bool(false) ---(Internal classes, using class instance)--- Does exception::getmessage exist? bool(true) Does stdclass::nonexistent exist? bool(false) -Done
\ No newline at end of file +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 5876cfa9bd..d5835b0b87 100644 --- a/ext/standard/tests/class_object/method_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_003.phpt @@ -23,4 +23,4 @@ echo "Done"; *** Testing method_exists() : variation *** bool(true) bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/property_exists_error.phpt b/ext/standard/tests/class_object/property_exists_error.phpt index e4564cbfa8..217a5c61f9 100644 --- a/ext/standard/tests/class_object/property_exists_error.phpt +++ b/ext/standard/tests/class_object/property_exists_error.phpt @@ -44,4 +44,4 @@ NULL Warning: First parameter must either be an object or the name of an existing class in %sproperty_exists_error.php on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== 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 60880236d8..c971af9a26 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 @@ -15,4 +15,4 @@ echo "Done" ?> --EXPECT-- bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt b/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt index 03c36b175b..94276a6573 100644 --- a/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt +++ b/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt @@ -17,4 +17,4 @@ string(2) "*0" string(2) "*0" string(2) "*0" string(2) "*0" -string(2) "*0"
\ No newline at end of file +string(2) "*0" diff --git a/ext/standard/tests/crypt/des_fallback_invalid_salt.phpt b/ext/standard/tests/crypt/des_fallback_invalid_salt.phpt index 7ef5ec631f..a6a7368081 100644 --- a/ext/standard/tests/crypt/des_fallback_invalid_salt.phpt +++ b/ext/standard/tests/crypt/des_fallback_invalid_salt.phpt @@ -12,4 +12,4 @@ Deprecated: crypt(): Supplied salt is not valid for DES. Possible bug in provide string(13) "$#8MWASl5pGIk" Deprecated: crypt(): Supplied salt is not valid for DES. Possible bug in provided salt format. in %s on line %d -string(13) "$54mkQyGCLvHs"
\ No newline at end of file +string(13) "$54mkQyGCLvHs" diff --git a/ext/standard/tests/dir/bug73877.phpt b/ext/standard/tests/dir/bug73877.phpt index bade168b4a..2fa6c90f02 100644 --- a/ext/standard/tests/dir/bug73877.phpt +++ b/ext/standard/tests/dir/bug73877.phpt @@ -47,4 +47,3 @@ string(%d) "%sbug73877" string(%d) "%sСерёжка" string(%d) "%sbug73877" bool(true) - diff --git a/ext/standard/tests/dir/dir_variation2.phpt b/ext/standard/tests/dir/dir_variation2.phpt index df6320c00a..f38b3caeea 100644 --- a/ext/standard/tests/dir/dir_variation2.phpt +++ b/ext/standard/tests/dir/dir_variation2.phpt @@ -220,4 +220,4 @@ NULL -- Iteration 28 -- Warning: dir() expects parameter 2 to be resource, null given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/dir/dir_variation7.phpt b/ext/standard/tests/dir/dir_variation7.phpt index ebf4a9ac24..11bfa0cb8e 100644 --- a/ext/standard/tests/dir/dir_variation7.phpt +++ b/ext/standard/tests/dir/dir_variation7.phpt @@ -91,4 +91,4 @@ bool(false) Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt index b5fc83caba..bd8b90d464 100644 --- a/ext/standard/tests/dir/opendir_variation5.phpt +++ b/ext/standard/tests/dir/opendir_variation5.phpt @@ -87,7 +87,6 @@ rmdir($child_dir_path); rmdir($sub_dir_path); rmdir($parent_dir_path); ?> - --EXPECTF-- *** Testing opendir() : usage variations *** diff --git a/ext/standard/tests/directory/bug74589_utf8.phpt b/ext/standard/tests/directory/bug74589_utf8.phpt index deba03c582..126857da5c 100644 --- a/ext/standard/tests/directory/bug74589_utf8.phpt +++ b/ext/standard/tests/directory/bug74589_utf8.phpt @@ -46,4 +46,3 @@ bool(true) unlink($test_file); rmdir($dir); ?> - diff --git a/ext/standard/tests/file/001-win32-mb.phpt b/ext/standard/tests/file/001-win32-mb.phpt index eb3be23f83..e593270b12 100644 --- a/ext/standard/tests/file/001-win32-mb.phpt +++ b/ext/standard/tests/file/001-win32-mb.phpt @@ -100,4 +100,3 @@ test_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.file is a regular file test_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.file is not a directory test_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.file does not exist test_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.file does not exist - diff --git a/ext/standard/tests/file/001-win32.phpt b/ext/standard/tests/file/001-win32.phpt index ee520940e4..3372c6cb83 100644 --- a/ext/standard/tests/file/001-win32.phpt +++ b/ext/standard/tests/file/001-win32.phpt @@ -97,4 +97,3 @@ test.file is a regular file test.file is not a directory test.file does not exist test.file does not exist - diff --git a/ext/standard/tests/file/005_error.phpt b/ext/standard/tests/file/005_error.phpt index 6ac22914db..e3ce551b3d 100644 --- a/ext/standard/tests/file/005_error.phpt +++ b/ext/standard/tests/file/005_error.phpt @@ -123,4 +123,3 @@ Warning: touch() expects at most 3 parameters, 4 given in %s on line %d NULL Done - diff --git a/ext/standard/tests/file/007_variation2.phpt b/ext/standard/tests/file/007_variation2.phpt index d456214c27..2adb9864f1 100644 --- a/ext/standard/tests/file/007_variation2.phpt +++ b/ext/standard/tests/file/007_variation2.phpt @@ -55,4 +55,4 @@ int(37) int(57) bool(true) string(7) "Unknown" -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/007_variation4.phpt b/ext/standard/tests/file/007_variation4.phpt index 417974d3be..4124a143f0 100644 --- a/ext/standard/tests/file/007_variation4.phpt +++ b/ext/standard/tests/file/007_variation4.phpt @@ -70,4 +70,4 @@ string(7) "Unknown" int(37) int(0) bool(true) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/bug38450_2.phpt b/ext/standard/tests/file/bug38450_2.phpt index 318a2a3eb9..774de66bfe 100644 --- a/ext/standard/tests/file/bug38450_2.phpt +++ b/ext/standard/tests/file/bug38450_2.phpt @@ -102,7 +102,6 @@ var_dump($myvar); echo "Done\n"; ?> --EXPECTF-- - Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d Fatal error: Uncaught Exception: constructor in %s:%d diff --git a/ext/standard/tests/file/bug39863.phpt b/ext/standard/tests/file/bug39863.phpt index 5e26b5a636..5460203e05 100644 --- a/ext/standard/tests/file/bug39863.phpt +++ b/ext/standard/tests/file/bug39863.phpt @@ -20,4 +20,3 @@ else { Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d PASS ===DONE=== - diff --git a/ext/standard/tests/file/bug41874_1.phpt b/ext/standard/tests/file/bug41874_1.phpt index c6ddef8066..ed14d87a67 100644 --- a/ext/standard/tests/file/bug41874_1.phpt +++ b/ext/standard/tests/file/bug41874_1.phpt @@ -13,4 +13,4 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) { popen("1:\\non_existent", "r"); ?> --EXPECT-- -The system cannot find the drive specified.
\ No newline at end of file +The system cannot find the drive specified. diff --git a/ext/standard/tests/file/bug41874_2.phpt b/ext/standard/tests/file/bug41874_2.phpt index bf76a749fd..012fc01a3d 100644 --- a/ext/standard/tests/file/bug41874_2.phpt +++ b/ext/standard/tests/file/bug41874_2.phpt @@ -14,4 +14,4 @@ $result = exec('cd 1:\\non_existent; dir nonexistent'); echo "$result"; ?> --EXPECT-- -The system cannot find the drive specified.
\ No newline at end of file +The system cannot find the drive specified. diff --git a/ext/standard/tests/file/bug41874_3.phpt b/ext/standard/tests/file/bug41874_3.phpt index 05095c6f10..01bd7dc606 100644 --- a/ext/standard/tests/file/bug41874_3.phpt +++ b/ext/standard/tests/file/bug41874_3.phpt @@ -13,4 +13,4 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) { system('cd 1:\\non_existent; dir nonexistent'); ?> --EXPECT-- -The system cannot find the drive specified.
\ No newline at end of file +The system cannot find the drive specified. diff --git a/ext/standard/tests/file/bug51094.phpt b/ext/standard/tests/file/bug51094.phpt index aa6ed93f50..fa62277bfb 100644 --- a/ext/standard/tests/file/bug51094.phpt +++ b/ext/standard/tests/file/bug51094.phpt @@ -19,4 +19,3 @@ string(4) ""ini" string(3) "ini" string(7) "ini"raw" string(0) "" - diff --git a/ext/standard/tests/file/bug61961.phpt b/ext/standard/tests/file/bug61961.phpt index ff0279a367..a2d83fe77e 100644 --- a/ext/standard/tests/file/bug61961.phpt +++ b/ext/standard/tests/file/bug61961.phpt @@ -11,4 +11,4 @@ unlink($tmp_empty_file); ==DONE== --EXPECT-- string(0) "" -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/standard/tests/file/bug63512.phpt b/ext/standard/tests/file/bug63512.phpt index 34c55d4ceb..9277359256 100644 --- a/ext/standard/tests/file/bug63512.phpt +++ b/ext/standard/tests/file/bug63512.phpt @@ -30,4 +30,3 @@ array(7) { ["d"]=> string(27) "INSTALL_ROOT "INSTALL_ROOT"" } - diff --git a/ext/standard/tests/file/bug69442.phpt b/ext/standard/tests/file/bug69442.phpt index 655eab306c..d7063f429d 100644 --- a/ext/standard/tests/file/bug69442.phpt +++ b/ext/standard/tests/file/bug69442.phpt @@ -42,5 +42,3 @@ type 1 string(0) "" type 2 string(0) "" type 3 string(3) "42 " - - diff --git a/ext/standard/tests/file/chmod_variation3.phpt b/ext/standard/tests/file/chmod_variation3.phpt index 13d2f1f667..bc6f0dc860 100644 --- a/ext/standard/tests/file/chmod_variation3.phpt +++ b/ext/standard/tests/file/chmod_variation3.phpt @@ -206,4 +206,3 @@ bool(false) Error: 2 - chmod(): %s, %s(%d) bool(false) ===DONE=== - diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt index 1eea8f65cc..e0da9f66ee 100644 --- a/ext/standard/tests/file/chmod_variation4.phpt +++ b/ext/standard/tests/file/chmod_variation4.phpt @@ -200,4 +200,3 @@ bool(true) --unset var-- bool(true) ===DONE=== - diff --git a/ext/standard/tests/file/copy_basic.phpt b/ext/standard/tests/file/copy_basic.phpt index d23a27839a..b23a262649 100644 --- a/ext/standard/tests/file/copy_basic.phpt +++ b/ext/standard/tests/file/copy_basic.phpt @@ -32,7 +32,6 @@ echo "\n"; echo "*** Done ***\n"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -41,7 +40,6 @@ $file_name2 = $file_path."/copy_basic2.tmp"; unlink($file_name1); unlink($file_name2); ?> - --EXPECTF-- *** Testing copy() function: to copy file from source to destination -- bool(true) @@ -55,4 +53,3 @@ bool(true) %d %d *** Done *** - diff --git a/ext/standard/tests/file/copy_error.phpt b/ext/standard/tests/file/copy_error.phpt index ad723370e4..2d6395167b 100644 --- a/ext/standard/tests/file/copy_error.phpt +++ b/ext/standard/tests/file/copy_error.phpt @@ -20,7 +20,6 @@ var_dump( copy(__FILE__, "file1", "file1") ); echo "*** Done ***\n"; ?> - --EXPECTF-- *** Testing copy() function: error conditions -- @@ -36,4 +35,3 @@ NULL Warning: copy() expects parameter 3 to be resource, string given in %s on line %d NULL *** Done *** - diff --git a/ext/standard/tests/file/copy_variation1.phpt b/ext/standard/tests/file/copy_variation1.phpt index aa1584b98a..bb7ae44fe1 100644 --- a/ext/standard/tests/file/copy_variation1.phpt +++ b/ext/standard/tests/file/copy_variation1.phpt @@ -69,12 +69,10 @@ foreach($dest_files as $dest_file) { echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation1.tmp"); ?> - --EXPECTF-- *** Test copy() function: destination file names containing numerics/strings *** Size of the source file before copy operation => int(1500) diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt index 289118240b..a0daa2a574 100644 --- a/ext/standard/tests/file/copy_variation10.phpt +++ b/ext/standard/tests/file/copy_variation10.phpt @@ -23,12 +23,10 @@ var_dump( filesize($file) ); echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation10.tmp"); ?> - --EXPECT-- *** Test copy(): Trying to create a copy of file with the same source name *** bool(false) diff --git a/ext/standard/tests/file/copy_variation11.phpt b/ext/standard/tests/file/copy_variation11.phpt index aabaa4cd4e..225351c619 100644 --- a/ext/standard/tests/file/copy_variation11.phpt +++ b/ext/standard/tests/file/copy_variation11.phpt @@ -44,13 +44,11 @@ var_dump( filesize($dir) ); //size of destination after copy echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation11.tmp"); rmdir(dirname(__FILE__)."/copy_variation11"); ?> - --EXPECTF-- *** Test copy() function: Trying to create a copy of source file as a dir *** Size of source before copy operation => int(300) diff --git a/ext/standard/tests/file/copy_variation12-win32.phpt b/ext/standard/tests/file/copy_variation12-win32.phpt index 4d39de3bb5..ff74c5e42c 100644 --- a/ext/standard/tests/file/copy_variation12-win32.phpt +++ b/ext/standard/tests/file/copy_variation12-win32.phpt @@ -30,13 +30,11 @@ var_dump( filesize($src_dir) ); echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_copy_variation12"); rmdir(dirname(__FILE__)."/copy_variation12"); ?> - --EXPECTF-- *** Test copy() function: Trying to create a copy of an existing dir *** diff --git a/ext/standard/tests/file/copy_variation12.phpt b/ext/standard/tests/file/copy_variation12.phpt index 7f96fd050d..a5f375b6c9 100644 --- a/ext/standard/tests/file/copy_variation12.phpt +++ b/ext/standard/tests/file/copy_variation12.phpt @@ -5,7 +5,6 @@ Test copy() function: usage variations - dir as source (Bug #42111) if(substr(PHP_OS, 0, 3) == "WIN") die("skip Do not run on Windows"); ?> - --FILE-- <?php /* Prototype: bool copy ( string $source, string $dest ); @@ -32,12 +31,10 @@ var_dump( filesize($dest) ); echo "*** Done ***\n"; ?> - --CLEAN-- <?php rmdir(dirname(__FILE__)."/copy_variation12"); ?> - --EXPECTF-- *** Test copy() function: Trying to create a copy of an existing dir *** diff --git a/ext/standard/tests/file/copy_variation13.phpt b/ext/standard/tests/file/copy_variation13.phpt index 779f82b6f6..a831d845c7 100644 --- a/ext/standard/tests/file/copy_variation13.phpt +++ b/ext/standard/tests/file/copy_variation13.phpt @@ -33,13 +33,11 @@ var_dump( filesize($dir) ); echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation13_dir.tmp"); rmdir(dirname(__FILE__)."/copy_variation13"); ?> - --EXPECTF-- *** Test copy() function: Trying to copy dir to file *** *** Testing copy() in copying dir to file *** diff --git a/ext/standard/tests/file/copy_variation14.phpt b/ext/standard/tests/file/copy_variation14.phpt index 1c30d361a0..49251bb495 100644 --- a/ext/standard/tests/file/copy_variation14.phpt +++ b/ext/standard/tests/file/copy_variation14.phpt @@ -28,12 +28,10 @@ var_dump( filesize($file) ); //size of the source echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation14.tmp"); ?> - --EXPECTF-- *** Test copy() function: Trying to create a copy of non-existing source in existing destination *** Warning: copy(%s): %s diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt index 546cbbb2f2..8f85f923d5 100644 --- a/ext/standard/tests/file/copy_variation15.phpt +++ b/ext/standard/tests/file/copy_variation15.phpt @@ -48,13 +48,11 @@ chmod($dir, $old_perms); echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation15.tmp"); rmdir(dirname(__FILE__)."/copy_variation15"); ?> - --EXPECTF-- *** Test copy() function: Trying to create a copy of file in a dir which doesn't have write permissions *** Warning: copy(%s): %s diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt index 6f8e9dd51d..7872a2138e 100644 --- a/ext/standard/tests/file/copy_variation16-win32.phpt +++ b/ext/standard/tests/file/copy_variation16-win32.phpt @@ -80,7 +80,6 @@ rmdir($base_dir); echo "*** Done ***\n"; ?> - --EXPECTF-- *** Testing copy() function: copying data file across directories *** - Size of source file => int(3500) diff --git a/ext/standard/tests/file/copy_variation16.phpt b/ext/standard/tests/file/copy_variation16.phpt index 1ef9da1ae6..e231715b0b 100644 --- a/ext/standard/tests/file/copy_variation16.phpt +++ b/ext/standard/tests/file/copy_variation16.phpt @@ -79,7 +79,6 @@ rmdir($base_dir); echo "*** Done ***\n"; ?> - --EXPECTF-- *** Testing copy() function: copying data file across directories *** - Size of source file => int(3500) diff --git a/ext/standard/tests/file/copy_variation17.phpt b/ext/standard/tests/file/copy_variation17.phpt index 73ccc71840..970e3155c3 100644 --- a/ext/standard/tests/file/copy_variation17.phpt +++ b/ext/standard/tests/file/copy_variation17.phpt @@ -45,13 +45,11 @@ foreach($src_file_names as $src_file_name) { echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation17.tmp"); rmdir(dirname(__FILE__)."/copy_variation17"); ?> - --EXPECTF-- *** Test copy() function: With source file names containing wild-card chars *** bool(true) diff --git a/ext/standard/tests/file/copy_variation18.phpt b/ext/standard/tests/file/copy_variation18.phpt index cfd28b7e66..0e39ca6c67 100644 --- a/ext/standard/tests/file/copy_variation18.phpt +++ b/ext/standard/tests/file/copy_variation18.phpt @@ -42,13 +42,11 @@ var_dump( compare_stats($stat_before_copy, $stat_after_copy, $stat_keys_to_compa echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_copy_variation18.tmp"); unlink(dirname(__FILE__)."/copy_variation18.tmp"); ?> - --EXPECT-- *** Test copy() function: stat of file before and after copy *** Copy operation => bool(true) diff --git a/ext/standard/tests/file/copy_variation2-win32-mb.phpt b/ext/standard/tests/file/copy_variation2-win32-mb.phpt index cb7c96fa0b..50c91b1936 100644 --- a/ext/standard/tests/file/copy_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/copy_variation2-win32-mb.phpt @@ -83,12 +83,10 @@ foreach($dest_files as $dest_file) { echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation2ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"); ?> - --EXPECTF-- *** Test copy() function: destination file names containing special characters *** Size of the source file before copy operation => int(1500) diff --git a/ext/standard/tests/file/copy_variation2-win32.phpt b/ext/standard/tests/file/copy_variation2-win32.phpt index 029c6c5f8e..3bde2e37de 100644 --- a/ext/standard/tests/file/copy_variation2-win32.phpt +++ b/ext/standard/tests/file/copy_variation2-win32.phpt @@ -83,12 +83,10 @@ foreach($dest_files as $dest_file) { echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation2.tmp"); ?> - --EXPECTF-- *** Test copy() function: destination file names containing special characters *** Size of the source file before copy operation => int(1500) diff --git a/ext/standard/tests/file/copy_variation2.phpt b/ext/standard/tests/file/copy_variation2.phpt index 681a00750c..b3bd5e6a8a 100644 --- a/ext/standard/tests/file/copy_variation2.phpt +++ b/ext/standard/tests/file/copy_variation2.phpt @@ -84,12 +84,10 @@ foreach($dest_files as $dest_file) { echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation2.tmp"); ?> - --EXPECTF-- *** Test copy() function: destination file names containing special characters *** Size of the source file before copy operation => int(1500) diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt index 259412f460..28cbd7b120 100644 --- a/ext/standard/tests/file/copy_variation3-win32.phpt +++ b/ext/standard/tests/file/copy_variation3-win32.phpt @@ -70,12 +70,10 @@ foreach($dest_files as $dest_file) { echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation3.tmp"); ?> - --EXPECTF-- *** 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_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt index 999c712385..cbbfd51ebc 100644 --- a/ext/standard/tests/file/copy_variation3.phpt +++ b/ext/standard/tests/file/copy_variation3.phpt @@ -69,12 +69,10 @@ foreach($dest_files as $dest_file) { echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation3.tmp"); ?> - --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_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt Binary files differindex f856d1665a..3c3abea05a 100644 --- a/ext/standard/tests/file/copy_variation4.phpt +++ b/ext/standard/tests/file/copy_variation4.phpt diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt index 1245191806..d26161a226 100644 --- a/ext/standard/tests/file/copy_variation5-win32.phpt +++ b/ext/standard/tests/file/copy_variation5-win32.phpt @@ -73,12 +73,10 @@ foreach($dest_files as $dest_file) { echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation5.tmp"); ?> - --EXPECTF-- *** Test copy() function: checking case sensitivity in creation of destination file names *** Size of the source file before copy operation => int(1500) diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt index df13f4bd1a..5a577508e7 100644 --- a/ext/standard/tests/file/copy_variation5.phpt +++ b/ext/standard/tests/file/copy_variation5.phpt @@ -72,12 +72,10 @@ foreach($dest_files as $dest_file) { echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_variation5.tmp"); ?> - --EXPECTF-- *** Test copy() function: checking case sensitivity in creation of destination file names *** Size of the source file before copy operation => int(1500) diff --git a/ext/standard/tests/file/copy_variation6-win32.phpt b/ext/standard/tests/file/copy_variation6-win32.phpt index 9d4fb9d9c9..a65b63f3b0 100644 --- a/ext/standard/tests/file/copy_variation6-win32.phpt +++ b/ext/standard/tests/file/copy_variation6-win32.phpt @@ -80,7 +80,6 @@ rmdir($base_dir); echo "*** Done ***\n"; ?> - --EXPECTF-- *** Test copy() function: copying file across directories *** Size of source file => int(0) diff --git a/ext/standard/tests/file/copy_variation6.phpt b/ext/standard/tests/file/copy_variation6.phpt index 2ce9bb3072..15de119035 100644 --- a/ext/standard/tests/file/copy_variation6.phpt +++ b/ext/standard/tests/file/copy_variation6.phpt @@ -78,7 +78,6 @@ rmdir($base_dir); echo "*** Done ***\n"; ?> - --EXPECTF-- *** Test copy() function: copying file across directories *** Size of source file => int(0) diff --git a/ext/standard/tests/file/copy_variation7.phpt b/ext/standard/tests/file/copy_variation7.phpt index 474d33bc49..8a0fae01e3 100644 --- a/ext/standard/tests/file/copy_variation7.phpt +++ b/ext/standard/tests/file/copy_variation7.phpt @@ -5,7 +5,6 @@ Test copy() function: usage variations - links if(substr(PHP_OS, 0, 3) == "WIN") die("skip Invalid for Windows"); ?> - --FILE-- <?php /* Prototype: bool copy ( string $source, string $dest ); @@ -54,7 +53,6 @@ clearstatcache(); echo "*** Done ***\n"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -64,7 +62,6 @@ unlink($file_path."/copy_variation7_symlink.tmp"); unlink($file_path."/copy_variation7_hardlink.tmp"); unlink($file_path."/copy_variation7.tmp"); ?> - --EXPECTF-- *** Testing copy() with symlink and hardlink *** Size of source files => diff --git a/ext/standard/tests/file/copy_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt index e2817aaef3..c6cb309433 100644 --- a/ext/standard/tests/file/copy_variation9.phpt +++ b/ext/standard/tests/file/copy_variation9.phpt @@ -50,7 +50,6 @@ var_dump( filesize($dest_file_name) ); echo "*** Done ***\n"; ?> - --CLEAN-- <?php unlink(dirname(__FILE__)."/copy_copy_variation9.tmp"); diff --git a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt index 1e7f016e7f..2c3aea79cf 100644 --- a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt +++ b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt @@ -10,4 +10,4 @@ closedir($h); ===DONE=== --EXPECT-- bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/dirname_basic.phpt b/ext/standard/tests/file/dirname_basic.phpt index 2ae0c82c79..74d0a14e9e 100644 --- a/ext/standard/tests/file/dirname_basic.phpt +++ b/ext/standard/tests/file/dirname_basic.phpt @@ -91,4 +91,3 @@ string(1) "." string(1) "/" string(1) "/" ===DONE=== - diff --git a/ext/standard/tests/file/dirname_error.phpt b/ext/standard/tests/file/dirname_error.phpt index 4181823b92..931373b966 100644 --- a/ext/standard/tests/file/dirname_error.phpt +++ b/ext/standard/tests/file/dirname_error.phpt @@ -37,4 +37,3 @@ NULL Warning: dirname() expects at most 2 parameters, 3 given in %s on line %d NULL ===DONE=== - diff --git a/ext/standard/tests/file/dirname_variation1.phpt b/ext/standard/tests/file/dirname_variation1.phpt index fd7aec1210..5e97982a9a 100644 --- a/ext/standard/tests/file/dirname_variation1.phpt +++ b/ext/standard/tests/file/dirname_variation1.phpt @@ -187,4 +187,3 @@ string(0) "" --unset var-- string(0) "" ===DONE=== - diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt index 9dbbea4e31..4ab48604ad 100644 --- a/ext/standard/tests/file/disk_free_space_basic.phpt +++ b/ext/standard/tests/file/disk_free_space_basic.phpt @@ -49,14 +49,12 @@ var_dump( disk_free_space(b"$file_path") ); echo"\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); unlink($file_path."/disk_free_space/disk_free_space.tmp"); rmdir($file_path."/disk_free_space"); ?> - --EXPECTF-- *** Testing with existing directory *** float(%d) diff --git a/ext/standard/tests/file/disk_free_space_error-win32.phpt b/ext/standard/tests/file/disk_free_space_error-win32.phpt index 27a1c0def6..acb0fdd717 100644 --- a/ext/standard/tests/file/disk_free_space_error-win32.phpt +++ b/ext/standard/tests/file/disk_free_space_error-win32.phpt @@ -72,4 +72,3 @@ Warning: diskfreespace(): The directory name is invalid. bool(false) -- Done -- - diff --git a/ext/standard/tests/file/disk_free_space_error.phpt b/ext/standard/tests/file/disk_free_space_error.phpt index a62954c74f..6433cde702 100644 --- a/ext/standard/tests/file/disk_free_space_error.phpt +++ b/ext/standard/tests/file/disk_free_space_error.phpt @@ -64,4 +64,3 @@ float(%d) float(%d) -- Done -- - diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt index e59079eac0..6c6575d896 100644 --- a/ext/standard/tests/file/disk_free_space_variation.phpt +++ b/ext/standard/tests/file/disk_free_space_variation.phpt @@ -55,14 +55,11 @@ foreach($dirs_arr as $dir1) { echo"\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); rmdir($file_path."/disk_free_space"); ?> - - --EXPECTF-- *** Testing with a directory *** float(%d) diff --git a/ext/standard/tests/file/disk_total_space_basic.phpt b/ext/standard/tests/file/disk_total_space_basic.phpt index b2cb79edfd..52c46e7785 100644 --- a/ext/standard/tests/file/disk_total_space_basic.phpt +++ b/ext/standard/tests/file/disk_total_space_basic.phpt @@ -35,7 +35,6 @@ $file_path = dirname(__FILE__); unlink($file_path."/disk_total_space/disk_total_space.tmp"); rmdir($file_path."/disk_total_space"); ?> - --EXPECTF-- *** Testing with normal directory *** float(%d) diff --git a/ext/standard/tests/file/disk_total_space_error-win32.phpt b/ext/standard/tests/file/disk_total_space_error-win32.phpt index 3fe54b5320..0d511b37a7 100644 --- a/ext/standard/tests/file/disk_total_space_error-win32.phpt +++ b/ext/standard/tests/file/disk_total_space_error-win32.phpt @@ -53,4 +53,3 @@ Warning: disk_total_space(): The directory name is invalid. bool(false) --- Done --- - diff --git a/ext/standard/tests/file/disk_total_space_error.phpt b/ext/standard/tests/file/disk_total_space_error.phpt index de37851d26..2c8a940117 100644 --- a/ext/standard/tests/file/disk_total_space_error.phpt +++ b/ext/standard/tests/file/disk_total_space_error.phpt @@ -49,4 +49,3 @@ bool(false) float(%d) --- Done --- - diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt index 4e94774a74..071fa60749 100644 --- a/ext/standard/tests/file/disk_total_space_variation.phpt +++ b/ext/standard/tests/file/disk_total_space_variation.phpt @@ -58,14 +58,11 @@ var_dump( disk_total_space(b"$file_path") ); echo"\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); rmdir($file_path."/disk_total_space"); ?> - - --EXPECTF-- *** Testing with a directory *** float(%d) diff --git a/ext/standard/tests/file/fflush_basic.phpt b/ext/standard/tests/file/fflush_basic.phpt index 962c774637..22a62ed1b0 100644 --- a/ext/standard/tests/file/fflush_basic.phpt +++ b/ext/standard/tests/file/fflush_basic.phpt @@ -36,14 +36,12 @@ var_dump( is_bool($return_value) ); fclose($file_handle); echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); $filename = "$file_path/fflush_basic.tmp"; unlink($filename); ?> - --EXPECT-- *** Testing fflush(): writing to a file and reading the contents *** int(63) diff --git a/ext/standard/tests/file/fflush_error.phpt b/ext/standard/tests/file/fflush_error.phpt index 8882f227ea..4bb1542962 100644 --- a/ext/standard/tests/file/fflush_error.phpt +++ b/ext/standard/tests/file/fflush_error.phpt @@ -43,13 +43,11 @@ for($loop_counter = 1; $loop_counter <= count($invalid_args); $loop_counter++) { } echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); unlink("$file_path/fflush_error.tmp"); ?> - --EXPECTF-- *** Testing error conditions *** -- Testing fflush(): with zero argument -- @@ -87,4 +85,3 @@ Warning: fflush() expects parameter 1 to be resource, object given in %s on line bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt index 32d6657208..19349b4442 100644 --- a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt @@ -5,7 +5,6 @@ Test fflush() function: usage variations - files in different modes if( substr(PHP_OS, 0, 3) != "WIN" ) die("skip.. only for Windows"); ?> - --FILE-- <?php /* Prototype: bool fflush ( resource $handle ); @@ -528,4 +527,3 @@ bool(true) ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 int(50) *** Done *** - diff --git a/ext/standard/tests/file/fflush_variation1-win32.phpt b/ext/standard/tests/file/fflush_variation1-win32.phpt index 0d3dbc6ef1..3ebde9ef85 100644 --- a/ext/standard/tests/file/fflush_variation1-win32.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32.phpt @@ -5,7 +5,6 @@ Test fflush() function: usage variations - files in different modes if( substr(PHP_OS, 0, 3) != "WIN" ) die("skip.. only for Windows"); ?> - --FILE-- <?php /* Prototype: bool fflush ( resource $handle ); @@ -528,4 +527,3 @@ bool(true) ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 int(50) *** Done *** - diff --git a/ext/standard/tests/file/fflush_variation1.phpt b/ext/standard/tests/file/fflush_variation1.phpt index 441ed8e299..caadbf2de4 100644 --- a/ext/standard/tests/file/fflush_variation1.phpt +++ b/ext/standard/tests/file/fflush_variation1.phpt @@ -5,7 +5,6 @@ Test fflush() function: usage variations - files in different modes if( substr(PHP_OS, 0, 3) == "WIN" ) die("skip.. only for linux"); ?> - --FILE-- <?php /* Prototype: bool fflush ( resource $handle ); @@ -529,4 +528,3 @@ bool(true) ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 int(50) *** Done *** - diff --git a/ext/standard/tests/file/fflush_variation2.phpt b/ext/standard/tests/file/fflush_variation2.phpt index 09670e875b..39d29f699c 100644 --- a/ext/standard/tests/file/fflush_variation2.phpt +++ b/ext/standard/tests/file/fflush_variation2.phpt @@ -440,4 +440,3 @@ bool(true) ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 int(60) *** Done *** - diff --git a/ext/standard/tests/file/fflush_variation3.phpt b/ext/standard/tests/file/fflush_variation3.phpt index defce24159..1f13ee5c31 100644 --- a/ext/standard/tests/file/fflush_variation3.phpt +++ b/ext/standard/tests/file/fflush_variation3.phpt @@ -380,4 +380,3 @@ bool(true) ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 int(60) *** Done *** - diff --git a/ext/standard/tests/file/fflush_variation4.phpt b/ext/standard/tests/file/fflush_variation4.phpt index 9a0040ab73..823de4c56a 100644 --- a/ext/standard/tests/file/fflush_variation4.phpt +++ b/ext/standard/tests/file/fflush_variation4.phpt @@ -50,4 +50,3 @@ bool(true) bool(true) *** Done *** - diff --git a/ext/standard/tests/file/fgetc_basic.phpt b/ext/standard/tests/file/fgetc_basic.phpt index 01f01f2361..6db0d58c91 100644 --- a/ext/standard/tests/file/fgetc_basic.phpt +++ b/ext/standard/tests/file/fgetc_basic.phpt @@ -540,4 +540,4 @@ string(1) "l" int(6) bool(false) resource(%d) of type (stream) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt index e3380e0098..1a61108f41 100644 --- a/ext/standard/tests/file/fgetc_variation4.phpt +++ b/ext/standard/tests/file/fgetc_variation4.phpt @@ -287,4 +287,4 @@ bool(false) string(1) " " int(7) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fgetcsv_variation11.phpt b/ext/standard/tests/file/fgetcsv_variation11.phpt index c555cf532a..ed15ae3e83 100644 --- a/ext/standard/tests/file/fgetcsv_variation11.phpt +++ b/ext/standard/tests/file/fgetcsv_variation11.phpt @@ -1832,4 +1832,4 @@ array(6) { } int(24) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fgetcsv_variation13.phpt b/ext/standard/tests/file/fgetcsv_variation13.phpt index b7c7b6b373..97edcab1c8 100644 --- a/ext/standard/tests/file/fgetcsv_variation13.phpt +++ b/ext/standard/tests/file/fgetcsv_variation13.phpt @@ -1,6 +1,5 @@ --TEST-- Test fgetcsv() : usage variations - with line without any csv fields - --FILE-- <?php /* diff --git a/ext/standard/tests/file/fgetcsv_variation20.phpt b/ext/standard/tests/file/fgetcsv_variation20.phpt index 5027d13a78..529fc89957 100644 --- a/ext/standard/tests/file/fgetcsv_variation20.phpt +++ b/ext/standard/tests/file/fgetcsv_variation20.phpt @@ -188,4 +188,4 @@ array(1) { } int(40) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fgets_basic.phpt b/ext/standard/tests/file/fgets_basic.phpt index d5610ce1ab..a8e8249aa8 100644 --- a/ext/standard/tests/file/fgets_basic.phpt +++ b/ext/standard/tests/file/fgets_basic.phpt @@ -315,4 +315,4 @@ bool(true) string(22) "ab12 ab12 ab12 ab12 ab" int(22) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt index 2a537b29a8..919343aa87 100644 --- a/ext/standard/tests/file/fgets_error.phpt +++ b/ext/standard/tests/file/fgets_error.phpt @@ -105,4 +105,3 @@ bool(false) Warning: fgets() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done - diff --git a/ext/standard/tests/file/fgets_variation2.phpt b/ext/standard/tests/file/fgets_variation2.phpt index fcd85ce6e0..0bbcf22039 100644 --- a/ext/standard/tests/file/fgets_variation2.phpt +++ b/ext/standard/tests/file/fgets_variation2.phpt @@ -60,4 +60,3 @@ Notice: Undefined variable: file_handle in %s on line %d Warning: fgets() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done - diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt index 8a64fbcbb0..d63ab8c268 100644 --- a/ext/standard/tests/file/fgets_variation3.phpt +++ b/ext/standard/tests/file/fgets_variation3.phpt @@ -497,4 +497,4 @@ int(0) string(22) "ab12 ab12 ab12 ab12 ab" int(22) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fgets_variation4.phpt b/ext/standard/tests/file/fgets_variation4.phpt index c858c8cb21..3a26dca477 100644 --- a/ext/standard/tests/file/fgets_variation4.phpt +++ b/ext/standard/tests/file/fgets_variation4.phpt @@ -571,4 +571,4 @@ int(25) string(19) "ab12 ab12 ab12 ab12" int(44) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fgets_variation5.phpt b/ext/standard/tests/file/fgets_variation5.phpt index c2ededf198..f474e45a1d 100644 --- a/ext/standard/tests/file/fgets_variation5.phpt +++ b/ext/standard/tests/file/fgets_variation5.phpt @@ -299,4 +299,4 @@ int(0) string(50) "ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 ab12 " int(50) bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fgets_variation6.phpt b/ext/standard/tests/file/fgets_variation6.phpt index 2bcec8a3bd..23e447db3b 100644 --- a/ext/standard/tests/file/fgets_variation6.phpt +++ b/ext/standard/tests/file/fgets_variation6.phpt @@ -369,4 +369,4 @@ bool(false) bool(false) int(50) bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/file_basic.phpt b/ext/standard/tests/file/file_basic.phpt index d93f7f84ed..3518968110 100644 --- a/ext/standard/tests/file/file_basic.phpt +++ b/ext/standard/tests/file/file_basic.phpt @@ -74,4 +74,3 @@ bool(true) bool(true) --- Done --- - diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt index 2456b80bcd..12148189e8 100644 --- a/ext/standard/tests/file/file_error.phpt +++ b/ext/standard/tests/file/file_error.phpt @@ -45,4 +45,3 @@ Warning: file(temp.tmp): failed to open stream: No such file or directory in %s bool(false) --- Done --- - diff --git a/ext/standard/tests/file/file_exists_error.phpt b/ext/standard/tests/file/file_exists_error.phpt index 7d98e4d0a5..e7544ac5fd 100644 --- a/ext/standard/tests/file/file_exists_error.phpt +++ b/ext/standard/tests/file/file_exists_error.phpt @@ -37,4 +37,3 @@ NULL Warning: file_exists() expects exactly 1 parameter, 2 given in %s on line %d NULL Done - diff --git a/ext/standard/tests/file/file_exists_variation1.phpt b/ext/standard/tests/file/file_exists_variation1.phpt index 697f8334ca..c3d4184724 100644 --- a/ext/standard/tests/file/file_exists_variation1.phpt +++ b/ext/standard/tests/file/file_exists_variation1.phpt @@ -19,7 +19,6 @@ var_dump(file_exists(' ')); var_dump(file_exists('|')); echo "Done"; ?> - --EXPECT-- *** Testing file_exists() : usage variations *** bool(false) @@ -27,4 +26,4 @@ bool(false) bool(false) bool(false) bool(false) -Done
\ No newline at end of file +Done 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 0cdfe5c197..4a604fa56d 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 @@ -1,6 +1,5 @@ --TEST-- Test file_get_contents() and file_put_contents() functions : usage variations - all arguments - --FILE-- <?php /* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, 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 24f1615afc..aa67869597 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 @@ -1,6 +1,5 @@ --TEST-- Test file_get_contents() and file_put_contents() functions : usage variations - use_include_path - --FILE-- <?php /* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt index 3443a4c62e..0ca7a6bf20 100644 --- a/ext/standard/tests/file/file_get_contents_variation4.phpt +++ b/ext/standard/tests/file/file_get_contents_variation4.phpt @@ -248,4 +248,4 @@ string(%d) "contents read" --stream context-- string(%d) "contents read" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt index baad767d6f..4f1dfac57b 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt @@ -112,4 +112,4 @@ bool(false) -- Iteration 12 -- string(%d) "contents read" -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt index f4bef2ec35..74e2cb4a6e 100644 --- a/ext/standard/tests/file/file_get_contents_variation9.phpt +++ b/ext/standard/tests/file/file_get_contents_variation9.phpt @@ -53,4 +53,3 @@ string(330) "Here is a repeated amount of dataHere is a repeated amount of dataH 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" *** Done *** - diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt index 6da2c0a416..74130007a7 100644 --- a/ext/standard/tests/file/file_put_contents_variation3.phpt +++ b/ext/standard/tests/file/file_put_contents_variation3.phpt @@ -247,4 +247,4 @@ int(13) --stream context-- int(13) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt Binary files differindex 20a2861bca..4aef0644f9 100644 --- a/ext/standard/tests/file/file_put_contents_variation8.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8.phpt diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt index 4eaffc330e..bd4366b945 100644 --- a/ext/standard/tests/file/file_variation.phpt +++ b/ext/standard/tests/file/file_variation.phpt @@ -53,7 +53,6 @@ fclose($file_handle2); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -157,4 +156,3 @@ array(1) { } --- Done --- - diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt index 6debeaac7e..f80ae0eeac 100644 --- a/ext/standard/tests/file/file_variation8-win32.phpt +++ b/ext/standard/tests/file/file_variation8-win32.phpt @@ -139,4 +139,4 @@ array(1) { string(13) "contents read" } -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/file_variation8.phpt b/ext/standard/tests/file/file_variation8.phpt index b4f1311ef0..49ab92a41c 100644 --- a/ext/standard/tests/file/file_variation8.phpt +++ b/ext/standard/tests/file/file_variation8.phpt @@ -125,4 +125,4 @@ array(1) { Warning: file(BADDIR/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/file_variation9.phpt b/ext/standard/tests/file/file_variation9.phpt index 415150dec0..dca79ff7b2 100644 --- a/ext/standard/tests/file/file_variation9.phpt +++ b/ext/standard/tests/file/file_variation9.phpt @@ -86,4 +86,4 @@ array(3) { " } -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/filegroup_basic.phpt b/ext/standard/tests/file/filegroup_basic.phpt index 2c8216a0ad..5defbbb2e9 100644 --- a/ext/standard/tests/file/filegroup_basic.phpt +++ b/ext/standard/tests/file/filegroup_basic.phpt @@ -41,7 +41,6 @@ var_dump( filegroup("/") ); echo "\n*** Done ***\n"; ?> - --CLEAN-- <?php @@ -51,7 +50,6 @@ $dir_name = $file_path."/filegroup_basic"; unlink($file_name); rmdir($dir_name); ?> - --EXPECTF-- *** Testing filegroup(): basic functionality *** -- Testing with the file or directory created by owner -- diff --git a/ext/standard/tests/file/filegroup_error.phpt b/ext/standard/tests/file/filegroup_error.phpt index 3d96ffdaf0..e32711cd5b 100644 --- a/ext/standard/tests/file/filegroup_error.phpt +++ b/ext/standard/tests/file/filegroup_error.phpt @@ -21,7 +21,6 @@ var_dump( filegroup("/no/such/file", "root") ); // args > expected echo "\n*** Done ***\n"; ?> - --EXPECTF-- *** Testing filegroup(): error conditions *** @@ -41,4 +40,3 @@ Warning: filegroup() expects exactly 1 parameter, 2 given in %s on line %d NULL *** Done *** - diff --git a/ext/standard/tests/file/filegroup_variation1.phpt b/ext/standard/tests/file/filegroup_variation1.phpt index 4b4a9aa00e..a41f5b2382 100644 --- a/ext/standard/tests/file/filegroup_variation1.phpt +++ b/ext/standard/tests/file/filegroup_variation1.phpt @@ -38,7 +38,6 @@ unlink($file_path."/filegroup_variation1_symlink.tmp"); unlink($file_path."/filegroup_variation1_link.tmp"); unlink($file_path."/filegroup_variation1.tmp"); ?> - --EXPECTF-- *** Testing filegroup() with links *** int(%d) diff --git a/ext/standard/tests/file/filegroup_variation2.phpt b/ext/standard/tests/file/filegroup_variation2.phpt index 966a9f43b7..809d61ba73 100644 --- a/ext/standard/tests/file/filegroup_variation2.phpt +++ b/ext/standard/tests/file/filegroup_variation2.phpt @@ -68,4 +68,3 @@ Warning: filegroup(): stat failed for 0 in %s on line %d bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fileinode_error.phpt b/ext/standard/tests/file/fileinode_error.phpt index 892121cc96..462ab62367 100644 --- a/ext/standard/tests/file/fileinode_error.phpt +++ b/ext/standard/tests/file/fileinode_error.phpt @@ -23,7 +23,6 @@ var_dump( fileinode() ); var_dump( fileinode(__FILE__, "string") ); echo "\n*** Done ***"; - --EXPECTF-- *** Testing error conditions of fileinode() *** Warning: fileinode(): stat failed for /no/such/file/dir in %s on line 10 diff --git a/ext/standard/tests/file/fileinode_variation.phpt b/ext/standard/tests/file/fileinode_variation.phpt index 9504766d9d..5f5cec47ed 100644 --- a/ext/standard/tests/file/fileinode_variation.phpt +++ b/ext/standard/tests/file/fileinode_variation.phpt @@ -85,7 +85,6 @@ rmdir("$file_path/dir/subdir"); rmdir("$file_path/dir"); echo "\n*** Done ***"; - --EXPECTF-- *** Testing fileinode() with files, links and directories *** -- Testing with files -- diff --git a/ext/standard/tests/file/fileinode_variation1.phpt b/ext/standard/tests/file/fileinode_variation1.phpt index 4961db19a6..c45bf3a5b2 100644 --- a/ext/standard/tests/file/fileinode_variation1.phpt +++ b/ext/standard/tests/file/fileinode_variation1.phpt @@ -39,7 +39,6 @@ unlink($file_path."/fileinode_variation1_symlink.tmp"); unlink($file_path."/fileinode_variation1_link.tmp"); unlink($file_path."/fileinode_variation1.tmp"); ?> - --EXPECTF-- *** Testing fileinode() with links *** int(%d) diff --git a/ext/standard/tests/file/fileinode_variation2.phpt b/ext/standard/tests/file/fileinode_variation2.phpt index 447c189e04..90c7eb19e3 100644 --- a/ext/standard/tests/file/fileinode_variation2.phpt +++ b/ext/standard/tests/file/fileinode_variation2.phpt @@ -69,4 +69,3 @@ Warning: fileinode(): stat failed for 0 in %s on line %d bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fileowner_basic.phpt b/ext/standard/tests/file/fileowner_basic.phpt index 05e4c16ef8..63ac59680e 100644 --- a/ext/standard/tests/file/fileowner_basic.phpt +++ b/ext/standard/tests/file/fileowner_basic.phpt @@ -29,7 +29,6 @@ var_dump( fileowner($dir_name) ); echo "*** Done ***\n"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -38,7 +37,6 @@ $dir_name = $file_path."/fileowner_basic"; unlink($file_name); rmdir($dir_name); ?> - --EXPECTF-- *** Testing fileowner(): basic functionality *** -- Testing with the file or directory created by owner -- @@ -48,4 +46,3 @@ int(%d) int(%d) int(%d) *** Done *** - diff --git a/ext/standard/tests/file/fileowner_error.phpt b/ext/standard/tests/file/fileowner_error.phpt index efffb36334..967a541cc0 100644 --- a/ext/standard/tests/file/fileowner_error.phpt +++ b/ext/standard/tests/file/fileowner_error.phpt @@ -21,7 +21,6 @@ var_dump( fileowner("/no/such/file", "root") ); // args > expected echo "\n*** Done ***\n"; ?> - --EXPECTF-- *** Testing fileowner(): error conditions *** @@ -41,4 +40,3 @@ Warning: fileowner() expects exactly 1 parameter, 2 given in %s on line %d NULL *** Done *** - diff --git a/ext/standard/tests/file/fileowner_variation1.phpt b/ext/standard/tests/file/fileowner_variation1.phpt index e40175d1bd..75873679ca 100644 --- a/ext/standard/tests/file/fileowner_variation1.phpt +++ b/ext/standard/tests/file/fileowner_variation1.phpt @@ -39,7 +39,6 @@ unlink($file_path."/fileowner_variation1_symlink.tmp"); unlink($file_path."/fileowner_variation1_link.tmp"); unlink($file_path."/fileowner_variation1.tmp"); ?> - --EXPECTF-- *** Testing fileowner() with links *** int(%d) diff --git a/ext/standard/tests/file/fileowner_variation2.phpt b/ext/standard/tests/file/fileowner_variation2.phpt index 83eeb6d5c0..131d43bfaa 100644 --- a/ext/standard/tests/file/fileowner_variation2.phpt +++ b/ext/standard/tests/file/fileowner_variation2.phpt @@ -69,4 +69,3 @@ Warning: fileowner(): stat failed for 0 in %s on line %d bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fileperms_variation1.phpt b/ext/standard/tests/file/fileperms_variation1.phpt index fdcedcac59..1fd5203e50 100644 --- a/ext/standard/tests/file/fileperms_variation1.phpt +++ b/ext/standard/tests/file/fileperms_variation1.phpt @@ -38,7 +38,6 @@ unlink($file_path."/fileperms_variation1_symlink.tmp"); unlink($file_path."/fileperms_variation1_link.tmp"); unlink($file_path."/fileperms_variation1.tmp"); ?> - --EXPECTF-- *** Testing fileperms() with links *** int(%d) diff --git a/ext/standard/tests/file/fileperms_variation2.phpt b/ext/standard/tests/file/fileperms_variation2.phpt index f9b190bcf8..6b1778e74e 100644 --- a/ext/standard/tests/file/fileperms_variation2.phpt +++ b/ext/standard/tests/file/fileperms_variation2.phpt @@ -68,4 +68,3 @@ Warning: fileperms(): stat failed for 0 in %s on line %d bool(false) *** Done *** - diff --git a/ext/standard/tests/file/filesize_basic.phpt b/ext/standard/tests/file/filesize_basic.phpt index 5a11259b6b..9cf0995035 100644 --- a/ext/standard/tests/file/filesize_basic.phpt +++ b/ext/standard/tests/file/filesize_basic.phpt @@ -36,4 +36,3 @@ int(%d) int(%d) int(0) *** Done *** - diff --git a/ext/standard/tests/file/filesize_error.phpt b/ext/standard/tests/file/filesize_error.phpt index 0060e66f55..9f721ff921 100644 --- a/ext/standard/tests/file/filesize_error.phpt +++ b/ext/standard/tests/file/filesize_error.phpt @@ -38,4 +38,3 @@ Warning: filesize() expects exactly 1 parameter, 2 given in %s on line %d NULL *** Done *** - diff --git a/ext/standard/tests/file/filesize_variation1.phpt b/ext/standard/tests/file/filesize_variation1.phpt index d8d3aff27a..6ee44159ce 100644 --- a/ext/standard/tests/file/filesize_variation1.phpt +++ b/ext/standard/tests/file/filesize_variation1.phpt @@ -28,7 +28,6 @@ for($size = 1; $size <10000; $size = $size+1000) } echo "Done\n"; - --EXPECTF-- *** Testing filesize(): usage variations *** *** Checking filesize() with different size of files *** diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index 451979e45b..19b2e6507e 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -146,4 +146,3 @@ file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d ===DONE=== - diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt index 00c2c82caa..8d8d36fe92 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -144,4 +144,3 @@ file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d ===DONE=== - diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt index 8c4c23fb30..73c5d68e76 100644 --- a/ext/standard/tests/file/fopen_variation14-win32.phpt +++ b/ext/standard/tests/file/fopen_variation14-win32.phpt @@ -186,4 +186,3 @@ test passed --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed ===DONE=== - diff --git a/ext/standard/tests/file/fopen_variation14.phpt b/ext/standard/tests/file/fopen_variation14.phpt index b62bedfe68..f1e37fdda0 100644 --- a/ext/standard/tests/file/fopen_variation14.phpt +++ b/ext/standard/tests/file/fopen_variation14.phpt @@ -131,4 +131,4 @@ Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): failed to open s test passed --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fopen_variation15-win32.phpt b/ext/standard/tests/file/fopen_variation15-win32.phpt index 0dd3d23857..52f69db746 100644 --- a/ext/standard/tests/file/fopen_variation15-win32.phpt +++ b/ext/standard/tests/file/fopen_variation15-win32.phpt @@ -190,4 +190,3 @@ test passed --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed ===DONE=== - diff --git a/ext/standard/tests/file/fopen_variation15.phpt b/ext/standard/tests/file/fopen_variation15.phpt index 3dca66841f..bad0a0b63c 100644 --- a/ext/standard/tests/file/fopen_variation15.phpt +++ b/ext/standard/tests/file/fopen_variation15.phpt @@ -135,4 +135,4 @@ Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): failed to open s test passed --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index ec33e1f0bf..b7e4e0a4cb 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -124,7 +124,6 @@ function test_fopen($mode) { ?> ===DONE=== --EXPECT-- - --- testing include path --- ** testing with mode=r ** @@ -148,4 +147,3 @@ in dir1 in working dir in script dir ===DONE=== - diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index b823709eac..221b6e62ef 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -123,7 +123,6 @@ function test_fopen($mode) { ?> ===DONE=== --EXPECT-- - --- testing include path --- ** testing with mode=r ** @@ -147,4 +146,3 @@ in dir1 in working dir in script dir ===DONE=== - diff --git a/ext/standard/tests/file/fpassthru_variation1.phpt b/ext/standard/tests/file/fpassthru_variation1.phpt index 655e2395b1..2df9b1ce20 100644 --- a/ext/standard/tests/file/fpassthru_variation1.phpt +++ b/ext/standard/tests/file/fpassthru_variation1.phpt @@ -221,4 +221,3 @@ Arg value Warning: fpassthru() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done - diff --git a/ext/standard/tests/file/fputcsv_002.phpt b/ext/standard/tests/file/fputcsv_002.phpt index bcf26fd89b..24105718d2 100644 --- a/ext/standard/tests/file/fputcsv_002.phpt +++ b/ext/standard/tests/file/fputcsv_002.phpt @@ -19,7 +19,6 @@ var_dump($data); $file = dirname(__FILE__) .'/fgetcsv-test.csv'; unlink($file); ?> - --EXPECTF-- Notice: Array to string conversion in %s on line %d array(7) { diff --git a/ext/standard/tests/file/fputcsv_error.phpt b/ext/standard/tests/file/fputcsv_error.phpt index 7cc3d351c7..779ffcc060 100644 --- a/ext/standard/tests/file/fputcsv_error.phpt +++ b/ext/standard/tests/file/fputcsv_error.phpt @@ -94,4 +94,3 @@ NULL Warning: fputcsv() expects parameter 1 to be resource, object given in %s on line %d NULL Done - diff --git a/ext/standard/tests/file/fputcsv_variation1.phpt b/ext/standard/tests/file/fputcsv_variation1.phpt index bad44ea0c3..41e6f02998 100644 --- a/ext/standard/tests/file/fputcsv_variation1.phpt +++ b/ext/standard/tests/file/fputcsv_variation1.phpt @@ -831,4 +831,3 @@ bool(false) string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& " Done - diff --git a/ext/standard/tests/file/fputcsv_variation10.phpt b/ext/standard/tests/file/fputcsv_variation10.phpt index 69fcadbfb6..085d72d0a0 100644 --- a/ext/standard/tests/file/fputcsv_variation10.phpt +++ b/ext/standard/tests/file/fputcsv_variation10.phpt @@ -333,4 +333,3 @@ bool(false) string(%d) " " Done - diff --git a/ext/standard/tests/file/fputcsv_variation11.phpt b/ext/standard/tests/file/fputcsv_variation11.phpt index 83e80adba2..07ae930fbd 100644 --- a/ext/standard/tests/file/fputcsv_variation11.phpt +++ b/ext/standard/tests/file/fputcsv_variation11.phpt @@ -831,4 +831,3 @@ bool(false) string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," " Done - diff --git a/ext/standard/tests/file/fputcsv_variation12.phpt b/ext/standard/tests/file/fputcsv_variation12.phpt index f177965686..dbf4fe9625 100644 --- a/ext/standard/tests/file/fputcsv_variation12.phpt +++ b/ext/standard/tests/file/fputcsv_variation12.phpt @@ -832,4 +832,3 @@ bool(false) string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," " Done - diff --git a/ext/standard/tests/file/fputcsv_variation13.phpt b/ext/standard/tests/file/fputcsv_variation13.phpt index 0518cb7435..04b321020c 100644 --- a/ext/standard/tests/file/fputcsv_variation13.phpt +++ b/ext/standard/tests/file/fputcsv_variation13.phpt @@ -1048,4 +1048,3 @@ bool(false) string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," " Done - diff --git a/ext/standard/tests/file/fputcsv_variation14.phpt b/ext/standard/tests/file/fputcsv_variation14.phpt index 2cbbf517ed..f7c885dd31 100644 --- a/ext/standard/tests/file/fputcsv_variation14.phpt +++ b/ext/standard/tests/file/fputcsv_variation14.phpt @@ -354,4 +354,3 @@ int(0) bool(false) string(0) "" Done - diff --git a/ext/standard/tests/file/fputcsv_variation2.phpt b/ext/standard/tests/file/fputcsv_variation2.phpt index 5cbaed0fdd..a486f57367 100644 --- a/ext/standard/tests/file/fputcsv_variation2.phpt +++ b/ext/standard/tests/file/fputcsv_variation2.phpt @@ -939,4 +939,3 @@ int(0) bool(false) string(0) "" Done - diff --git a/ext/standard/tests/file/fputcsv_variation3.phpt b/ext/standard/tests/file/fputcsv_variation3.phpt index f184ffabf2..0169f715ef 100644 --- a/ext/standard/tests/file/fputcsv_variation3.phpt +++ b/ext/standard/tests/file/fputcsv_variation3.phpt @@ -939,4 +939,3 @@ int(0) bool(false) string(0) "" Done - diff --git a/ext/standard/tests/file/fputcsv_variation4.phpt b/ext/standard/tests/file/fputcsv_variation4.phpt index 02c7485d7e..3d24d8502b 100644 --- a/ext/standard/tests/file/fputcsv_variation4.phpt +++ b/ext/standard/tests/file/fputcsv_variation4.phpt @@ -939,4 +939,3 @@ int(0) bool(false) string(0) "" Done - diff --git a/ext/standard/tests/file/fputcsv_variation5.phpt b/ext/standard/tests/file/fputcsv_variation5.phpt index 49f6d81d10..d97cd12582 100644 --- a/ext/standard/tests/file/fputcsv_variation5.phpt +++ b/ext/standard/tests/file/fputcsv_variation5.phpt @@ -831,4 +831,3 @@ bool(false) string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," " Done - diff --git a/ext/standard/tests/file/fputcsv_variation6.phpt b/ext/standard/tests/file/fputcsv_variation6.phpt index 5de601707c..ac1d0ce19a 100644 --- a/ext/standard/tests/file/fputcsv_variation6.phpt +++ b/ext/standard/tests/file/fputcsv_variation6.phpt @@ -834,4 +834,3 @@ bool(false) string(%d) "&""""&:&"&:,:":&,&:,,,, " Done - diff --git a/ext/standard/tests/file/fputcsv_variation7.phpt b/ext/standard/tests/file/fputcsv_variation7.phpt index 789825de52..ecd8a6bd54 100644 --- a/ext/standard/tests/file/fputcsv_variation7.phpt +++ b/ext/standard/tests/file/fputcsv_variation7.phpt @@ -834,4 +834,3 @@ bool(false) string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,& " Done - diff --git a/ext/standard/tests/file/fputcsv_variation8.phpt b/ext/standard/tests/file/fputcsv_variation8.phpt index 74c10852d8..e234f736f6 100644 --- a/ext/standard/tests/file/fputcsv_variation8.phpt +++ b/ext/standard/tests/file/fputcsv_variation8.phpt @@ -834,4 +834,3 @@ bool(false) string(%d) "+&""""&:&"&:,:":&,&:,,,,+ " Done - diff --git a/ext/standard/tests/file/fputcsv_variation9.phpt b/ext/standard/tests/file/fputcsv_variation9.phpt index c4c560971a..ba14c54ba1 100644 --- a/ext/standard/tests/file/fputcsv_variation9.phpt +++ b/ext/standard/tests/file/fputcsv_variation9.phpt @@ -1265,4 +1265,3 @@ bool(false) string(%d) "&""""&:&"&:,:":&,&:,,,, " Done - diff --git a/ext/standard/tests/file/fread_fwrite_basic.phpt b/ext/standard/tests/file/fread_fwrite_basic.phpt index d930e55a71..1b47d4ddd2 100644 --- a/ext/standard/tests/file/fread_fwrite_basic.phpt +++ b/ext/standard/tests/file/fread_fwrite_basic.phpt @@ -69,4 +69,4 @@ bool(true) bool(true) bool(true) last bytes: xtra -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fread_variation1.phpt b/ext/standard/tests/file/fread_variation1.phpt index 4066cadafe..143f3bd123 100644 --- a/ext/standard/tests/file/fread_variation1.phpt +++ b/ext/standard/tests/file/fread_variation1.phpt @@ -654,4 +654,4 @@ Reading 1000 bytes from file, expecting 1000 bytes ... OK int(1000) bool(false) string(32) "a49d752f980184c7f44568e930f89c72" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fread_variation3-win32.phpt b/ext/standard/tests/file/fread_variation3-win32.phpt index e450437cb3..44d6ebd697 100644 --- a/ext/standard/tests/file/fread_variation3-win32.phpt +++ b/ext/standard/tests/file/fread_variation3-win32.phpt @@ -495,4 +495,4 @@ bool(false) Reading 10 bytes from file, expecting 0 bytes ... OK int(1137) bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fread_variation3.phpt b/ext/standard/tests/file/fread_variation3.phpt index af5f5e2329..cd03ec2197 100644 --- a/ext/standard/tests/file/fread_variation3.phpt +++ b/ext/standard/tests/file/fread_variation3.phpt @@ -495,4 +495,4 @@ bool(false) Reading 10 bytes from file, expecting 0 bytes ... OK int(1024) bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fread_variation4-win32.phpt b/ext/standard/tests/file/fread_variation4-win32.phpt index 6c6ad7ec18..6de3bc571f 100644 --- a/ext/standard/tests/file/fread_variation4-win32.phpt +++ b/ext/standard/tests/file/fread_variation4-win32.phpt @@ -466,4 +466,4 @@ bool(false) Reading 10 bytes from file, expecting 0 bytes ... OK int(1137) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fread_variation4.phpt b/ext/standard/tests/file/fread_variation4.phpt index aa5ad51ba4..a77fc56517 100644 --- a/ext/standard/tests/file/fread_variation4.phpt +++ b/ext/standard/tests/file/fread_variation4.phpt @@ -466,4 +466,4 @@ bool(false) Reading 10 bytes from file, expecting 0 bytes ... OK int(1024) bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt index fe351960dd..db2a881d6c 100644 --- a/ext/standard/tests/file/fscanf_error.phpt +++ b/ext/standard/tests/file/fscanf_error.phpt @@ -1,6 +1,5 @@ --TEST-- Test fscanf() function: error conditions - --FILE-- <?php /* diff --git a/ext/standard/tests/file/fscanf_variation1.phpt b/ext/standard/tests/file/fscanf_variation1.phpt index e421792007..d9ccf22192 100644 --- a/ext/standard/tests/file/fscanf_variation1.phpt +++ b/ext/standard/tests/file/fscanf_variation1.phpt @@ -47,4 +47,3 @@ array(1) { } *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation10.phpt b/ext/standard/tests/file/fscanf_variation10.phpt index 9ab441610c..da3afc3e12 100644 --- a/ext/standard/tests/file/fscanf_variation10.phpt +++ b/ext/standard/tests/file/fscanf_variation10.phpt @@ -219,4 +219,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation11.phpt b/ext/standard/tests/file/fscanf_variation11.phpt index 7b5168011f..c6f16ca7fb 100644 --- a/ext/standard/tests/file/fscanf_variation11.phpt +++ b/ext/standard/tests/file/fscanf_variation11.phpt @@ -710,4 +710,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation12.phpt b/ext/standard/tests/file/fscanf_variation12.phpt index 8968fc3397..4848a7e030 100644 --- a/ext/standard/tests/file/fscanf_variation12.phpt +++ b/ext/standard/tests/file/fscanf_variation12.phpt @@ -943,4 +943,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation13.phpt b/ext/standard/tests/file/fscanf_variation13.phpt index 89da5567f4..b0d79bc3a8 100644 --- a/ext/standard/tests/file/fscanf_variation13.phpt +++ b/ext/standard/tests/file/fscanf_variation13.phpt @@ -243,4 +243,3 @@ NULL bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation14.phpt b/ext/standard/tests/file/fscanf_variation14.phpt index a49e8391df..7d28d509d1 100644 --- a/ext/standard/tests/file/fscanf_variation14.phpt +++ b/ext/standard/tests/file/fscanf_variation14.phpt @@ -1076,4 +1076,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation15.phpt b/ext/standard/tests/file/fscanf_variation15.phpt index a6dc720b91..4ca91ac1fc 100644 --- a/ext/standard/tests/file/fscanf_variation15.phpt +++ b/ext/standard/tests/file/fscanf_variation15.phpt @@ -860,4 +860,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation16.phpt b/ext/standard/tests/file/fscanf_variation16.phpt index df4ebaa476..a6a7ba7557 100644 --- a/ext/standard/tests/file/fscanf_variation16.phpt +++ b/ext/standard/tests/file/fscanf_variation16.phpt @@ -218,4 +218,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation17.phpt b/ext/standard/tests/file/fscanf_variation17.phpt index 899d558057..3b6051c4e6 100644 --- a/ext/standard/tests/file/fscanf_variation17.phpt +++ b/ext/standard/tests/file/fscanf_variation17.phpt @@ -709,4 +709,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation18.phpt b/ext/standard/tests/file/fscanf_variation18.phpt index 5babc5479f..6f9fa8099c 100644 --- a/ext/standard/tests/file/fscanf_variation18.phpt +++ b/ext/standard/tests/file/fscanf_variation18.phpt @@ -1011,4 +1011,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation19.phpt b/ext/standard/tests/file/fscanf_variation19.phpt index 0cf07076fe..db4573961a 100644 --- a/ext/standard/tests/file/fscanf_variation19.phpt +++ b/ext/standard/tests/file/fscanf_variation19.phpt @@ -247,4 +247,3 @@ NULL bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation2.phpt b/ext/standard/tests/file/fscanf_variation2.phpt index b79b96ba4e..19b60ab8e2 100644 --- a/ext/standard/tests/file/fscanf_variation2.phpt +++ b/ext/standard/tests/file/fscanf_variation2.phpt @@ -1005,4 +1005,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation20.phpt b/ext/standard/tests/file/fscanf_variation20.phpt index 421f75067d..928cb34d8b 100644 --- a/ext/standard/tests/file/fscanf_variation20.phpt +++ b/ext/standard/tests/file/fscanf_variation20.phpt @@ -1009,4 +1009,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation21.phpt b/ext/standard/tests/file/fscanf_variation21.phpt index 42e05aaf04..0e714a2e7a 100644 --- a/ext/standard/tests/file/fscanf_variation21.phpt +++ b/ext/standard/tests/file/fscanf_variation21.phpt @@ -860,4 +860,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation22.phpt b/ext/standard/tests/file/fscanf_variation22.phpt index 50bb9e0d1d..2aecf79bca 100644 --- a/ext/standard/tests/file/fscanf_variation22.phpt +++ b/ext/standard/tests/file/fscanf_variation22.phpt @@ -218,4 +218,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation23.phpt b/ext/standard/tests/file/fscanf_variation23.phpt index d429377e70..b5702106b6 100644 --- a/ext/standard/tests/file/fscanf_variation23.phpt +++ b/ext/standard/tests/file/fscanf_variation23.phpt @@ -709,4 +709,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation24.phpt b/ext/standard/tests/file/fscanf_variation24.phpt index 8be8354023..decbd03306 100644 --- a/ext/standard/tests/file/fscanf_variation24.phpt +++ b/ext/standard/tests/file/fscanf_variation24.phpt @@ -991,4 +991,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation25.phpt b/ext/standard/tests/file/fscanf_variation25.phpt index c8391d8388..03fb953fe8 100644 --- a/ext/standard/tests/file/fscanf_variation25.phpt +++ b/ext/standard/tests/file/fscanf_variation25.phpt @@ -291,4 +291,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation26.phpt b/ext/standard/tests/file/fscanf_variation26.phpt index 788427188c..faaed9b2ea 100644 --- a/ext/standard/tests/file/fscanf_variation26.phpt +++ b/ext/standard/tests/file/fscanf_variation26.phpt @@ -353,4 +353,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation27.phpt b/ext/standard/tests/file/fscanf_variation27.phpt index 3e44d643ee..e4db0b7105 100644 --- a/ext/standard/tests/file/fscanf_variation27.phpt +++ b/ext/standard/tests/file/fscanf_variation27.phpt @@ -1010,4 +1010,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation29.phpt b/ext/standard/tests/file/fscanf_variation29.phpt index 80b52654db..def96aca51 100644 --- a/ext/standard/tests/file/fscanf_variation29.phpt +++ b/ext/standard/tests/file/fscanf_variation29.phpt @@ -219,4 +219,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation3.phpt b/ext/standard/tests/file/fscanf_variation3.phpt index 8ea8c8674a..68d50e97a4 100644 --- a/ext/standard/tests/file/fscanf_variation3.phpt +++ b/ext/standard/tests/file/fscanf_variation3.phpt @@ -862,4 +862,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation30.phpt b/ext/standard/tests/file/fscanf_variation30.phpt index 7303454175..0d0639344f 100644 --- a/ext/standard/tests/file/fscanf_variation30.phpt +++ b/ext/standard/tests/file/fscanf_variation30.phpt @@ -710,4 +710,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation31.phpt b/ext/standard/tests/file/fscanf_variation31.phpt index 6ba47b6a51..335bbcac52 100644 --- a/ext/standard/tests/file/fscanf_variation31.phpt +++ b/ext/standard/tests/file/fscanf_variation31.phpt @@ -943,4 +943,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation32.phpt b/ext/standard/tests/file/fscanf_variation32.phpt index b1f0b248b5..b9fb3a286f 100644 --- a/ext/standard/tests/file/fscanf_variation32.phpt +++ b/ext/standard/tests/file/fscanf_variation32.phpt @@ -248,4 +248,3 @@ NULL bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt index b1a2eaa703..75379361e6 100644 --- a/ext/standard/tests/file/fscanf_variation33.phpt +++ b/ext/standard/tests/file/fscanf_variation33.phpt @@ -1016,4 +1016,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation34.phpt b/ext/standard/tests/file/fscanf_variation34.phpt index 77437efc99..1d5ae68202 100644 --- a/ext/standard/tests/file/fscanf_variation34.phpt +++ b/ext/standard/tests/file/fscanf_variation34.phpt @@ -866,4 +866,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation35.phpt b/ext/standard/tests/file/fscanf_variation35.phpt index 0e98f95022..2910e030ff 100644 --- a/ext/standard/tests/file/fscanf_variation35.phpt +++ b/ext/standard/tests/file/fscanf_variation35.phpt @@ -214,4 +214,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation36.phpt b/ext/standard/tests/file/fscanf_variation36.phpt index 3bf065fde0..7f52bf5acd 100644 --- a/ext/standard/tests/file/fscanf_variation36.phpt +++ b/ext/standard/tests/file/fscanf_variation36.phpt @@ -705,4 +705,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation37.phpt b/ext/standard/tests/file/fscanf_variation37.phpt index 43668fff4f..47481b6dd1 100644 --- a/ext/standard/tests/file/fscanf_variation37.phpt +++ b/ext/standard/tests/file/fscanf_variation37.phpt @@ -943,4 +943,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation38.phpt b/ext/standard/tests/file/fscanf_variation38.phpt index 58327b867e..410fe768c2 100644 --- a/ext/standard/tests/file/fscanf_variation38.phpt +++ b/ext/standard/tests/file/fscanf_variation38.phpt @@ -243,4 +243,3 @@ NULL bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation39.phpt b/ext/standard/tests/file/fscanf_variation39.phpt index 42a8c515d8..b2eda4ab73 100644 --- a/ext/standard/tests/file/fscanf_variation39.phpt +++ b/ext/standard/tests/file/fscanf_variation39.phpt @@ -1011,4 +1011,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation4.phpt b/ext/standard/tests/file/fscanf_variation4.phpt index b1ceb085f3..20656d9f56 100644 --- a/ext/standard/tests/file/fscanf_variation4.phpt +++ b/ext/standard/tests/file/fscanf_variation4.phpt @@ -215,4 +215,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation40.phpt b/ext/standard/tests/file/fscanf_variation40.phpt index 1324007561..53245e6519 100644 --- a/ext/standard/tests/file/fscanf_variation40.phpt +++ b/ext/standard/tests/file/fscanf_variation40.phpt @@ -862,4 +862,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation41.phpt b/ext/standard/tests/file/fscanf_variation41.phpt index 507eac335c..62e8de46d7 100644 --- a/ext/standard/tests/file/fscanf_variation41.phpt +++ b/ext/standard/tests/file/fscanf_variation41.phpt @@ -214,4 +214,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation42.phpt b/ext/standard/tests/file/fscanf_variation42.phpt index fc8f8b89ca..6f993ae56a 100644 --- a/ext/standard/tests/file/fscanf_variation42.phpt +++ b/ext/standard/tests/file/fscanf_variation42.phpt @@ -705,4 +705,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation43.phpt b/ext/standard/tests/file/fscanf_variation43.phpt index e77ea08cfc..4d4197d70f 100644 --- a/ext/standard/tests/file/fscanf_variation43.phpt +++ b/ext/standard/tests/file/fscanf_variation43.phpt @@ -943,4 +943,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation44.phpt b/ext/standard/tests/file/fscanf_variation44.phpt index fa51b5bca4..37ee0274d4 100644 --- a/ext/standard/tests/file/fscanf_variation44.phpt +++ b/ext/standard/tests/file/fscanf_variation44.phpt @@ -243,4 +243,3 @@ NULL bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation45.phpt b/ext/standard/tests/file/fscanf_variation45.phpt index 533b200c7e..faf4820160 100644 --- a/ext/standard/tests/file/fscanf_variation45.phpt +++ b/ext/standard/tests/file/fscanf_variation45.phpt @@ -1005,4 +1005,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation46.phpt b/ext/standard/tests/file/fscanf_variation46.phpt index c3cd8e0b7b..4206e37730 100644 --- a/ext/standard/tests/file/fscanf_variation46.phpt +++ b/ext/standard/tests/file/fscanf_variation46.phpt @@ -856,4 +856,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation47.phpt b/ext/standard/tests/file/fscanf_variation47.phpt index cf30d4b9c2..362f7cbe73 100644 --- a/ext/standard/tests/file/fscanf_variation47.phpt +++ b/ext/standard/tests/file/fscanf_variation47.phpt @@ -214,4 +214,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation49.phpt b/ext/standard/tests/file/fscanf_variation49.phpt index a681cc01e3..ba5b77a7b4 100644 --- a/ext/standard/tests/file/fscanf_variation49.phpt +++ b/ext/standard/tests/file/fscanf_variation49.phpt @@ -943,4 +943,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation5.phpt b/ext/standard/tests/file/fscanf_variation5.phpt index a39d0b8ae1..44f59a0a23 100644 --- a/ext/standard/tests/file/fscanf_variation5.phpt +++ b/ext/standard/tests/file/fscanf_variation5.phpt @@ -705,4 +705,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation50.phpt b/ext/standard/tests/file/fscanf_variation50.phpt index af406a147a..9c659d8a2d 100644 --- a/ext/standard/tests/file/fscanf_variation50.phpt +++ b/ext/standard/tests/file/fscanf_variation50.phpt @@ -243,4 +243,3 @@ NULL bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation51.phpt b/ext/standard/tests/file/fscanf_variation51.phpt index 46663364d0..93fd4d545c 100644 --- a/ext/standard/tests/file/fscanf_variation51.phpt +++ b/ext/standard/tests/file/fscanf_variation51.phpt @@ -150,4 +150,3 @@ bool(false) bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation52.phpt b/ext/standard/tests/file/fscanf_variation52.phpt index 974ddef8f1..92e9cf27d5 100644 --- a/ext/standard/tests/file/fscanf_variation52.phpt +++ b/ext/standard/tests/file/fscanf_variation52.phpt @@ -175,4 +175,3 @@ bool(false) bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation53.phpt b/ext/standard/tests/file/fscanf_variation53.phpt index 3cd273488d..874385f6b3 100644 --- a/ext/standard/tests/file/fscanf_variation53.phpt +++ b/ext/standard/tests/file/fscanf_variation53.phpt @@ -226,4 +226,3 @@ bool(false) bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation54.phpt b/ext/standard/tests/file/fscanf_variation54.phpt index 72ba7c84a2..2d50f32cf0 100644 --- a/ext/standard/tests/file/fscanf_variation54.phpt +++ b/ext/standard/tests/file/fscanf_variation54.phpt @@ -98,4 +98,3 @@ array(1) { } *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation55.phpt b/ext/standard/tests/file/fscanf_variation55.phpt index ef34fb16d5..829eba46fa 100644 --- a/ext/standard/tests/file/fscanf_variation55.phpt +++ b/ext/standard/tests/file/fscanf_variation55.phpt @@ -1688,4 +1688,3 @@ int(68) bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation6.phpt b/ext/standard/tests/file/fscanf_variation6.phpt index 0a6c908b2d..71992c327c 100644 --- a/ext/standard/tests/file/fscanf_variation6.phpt +++ b/ext/standard/tests/file/fscanf_variation6.phpt @@ -943,4 +943,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation7.phpt b/ext/standard/tests/file/fscanf_variation7.phpt index 6466193820..8f0c5aff97 100644 --- a/ext/standard/tests/file/fscanf_variation7.phpt +++ b/ext/standard/tests/file/fscanf_variation7.phpt @@ -243,4 +243,3 @@ NULL bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation8.phpt b/ext/standard/tests/file/fscanf_variation8.phpt index aeb7eb78cc..adce2e2482 100644 --- a/ext/standard/tests/file/fscanf_variation8.phpt +++ b/ext/standard/tests/file/fscanf_variation8.phpt @@ -1611,4 +1611,3 @@ array(0) { bool(false) *** Done *** - diff --git a/ext/standard/tests/file/fscanf_variation9.phpt b/ext/standard/tests/file/fscanf_variation9.phpt index 331d8f9c2f..d1218c8a55 100644 --- a/ext/standard/tests/file/fscanf_variation9.phpt +++ b/ext/standard/tests/file/fscanf_variation9.phpt @@ -1012,4 +1012,3 @@ array(0) { bool(false) *** Done *** - 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 99324ed472..4b88ee0720 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 @@ -5,7 +5,6 @@ Test fseek(), ftell() & rewind() functions : basic functionality - all w and x m if( substr(PHP_OS, 0, 3) != "WIN" ) die("skip.. only valid for Windows"); ?> - --FILE-- <?php /* Prototype: int fseek ( resource $handle, int $offset [, int $whence] ); 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 79d565d3d1..278f640a6c 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt @@ -5,7 +5,6 @@ Test fseek(), ftell() & rewind() functions : basic functionality - all w and x m if( substr(PHP_OS, 0, 3) != "WIN" ) die("skip.. only valid for Windows"); ?> - --FILE-- <?php /* Prototype: int fseek ( resource $handle, int $offset [, int $whence] ); diff --git a/ext/standard/tests/file/fseek_variation1.phpt b/ext/standard/tests/file/fseek_variation1.phpt index 0dda585822..0736d232c8 100644 --- a/ext/standard/tests/file/fseek_variation1.phpt +++ b/ext/standard/tests/file/fseek_variation1.phpt @@ -195,4 +195,3 @@ Arg value int(0) int(0) Done - diff --git a/ext/standard/tests/file/fseek_variation2.phpt b/ext/standard/tests/file/fseek_variation2.phpt index 2a489358d5..38f9561394 100644 --- a/ext/standard/tests/file/fseek_variation2.phpt +++ b/ext/standard/tests/file/fseek_variation2.phpt @@ -158,4 +158,3 @@ Arg value int(0) int(3) Done - diff --git a/ext/standard/tests/file/fstat_basic.phpt b/ext/standard/tests/file/fstat_basic.phpt index a404929a25..e1f92a7926 100644 --- a/ext/standard/tests/file/fstat_basic.phpt +++ b/ext/standard/tests/file/fstat_basic.phpt @@ -62,4 +62,4 @@ array(26) { ["blocks"]=> int(%i) } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fstat_error.phpt b/ext/standard/tests/file/fstat_error.phpt index c3c15295dd..5eab97ce18 100644 --- a/ext/standard/tests/file/fstat_error.phpt +++ b/ext/standard/tests/file/fstat_error.phpt @@ -13,10 +13,9 @@ fclose($fp); ?> ===DONE=== --EXPECTF-- - Warning: fstat() expects exactly 1 parameter, 2 given in %s on line %d bool(false) Warning: fstat() expects exactly 1 parameter, 0 given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fstat_variation1.phpt b/ext/standard/tests/file/fstat_variation1.phpt index 14b7b31c4b..658eb74c24 100644 --- a/ext/standard/tests/file/fstat_variation1.phpt +++ b/ext/standard/tests/file/fstat_variation1.phpt @@ -19,7 +19,6 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- - Warning: fstat() expects parameter 1 to be resource, array given in %s on line %d bool(false) @@ -31,4 +30,4 @@ bool(false) Warning: fstat() expects parameter 1 to be resource, array given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fstat_variation2.phpt b/ext/standard/tests/file/fstat_variation2.phpt index e2aa865874..75e50589b3 100644 --- a/ext/standard/tests/file/fstat_variation2.phpt +++ b/ext/standard/tests/file/fstat_variation2.phpt @@ -16,7 +16,6 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- - Warning: fstat() expects parameter 1 to be resource, bool given in %s on line %d bool(false) @@ -28,4 +27,4 @@ bool(false) Warning: fstat() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fstat_variation3.phpt b/ext/standard/tests/file/fstat_variation3.phpt index 59de1bbfc1..829f5ba075 100644 --- a/ext/standard/tests/file/fstat_variation3.phpt +++ b/ext/standard/tests/file/fstat_variation3.phpt @@ -21,7 +21,6 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- - Warning: fstat() expects parameter 1 to be resource, null given in %s on line %d bool(false) @@ -39,4 +38,4 @@ bool(false) Warning: fstat() expects parameter 1 to be resource, null given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fstat_variation4.phpt b/ext/standard/tests/file/fstat_variation4.phpt index 66da94f552..1ea68382f7 100644 --- a/ext/standard/tests/file/fstat_variation4.phpt +++ b/ext/standard/tests/file/fstat_variation4.phpt @@ -17,7 +17,6 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- - Warning: fstat() expects parameter 1 to be resource, float given in %s on line %d bool(false) @@ -32,4 +31,4 @@ bool(false) Warning: fstat() expects parameter 1 to be resource, float given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fstat_variation5.phpt b/ext/standard/tests/file/fstat_variation5.phpt index 6478b39377..208109fe21 100644 --- a/ext/standard/tests/file/fstat_variation5.phpt +++ b/ext/standard/tests/file/fstat_variation5.phpt @@ -16,7 +16,6 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- - Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d bool(false) @@ -28,4 +27,4 @@ bool(false) Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fstat_variation6.phpt b/ext/standard/tests/file/fstat_variation6.phpt index 01f6d36199..c720c6f25a 100644 --- a/ext/standard/tests/file/fstat_variation6.phpt +++ b/ext/standard/tests/file/fstat_variation6.phpt @@ -43,4 +43,4 @@ Error: 2 - fstat() expects parameter 1 to be resource, object given, %s(%d) bool(false) Error: 2 - fstat() expects parameter 1 to be resource, object given, %s(%d) bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fstat_variation7.phpt b/ext/standard/tests/file/fstat_variation7.phpt index 5a55dceb9a..a95d2dd807 100644 --- a/ext/standard/tests/file/fstat_variation7.phpt +++ b/ext/standard/tests/file/fstat_variation7.phpt @@ -20,7 +20,6 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- - Warning: fstat() expects parameter 1 to be resource, string given in %s on line %d bool(false) @@ -32,4 +31,4 @@ bool(false) Warning: fstat() expects parameter 1 to be resource, string given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fstat_variation8.phpt b/ext/standard/tests/file/fstat_variation8.phpt index b493d4ec9c..c738b1bcaa 100644 --- a/ext/standard/tests/file/fstat_variation8.phpt +++ b/ext/standard/tests/file/fstat_variation8.phpt @@ -30,4 +30,4 @@ if ($failed !== true) { ===DONE=== --EXPECT-- PASSED: all elements are the same -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt index e63e96c38f..fa20f3c870 100644 --- a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt @@ -421,4 +421,4 @@ bool(false) bool(true) int(2148) string(32) "719e3329c19218c12d232f2ee81e100f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fwrite_basic-win32.phpt b/ext/standard/tests/file/fwrite_basic-win32.phpt index be6b8e758f..c922159327 100644 --- a/ext/standard/tests/file/fwrite_basic-win32.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32.phpt @@ -421,4 +421,4 @@ bool(false) bool(true) int(2148) string(32) "719e3329c19218c12d232f2ee81e100f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fwrite_basic.phpt b/ext/standard/tests/file/fwrite_basic.phpt index ebbfbd1ad7..e41d08c424 100644 --- a/ext/standard/tests/file/fwrite_basic.phpt +++ b/ext/standard/tests/file/fwrite_basic.phpt @@ -421,4 +421,4 @@ bool(false) bool(true) int(2148) string(32) "719e3329c19218c12d232f2ee81e100f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt index cc0ead07f0..f4f691be35 100644 --- a/ext/standard/tests/file/fwrite_error.phpt +++ b/ext/standard/tests/file/fwrite_error.phpt @@ -118,4 +118,3 @@ bool(false) Warning: fwrite() expects parameter 1 to be resource, null given in %s on line %d bool(false) Done - diff --git a/ext/standard/tests/file/fwrite_variation5.phpt b/ext/standard/tests/file/fwrite_variation5.phpt index 7afa91216e..ff1214c527 100644 --- a/ext/standard/tests/file/fwrite_variation5.phpt +++ b/ext/standard/tests/file/fwrite_variation5.phpt @@ -170,4 +170,3 @@ Error: 2 - fwrite() expects parameter 2 to be string, object given, %s(%d) --unset var-- ===DONE=== - diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt index 470982d9b8..d7701a5d6a 100644 --- a/ext/standard/tests/file/include_userstream_003.phpt +++ b/ext/standard/tests/file/include_userstream_003.phpt @@ -118,4 +118,4 @@ Warning: fopen(test1://hello): failed to open stream: no suitable wrapper could Warning: include(test2://hello): failed to open stream: "test::stream_open" call failed in %sinclude_userstream_003.php on line 89 -Warning: include(): Failed opening 'test2://hello' for inclusion (include_path='%s') in %sinclude_userstream_003.php on line 89
\ No newline at end of file +Warning: include(): Failed opening 'test2://hello' for inclusion (include_path='%s') in %sinclude_userstream_003.php on line 89 diff --git a/ext/standard/tests/file/is_dir_basic.phpt b/ext/standard/tests/file/is_dir_basic.phpt index c3d659b564..7582a502a7 100644 --- a/ext/standard/tests/file/is_dir_basic.phpt +++ b/ext/standard/tests/file/is_dir_basic.phpt @@ -30,7 +30,6 @@ $file_path = dirname(__FILE__); $dir_name = $file_path."/is_dir_basic"; rmdir($dir_name); ?> - --EXPECT-- *** Testing is_dir(): basic functionality *** bool(true) diff --git a/ext/standard/tests/file/is_dir_error.phpt b/ext/standard/tests/file/is_dir_error.phpt index 6040767686..0a23e46d52 100644 --- a/ext/standard/tests/file/is_dir_error.phpt +++ b/ext/standard/tests/file/is_dir_error.phpt @@ -19,7 +19,6 @@ var_dump( is_dir("/no/such/dir") ); echo "*** Done ***"; ?> - --CLEAN-- <?php rmdir(dirname(__FILE__)."/is_dir_error"); diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt index 2070374117..c1664165eb 100644 --- a/ext/standard/tests/file/is_dir_variation3.phpt +++ b/ext/standard/tests/file/is_dir_variation3.phpt @@ -48,4 +48,3 @@ bool(false) bool(false) *** Done *** - diff --git a/ext/standard/tests/file/is_executable_variation3.phpt b/ext/standard/tests/file/is_executable_variation3.phpt index b9f734d448..a804f66eb2 100644 --- a/ext/standard/tests/file/is_executable_variation3.phpt +++ b/ext/standard/tests/file/is_executable_variation3.phpt @@ -66,4 +66,3 @@ Warning: is_executable() expects parameter 1 to be a valid path, array given in NULL bool(false) Done - diff --git a/ext/standard/tests/file/is_file_error.phpt b/ext/standard/tests/file/is_file_error.phpt index abccb721a1..871b717bae 100644 --- a/ext/standard/tests/file/is_file_error.phpt +++ b/ext/standard/tests/file/is_file_error.phpt @@ -25,7 +25,6 @@ fclose($file_handle); echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/is_file_variation2.phpt b/ext/standard/tests/file/is_file_variation2.phpt index 6a871468d3..de5c52b05c 100644 --- a/ext/standard/tests/file/is_file_variation2.phpt +++ b/ext/standard/tests/file/is_file_variation2.phpt @@ -37,7 +37,6 @@ unlink($file_path."/is_file_variation2_symlink.tmp"); unlink($file_path."/is_file_variation2_link.tmp"); unlink($file_path."/is_file_variation2.tmp"); ?> - --EXPECT-- *** Testing is_file() with links *** bool(true) diff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt index 6a6d76f793..ec70371417 100644 --- a/ext/standard/tests/file/is_file_variation3.phpt +++ b/ext/standard/tests/file/is_file_variation3.phpt @@ -57,4 +57,3 @@ bool(false) bool(false) *** Done *** - diff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt index 3de5f1623e..74fc7af574 100644 --- a/ext/standard/tests/file/is_readable_variation3.phpt +++ b/ext/standard/tests/file/is_readable_variation3.phpt @@ -65,4 +65,3 @@ Warning: is_readable() expects parameter 1 to be a valid path, array given in %s NULL bool(false) Done - diff --git a/ext/standard/tests/file/is_uploaded_file_basic.phpt b/ext/standard/tests/file/is_uploaded_file_basic.phpt index 1907d390be..1721935549 100644 --- a/ext/standard/tests/file/is_uploaded_file_basic.phpt +++ b/ext/standard/tests/file/is_uploaded_file_basic.phpt @@ -45,4 +45,3 @@ NULL Warning: is_uploaded_file() expects exactly 1 parameter, 2 given in %s on line %d NULL - diff --git a/ext/standard/tests/file/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt index 6b79934760..3cc7a4da9d 100644 --- a/ext/standard/tests/file/is_writable_variation3.phpt +++ b/ext/standard/tests/file/is_writable_variation3.phpt @@ -75,4 +75,3 @@ NULL bool(false) bool(false) Done - diff --git a/ext/standard/tests/file/lstat_stat_variation1.phpt b/ext/standard/tests/file/lstat_stat_variation1.phpt index ca5f3eaeeb..68f526b5d0 100644 --- a/ext/standard/tests/file/lstat_stat_variation1.phpt +++ b/ext/standard/tests/file/lstat_stat_variation1.phpt @@ -45,7 +45,6 @@ clearstatcache(); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation10.phpt b/ext/standard/tests/file/lstat_stat_variation10.phpt index fe36697237..3a7c692881 100644 --- a/ext/standard/tests/file/lstat_stat_variation10.phpt +++ b/ext/standard/tests/file/lstat_stat_variation10.phpt @@ -43,7 +43,6 @@ var_dump( compare_stats($old_stat, $new_stat, $all_stat_keys) ); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation11.phpt b/ext/standard/tests/file/lstat_stat_variation11.phpt index 08a51c8423..975b1be55c 100644 --- a/ext/standard/tests/file/lstat_stat_variation11.phpt +++ b/ext/standard/tests/file/lstat_stat_variation11.phpt @@ -44,7 +44,6 @@ clearstatcache(); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation12.phpt b/ext/standard/tests/file/lstat_stat_variation12.phpt index 26c0e578b1..8ad7893286 100644 --- a/ext/standard/tests/file/lstat_stat_variation12.phpt +++ b/ext/standard/tests/file/lstat_stat_variation12.phpt @@ -49,7 +49,6 @@ clearstatcache(); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation13.phpt b/ext/standard/tests/file/lstat_stat_variation13.phpt index 311e1384e8..476c091ca1 100644 --- a/ext/standard/tests/file/lstat_stat_variation13.phpt +++ b/ext/standard/tests/file/lstat_stat_variation13.phpt @@ -43,7 +43,6 @@ var_dump( compare_stats($old_stat, $new_stat, $all_stat_keys) ); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation14.phpt b/ext/standard/tests/file/lstat_stat_variation14.phpt index 101bb6005c..6ddd7497e4 100644 --- a/ext/standard/tests/file/lstat_stat_variation14.phpt +++ b/ext/standard/tests/file/lstat_stat_variation14.phpt @@ -45,7 +45,6 @@ clearstatcache(); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation15.phpt b/ext/standard/tests/file/lstat_stat_variation15.phpt index 6a8dcb7146..903531db08 100644 --- a/ext/standard/tests/file/lstat_stat_variation15.phpt +++ b/ext/standard/tests/file/lstat_stat_variation15.phpt @@ -47,7 +47,6 @@ var_dump( compare_stats($old_stat, $new_stat, $all_stat_keys, "=") ); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation16.phpt b/ext/standard/tests/file/lstat_stat_variation16.phpt index 31c0e13ee6..056cec1c7d 100644 --- a/ext/standard/tests/file/lstat_stat_variation16.phpt +++ b/ext/standard/tests/file/lstat_stat_variation16.phpt @@ -42,7 +42,6 @@ var_dump( compare_stats($old_stat, $new_stat, $affected_members, "!=") ); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation17.phpt b/ext/standard/tests/file/lstat_stat_variation17.phpt index 78d4090870..51349f6a93 100644 --- a/ext/standard/tests/file/lstat_stat_variation17.phpt +++ b/ext/standard/tests/file/lstat_stat_variation17.phpt @@ -41,7 +41,6 @@ var_dump( compare_stats($old_stat, $new_stat, $affected_members, "!=") ); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation18.phpt b/ext/standard/tests/file/lstat_stat_variation18.phpt index 4ac01f2035..91a3ddcb6b 100644 --- a/ext/standard/tests/file/lstat_stat_variation18.phpt +++ b/ext/standard/tests/file/lstat_stat_variation18.phpt @@ -51,7 +51,6 @@ var_dump( stat($dir_name->var_name) ); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation19.phpt b/ext/standard/tests/file/lstat_stat_variation19.phpt index fedf0bd154..f3d1c303e6 100644 --- a/ext/standard/tests/file/lstat_stat_variation19.phpt +++ b/ext/standard/tests/file/lstat_stat_variation19.phpt @@ -52,7 +52,6 @@ var_dump( stat($names_with_key["dir"]) ); // value stored with string key echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation2.phpt b/ext/standard/tests/file/lstat_stat_variation2.phpt index 8c4a499510..52b817e5d0 100644 --- a/ext/standard/tests/file/lstat_stat_variation2.phpt +++ b/ext/standard/tests/file/lstat_stat_variation2.phpt @@ -46,7 +46,6 @@ clearstatcache(); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation20.phpt b/ext/standard/tests/file/lstat_stat_variation20.phpt index ad0f586f1b..26382fda53 100644 --- a/ext/standard/tests/file/lstat_stat_variation20.phpt +++ b/ext/standard/tests/file/lstat_stat_variation20.phpt @@ -54,7 +54,6 @@ var_dump( stat($link_array_with_key['linkname']) ); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation21.phpt b/ext/standard/tests/file/lstat_stat_variation21.phpt index 833cf1dabb..d339a988a8 100644 --- a/ext/standard/tests/file/lstat_stat_variation21.phpt +++ b/ext/standard/tests/file/lstat_stat_variation21.phpt @@ -49,7 +49,6 @@ var_dump( compare_stats($old_stat, $new_stat, $affected_members, '!=') ); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation4.phpt b/ext/standard/tests/file/lstat_stat_variation4.phpt index 1fccb95816..5046f70086 100644 --- a/ext/standard/tests/file/lstat_stat_variation4.phpt +++ b/ext/standard/tests/file/lstat_stat_variation4.phpt @@ -49,7 +49,6 @@ clearstatcache(); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation5.phpt b/ext/standard/tests/file/lstat_stat_variation5.phpt index 17458d9107..33aee9f31a 100644 --- a/ext/standard/tests/file/lstat_stat_variation5.phpt +++ b/ext/standard/tests/file/lstat_stat_variation5.phpt @@ -50,7 +50,6 @@ clearstatcache(); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation6.phpt b/ext/standard/tests/file/lstat_stat_variation6.phpt index c9ac88334f..239a82927f 100644 --- a/ext/standard/tests/file/lstat_stat_variation6.phpt +++ b/ext/standard/tests/file/lstat_stat_variation6.phpt @@ -62,7 +62,6 @@ clearstatcache(); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation7.phpt b/ext/standard/tests/file/lstat_stat_variation7.phpt index 8aa11a3443..f849e8254a 100644 --- a/ext/standard/tests/file/lstat_stat_variation7.phpt +++ b/ext/standard/tests/file/lstat_stat_variation7.phpt @@ -42,7 +42,6 @@ clearstatcache(); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/lstat_stat_variation9.phpt b/ext/standard/tests/file/lstat_stat_variation9.phpt index 7a5aa4d498..84b051304d 100644 --- a/ext/standard/tests/file/lstat_stat_variation9.phpt +++ b/ext/standard/tests/file/lstat_stat_variation9.phpt @@ -52,7 +52,6 @@ var_dump(compare_stats($old_stat, $new_stat, $affected_members, ">")); echo "\n--- Done ---"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/mkdir_variation4.phpt b/ext/standard/tests/file/mkdir_variation4.phpt index 8be3ca2605..a31ae722c6 100644 --- a/ext/standard/tests/file/mkdir_variation4.phpt +++ b/ext/standard/tests/file/mkdir_variation4.phpt @@ -217,4 +217,4 @@ Directory created --file resource-- Error: 2 - mkdir(): supplied resource is not a valid Stream-Context resource, %s(%d) Directory created -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/move_uploaded_file_basic.phpt b/ext/standard/tests/file/move_uploaded_file_basic.phpt index 7349a694de..c6cfdd3203 100644 --- a/ext/standard/tests/file/move_uploaded_file_basic.phpt +++ b/ext/standard/tests/file/move_uploaded_file_basic.phpt @@ -73,4 +73,3 @@ NULL Warning: move_uploaded_file() expects exactly 2 parameters, 3 given in %s on line %d NULL - diff --git a/ext/standard/tests/file/parse_ini_file_variation4.phpt b/ext/standard/tests/file/parse_ini_file_variation4.phpt index e80c25822d..15acc9c3c5 100644 --- a/ext/standard/tests/file/parse_ini_file_variation4.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation4.phpt @@ -208,4 +208,3 @@ bool(false) Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) ===DONE=== - diff --git a/ext/standard/tests/file/parse_ini_file_variation5.phpt b/ext/standard/tests/file/parse_ini_file_variation5.phpt index 5fb76b6004..4cfc2a661f 100644 --- a/ext/standard/tests/file/parse_ini_file_variation5.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation5.phpt @@ -251,4 +251,3 @@ array(1) { string(4) "test" } ===DONE=== - diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt index 432441ae6e..edfc0e82bb 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt @@ -140,4 +140,4 @@ array(1) { string(4) "test" } -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt index 7d5b650cc3..77cb693cad 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt @@ -140,4 +140,4 @@ array(1) { string(4) "test" } -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/parse_ini_file_variation6.phpt b/ext/standard/tests/file/parse_ini_file_variation6.phpt index a4f24e4e13..d6f97b9008 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6.phpt @@ -126,4 +126,4 @@ array(1) { Warning: parse_ini_file(BADDIR/ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/pathinfo_basic1.phpt b/ext/standard/tests/file/pathinfo_basic1.phpt index 8545406e51..c9e84522a8 100644 --- a/ext/standard/tests/file/pathinfo_basic1.phpt +++ b/ext/standard/tests/file/pathinfo_basic1.phpt @@ -607,4 +607,3 @@ array(3) { string(3) "usr" } Done - diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt index 0df852eb18..51de45d33d 100644 --- a/ext/standard/tests/file/pathinfo_basic2.phpt +++ b/ext/standard/tests/file/pathinfo_basic2.phpt @@ -270,4 +270,3 @@ array(3) { string(5) "afile" } Done - diff --git a/ext/standard/tests/file/pathinfo_variation3.phpt b/ext/standard/tests/file/pathinfo_variation3.phpt index b8509dc8ec..014cc90e9a 100644 --- a/ext/standard/tests/file/pathinfo_variation3.phpt +++ b/ext/standard/tests/file/pathinfo_variation3.phpt @@ -77,4 +77,4 @@ string(17) "/usr/include/arpa" string(6) "inet.h" string(17) "/usr/include/arpa" string(17) "/usr/include/arpa" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt index bc12266675..7c22389646 100644 --- a/ext/standard/tests/file/pclose_variation1.phpt +++ b/ext/standard/tests/file/pclose_variation1.phpt @@ -229,4 +229,3 @@ bool(false) Error: 2 - pclose() expects parameter 1 to be resource, null given, %s(%d) bool(false) ===DONE=== - diff --git a/ext/standard/tests/file/php_fd_wrapper_04.phpt b/ext/standard/tests/file/php_fd_wrapper_04.phpt index 1c5defdaef..3946367ef0 100644 --- a/ext/standard/tests/file/php_fd_wrapper_04.phpt +++ b/ext/standard/tests/file/php_fd_wrapper_04.phpt @@ -8,7 +8,6 @@ if(substr(PHP_OS, 0, 3) == "WIN") //we'd need a release and a test variation for windows, because in debug builds we get this message: //Warning: Invalid parameter detected in CRT function '_dup' (f:\dd\vctools\crt_bld\self_x86\crt\src\dup.c:52) //I greped the CRT sources and found no function capable of validating a file descriptor - --FILE-- <?php fopen("php://fd/12", "w"); 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 6eaeec55e2..de5510bb81 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt @@ -1,12 +1,10 @@ --TEST-- Test popen() and pclose function: basic functionality - --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != 'WIN' ) die("skip Not Valid for Linux"); ?> - --FILE-- <?php /* diff --git a/ext/standard/tests/file/popen_pclose_basic-win32.phpt b/ext/standard/tests/file/popen_pclose_basic-win32.phpt index 53e7df1eee..829a095ab1 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt @@ -1,12 +1,10 @@ --TEST-- Test popen() and pclose function: basic functionality - --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != 'WIN' ) die("skip Not Valid for Linux"); ?> - --FILE-- <?php /* diff --git a/ext/standard/tests/file/popen_pclose_basic.phpt b/ext/standard/tests/file/popen_pclose_basic.phpt index 7aa879b48e..c53db26db0 100644 --- a/ext/standard/tests/file/popen_pclose_basic.phpt +++ b/ext/standard/tests/file/popen_pclose_basic.phpt @@ -5,7 +5,6 @@ Test popen() and pclose function: basic functionality if(substr(PHP_OS, 0, 3) == 'WIN' ) die("skip Not Valid for Windows"); ?> - --FILE-- <?php /* @@ -71,7 +70,6 @@ unlink($dirpath."/popen_basic.tmp"); unlink($dirpath."/popen_basic1.tmp"); rmdir($dirpath); ?> - --EXPECT-- *** Testing popen() and pclose() with different processes *** -- Testing popen(): reading from the pipe -- diff --git a/ext/standard/tests/file/popen_pclose_error-sunos.phpt b/ext/standard/tests/file/popen_pclose_error-sunos.phpt index b63dbeb7ea..8f87540395 100644 --- a/ext/standard/tests/file/popen_pclose_error-sunos.phpt +++ b/ext/standard/tests/file/popen_pclose_error-sunos.phpt @@ -5,7 +5,6 @@ Test popen() and pclose function: error conditions if( substr(PHP_OS, 0, 3) != 'Sun') die("skip Only valid for Sun Solaris"); ?> - --FILE-- <?php /* diff --git a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt index 3c4439e5cb..f786021231 100644 --- a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt +++ b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt @@ -1,6 +1,5 @@ --TEST-- Test popen() and pclose function: error conditions - --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != 'WIN' && PHP_DEBUG) die("skip Valid only on Windows"); @@ -9,7 +8,6 @@ if(!PHP_DEBUG) die("skip Not Valid for release builds"); ob_start();phpinfo(INFO_GENERAL);$inf=ob_get_contents(); ob_end_clean(); if (!(strpos($inf, 'MSVC9') || strpos($inf, 'MSVC8'))) die("skip Not Valid for build done with VC < 8"); ?> - --FILE-- <?php /* diff --git a/ext/standard/tests/file/popen_pclose_error-win32.phpt b/ext/standard/tests/file/popen_pclose_error-win32.phpt index 1d059828d0..0b29f9eefb 100644 --- a/ext/standard/tests/file/popen_pclose_error-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_error-win32.phpt @@ -1,12 +1,10 @@ --TEST-- Test popen() and pclose function: error conditions - --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') die("skip Valid only on Windows"); if (PHP_DEBUG) die("skip Not Valid for debug builds"); ?> - --FILE-- <?php /* diff --git a/ext/standard/tests/file/popen_pclose_error.phpt b/ext/standard/tests/file/popen_pclose_error.phpt index 8b851f13bb..280e93427a 100644 --- a/ext/standard/tests/file/popen_pclose_error.phpt +++ b/ext/standard/tests/file/popen_pclose_error.phpt @@ -5,7 +5,6 @@ Test popen() and pclose function: error conditions if(substr(PHP_OS, 0, 3) == 'WIN' || strtoupper( substr(PHP_OS, 0, 3) ) == 'SUN') die("skip Not Valid for Windows & Sun Solaris"); ?> - --FILE-- <?php /* diff --git a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt index b4fb0bf322..76774b8260 100644 --- a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt @@ -106,4 +106,4 @@ Warning: readfile(BADDIR\fileToRead.tmp): failed to open stream: No such file or -- /%s/readfileVarç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™8/readfileVarç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™8Sub -- The File Contents -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/readfile_variation8-win32.phpt b/ext/standard/tests/file/readfile_variation8-win32.phpt index dde7a1ec7a..0750c910a1 100644 --- a/ext/standard/tests/file/readfile_variation8-win32.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32.phpt @@ -106,4 +106,4 @@ Warning: readfile(BADDIR\fileToRead.tmp): failed to open stream: No such file or -- /%s/readfileVar8/readfileVar8Sub -- The File Contents -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/readfile_variation9.phpt b/ext/standard/tests/file/readfile_variation9.phpt index cf80caae99..5f5804a81d 100644 --- a/ext/standard/tests/file/readfile_variation9.phpt +++ b/ext/standard/tests/file/readfile_variation9.phpt @@ -96,4 +96,4 @@ The File Contents Warning: readfile(BADDIR/fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/readlink_variation1.phpt b/ext/standard/tests/file/readlink_variation1.phpt index c66e2a4265..c350a94c77 100644 --- a/ext/standard/tests/file/readlink_variation1.phpt +++ b/ext/standard/tests/file/readlink_variation1.phpt @@ -75,4 +75,3 @@ Warning: readlink(): %s in %s on line %d bool(false) *** Done *** - diff --git a/ext/standard/tests/file/realpath_variation2.phpt b/ext/standard/tests/file/realpath_variation2.phpt index 0c8bdb87e5..9b0393a5f8 100644 --- a/ext/standard/tests/file/realpath_variation2.phpt +++ b/ext/standard/tests/file/realpath_variation2.phpt @@ -71,4 +71,4 @@ bool(false) --\tmp\-- bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt index 828837a84d..9aed95a189 100644 --- a/ext/standard/tests/file/rename_variation-win32.phpt +++ b/ext/standard/tests/file/rename_variation-win32.phpt @@ -84,4 +84,3 @@ bool(true) bool(false) bool(true) Done - diff --git a/ext/standard/tests/file/rename_variation1-win32.phpt b/ext/standard/tests/file/rename_variation1-win32.phpt index 46a47c3e94..764ba1cac4 100644 --- a/ext/standard/tests/file/rename_variation1-win32.phpt +++ b/ext/standard/tests/file/rename_variation1-win32.phpt @@ -78,4 +78,3 @@ bool(true) bool(false) bool(true) Done - diff --git a/ext/standard/tests/file/rename_variation11-win32.phpt b/ext/standard/tests/file/rename_variation11-win32.phpt index e940f78070..bf93ecd450 100644 --- a/ext/standard/tests/file/rename_variation11-win32.phpt +++ b/ext/standard/tests/file/rename_variation11-win32.phpt @@ -125,4 +125,4 @@ bool(false) bool(true) bool(true) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/rename_variation12-win32.phpt b/ext/standard/tests/file/rename_variation12-win32.phpt index 064daa4dfe..0457976ea1 100644 --- a/ext/standard/tests/file/rename_variation12-win32.phpt +++ b/ext/standard/tests/file/rename_variation12-win32.phpt @@ -118,4 +118,4 @@ bool(true) Warning: rename(BADDIR/renameMe.tmp,BADDIR/IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/file/rename_variation2-win32.phpt b/ext/standard/tests/file/rename_variation2-win32.phpt index 193bb28f1f..cc01b928e5 100644 --- a/ext/standard/tests/file/rename_variation2-win32.phpt +++ b/ext/standard/tests/file/rename_variation2-win32.phpt @@ -58,4 +58,3 @@ bool(true) bool(false) bool(true) Done - diff --git a/ext/standard/tests/file/rename_variation3-win32.phpt b/ext/standard/tests/file/rename_variation3-win32.phpt index 5f071fb5b9..9f282a4661 100644 --- a/ext/standard/tests/file/rename_variation3-win32.phpt +++ b/ext/standard/tests/file/rename_variation3-win32.phpt @@ -81,4 +81,3 @@ bool(true) bool(true) bool(false) Done - diff --git a/ext/standard/tests/file/rename_variation8-win32.phpt b/ext/standard/tests/file/rename_variation8-win32.phpt index b3a1797c7a..5fbe126305 100644 --- a/ext/standard/tests/file/rename_variation8-win32.phpt +++ b/ext/standard/tests/file/rename_variation8-win32.phpt @@ -67,4 +67,3 @@ bool(false) bool(false) bool(false) Done - diff --git a/ext/standard/tests/file/rename_variation8.phpt b/ext/standard/tests/file/rename_variation8.phpt index 2026a249bc..58235aa626 100644 --- a/ext/standard/tests/file/rename_variation8.phpt +++ b/ext/standard/tests/file/rename_variation8.phpt @@ -68,4 +68,3 @@ bool(false) bool(false) bool(false) Done - diff --git a/ext/standard/tests/file/rename_variation9.phpt b/ext/standard/tests/file/rename_variation9.phpt index 272fa94025..42897761b2 100644 --- a/ext/standard/tests/file/rename_variation9.phpt +++ b/ext/standard/tests/file/rename_variation9.phpt @@ -50,4 +50,3 @@ bool(true) bool(false) bool(true) Done - diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt index 2418ccfd5f..ac8c9dd368 100644 --- a/ext/standard/tests/file/rmdir_variation3-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt @@ -105,4 +105,4 @@ Directory removed Directory removed -- removing /%s/rmdirVar3.tmp/aSubDir -- Directory removed -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/rmdir_variation3.phpt b/ext/standard/tests/file/rmdir_variation3.phpt index fd700a0062..095cde0880 100644 --- a/ext/standard/tests/file/rmdir_variation3.phpt +++ b/ext/standard/tests/file/rmdir_variation3.phpt @@ -93,4 +93,4 @@ Directory removed Directory removed -- removing %s//rmdirVar3.tmp//aSubDir -- Directory removed -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/stat_basic-win32-mb.phpt b/ext/standard/tests/file/stat_basic-win32-mb.phpt index b25b38cef5..8ab15518b8 100644 --- a/ext/standard/tests/file/stat_basic-win32-mb.phpt +++ b/ext/standard/tests/file/stat_basic-win32-mb.phpt @@ -189,4 +189,3 @@ bool(true) bool(true) ---Done--- - diff --git a/ext/standard/tests/file/stat_basic-win32.phpt b/ext/standard/tests/file/stat_basic-win32.phpt index 80ed943188..14dbed311a 100644 --- a/ext/standard/tests/file/stat_basic-win32.phpt +++ b/ext/standard/tests/file/stat_basic-win32.phpt @@ -189,4 +189,3 @@ bool(true) bool(true) ---Done--- - diff --git a/ext/standard/tests/file/stat_error-win32.phpt b/ext/standard/tests/file/stat_error-win32.phpt index 3614ba5f7e..20bffc79df 100644 --- a/ext/standard/tests/file/stat_error-win32.phpt +++ b/ext/standard/tests/file/stat_error-win32.phpt @@ -52,4 +52,3 @@ bool(false) Warning: stat() expects parameter 1 to be a valid path, array given in %s on line %d NULL Done - diff --git a/ext/standard/tests/file/stat_variation1-win32-mb.phpt b/ext/standard/tests/file/stat_variation1-win32-mb.phpt index f5c0a9de1f..36ce34dea6 100644 --- a/ext/standard/tests/file/stat_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/stat_variation1-win32-mb.phpt @@ -70,7 +70,6 @@ clearstatcache(); echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -91,4 +90,3 @@ bool(true) bool(true) *** Done *** - diff --git a/ext/standard/tests/file/stat_variation1-win32.phpt b/ext/standard/tests/file/stat_variation1-win32.phpt index a8e1a03c8f..eae08fcb28 100644 --- a/ext/standard/tests/file/stat_variation1-win32.phpt +++ b/ext/standard/tests/file/stat_variation1-win32.phpt @@ -70,7 +70,6 @@ clearstatcache(); echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -91,4 +90,3 @@ bool(true) bool(true) *** Done *** - diff --git a/ext/standard/tests/file/stat_variation2-win32.phpt b/ext/standard/tests/file/stat_variation2-win32.phpt index b6a9300bb4..7877188833 100644 --- a/ext/standard/tests/file/stat_variation2-win32.phpt +++ b/ext/standard/tests/file/stat_variation2-win32.phpt @@ -48,7 +48,6 @@ clearstatcache(); echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -62,4 +61,3 @@ bool(true) bool(true) *** Done *** - diff --git a/ext/standard/tests/file/stat_variation3-win32.phpt b/ext/standard/tests/file/stat_variation3-win32.phpt index e472a006ed..46537c6d0f 100644 --- a/ext/standard/tests/file/stat_variation3-win32.phpt +++ b/ext/standard/tests/file/stat_variation3-win32.phpt @@ -59,14 +59,12 @@ clearstatcache(); echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); rmdir("$file_path/stat_variation3"); ?> --EXPECT-- - *** Testing stat(): with creating & deleting subdir/file *** -- Testing stat() on dir after subdir and file is created in it -- bool(true) @@ -77,4 +75,3 @@ bool(true) bool(true) *** Done *** - diff --git a/ext/standard/tests/file/stat_variation4-win32.phpt b/ext/standard/tests/file/stat_variation4-win32.phpt index 0b3c66ad5c..5f52f8b8e5 100644 --- a/ext/standard/tests/file/stat_variation4-win32.phpt +++ b/ext/standard/tests/file/stat_variation4-win32.phpt @@ -68,7 +68,6 @@ clearstatcache(); echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -90,4 +89,3 @@ bool(true) bool(true) *** Done *** - diff --git a/ext/standard/tests/file/stat_variation5-win32.phpt b/ext/standard/tests/file/stat_variation5-win32.phpt index a28cc76d54..4edca599d1 100644 --- a/ext/standard/tests/file/stat_variation5-win32.phpt +++ b/ext/standard/tests/file/stat_variation5-win32.phpt @@ -49,18 +49,15 @@ clearstatcache(); echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); unlink("$file_path/stat_variation5.tmp"); ?> --EXPECT-- - *** Testing stat(): on a file with read/write permission *** bool(true) bool(true) bool(true) *** Done *** - diff --git a/ext/standard/tests/file/stat_variation6-win32.phpt b/ext/standard/tests/file/stat_variation6-win32.phpt index d30b8fd8d7..496ccac768 100644 --- a/ext/standard/tests/file/stat_variation6-win32.phpt +++ b/ext/standard/tests/file/stat_variation6-win32.phpt @@ -67,7 +67,6 @@ clearstatcache(); // clear statement cache echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -75,7 +74,6 @@ unlink("$file_path/stat_variation6.tmp"); rmdir("$file_path/stat_variation6"); ?> --EXPECT-- - *** Testing stat() on file with miscelleneous file permission and content *** bool(true) bool(true) @@ -89,4 +87,3 @@ bool(true) bool(true) *** Done *** - diff --git a/ext/standard/tests/file/stat_variation7-win32.phpt b/ext/standard/tests/file/stat_variation7-win32.phpt index 67589ea02a..2c8868b82d 100644 --- a/ext/standard/tests/file/stat_variation7-win32.phpt +++ b/ext/standard/tests/file/stat_variation7-win32.phpt @@ -61,7 +61,6 @@ var_dump( stat($obj2->var_name) ); echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -295,4 +294,3 @@ array(26) { } *** Done *** - diff --git a/ext/standard/tests/file/stat_variation8-win32.phpt b/ext/standard/tests/file/stat_variation8-win32.phpt index 23d0159e79..0ecd956594 100644 --- a/ext/standard/tests/file/stat_variation8-win32.phpt +++ b/ext/standard/tests/file/stat_variation8-win32.phpt @@ -60,7 +60,6 @@ clearstatcache(true, $filename); // clear previous size value in cache echo "\n*** Done ***"; ?> - --CLEAN-- <?php $file_path = dirname(__FILE__); @@ -74,4 +73,3 @@ bool(true) bool(true) *** Done *** - diff --git a/ext/standard/tests/file/stream_rfc2397_001.phpt b/ext/standard/tests/file/stream_rfc2397_001.phpt index 040dc26f58..d88e778623 100644 --- a/ext/standard/tests/file/stream_rfc2397_001.phpt +++ b/ext/standard/tests/file/stream_rfc2397_001.phpt @@ -19,4 +19,4 @@ var_dump(stream_get_contents($file)); --EXPECT-- string(11) "hello world" string(11) "hello world" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/stream_rfc2397_004.phpt b/ext/standard/tests/file/stream_rfc2397_004.phpt index 0f64ec16af..4c13a5f9cd 100644 --- a/ext/standard/tests/file/stream_rfc2397_004.phpt +++ b/ext/standard/tests/file/stream_rfc2397_004.phpt @@ -29,4 +29,4 @@ string(4) "test" bool(false) string(5) "Hello" string(3) "a,b" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/stream_rfc2397_005.phpt b/ext/standard/tests/file/stream_rfc2397_005.phpt index e2d58b4424..ab03f399f3 100644 --- a/ext/standard/tests/file/stream_rfc2397_005.phpt +++ b/ext/standard/tests/file/stream_rfc2397_005.phpt @@ -35,4 +35,4 @@ string(4) "test" bool(false) string(5) "Hello" string(3) "a,b" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt index 0386e64415..fc891fde7b 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt @@ -108,4 +108,3 @@ bool(false) bool(false) bool(false) Done - diff --git a/ext/standard/tests/file/tempnam_variation3.phpt b/ext/standard/tests/file/tempnam_variation3.phpt index 11b87809fc..2d95cb0a43 100644 --- a/ext/standard/tests/file/tempnam_variation3.phpt +++ b/ext/standard/tests/file/tempnam_variation3.phpt @@ -121,4 +121,3 @@ File permissions are => 100600 File created in => directory specified *** Done *** - diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt index 40999fef47..5bacb5e876 100644 --- a/ext/standard/tests/file/tempnam_variation7-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt @@ -120,4 +120,3 @@ File permissions are => 100666 File created in => temp dir *** Done *** - diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt index 4a5ffcd332..9ed84f974a 100644 --- a/ext/standard/tests/file/tempnam_variation7.phpt +++ b/ext/standard/tests/file/tempnam_variation7.phpt @@ -125,4 +125,3 @@ File permissions are => 100600 File created in => temp dir *** Done *** - diff --git a/ext/standard/tests/file/touch.phpt b/ext/standard/tests/file/touch.phpt index fa000db008..42d1fad1e5 100644 --- a/ext/standard/tests/file/touch.phpt +++ b/ext/standard/tests/file/touch.phpt @@ -55,4 +55,3 @@ int(100) Warning: touch(): Unable to create file /no/such/file/or/directory because %s in %s on line %d bool(false) Done - diff --git a/ext/standard/tests/file/touch_basic-win32-mb.phpt b/ext/standard/tests/file/touch_basic-win32-mb.phpt index 9a87ac60a6..2572688174 100644 --- a/ext/standard/tests/file/touch_basic-win32-mb.phpt +++ b/ext/standard/tests/file/touch_basic-win32-mb.phpt @@ -93,4 +93,3 @@ ctime=%d mtime=10000 atime=20470 Done - diff --git a/ext/standard/tests/file/touch_basic-win32.phpt b/ext/standard/tests/file/touch_basic-win32.phpt index ff0b9d944b..481d476f54 100644 --- a/ext/standard/tests/file/touch_basic-win32.phpt +++ b/ext/standard/tests/file/touch_basic-win32.phpt @@ -93,4 +93,3 @@ ctime=%d mtime=10000 atime=20470 Done - diff --git a/ext/standard/tests/file/touch_error.phpt b/ext/standard/tests/file/touch_error.phpt index 9fa8a81739..0520055a90 100644 --- a/ext/standard/tests/file/touch_error.phpt +++ b/ext/standard/tests/file/touch_error.phpt @@ -19,4 +19,3 @@ NULL Warning: touch(): Unable to create file /no/such/file/or/directory because No such file or directory in %s on line %d bool(false) - diff --git a/ext/standard/tests/file/touch_variation1.phpt b/ext/standard/tests/file/touch_variation1.phpt index 3c9e429c77..eaf4c46b1d 100644 --- a/ext/standard/tests/file/touch_variation1.phpt +++ b/ext/standard/tests/file/touch_variation1.phpt @@ -36,4 +36,4 @@ int(101) bool(true) int(100) int(102) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt index a3bea53c90..cebf6f6c95 100644 --- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt @@ -197,4 +197,3 @@ bool(true) --unset var-- bool(true) ===DONE=== - diff --git a/ext/standard/tests/file/touch_variation3-win32.phpt b/ext/standard/tests/file/touch_variation3-win32.phpt index 8e2b8ca9bb..a781ffae2f 100644 --- a/ext/standard/tests/file/touch_variation3-win32.phpt +++ b/ext/standard/tests/file/touch_variation3-win32.phpt @@ -197,4 +197,3 @@ bool(true) --unset var-- bool(true) ===DONE=== - diff --git a/ext/standard/tests/file/touch_variation3.phpt b/ext/standard/tests/file/touch_variation3.phpt index 7cf338a949..5eb6ad315e 100644 --- a/ext/standard/tests/file/touch_variation3.phpt +++ b/ext/standard/tests/file/touch_variation3.phpt @@ -197,4 +197,3 @@ bool(true) --unset var-- bool(true) ===DONE=== - diff --git a/ext/standard/tests/file/touch_variation4-win32.phpt b/ext/standard/tests/file/touch_variation4-win32.phpt index 91dcbf4678..62816e1ec6 100644 --- a/ext/standard/tests/file/touch_variation4-win32.phpt +++ b/ext/standard/tests/file/touch_variation4-win32.phpt @@ -197,4 +197,3 @@ bool(true) --unset var-- bool(true) ===DONE=== - diff --git a/ext/standard/tests/file/touch_variation4.phpt b/ext/standard/tests/file/touch_variation4.phpt index 30298087b3..190d0f4b1a 100644 --- a/ext/standard/tests/file/touch_variation4.phpt +++ b/ext/standard/tests/file/touch_variation4.phpt @@ -197,4 +197,3 @@ bool(true) --unset var-- bool(true) ===DONE=== - diff --git a/ext/standard/tests/file/touch_variation5-win32.phpt b/ext/standard/tests/file/touch_variation5-win32.phpt index 37fc45c234..5761824ef3 100644 --- a/ext/standard/tests/file/touch_variation5-win32.phpt +++ b/ext/standard/tests/file/touch_variation5-win32.phpt @@ -227,4 +227,3 @@ PASSED: touchVar5.tmp//aSubDirOrFile - touched --- testing %s//touchVar5.tmp//aSubDirOrFile --- PASSED: %s//touchVar5.tmp//aSubDirOrFile - touched ===DONE=== - diff --git a/ext/standard/tests/file/touch_variation5.phpt b/ext/standard/tests/file/touch_variation5.phpt index 4c704ccaca..7eb4aaa7e0 100644 --- a/ext/standard/tests/file/touch_variation5.phpt +++ b/ext/standard/tests/file/touch_variation5.phpt @@ -227,4 +227,3 @@ PASSED: touchVar5.tmp//aSubDirOrFile - touched --- testing /%s//touchVar5.tmp//aSubDirOrFile --- PASSED: /%s//touchVar5.tmp//aSubDirOrFile - touched ===DONE=== - diff --git a/ext/standard/tests/file/touch_variation6-win32.phpt b/ext/standard/tests/file/touch_variation6-win32.phpt index fa4ff7f5cf..197078db3b 100644 --- a/ext/standard/tests/file/touch_variation6-win32.phpt +++ b/ext/standard/tests/file/touch_variation6-win32.phpt @@ -239,4 +239,3 @@ PASSED: %s\\touchVar5.tmp\\aSubDirOrFile - touched --- testing /%s/touchVar5.tmp/aSubDirOrFile --- PASSED: /%s/touchVar5.tmp/aSubDirOrFile - touched ===DONE=== - diff --git a/ext/standard/tests/file/umask_variation3.phpt b/ext/standard/tests/file/umask_variation3.phpt index 843dbe0dc4..68996ab692 100644 --- a/ext/standard/tests/file/umask_variation3.phpt +++ b/ext/standard/tests/file/umask_variation3.phpt @@ -235,4 +235,3 @@ int(0) int(0) int(0) ===DONE=== - diff --git a/ext/standard/tests/file/unlink_variation1.phpt b/ext/standard/tests/file/unlink_variation1.phpt index c27c13dfc4..c76e236566 100644 --- a/ext/standard/tests/file/unlink_variation1.phpt +++ b/ext/standard/tests/file/unlink_variation1.phpt @@ -89,4 +89,4 @@ bool(true) bool(true) bool(false) bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt index cfe0eb8562..bd58f93cf7 100644 --- a/ext/standard/tests/file/unlink_variation10.phpt +++ b/ext/standard/tests/file/unlink_variation10.phpt @@ -103,4 +103,4 @@ directory unlinked --- try to unlink a directory --- Warning: unlink(unlinkVar8.tmp/linkme.tmp): %s in %s on line %d -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/file/userstreams_006.phpt b/ext/standard/tests/file/userstreams_006.phpt index 69ebd8d0a9..c434f4cc62 100644 --- a/ext/standard/tests/file/userstreams_006.phpt +++ b/ext/standard/tests/file/userstreams_006.phpt @@ -27,7 +27,6 @@ var_dump(stream_set_write_buffer($fd, 50)); var_dump(stream_set_chunk_size($fd, 42)); var_dump(fwrite($fd, str_repeat('0', 70))); - --EXPECT-- bool(true) option: 3, 2, 50 diff --git a/ext/standard/tests/file/userstreams_007.phpt b/ext/standard/tests/file/userstreams_007.phpt index 3f66f1802b..b3e52bb098 100644 --- a/ext/standard/tests/file/userstreams_007.phpt +++ b/ext/standard/tests/file/userstreams_007.phpt @@ -46,4 +46,4 @@ test metadata: test://testdir/chgrp, 5 42 metadata: test://testdir/chmod, 6 -493
\ No newline at end of file +493 diff --git a/ext/standard/tests/file/userwrapper.phpt b/ext/standard/tests/file/userwrapper.phpt index 717e73c708..3b512a6f36 100644 --- a/ext/standard/tests/file/userwrapper.phpt +++ b/ext/standard/tests/file/userwrapper.phpt @@ -80,4 +80,3 @@ Array ) Filesize = 31337 filemtime = 1231231231 - diff --git a/ext/standard/tests/file/windows_links/bug48746.phpt b/ext/standard/tests/file/windows_links/bug48746.phpt index 6e3431943f..d8bcc9ead4 100644 --- a/ext/standard/tests/file/windows_links/bug48746.phpt +++ b/ext/standard/tests/file/windows_links/bug48746.phpt @@ -1,9 +1,7 @@ --TEST-- Bug#48746 - Junction not working properly - --CREDITS-- Venkat Raman Don (don.raman@microsoft.com) - --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != 'WIN' ) { diff --git a/ext/standard/tests/file/windows_links/bug48746_1.phpt b/ext/standard/tests/file/windows_links/bug48746_1.phpt index dfd1b98f15..5ff00ca392 100644 --- a/ext/standard/tests/file/windows_links/bug48746_1.phpt +++ b/ext/standard/tests/file/windows_links/bug48746_1.phpt @@ -1,9 +1,7 @@ --TEST-- Bug#48746 - Junction not working properly - --CREDITS-- Venkat Raman Don (don.raman@microsoft.com) - --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != 'WIN' ) { diff --git a/ext/standard/tests/file/windows_links/bug48746_2.phpt b/ext/standard/tests/file/windows_links/bug48746_2.phpt index 9f2ff850b6..5e34344a73 100644 --- a/ext/standard/tests/file/windows_links/bug48746_2.phpt +++ b/ext/standard/tests/file/windows_links/bug48746_2.phpt @@ -1,9 +1,7 @@ --TEST-- Bug#48746 - Junction not working properly - --CREDITS-- Venkat Raman Don (don.raman@microsoft.com) - --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != 'WIN' ) { diff --git a/ext/standard/tests/file/windows_links/bug48746_3.phpt b/ext/standard/tests/file/windows_links/bug48746_3.phpt index 83bdea3a8c..09875f32c8 100644 --- a/ext/standard/tests/file/windows_links/bug48746_3.phpt +++ b/ext/standard/tests/file/windows_links/bug48746_3.phpt @@ -1,9 +1,7 @@ --TEST-- Bug#48746 - Junction not working properly - --CREDITS-- Venkat Raman Don (don.raman@microsoft.com) - --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != 'WIN' ) { diff --git a/ext/standard/tests/file/windows_links/bug73962.phpt b/ext/standard/tests/file/windows_links/bug73962.phpt index 9be48c7eeb..36dd122f49 100644 --- a/ext/standard/tests/file/windows_links/bug73962.phpt +++ b/ext/standard/tests/file/windows_links/bug73962.phpt @@ -74,4 +74,3 @@ array(4) { string(5) "b.php" } bool(true) - diff --git a/ext/standard/tests/file/windows_links/bug76335.phpt b/ext/standard/tests/file/windows_links/bug76335.phpt index 866057fe02..6762dc9fb6 100644 --- a/ext/standard/tests/file/windows_links/bug76335.phpt +++ b/ext/standard/tests/file/windows_links/bug76335.phpt @@ -49,4 +49,3 @@ rmdir($d1); --EXPECT-- bool(true) bool(true) - diff --git a/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt b/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt index 1c890ed53a..a6bbac111e 100644 --- a/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt @@ -68,7 +68,6 @@ rmdir($d0); rmdir($prefix); ?> ===DONE=== - --EXPECTF-- string(4) "òåñò" bool(true) @@ -77,4 +76,3 @@ string(8) "code.php" string(8) "test.txt" string(8) "òàñò.txt" ===DONE=== - diff --git a/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt b/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt index b4a59d1afc..6028facfaa 100644 --- a/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt @@ -69,7 +69,6 @@ rmdir($d0); rmdir($prefix); ?> - --EXPECTF-- string(8) "теÑÑ‚" bool(true) @@ -78,4 +77,3 @@ string(8) "code.php" string(8) "test.txt" string(12) "таÑÑ‚.txt" ===DONE=== - diff --git a/ext/standard/tests/file/windows_mb_path/recursive_it.phpt b/ext/standard/tests/file/windows_mb_path/recursive_it.phpt index f0f5f40e70..19c08a38c2 100644 --- a/ext/standard/tests/file/windows_mb_path/recursive_it.phpt +++ b/ext/standard/tests/file/windows_mb_path/recursive_it.phpt @@ -62,4 +62,3 @@ do { string(%d) "%shello.txt" bool(false) ==DONE== - diff --git a/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt index d41a215b68..930082bd63 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt @@ -1,8 +1,6 @@ --TEST-- Test chdir()/getcwd() with a dir for multibyte filenames - --SKIPIF-- - <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -14,9 +12,7 @@ skip_if_no_required_exts(); ?> - --FILE-- - <?php @@ -42,7 +38,6 @@ remove_data("dir_mb"); ?> ===DONE=== - --EXPECTF-- Active code page: 65001 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 53b6f40b19..e897aaa07d 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 @@ -42,4 +42,3 @@ bool(true) bool(true) bool(true) ===DONE=== - diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt index 6285e1a6ac..bb50ffdebe 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 @@ -29,4 +29,3 @@ unlink($testFile); Generating a file with a path length of 259 characters... Opening file... OK ===DONE=== - diff --git a/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt index da87fe9f8b..7279850c86 100644 --- a/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt @@ -1,8 +1,6 @@ --TEST-- Test rename() with a dir for multibyte filenames - --SKIPIF-- - <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -14,9 +12,7 @@ skip_if_no_required_exts(); ?> - --FILE-- - <?php @@ -60,7 +56,6 @@ remove_data("file2_mb"); ?> ===DONE=== - --EXPECTF-- Active code page: 65001 bool(true) diff --git a/ext/standard/tests/general_functions/005.phpt b/ext/standard/tests/general_functions/005.phpt index 027d124add..fa90adf1b8 100644 --- a/ext/standard/tests/general_functions/005.phpt +++ b/ext/standard/tests/general_functions/005.phpt @@ -21,4 +21,3 @@ bool(false) bool(false) bool(false) bool(false) - diff --git a/ext/standard/tests/general_functions/008.phpt b/ext/standard/tests/general_functions/008.phpt index f76c73572b..1148f777f4 100644 --- a/ext/standard/tests/general_functions/008.phpt +++ b/ext/standard/tests/general_functions/008.phpt @@ -37,4 +37,4 @@ array(14) { float(1.23456789012E+12) [13]=> float(1.23456789012E+19) -}
\ No newline at end of file +} diff --git a/ext/standard/tests/general_functions/bug31190.phpt b/ext/standard/tests/general_functions/bug31190.phpt index 12776448b3..1a7917d47e 100644 --- a/ext/standard/tests/general_functions/bug31190.phpt +++ b/ext/standard/tests/general_functions/bug31190.phpt @@ -23,4 +23,3 @@ try { --EXPECT-- Hello World! Hello World! - diff --git a/ext/standard/tests/general_functions/bug43293_1.phpt b/ext/standard/tests/general_functions/bug43293_1.phpt index 34eb2f855c..c1f618f2bd 100644 --- a/ext/standard/tests/general_functions/bug43293_1.phpt +++ b/ext/standard/tests/general_functions/bug43293_1.phpt @@ -22,4 +22,3 @@ array(3) { int(3) } bool(false) - diff --git a/ext/standard/tests/general_functions/bug43293_2.phpt b/ext/standard/tests/general_functions/bug43293_2.phpt index 76a5956af0..2cb511eaf4 100644 --- a/ext/standard/tests/general_functions/bug43293_2.phpt +++ b/ext/standard/tests/general_functions/bug43293_2.phpt @@ -10,4 +10,3 @@ var_dump(getopt("abcd")); --EXPECT-- array(0) { } - diff --git a/ext/standard/tests/general_functions/bug43293_3.phpt b/ext/standard/tests/general_functions/bug43293_3.phpt index 6cf6529820..7fa00fc2b1 100644 --- a/ext/standard/tests/general_functions/bug43293_3.phpt +++ b/ext/standard/tests/general_functions/bug43293_3.phpt @@ -27,4 +27,3 @@ array(3) { [2]=> string(1) "f" } - diff --git a/ext/standard/tests/general_functions/bug44461.phpt b/ext/standard/tests/general_functions/bug44461.phpt index 6fa73ee27f..31dba0a6ec 100644 --- a/ext/standard/tests/general_functions/bug44461.phpt +++ b/ext/standard/tests/general_functions/bug44461.phpt @@ -15,4 +15,4 @@ parse_ini_file(__DIR__ . 'bug44461.ini', true); unlink(__DIR__ . 'bug44461.ini'); ?> --EXPECT-- -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/bug47857.phpt b/ext/standard/tests/general_functions/bug47857.phpt index 8bf04a39aa..d19eca7248 100644 --- a/ext/standard/tests/general_functions/bug47857.phpt +++ b/ext/standard/tests/general_functions/bug47857.phpt @@ -23,4 +23,3 @@ Fatal error: Uncaught Error: Non-static method Exception::getMessage() cannot be Stack trace: #0 {main} thrown in %sbug47857.php on line %d - diff --git a/ext/standard/tests/general_functions/bug49847.phpt b/ext/standard/tests/general_functions/bug49847.phpt index 112592d6ed..b7fbded2fc 100644 --- a/ext/standard/tests/general_functions/bug49847.phpt +++ b/ext/standard/tests/general_functions/bug49847.phpt @@ -23,4 +23,3 @@ array(1) { [0]=> string(4098) "%s 1" } - diff --git a/ext/standard/tests/general_functions/bug60227_1.phpt b/ext/standard/tests/general_functions/bug60227_1.phpt index 8efe222ada..748d15357c 100644 --- a/ext/standard/tests/general_functions/bug60227_1.phpt +++ b/ext/standard/tests/general_functions/bug60227_1.phpt @@ -17,4 +17,3 @@ X-Foo1: a X-Foo2: b X-Foo3: c X-Foo4: d - diff --git a/ext/standard/tests/general_functions/bug60227_2.phpt b/ext/standard/tests/general_functions/bug60227_2.phpt index 23bc8b1937..1c92aaaefa 100644 --- a/ext/standard/tests/general_functions/bug60227_2.phpt +++ b/ext/standard/tests/general_functions/bug60227_2.phpt @@ -9,7 +9,6 @@ header("X-foo: e\n foo"); echo 'foo'; ?> --EXPECTF-- - Warning: Header may not contain more than a single header, new line detected in %s on line %d foo --EXPECTHEADERS-- diff --git a/ext/standard/tests/general_functions/bug69646.phpt b/ext/standard/tests/general_functions/bug69646.phpt index b077c67319..4c897516c8 100644 --- a/ext/standard/tests/general_functions/bug69646.phpt +++ b/ext/standard/tests/general_functions/bug69646.phpt @@ -44,4 +44,3 @@ array(3) { [2]=> string(7) "b -c d\" } - diff --git a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt index 4f82039e2d..8d1947e194 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt @@ -15,7 +15,6 @@ debug_zval_dump(); echo "Done\n"; ?> - --EXPECTF-- *** Testing error conditions *** diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt index f637bfc2e9..b1dce294ab 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt @@ -118,7 +118,6 @@ foreach( $misc_values as $value ) { echo "Done\n"; ?> - --EXPECTF-- *** Testing debug_zval_dump() on functions *** --- Variation 1: global variable inside a function --- diff --git a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt index 57115a2b72..263c9a6def 100644 --- a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt +++ b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt @@ -14,6 +14,5 @@ enable_dl=1 var_dump(dl(str_repeat("a", 8376757))); ?> --EXPECTF-- - Warning: dl(): File name exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt index 7ee46ea9a2..b3a4c13502 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt @@ -30,4 +30,4 @@ string(12) ""Mr O\'Neil"" string(11) "" FILENAME"" string(11) "" FILENAME"" string(2) """" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt index 1efa72d992..d7d1fc64e3 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt @@ -28,4 +28,4 @@ string(14) "'Mr O'\''Neil'" string(15) "'Mr O\'\''Neil'" string(11) "'%FILENAME'" string(2) "''" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt index f4e9439b14..aa264cce37 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt @@ -137,4 +137,4 @@ string(2) """" -- Iteration 20 -- string(2) """" -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/general_functions/floatval_basic.phpt b/ext/standard/tests/general_functions/floatval_basic.phpt index 71f4e0d139..8ad628b4f0 100644 --- a/ext/standard/tests/general_functions/floatval_basic.phpt +++ b/ext/standard/tests/general_functions/floatval_basic.phpt @@ -169,4 +169,4 @@ float(5000000) -- Iteration : -.5e+7 -- float(-5000000) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/floatval_error.phpt b/ext/standard/tests/general_functions/floatval_error.phpt index 178713abe9..3f6fca4076 100644 --- a/ext/standard/tests/general_functions/floatval_error.phpt +++ b/ext/standard/tests/general_functions/floatval_error.phpt @@ -37,4 +37,4 @@ NULL Warning: doubleval() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/floatval_variation1.phpt b/ext/standard/tests/general_functions/floatval_variation1.phpt index 2aafa0684c..0bb11e95c4 100644 --- a/ext/standard/tests/general_functions/floatval_variation1.phpt +++ b/ext/standard/tests/general_functions/floatval_variation1.phpt @@ -52,7 +52,6 @@ foreach ($not_float_types as $key => $type ) { ?> ===DONE=== --EXPECTF-- - Notice: A non well formed numeric value encountered in %s on line %d Notice: A non well formed numeric value encountered in %s on line %d 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 ec982bd55b..1d9ca4a277 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt @@ -36,4 +36,4 @@ string(5) "array" array(0) { } TEST PASSED -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/get_defined_constants_error.phpt b/ext/standard/tests/general_functions/get_defined_constants_error.phpt index b093ed1e0c..c9eb22e256 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_error.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_error.phpt @@ -22,4 +22,4 @@ var_dump( get_defined_constants(true, $extra_arg) ); Warning: get_defined_constants() expects at most 1 parameter, 2 given in %s on line 11 NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt index b809dc9d55..6e9494509a 100644 --- a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt @@ -149,4 +149,4 @@ array(9) { ["b1"]=> bool(true) } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/get_include_path_basic.phpt b/ext/standard/tests/general_functions/get_include_path_basic.phpt index b777a2a44d..2017bf697a 100644 --- a/ext/standard/tests/general_functions/get_include_path_basic.phpt +++ b/ext/standard/tests/general_functions/get_include_path_basic.phpt @@ -34,4 +34,4 @@ Error cases: Warning: get_include_path() expects exactly 0 parameters, 1 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/get_included_files.phpt b/ext/standard/tests/general_functions/get_included_files.phpt index e7e1ed5219..e6d00a56a1 100644 --- a/ext/standard/tests/general_functions/get_included_files.phpt +++ b/ext/standard/tests/general_functions/get_included_files.phpt @@ -60,4 +60,4 @@ array(4) { Warning: get_included_files() expects exactly 0 parameters, 1 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt index 8ce2323a39..c72a88de13 100644 --- a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt +++ b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt @@ -20,4 +20,4 @@ Get loaded extensions array(%d) { %a } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt index 1728dea23f..8bb782fc79 100644 --- a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt +++ b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt @@ -23,4 +23,4 @@ var_dump( get_resource_type(true, $extra_arg) ); Warning: get_resource_type() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/get_resource_type_error.phpt b/ext/standard/tests/general_functions/get_resource_type_error.phpt index a010f7eba4..fd8fce6e53 100644 --- a/ext/standard/tests/general_functions/get_resource_type_error.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_error.phpt @@ -31,4 +31,4 @@ NULL Warning: get_resource_type() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt index 499581c05b..b5f33e1830 100644 --- a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt @@ -71,4 +71,4 @@ NULL Warning: get_resource_type() expects parameter 1 to be resource, object given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/getmypid_basic.phpt b/ext/standard/tests/general_functions/getmypid_basic.phpt index 3f4d9cd5cf..ec52ee927d 100644 --- a/ext/standard/tests/general_functions/getmypid_basic.phpt +++ b/ext/standard/tests/general_functions/getmypid_basic.phpt @@ -17,4 +17,4 @@ echo "Done\n"; --EXPECTF-- Simple testcase for getmypid() function int(%d) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/general_functions/getopt_002.phpt b/ext/standard/tests/general_functions/getopt_002.phpt index 3912ec87c7..1bf65e70ab 100644 --- a/ext/standard/tests/general_functions/getopt_002.phpt +++ b/ext/standard/tests/general_functions/getopt_002.phpt @@ -38,5 +38,3 @@ array(4) { [2]=> bool(false) } - - diff --git a/ext/standard/tests/general_functions/getopt_003.phpt b/ext/standard/tests/general_functions/getopt_003.phpt index fbb39b0e55..e1a5146065 100644 --- a/ext/standard/tests/general_functions/getopt_003.phpt +++ b/ext/standard/tests/general_functions/getopt_003.phpt @@ -53,5 +53,3 @@ array(7) { bool(false) } } - - diff --git a/ext/standard/tests/general_functions/getopt_004.phpt b/ext/standard/tests/general_functions/getopt_004.phpt index 193bd40f4d..ac0aafe27b 100644 --- a/ext/standard/tests/general_functions/getopt_004.phpt +++ b/ext/standard/tests/general_functions/getopt_004.phpt @@ -25,5 +25,3 @@ array(1) { string(3) "100" } } - - diff --git a/ext/standard/tests/general_functions/getopt_005.phpt b/ext/standard/tests/general_functions/getopt_005.phpt index fe43a025e9..3fa1791eab 100644 --- a/ext/standard/tests/general_functions/getopt_005.phpt +++ b/ext/standard/tests/general_functions/getopt_005.phpt @@ -28,5 +28,3 @@ array(2) { string(5) "value" } } - - diff --git a/ext/standard/tests/general_functions/is_resource_error.phpt b/ext/standard/tests/general_functions/is_resource_error.phpt index f7168737cd..b90f8a26e1 100644 --- a/ext/standard/tests/general_functions/is_resource_error.phpt +++ b/ext/standard/tests/general_functions/is_resource_error.phpt @@ -31,4 +31,4 @@ bool(false) Warning: is_resource() expects exactly 1 parameter, 2 given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/isset_basic1.phpt b/ext/standard/tests/general_functions/isset_basic1.phpt index fd3f5be6a0..bdaf1eb46d 100644 --- a/ext/standard/tests/general_functions/isset_basic1.phpt +++ b/ext/standard/tests/general_functions/isset_basic1.phpt @@ -63,4 +63,4 @@ Boolean test: NO Null test: NO Object test: NO Resource test: NO -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/isset_basic2.phpt b/ext/standard/tests/general_functions/isset_basic2.phpt index 5f0432b594..925b19a2c0 100644 --- a/ext/standard/tests/general_functions/isset_basic2.phpt +++ b/ext/standard/tests/general_functions/isset_basic2.phpt @@ -57,4 +57,4 @@ bool(false) bool(true) bool(true) bool(true) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt b/ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt index 60bc61395f..58b6f19f5c 100644 --- a/ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt +++ b/ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt @@ -74,7 +74,6 @@ Test use_trans_sid=1 <form action="http://php.net/bar.php" method="get"> </form> <form action="bad://php.net/bar.php" method="get"> </form> <form action="//www.php.net/bar.php" method="get"> </form> - --EXPECT-- Without session <a href="?%3CNAME%3E=%3CVALUE%3E"> </a> diff --git a/ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt b/ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt index 94c79b8a14..6b0c4e85a9 100644 --- a/ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt +++ b/ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt @@ -74,7 +74,6 @@ Test use_trans_sid=1 <form action="http://php.net/bar.php" method="get"> </a> <form action="bad://php.net/bar.php" method="get"> </a> <form action="//www.php.net/bar.php" method="get"> </a> - --EXPECT-- Without session <a href="?%3CNAME%3E=%3CVALUE%3E"> </a> diff --git a/ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt b/ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt index a7a4a94378..9e35f967f0 100644 --- a/ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt +++ b/ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt @@ -73,7 +73,6 @@ Test use_trans_sid=1 <form action="http://php.net/bar.php" method="get"> </a> <form action="bad://php.net/bar.php" method="get"> </a> <form action="//www.php.net/bar.php" method="get"> </a> - --EXPECT-- Without session <a href="?%3CNAME%3E=%3CVALUE%3E"> </a> diff --git a/ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt b/ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt index 775b590202..2dda4e7896 100644 --- a/ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt +++ b/ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt @@ -73,7 +73,6 @@ Test use_trans_sid=1 <form action="http://php.net/bar.php" method="get"> </a> <form action="bad://php.net/bar.php" method="get"> </a> <form action="//www.php.net/bar.php" method="get"> </a> - --EXPECT-- Without session <a href="?%3CNAME%3E=%3CVALUE%3E"> </a> diff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt index 2f671cd016..392e1c930e 100644 --- a/ext/standard/tests/general_functions/php_uname_error.phpt +++ b/ext/standard/tests/general_functions/php_uname_error.phpt @@ -53,4 +53,4 @@ NULL Warning: php_uname() expects parameter 1 to be string, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/php_uname_variation1.phpt b/ext/standard/tests/general_functions/php_uname_variation1.phpt index 4a47827657..d5b86c7b5c 100644 --- a/ext/standard/tests/general_functions/php_uname_variation1.phpt +++ b/ext/standard/tests/general_functions/php_uname_variation1.phpt @@ -109,4 +109,4 @@ string(%d) "%s" string(%d) "%s" -- Iterator unset var -- string(%d) "%s" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt index 25776dd3ba..5447a94db8 100644 --- a/ext/standard/tests/general_functions/print_r_64bit.phpt +++ b/ext/standard/tests/general_functions/print_r_64bit.phpt @@ -7,7 +7,6 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --INI-- precision=14 --FILE-- - <?php /* Prototype: bool print_r ( mixed $expression [, bool $return] ); Description: Prints human-readable information about a variable diff --git a/ext/standard/tests/general_functions/sys_getloadavg.phpt b/ext/standard/tests/general_functions/sys_getloadavg.phpt index a788e3206b..5763084f70 100644 --- a/ext/standard/tests/general_functions/sys_getloadavg.phpt +++ b/ext/standard/tests/general_functions/sys_getloadavg.phpt @@ -13,7 +13,6 @@ var_dump(sys_getloadavg()); echo "Done\n"; ?> --EXPECTF-- - Warning: sys_getloadavg() expects exactly 0 parameters, %d given in %s NULL array(3) { diff --git a/ext/standard/tests/general_functions/uniqid_error.phpt b/ext/standard/tests/general_functions/uniqid_error.phpt index 388bc42599..4a56234bec 100644 --- a/ext/standard/tests/general_functions/uniqid_error.phpt +++ b/ext/standard/tests/general_functions/uniqid_error.phpt @@ -43,4 +43,4 @@ Warning: uniqid() expects parameter 1 to be string, array given in %s on line %d Warning: uniqid() expects parameter 1 to be string, resource given in %s on line %d Warning: uniqid() expects parameter 1 to be string, object given in %s on line %d -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt index b12f5f579f..f0da840c3b 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -1575,4 +1575,3 @@ string(9) " Warning: var_dump() expects at least 1 parameter, 0 given in %s on line %d Done - diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt index a7f61ec063..a2476ef3f6 100644 --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt @@ -1575,4 +1575,3 @@ string(9) " Warning: var_dump() expects at least 1 parameter, 0 given in %s on line %d Done - diff --git a/ext/standard/tests/general_functions/var_export_basic2.phpt b/ext/standard/tests/general_functions/var_export_basic2.phpt index 6dfb08f082..29c3a138f9 100644 --- a/ext/standard/tests/general_functions/var_export_basic2.phpt +++ b/ext/standard/tests/general_functions/var_export_basic2.phpt @@ -73,4 +73,4 @@ false false string(5) "false" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_basic4.phpt b/ext/standard/tests/general_functions/var_export_basic4.phpt index cfdac8b268..b99f4584a6 100644 --- a/ext/standard/tests/general_functions/var_export_basic4.phpt +++ b/ext/standard/tests/general_functions/var_export_basic4.phpt @@ -144,4 +144,4 @@ string(7) "'\\060'" '8' string(3) "'8'" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_error2.phpt b/ext/standard/tests/general_functions/var_export_error2.phpt index 57764e54d1..eedb757d20 100644 --- a/ext/standard/tests/general_functions/var_export_error2.phpt +++ b/ext/standard/tests/general_functions/var_export_error2.phpt @@ -14,6 +14,5 @@ var_export($obj, true); ?> ===DONE=== --EXPECTF-- - Warning: var_export does not handle circular references in %s on line 9 ===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_error3.phpt b/ext/standard/tests/general_functions/var_export_error3.phpt index a5acb37027..38b5dbc28c 100644 --- a/ext/standard/tests/general_functions/var_export_error3.phpt +++ b/ext/standard/tests/general_functions/var_export_error3.phpt @@ -14,6 +14,5 @@ var_export($a, true); ?> ===DONE=== --EXPECTF-- - Warning: var_export does not handle circular references in %s on line 9 ===DONE=== diff --git a/ext/standard/tests/http/bug47021.phpt b/ext/standard/tests/http/bug47021.phpt index 6cdfda6a6b..f3db3e1be2 100644 --- a/ext/standard/tests/http/bug47021.phpt +++ b/ext/standard/tests/http/bug47021.phpt @@ -90,4 +90,3 @@ Type='text/plain' Hello Size=5 World - diff --git a/ext/standard/tests/http/bug60570.phpt b/ext/standard/tests/http/bug60570.phpt index 7cdb6e3d41..2a2781ec28 100644 --- a/ext/standard/tests/http/bug60570.phpt +++ b/ext/standard/tests/http/bug60570.phpt @@ -38,7 +38,6 @@ function do_test() { } do_test(); - --EXPECTF-- Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found in %s on line %d @@ -50,4 +49,3 @@ Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP in %s on line %d leak? penultimate iteration: %d, last one: %d bool(true) - diff --git a/ext/standard/tests/http/http_response_header_04.phpt b/ext/standard/tests/http/http_response_header_04.phpt index e8f22e00b1..2ed00b8fa8 100644 --- a/ext/standard/tests/http/http_response_header_04.phpt +++ b/ext/standard/tests/http/http_response_header_04.phpt @@ -34,4 +34,3 @@ array(2) { string(14) "Some: Header" } ==DONE== - diff --git a/ext/standard/tests/http/http_response_header_05.phpt b/ext/standard/tests/http/http_response_header_05.phpt index 27ba77adcc..871ea9e37a 100644 --- a/ext/standard/tests/http/http_response_header_05.phpt +++ b/ext/standard/tests/http/http_response_header_05.phpt @@ -34,4 +34,3 @@ array(2) { string(0) "" } ==DONE== - diff --git a/ext/standard/tests/image/bug72278.phpt b/ext/standard/tests/image/bug72278.phpt index d9f2a2b531..6c5dfa8777 100644 --- a/ext/standard/tests/image/bug72278.phpt +++ b/ext/standard/tests/image/bug72278.phpt @@ -8,7 +8,6 @@ var_dump(getimagesize(FILENAME)); ?> ===DONE=== --EXPECTF-- - Warning: getimagesize(): corrupt JPEG data: 3 extraneous bytes before marker in %s%ebug72278.php on line %d array(7) { [0]=> diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt index e4403a7120..dc2ec5e2e7 100644 --- a/ext/standard/tests/image/getimagesize_basic.phpt +++ b/ext/standard/tests/image/getimagesize_basic.phpt @@ -216,4 +216,4 @@ array(6) { } array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/image/getimagesize_error1.phpt b/ext/standard/tests/image/getimagesize_error1.phpt index d72535c91c..ade499b67e 100644 --- a/ext/standard/tests/image/getimagesize_error1.phpt +++ b/ext/standard/tests/image/getimagesize_error1.phpt @@ -35,4 +35,4 @@ NULL Warning: getimagesize() expects at most 2 parameters, 3 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/image/getimagesize_tif_mm.phpt b/ext/standard/tests/image/getimagesize_tif_mm.phpt index 99c6e7c63b..3e044e12be 100644 --- a/ext/standard/tests/image/getimagesize_tif_mm.phpt +++ b/ext/standard/tests/image/getimagesize_tif_mm.phpt @@ -30,4 +30,4 @@ array(5) { } array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/image/getimagesize_variation1.phpt b/ext/standard/tests/image/getimagesize_variation1.phpt index 09679f53c7..3d3814414e 100644 --- a/ext/standard/tests/image/getimagesize_variation1.phpt +++ b/ext/standard/tests/image/getimagesize_variation1.phpt @@ -182,4 +182,4 @@ bool(false) -- Arg value: unset_var -- Error: 2 - getimagesize(): Filename cannot be empty, %s(%d) bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt index c6bcf32e25..eec2301c40 100644 --- a/ext/standard/tests/image/getimagesize_variation2.phpt +++ b/ext/standard/tests/image/getimagesize_variation2.phpt @@ -158,4 +158,4 @@ string(28) "4a46494600010201006000600000" -- Arg value unset_var -- string(28) "4a46494600010201006000600000" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/image/getimagesize_variation3.phpt b/ext/standard/tests/image/getimagesize_variation3.phpt index 26d871150b..f935a9f883 100644 --- a/ext/standard/tests/image/getimagesize_variation3.phpt +++ b/ext/standard/tests/image/getimagesize_variation3.phpt @@ -67,4 +67,4 @@ Notice: getimagesize(): Read error! in %s on line %d bool(false) array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt index f8ba898d7d..ae73e27921 100644 --- a/ext/standard/tests/image/getimagesize_variation4.phpt +++ b/ext/standard/tests/image/getimagesize_variation4.phpt @@ -35,4 +35,4 @@ array(5) { } array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/image/getimagesize_variation_003.phpt b/ext/standard/tests/image/getimagesize_variation_003.phpt index e46b9e97b4..c242234e97 100644 --- a/ext/standard/tests/image/getimagesize_variation_003.phpt +++ b/ext/standard/tests/image/getimagesize_variation_003.phpt @@ -67,4 +67,4 @@ Notice: getimagesize(): Read error! in %s on line %d bool(false) array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/image/getimagesizefromstring1.phpt b/ext/standard/tests/image/getimagesizefromstring1.phpt index 1e9dc59d45..6202b38e89 100644 --- a/ext/standard/tests/image/getimagesizefromstring1.phpt +++ b/ext/standard/tests/image/getimagesizefromstring1.phpt @@ -46,4 +46,3 @@ array(7) { ["mime"]=> string(9) "image/gif" } - diff --git a/ext/standard/tests/image/image_type_to_mime_type_error.phpt b/ext/standard/tests/image/image_type_to_mime_type_error.phpt index 9a3e2d17c5..b33c645508 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_error.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_error.phpt @@ -32,4 +32,4 @@ NULL Warning: image_type_to_mime_type() expects exactly 1 parameter, 2 given in %simage_type_to_mime_type_error.php on line 17 NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt index 153aa80fe8..5c3f8ff8ea 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -48,4 +48,4 @@ float(23.45) int(0) int(1) int(0) -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/atan2_variation1.phpt b/ext/standard/tests/math/atan2_variation1.phpt index 7f9be489e7..a2bc481ad2 100644 --- a/ext/standard/tests/math/atan2_variation1.phpt +++ b/ext/standard/tests/math/atan2_variation1.phpt @@ -184,4 +184,4 @@ float(0) Warning: atan2() expects parameter 1 to be float, resource given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/atan2_variation2.phpt b/ext/standard/tests/math/atan2_variation2.phpt index 120ac45eb5..45c0215ea3 100644 --- a/ext/standard/tests/math/atan2_variation2.phpt +++ b/ext/standard/tests/math/atan2_variation2.phpt @@ -183,4 +183,4 @@ float(1.570796327) Warning: atan2() expects parameter 2 to be float, resource given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/base_convert_basic.phpt b/ext/standard/tests/math/base_convert_basic.phpt index 9591411db3..b5e34dfb8b 100644 --- a/ext/standard/tests/math/base_convert_basic.phpt +++ b/ext/standard/tests/math/base_convert_basic.phpt @@ -28,7 +28,6 @@ for ($f= 0; $f < count($frombase); $f++) { } } ?> - --EXPECT-- ...from base is 2 ......to base is 2 diff --git a/ext/standard/tests/math/base_convert_error.phpt b/ext/standard/tests/math/base_convert_error.phpt index c11a01b03f..f27d0a66cf 100644 --- a/ext/standard/tests/math/base_convert_error.phpt +++ b/ext/standard/tests/math/base_convert_error.phpt @@ -40,4 +40,4 @@ Warning: base_convert(): Invalid `from base' (1) in %s on line %d Warning: base_convert(): Invalid `to base' (37) in %s on line %d Incorrect input -Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d
\ No newline at end of file +Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d diff --git a/ext/standard/tests/math/base_convert_variation2.phpt b/ext/standard/tests/math/base_convert_variation2.phpt index 9051323eec..23e74c621d 100644 --- a/ext/standard/tests/math/base_convert_variation2.phpt +++ b/ext/standard/tests/math/base_convert_variation2.phpt @@ -190,4 +190,4 @@ bool(false) Warning: base_convert(): Invalid `from base' (0) in %s on line %d bool(false) -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/base_convert_variation3.phpt b/ext/standard/tests/math/base_convert_variation3.phpt index 220105f2fb..d4b96fb1f2 100644 --- a/ext/standard/tests/math/base_convert_variation3.phpt +++ b/ext/standard/tests/math/base_convert_variation3.phpt @@ -190,4 +190,4 @@ bool(false) Warning: base_convert(): Invalid `to base' (0) in %s on line %d bool(false) -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/bindec_error.phpt b/ext/standard/tests/math/bindec_error.phpt index 8bd52332c4..a6b96185c1 100644 --- a/ext/standard/tests/math/bindec_error.phpt +++ b/ext/standard/tests/math/bindec_error.phpt @@ -34,4 +34,4 @@ Warning: bindec() expects exactly 1 parameter, 0 given in %s on line %d Warning: bindec() expects exactly 1 parameter, 2 given in %s on line %d Incorrect input -Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d
\ No newline at end of file +Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d diff --git a/ext/standard/tests/math/bindec_variation1.phpt b/ext/standard/tests/math/bindec_variation1.phpt index 9efadf6e5c..6041af19dc 100644 --- a/ext/standard/tests/math/bindec_variation1.phpt +++ b/ext/standard/tests/math/bindec_variation1.phpt @@ -155,4 +155,4 @@ int(0) -- Iteration 24 -- int(%d) -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/bindec_variation1_64bit.phpt b/ext/standard/tests/math/bindec_variation1_64bit.phpt index ab667126da..7fe9db234a 100644 --- a/ext/standard/tests/math/bindec_variation1_64bit.phpt +++ b/ext/standard/tests/math/bindec_variation1_64bit.phpt @@ -155,4 +155,4 @@ int(0) -- Iteration 24 -- int(%d) -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/bug30695.phpt b/ext/standard/tests/math/bug30695.phpt index c515784ee2..938b0e7fc8 100644 --- a/ext/standard/tests/math/bug30695.phpt +++ b/ext/standard/tests/math/bug30695.phpt @@ -47,7 +47,6 @@ Bug #30695 (32 bit issues) echo "\n", toUTF8(65), "\n", toUTF8(233), "\n", toUTF8(1252), "\n", toUTF8(20095), "\n"; ?> --EXPECT-- - A é Ӥ diff --git a/ext/standard/tests/math/constants.phpt b/ext/standard/tests/math/constants.phpt index deeb785f44..9492629e33 100644 --- a/ext/standard/tests/math/constants.phpt +++ b/ext/standard/tests/math/constants.phpt @@ -45,4 +45,3 @@ M_EULER : 0.577215[0-9]* M_SQRT2 : 1.414213[0-9]* M_SQRT1_2 : 0.707106[0-9]* M_SQRT3 : 1.732050[0-9]* - diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt index 158c05b54a..b067030a48 100644 --- a/ext/standard/tests/math/decbin_basic.phpt +++ b/ext/standard/tests/math/decbin_basic.phpt @@ -22,7 +22,6 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> - --EXPECT-- string(4) "1010" string(12) "111101101110" diff --git a/ext/standard/tests/math/decbin_error.phpt b/ext/standard/tests/math/decbin_error.phpt index 38279c41ce..4406c7a40a 100644 --- a/ext/standard/tests/math/decbin_error.phpt +++ b/ext/standard/tests/math/decbin_error.phpt @@ -30,4 +30,3 @@ Warning: expm1() expects exactly 1 parameter, 0 given in %s on line %d Warning: expm1() expects exactly 1 parameter, 2 given in %s on line %d ===Done=== - diff --git a/ext/standard/tests/math/decbin_variation1.phpt b/ext/standard/tests/math/decbin_variation1.phpt index b6341cca76..711f1733a2 100644 --- a/ext/standard/tests/math/decbin_variation1.phpt +++ b/ext/standard/tests/math/decbin_variation1.phpt @@ -176,4 +176,4 @@ string(1) "0" -- Iteration 27 -- string(%d) "%d" -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/decbin_variation1_64bit.phpt b/ext/standard/tests/math/decbin_variation1_64bit.phpt index b2209ba301..ccde29472b 100644 --- a/ext/standard/tests/math/decbin_variation1_64bit.phpt +++ b/ext/standard/tests/math/decbin_variation1_64bit.phpt @@ -176,4 +176,4 @@ string(1) "0" -- Iteration 27 -- string(%d) "%d" -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/dechex_error.phpt b/ext/standard/tests/math/dechex_error.phpt index 4c3fd6f858..66bdc56ff6 100644 --- a/ext/standard/tests/math/dechex_error.phpt +++ b/ext/standard/tests/math/dechex_error.phpt @@ -23,4 +23,4 @@ Incorrect number of arguments Warning: dechex() expects exactly 1 parameter, 0 given in %s on line %d Warning: dechex() expects exactly 1 parameter, 3 given in %s on line %d -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/dechex_variation1.phpt b/ext/standard/tests/math/dechex_variation1.phpt index ee51c134d5..e77ea9922e 100644 --- a/ext/standard/tests/math/dechex_variation1.phpt +++ b/ext/standard/tests/math/dechex_variation1.phpt @@ -176,4 +176,4 @@ string(1) "0" -- Iteration 27 -- string(%d) "%s" -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/dechex_variation1_64bit.phpt b/ext/standard/tests/math/dechex_variation1_64bit.phpt index 404e9dfd82..ff88ec8c79 100644 --- a/ext/standard/tests/math/dechex_variation1_64bit.phpt +++ b/ext/standard/tests/math/dechex_variation1_64bit.phpt @@ -176,4 +176,4 @@ string(1) "0" -- Iteration 27 -- string(%d) "%s" -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/decoct_variation1_64bit.phpt b/ext/standard/tests/math/decoct_variation1_64bit.phpt index 14a978b2b3..8e76e15c2e 100644 --- a/ext/standard/tests/math/decoct_variation1_64bit.phpt +++ b/ext/standard/tests/math/decoct_variation1_64bit.phpt @@ -177,4 +177,4 @@ string(1) "0" -- Iteration 27 -- string(%d) "%d" -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt index 973f74de0b..6d90c9d8a8 100644 --- a/ext/standard/tests/math/exp_basic.phpt +++ b/ext/standard/tests/math/exp_basic.phpt @@ -28,7 +28,6 @@ foreach($values as $value) { ?> ===Done=== --EXPECT-- - -- Iteration 1 -- float(22026.465794807) diff --git a/ext/standard/tests/math/exp_error.phpt b/ext/standard/tests/math/exp_error.phpt index 21949f4a74..6c8de64ddd 100644 --- a/ext/standard/tests/math/exp_error.phpt +++ b/ext/standard/tests/math/exp_error.phpt @@ -8,7 +8,6 @@ exp(); exp(23,true); ?> --EXPECTF-- - Warning: exp() expects exactly 1 parameter, 0 given in %s on line %d Warning: exp() expects exactly 1 parameter, 2 given in %s on line %d diff --git a/ext/standard/tests/math/expm1_variation1.phpt b/ext/standard/tests/math/expm1_variation1.phpt index de51bc7e75..6d93b6eab6 100644 --- a/ext/standard/tests/math/expm1_variation1.phpt +++ b/ext/standard/tests/math/expm1_variation1.phpt @@ -196,4 +196,4 @@ float(0) Warning: expm1() expects parameter 1 to be float, resource given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/floor_error.phpt b/ext/standard/tests/math/floor_error.phpt index f33902e6a0..d594feca07 100644 --- a/ext/standard/tests/math/floor_error.phpt +++ b/ext/standard/tests/math/floor_error.phpt @@ -30,4 +30,4 @@ NULL Warning: floor() expects exactly 1 parameter, 0 given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt index c851a2632c..875ae8dd05 100644 --- a/ext/standard/tests/math/fmod_basic.phpt +++ b/ext/standard/tests/math/fmod_basic.phpt @@ -39,7 +39,6 @@ for ($i = 0; $i < count($values1); $i++) { } ?> --EXPECT-- - iteration 0 float(0) float(0) diff --git a/ext/standard/tests/math/fmod_error.phpt b/ext/standard/tests/math/fmod_error.phpt index 42a6ad1a02..4720ee46d2 100644 --- a/ext/standard/tests/math/fmod_error.phpt +++ b/ext/standard/tests/math/fmod_error.phpt @@ -9,7 +9,6 @@ fmod(23); fmod(23,2,true); ?> --EXPECTF-- - Warning: fmod() expects exactly 2 parameters, 0 given in %s on line 2 Warning: fmod() expects exactly 2 parameters, 1 given in %s on line 3 diff --git a/ext/standard/tests/math/getrandmax_basic.phpt b/ext/standard/tests/math/getrandmax_basic.phpt index 4e52c192d8..067b008f47 100644 --- a/ext/standard/tests/math/getrandmax_basic.phpt +++ b/ext/standard/tests/math/getrandmax_basic.phpt @@ -6,4 +6,4 @@ $biggest_int = getrandmax(); var_dump($biggest_int); ?> --EXPECTF-- -int(%d)
\ No newline at end of file +int(%d) diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt index aec6b76a7b..2168a31038 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -90,4 +90,4 @@ int(0) -- hexdec -- int(0) -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/hexdec_error.phpt b/ext/standard/tests/math/hexdec_error.phpt index 7b65e5623a..f65047ffaf 100644 --- a/ext/standard/tests/math/hexdec_error.phpt +++ b/ext/standard/tests/math/hexdec_error.phpt @@ -33,4 +33,4 @@ Warning: hexdec() expects exactly 1 parameter, 2 given in %s on line %d -- Incorrect input -- -Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d
\ No newline at end of file +Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d diff --git a/ext/standard/tests/math/hexdec_variation1.phpt b/ext/standard/tests/math/hexdec_variation1.phpt index 34b2e474d0..00b11d2b3d 100644 --- a/ext/standard/tests/math/hexdec_variation1.phpt +++ b/ext/standard/tests/math/hexdec_variation1.phpt @@ -165,4 +165,4 @@ int(0) -- Iteration 26 -- %s -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/hexdec_variation1_64bit.phpt b/ext/standard/tests/math/hexdec_variation1_64bit.phpt index f70a48eeb2..0ce9f6e39a 100644 --- a/ext/standard/tests/math/hexdec_variation1_64bit.phpt +++ b/ext/standard/tests/math/hexdec_variation1_64bit.phpt @@ -165,4 +165,4 @@ int(0) -- Iteration 26 -- %s -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/hypot_basic.phpt b/ext/standard/tests/math/hypot_basic.phpt index 107d3e40de..c09dd51da5 100644 --- a/ext/standard/tests/math/hypot_basic.phpt +++ b/ext/standard/tests/math/hypot_basic.phpt @@ -441,4 +441,4 @@ Y: X: float(0) Y: X:1 float(1) Y: X: float(0) -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/hypot_error.phpt b/ext/standard/tests/math/hypot_error.phpt index b816cd58a0..ab815de400 100644 --- a/ext/standard/tests/math/hypot_error.phpt +++ b/ext/standard/tests/math/hypot_error.phpt @@ -30,4 +30,4 @@ Warning: hypot() expects exactly 2 parameters, 1 given in %s on line %d -- Testing hypot() function with more than expected no. of arguments -- Warning: hypot() expects exactly 2 parameters, 3 given in %s on line %d -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/hypot_variation1.phpt b/ext/standard/tests/math/hypot_variation1.phpt index 762bc58727..0fdfa25375 100644 --- a/ext/standard/tests/math/hypot_variation1.phpt +++ b/ext/standard/tests/math/hypot_variation1.phpt @@ -182,4 +182,4 @@ float(5) Warning: hypot() expects parameter 1 to be float, resource given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/hypot_variation2.phpt b/ext/standard/tests/math/hypot_variation2.phpt index 989e7d00ae..3b48b23123 100644 --- a/ext/standard/tests/math/hypot_variation2.phpt +++ b/ext/standard/tests/math/hypot_variation2.phpt @@ -182,4 +182,4 @@ float(3) Warning: hypot() expects parameter 2 to be float, resource given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/intdiv_64bit.phpt b/ext/standard/tests/math/intdiv_64bit.phpt index acc7f4ef98..df8367bdbb 100644 --- a/ext/standard/tests/math/intdiv_64bit.phpt +++ b/ext/standard/tests/math/intdiv_64bit.phpt @@ -12,4 +12,4 @@ if (PHP_INT_SIZE !== 8) { var_dump(intdiv(PHP_INT_MAX, 3)); ?> --EXPECT-- -int(3074457345618258602)
\ No newline at end of file +int(3074457345618258602) diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt index d0f5080619..11db785ae4 100644 --- a/ext/standard/tests/math/is_finite_basic.phpt +++ b/ext/standard/tests/math/is_finite_basic.phpt @@ -37,5 +37,3 @@ bool(true) bool(true) bool(false) bool(false) - - diff --git a/ext/standard/tests/math/is_finite_error.phpt b/ext/standard/tests/math/is_finite_error.phpt index e26563079e..1c599df4d4 100644 --- a/ext/standard/tests/math/is_finite_error.phpt +++ b/ext/standard/tests/math/is_finite_error.phpt @@ -6,8 +6,6 @@ is_finite(); is_finite(23,2,true); ?> --EXPECTF-- - Warning: is_finite() expects exactly 1 parameter, 0 given in %s on line 2 Warning: is_finite() expects exactly 1 parameter, 3 given in %s on line 3 - diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt index 6df5c66da6..4f90340311 100644 --- a/ext/standard/tests/math/is_infinite_basic.phpt +++ b/ext/standard/tests/math/is_infinite_basic.phpt @@ -37,6 +37,3 @@ bool(false) bool(false) bool(true) bool(false) - - - diff --git a/ext/standard/tests/math/is_infinite_error.phpt b/ext/standard/tests/math/is_infinite_error.phpt index 5d6ad9d42c..217f89f7ec 100644 --- a/ext/standard/tests/math/is_infinite_error.phpt +++ b/ext/standard/tests/math/is_infinite_error.phpt @@ -6,7 +6,6 @@ is_infinite(); is_infinite(23,2,true); ?> --EXPECTF-- - Warning: is_infinite() expects exactly 1 parameter, 0 given in %s on line 2 Warning: is_infinite() expects exactly 1 parameter, 3 given in %s on line 3 diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt index 3ff65483fe..49d2ce4ccf 100644 --- a/ext/standard/tests/math/is_nan_basic.phpt +++ b/ext/standard/tests/math/is_nan_basic.phpt @@ -24,7 +24,6 @@ for ($i = 0; $i < count($values); $i++) { } ?> - --EXPECT-- bool(false) bool(false) @@ -40,6 +39,3 @@ bool(false) bool(false) bool(false) bool(true) - - - diff --git a/ext/standard/tests/math/is_nan_error.phpt b/ext/standard/tests/math/is_nan_error.phpt index 7749e4e406..4e12d7e816 100644 --- a/ext/standard/tests/math/is_nan_error.phpt +++ b/ext/standard/tests/math/is_nan_error.phpt @@ -6,11 +6,6 @@ is_nan(); is_nan(23,2,true); ?> --EXPECTF-- - Warning: is_nan() expects exactly 1 parameter, 0 given in %s on line 2 Warning: is_nan() expects exactly 1 parameter, 3 given in %s on line 3 - - - - diff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt index 16ef44c47d..44304f2475 100644 --- a/ext/standard/tests/math/lcg_value_basic.phpt +++ b/ext/standard/tests/math/lcg_value_basic.phpt @@ -40,7 +40,6 @@ if (is_null($res)) { echo "MATHS test script completed\n"; ?> - --EXPECTF-- MATHS test script started @@ -55,4 +54,3 @@ PASSED Warning: lcg_value() expects exactly 0 parameters, 2 given in %slcg_value_basic.php on line %d PASSED MATHS test script completed - diff --git a/ext/standard/tests/math/log1p_error.phpt b/ext/standard/tests/math/log1p_error.phpt index 09d63be128..230a66af3a 100644 --- a/ext/standard/tests/math/log1p_error.phpt +++ b/ext/standard/tests/math/log1p_error.phpt @@ -26,4 +26,4 @@ Warning: log1p() expects exactly 1 parameter, 0 given in %s on line %d -- Testing log1p() function with more than expected no. of arguments -- Warning: log1p() expects exactly 1 parameter, 2 given in %s on line %d -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/log1p_variation1.phpt b/ext/standard/tests/math/log1p_variation1.phpt index b166c302eb..2065fb9fba 100644 --- a/ext/standard/tests/math/log1p_variation1.phpt +++ b/ext/standard/tests/math/log1p_variation1.phpt @@ -188,4 +188,4 @@ float(0) Warning: log1p() expects parameter 1 to be float, resource given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt index 2d0a0b4bbc..de97ee264b 100644 --- a/ext/standard/tests/math/log_basic.phpt +++ b/ext/standard/tests/math/log_basic.phpt @@ -29,7 +29,6 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> - --EXPECT-- LOG tests...no base float(3.1354942159291) diff --git a/ext/standard/tests/math/log_variation1.phpt b/ext/standard/tests/math/log_variation1.phpt index 5874f63211..06954d4173 100644 --- a/ext/standard/tests/math/log_variation1.phpt +++ b/ext/standard/tests/math/log_variation1.phpt @@ -181,4 +181,4 @@ float(-INF) Warning: log() expects parameter 1 to be float, resource given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/log_variation2.phpt b/ext/standard/tests/math/log_variation2.phpt index 4ea191e75c..4e4612fdc0 100644 --- a/ext/standard/tests/math/log_variation2.phpt +++ b/ext/standard/tests/math/log_variation2.phpt @@ -199,4 +199,4 @@ bool(false) Warning: log() expects parameter 2 to be float, resource given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/mt_getrandmax_basic.phpt b/ext/standard/tests/math/mt_getrandmax_basic.phpt index 29a30d088f..3bc4200f2c 100644 --- a/ext/standard/tests/math/mt_getrandmax_basic.phpt +++ b/ext/standard/tests/math/mt_getrandmax_basic.phpt @@ -5,4 +5,4 @@ Test mt_getrandmax() - basic function test mt_getrandmax() var_dump(mt_getrandmax()); ?> --EXPECTF-- -int(%d)
\ No newline at end of file +int(%d) diff --git a/ext/standard/tests/math/mt_getrandmax_error.phpt b/ext/standard/tests/math/mt_getrandmax_error.phpt index fc6adb82ef..f360d12aec 100644 --- a/ext/standard/tests/math/mt_getrandmax_error.phpt +++ b/ext/standard/tests/math/mt_getrandmax_error.phpt @@ -6,4 +6,4 @@ var_dump(mt_getrandmax(true)); ?> --EXPECTF-- Warning: mt_getrandmax() expects exactly 0 parameters, 1 given in %s on line 2 -NULL
\ No newline at end of file +NULL diff --git a/ext/standard/tests/math/mt_rand_error.phpt b/ext/standard/tests/math/mt_rand_error.phpt index 87f5c3641d..625f3092c5 100644 --- a/ext/standard/tests/math/mt_rand_error.phpt +++ b/ext/standard/tests/math/mt_rand_error.phpt @@ -7,9 +7,7 @@ mt_rand(10,100,false); mt_rand("one", 100); mt_rand(1, "hundered"); ?> - --EXPECTF-- - Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line 2 Warning: mt_rand() expects exactly 2 parameters, 3 given in %s on line 3 diff --git a/ext/standard/tests/math/mt_srand_basic.phpt b/ext/standard/tests/math/mt_srand_basic.phpt index a3a34ab73b..ec0c24254d 100644 --- a/ext/standard/tests/math/mt_srand_basic.phpt +++ b/ext/standard/tests/math/mt_srand_basic.phpt @@ -21,4 +21,4 @@ NULL NULL NULL NULL -NULL
\ No newline at end of file +NULL diff --git a/ext/standard/tests/math/mt_srand_error.phpt b/ext/standard/tests/math/mt_srand_error.phpt index 0858a99e83..569f3d6f21 100644 --- a/ext/standard/tests/math/mt_srand_error.phpt +++ b/ext/standard/tests/math/mt_srand_error.phpt @@ -15,6 +15,3 @@ NULL Notice: A non well formed numeric value encountered in %s on line 4 NULL - - - diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt index 7c72205639..6b23f4e029 100644 --- a/ext/standard/tests/math/octdec_basic.phpt +++ b/ext/standard/tests/math/octdec_basic.phpt @@ -46,4 +46,4 @@ int(102923) int(823384) int(1) int(0) -int(0)
\ No newline at end of file +int(0) diff --git a/ext/standard/tests/math/octdec_error.phpt b/ext/standard/tests/math/octdec_error.phpt index 5d94acc435..61be4fdfe0 100644 --- a/ext/standard/tests/math/octdec_error.phpt +++ b/ext/standard/tests/math/octdec_error.phpt @@ -34,4 +34,4 @@ Warning: octdec() expects exactly 1 parameter, 2 given in %s on line %d -- Incorrect input -- -Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d
\ No newline at end of file +Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d diff --git a/ext/standard/tests/math/pow-operator.phpt b/ext/standard/tests/math/pow-operator.phpt index 620091e313..66c65f4dea 100644 --- a/ext/standard/tests/math/pow-operator.phpt +++ b/ext/standard/tests/math/pow-operator.phpt @@ -16,7 +16,6 @@ TESTS; echo "On failure, please mail result to php-dev@lists.php.net\n"; include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); - --EXPECT-- On failure, please mail result to php-dev@lists.php.net OK diff --git a/ext/standard/tests/math/pow.phpt b/ext/standard/tests/math/pow.phpt index 26bae7e0cf..896acd7bcf 100644 --- a/ext/standard/tests/math/pow.phpt +++ b/ext/standard/tests/math/pow.phpt @@ -142,7 +142,6 @@ TESTS; echo "On failure, please mail result to php-dev@lists.php.net\n"; include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); - --EXPECT-- 1,1,0,0 On failure, please mail result to php-dev@lists.php.net diff --git a/ext/standard/tests/math/pow_basic.phpt b/ext/standard/tests/math/pow_basic.phpt index abd4f26d8e..3a719ada08 100644 --- a/ext/standard/tests/math/pow_basic.phpt +++ b/ext/standard/tests/math/pow_basic.phpt @@ -267,4 +267,4 @@ Base = -2147483648 ..... Exponent = 2147483647 Result = -INF ..... Exponent = -2147483648 Result = 0 -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/pow_basic2.phpt b/ext/standard/tests/math/pow_basic2.phpt index a1cb124767..8dfb487639 100644 --- a/ext/standard/tests/math/pow_basic2.phpt +++ b/ext/standard/tests/math/pow_basic2.phpt @@ -28,7 +28,6 @@ var_dump(pow(-0.24, -$large_exp+1)); ?> ===Done=== --EXPECTF-- - -- The following all result in INF -- float(INF) float(INF) @@ -49,4 +48,4 @@ float(%s) -- The following all result in -INF -- float(-INF) float(-INF) -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/pow_error.phpt b/ext/standard/tests/math/pow_error.phpt index d00173eb48..5c473b6eba 100644 --- a/ext/standard/tests/math/pow_error.phpt +++ b/ext/standard/tests/math/pow_error.phpt @@ -9,11 +9,8 @@ pow(36); pow(36,4,true); ?> --EXPECTF-- - Warning: pow() expects exactly 2 parameters, 0 given in %s line 2 Warning: pow() expects exactly 2 parameters, 1 given in %s line 3 Warning: pow() expects exactly 2 parameters, 3 given in %s line 4 - - diff --git a/ext/standard/tests/math/rand_basic.phpt b/ext/standard/tests/math/rand_basic.phpt index f59a7823b4..fbaab3c9af 100644 --- a/ext/standard/tests/math/rand_basic.phpt +++ b/ext/standard/tests/math/rand_basic.phpt @@ -80,7 +80,6 @@ for ($x = 0; $x < count($min); $x++) { } ?> --EXPECTF-- - rand() tests with default min and max value (i.e 0 thru %i) PASSED: range min = 0 max = %i diff --git a/ext/standard/tests/math/rand_error.phpt b/ext/standard/tests/math/rand_error.phpt index 876f79b029..83de20ac20 100644 --- a/ext/standard/tests/math/rand_error.phpt +++ b/ext/standard/tests/math/rand_error.phpt @@ -8,7 +8,6 @@ rand("one", 100); rand(1, "hundered"); ?> --EXPECTF-- - Warning: rand() expects exactly 2 parameters, 1 given in %s on line 2 Warning: rand() expects exactly 2 parameters, 3 given in %s on line 3 diff --git a/ext/standard/tests/math/round_variation2.phpt b/ext/standard/tests/math/round_variation2.phpt index 1bb5ec06cc..e0358da735 100644 --- a/ext/standard/tests/math/round_variation2.phpt +++ b/ext/standard/tests/math/round_variation2.phpt @@ -184,4 +184,4 @@ float(123) Warning: round() expects parameter 2 to be int, resource given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/tan_basiclong_64bit.phpt b/ext/standard/tests/math/tan_basiclong_64bit.phpt index bdc97b0732..b62f09a69e 100644 --- a/ext/standard/tests/math/tan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/tan_basiclong_64bit.phpt @@ -60,4 +60,3 @@ float(-84.739) --- testing: -9.2234E+18 --- float(-84.739) ===DONE=== - diff --git a/ext/standard/tests/network/gethostbyname_basic003.phpt b/ext/standard/tests/network/gethostbyname_basic003.phpt index 2c6a6d3b21..6462126a0d 100644 --- a/ext/standard/tests/network/gethostbyname_basic003.phpt +++ b/ext/standard/tests/network/gethostbyname_basic003.phpt @@ -15,4 +15,4 @@ echo gethostbyname("localhost")."\n"; --EXPECT-- *** Testing gethostbyname() : basic functionality *** 127.0.0.1 -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/network/gethostbynamel_basic1.phpt b/ext/standard/tests/network/gethostbynamel_basic1.phpt index ceb2a843fd..94fd2a01ff 100644 --- a/ext/standard/tests/network/gethostbynamel_basic1.phpt +++ b/ext/standard/tests/network/gethostbynamel_basic1.phpt @@ -16,4 +16,4 @@ var_dump(gethostbynamel("localhost")); array(%d) { %a } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/network/long2ip_error.phpt b/ext/standard/tests/network/long2ip_error.phpt index 7003c36806..52cdf55a89 100644 --- a/ext/standard/tests/network/long2ip_error.phpt +++ b/ext/standard/tests/network/long2ip_error.phpt @@ -34,4 +34,4 @@ NULL Warning: long2ip() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/network/setcookie_error.phpt b/ext/standard/tests/network/setcookie_error.phpt index d9241d3de7..98fb64b851 100644 --- a/ext/standard/tests/network/setcookie_error.phpt +++ b/ext/standard/tests/network/setcookie_error.phpt @@ -17,7 +17,6 @@ setcookie('name3', 'value3', ['path' => '/path/', 'foo' => 'bar']); setcookie('name4', 'value4', [], "path", "domain.tld", true, true); var_dump(headers_list()); - --EXPECTHEADERS-- --EXPECTF-- diff --git a/ext/standard/tests/network/socket_bug74429.phpt b/ext/standard/tests/network/socket_bug74429.phpt index 8c595468e1..2c955bb5be 100644 --- a/ext/standard/tests/network/socket_bug74429.phpt +++ b/ext/standard/tests/network/socket_bug74429.phpt @@ -29,4 +29,3 @@ fclose($client1); --EXPECTF-- resource(%d) of type (stream) resource(%d) of type (stream) - diff --git a/ext/standard/tests/password/password_bcrypt_errors.phpt b/ext/standard/tests/password/password_bcrypt_errors.phpt index e8f7600b63..a0826080e6 100644 --- a/ext/standard/tests/password/password_bcrypt_errors.phpt +++ b/ext/standard/tests/password/password_bcrypt_errors.phpt @@ -41,5 +41,3 @@ NULL Warning: password_hash(): Invalid bcrypt cost parameter specified: 0 in %s on line %d NULL - - diff --git a/ext/standard/tests/password/password_deprecated_salts.phpt b/ext/standard/tests/password/password_deprecated_salts.phpt index 971732cefa..c173401067 100644 --- a/ext/standard/tests/password/password_deprecated_salts.phpt +++ b/ext/standard/tests/password/password_deprecated_salts.phpt @@ -18,4 +18,3 @@ string(60) "$2y$07$usesomesillystringfore2uDLvp1Ii2e./U9C8sBjqp8I90dH6hi" Deprecated: password_hash(): Use of the 'salt' option to password_hash is deprecated in %s on line %d string(60) "$2y$10$MTIzNDU2Nzg5MDEyMzQ1Nej0NmcAWSLR.oP7XOR9HD/vjUuOj100y" OK! - diff --git a/ext/standard/tests/password/password_get_info_argon2.phpt b/ext/standard/tests/password/password_get_info_argon2.phpt index 7caf6e6c69..b67fc5790e 100644 --- a/ext/standard/tests/password/password_get_info_argon2.phpt +++ b/ext/standard/tests/password/password_get_info_argon2.phpt @@ -43,4 +43,4 @@ array(3) { int(2) } } -OK!
\ No newline at end of file +OK! diff --git a/ext/standard/tests/password/password_hash.phpt b/ext/standard/tests/password/password_hash.phpt index ebb27292ea..47335c376a 100644 --- a/ext/standard/tests/password/password_hash.phpt +++ b/ext/standard/tests/password/password_hash.phpt @@ -15,4 +15,4 @@ echo "OK!"; --EXPECT-- int(60) bool(true) -OK!
\ No newline at end of file +OK! diff --git a/ext/standard/tests/password/password_hash_argon2.phpt b/ext/standard/tests/password/password_hash_argon2.phpt index a2cbdfacbd..184bac4ac6 100644 --- a/ext/standard/tests/password/password_hash_argon2.phpt +++ b/ext/standard/tests/password/password_hash_argon2.phpt @@ -20,4 +20,4 @@ echo "OK!"; --EXPECT-- bool(true) bool(true) -OK!
\ No newline at end of file +OK! diff --git a/ext/standard/tests/password/password_hash_error_argon2.phpt b/ext/standard/tests/password/password_hash_error_argon2.phpt index c1968b2971..070d61656a 100644 --- a/ext/standard/tests/password/password_hash_error_argon2.phpt +++ b/ext/standard/tests/password/password_hash_error_argon2.phpt @@ -31,4 +31,4 @@ Warning: password_hash(): Time cost is outside of allowed time range in %s on li NULL Warning: password_hash(): Invalid number of threads in %s on line %d -NULL
\ No newline at end of file +NULL diff --git a/ext/standard/tests/password/password_needs_rehash_argon2.phpt b/ext/standard/tests/password/password_needs_rehash_argon2.phpt index de85a1d27b..9552be1dc9 100644 --- a/ext/standard/tests/password/password_needs_rehash_argon2.phpt +++ b/ext/standard/tests/password/password_needs_rehash_argon2.phpt @@ -30,4 +30,4 @@ bool(false) bool(true) bool(true) bool(true) -OK!
\ No newline at end of file +OK! diff --git a/ext/standard/tests/password/password_verify_argon2.phpt b/ext/standard/tests/password/password_verify_argon2.phpt index f84df97286..43db2926ec 100644 --- a/ext/standard/tests/password/password_verify_argon2.phpt +++ b/ext/standard/tests/password/password_verify_argon2.phpt @@ -21,4 +21,4 @@ bool(true) bool(false) bool(true) bool(false) -OK!
\ No newline at end of file +OK! diff --git a/ext/standard/tests/password/password_verify_error.phpt b/ext/standard/tests/password/password_verify_error.phpt index 3e653fa04e..7f680af448 100644 --- a/ext/standard/tests/password/password_verify_error.phpt +++ b/ext/standard/tests/password/password_verify_error.phpt @@ -15,4 +15,3 @@ bool(false) Warning: password_verify() expects exactly 2 parameters, 1 given in %s on line %d bool(false) - diff --git a/ext/standard/tests/serialize/bug65806.phpt b/ext/standard/tests/serialize/bug65806.phpt index 19fab95c64..cefb923f23 100644 --- a/ext/standard/tests/serialize/bug65806.phpt +++ b/ext/standard/tests/serialize/bug65806.phpt @@ -80,4 +80,3 @@ start serialize/unserialize finish serialize/unserialize check successful SCRIPT END - diff --git a/ext/standard/tests/serialize/bug69210.phpt b/ext/standard/tests/serialize/bug69210.phpt index e9b6bf21da..c06fe50e02 100644 --- a/ext/standard/tests/serialize/bug69210.phpt +++ b/ext/standard/tests/serialize/bug69210.phpt @@ -48,4 +48,4 @@ object(testInteger)#3 (2) { bool(true) ["1"]=> NULL -}
\ No newline at end of file +} diff --git a/ext/standard/tests/serialize/bug71311.phpt b/ext/standard/tests/serialize/bug71311.phpt index 70267c5b0b..4b9c8d8f5e 100644 --- a/ext/standard/tests/serialize/bug71311.phpt +++ b/ext/standard/tests/serialize/bug71311.phpt @@ -12,5 +12,3 @@ Stack trace: #1 %s%ebug71311.php(2): unserialize('%s') #2 {main} thrown in %s%ebug71311.php on line 2 - - diff --git a/ext/standard/tests/serialize/serialization_arrays_002.phpt b/ext/standard/tests/serialize/serialization_arrays_002.phpt index fd78fdb536..39212b6455 100644 --- a/ext/standard/tests/serialize/serialization_arrays_002.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_002.phpt @@ -101,8 +101,6 @@ check($a); echo "Done"; ?> --EXPECT-- - - --- No references: array(3) { [0]=> diff --git a/ext/standard/tests/serialize/serialization_arrays_003.phpt b/ext/standard/tests/serialize/serialization_arrays_003.phpt index ee89e9a1e2..18238d7b1e 100644 --- a/ext/standard/tests/serialize/serialization_arrays_003.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_003.phpt @@ -71,8 +71,6 @@ check($a); echo "Done"; ?> --EXPECT-- - - --- 0 refs external: array(3) { [0]=> @@ -291,4 +289,4 @@ array(3) { [2]=> &string(10) "b2.changed" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_001.phpt b/ext/standard/tests/serialize/serialization_objects_001.phpt Binary files differindex d887aba236..cb50d5174b 100644 --- a/ext/standard/tests/serialize/serialization_objects_001.phpt +++ b/ext/standard/tests/serialize/serialization_objects_001.phpt diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt index ed28341143..df94923540 100644 --- a/ext/standard/tests/serialize/serialization_objects_004.phpt +++ b/ext/standard/tests/serialize/serialization_objects_004.phpt @@ -46,4 +46,4 @@ string(30) "a:2:{i:0;s:1:"a";i:1;s:1:"a";}" string(22) "a:2:{i:0;b:1;i:1;b:1;}" string(18) "a:2:{i:0;N;i:1;N;}" string(26) "a:2:{i:0;a:0:{}i:1;a:0:{}}" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_008.phpt b/ext/standard/tests/serialize/serialization_objects_008.phpt index 484d38216d..675911f3e1 100644 --- a/ext/standard/tests/serialize/serialization_objects_008.phpt +++ b/ext/standard/tests/serialize/serialization_objects_008.phpt @@ -19,10 +19,9 @@ var_dump($o); echo "Done"; ?> --EXPECTF-- - Warning: unserialize(): defined (Nonexistent) but not found in %s on line 14 object(__PHP_Incomplete_Class)#%d (1) { ["__PHP_Incomplete_Class_Name"]=> string(3) "FOO" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_009.phpt b/ext/standard/tests/serialize/serialization_objects_009.phpt index 0c969df7cd..74acc16ced 100644 --- a/ext/standard/tests/serialize/serialization_objects_009.phpt +++ b/ext/standard/tests/serialize/serialization_objects_009.phpt @@ -32,4 +32,4 @@ object(__PHP_Incomplete_Class)#%d (1) { } object(C)#%d (0) { } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_010.phpt b/ext/standard/tests/serialize/serialization_objects_010.phpt index 60b9f23f31..32205209f7 100644 --- a/ext/standard/tests/serialize/serialization_objects_010.phpt +++ b/ext/standard/tests/serialize/serialization_objects_010.phpt @@ -32,4 +32,4 @@ echo "Done"; ?> --EXPECT-- C::serialize() must return a string or NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_011.phpt b/ext/standard/tests/serialize/serialization_objects_011.phpt index 09b3046d05..a224a13d0c 100644 --- a/ext/standard/tests/serialize/serialization_objects_011.phpt +++ b/ext/standard/tests/serialize/serialization_objects_011.phpt @@ -193,4 +193,4 @@ object(C)#%d (10) { string(7) "A.APriv" } Sanity check: bool(true) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_012.phpt b/ext/standard/tests/serialize/serialization_objects_012.phpt index b834de3221..b095ce97b9 100644 --- a/ext/standard/tests/serialize/serialization_objects_012.phpt +++ b/ext/standard/tests/serialize/serialization_objects_012.phpt @@ -84,8 +84,6 @@ var_dump($ucontainer); echo "Done"; ?> --EXPECTF-- - - Array containing same object twice: array(2) { [0]=> @@ -241,4 +239,4 @@ object(stdClass)#%d (2) { ["b"]=> &string(20) "container->a.changed" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_013.phpt b/ext/standard/tests/serialize/serialization_objects_013.phpt index 1d4ec1c1ec..3ff2d3cc11 100644 --- a/ext/standard/tests/serialize/serialization_objects_013.phpt +++ b/ext/standard/tests/serialize/serialization_objects_013.phpt @@ -94,7 +94,6 @@ check($obj); echo "Done"; ?> --EXPECTF-- - --- a refs b: object(stdClass)#%d (3) { ["b"]=> diff --git a/ext/standard/tests/serialize/serialization_objects_014.phpt b/ext/standard/tests/serialize/serialization_objects_014.phpt index c1681df37d..fa15a577b0 100644 --- a/ext/standard/tests/serialize/serialization_objects_014.phpt +++ b/ext/standard/tests/serialize/serialization_objects_014.phpt @@ -71,7 +71,6 @@ check($obj); echo "Done"; ?> --EXPECTF-- - --- a refs external: object(stdClass)#%d (3) { ["a"]=> diff --git a/ext/standard/tests/serialize/serialization_precision_001.phpt b/ext/standard/tests/serialize/serialization_precision_001.phpt index b4a83effd8..4d17e943c2 100644 --- a/ext/standard/tests/serialize/serialization_precision_001.phpt +++ b/ext/standard/tests/serialize/serialization_precision_001.phpt @@ -18,4 +18,4 @@ serialize_precision=10 var_dump(serialize(0.1)); ?> --EXPECT-- -string(6) "d:0.1;"
\ No newline at end of file +string(6) "d:0.1;" diff --git a/ext/standard/tests/serialize/serialization_precision_002.phpt b/ext/standard/tests/serialize/serialization_precision_002.phpt index 59f09120c7..fa73130241 100644 --- a/ext/standard/tests/serialize/serialization_precision_002.phpt +++ b/ext/standard/tests/serialize/serialization_precision_002.phpt @@ -18,4 +18,4 @@ serialize_precision=75 var_dump(serialize(0.1)); ?> --EXPECT-- -string(60) "d:0.1000000000000000055511151231257827021181583404541015625;"
\ No newline at end of file +string(60) "d:0.1000000000000000055511151231257827021181583404541015625;" diff --git a/ext/standard/tests/serialize/serialization_resources_001.phpt b/ext/standard/tests/serialize/serialization_resources_001.phpt index 233b31ba64..1ec975e3f9 100644 --- a/ext/standard/tests/serialize/serialization_resources_001.phpt +++ b/ext/standard/tests/serialize/serialization_resources_001.phpt @@ -27,4 +27,4 @@ echo "\nDone"; string(4) "i:%d;" int(%d) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/unserializeS.phpt b/ext/standard/tests/serialize/unserializeS.phpt index 897208bb59..0f350f4247 100644 --- a/ext/standard/tests/serialize/unserializeS.phpt +++ b/ext/standard/tests/serialize/unserializeS.phpt @@ -9,6 +9,5 @@ $arr = array(str_repeat('"', 200)."1"=>1,str_repeat('"', 200)."2"=>1); $data = unserialize($str); var_dump($data); - --EXPECT-- bool(false) diff --git a/ext/standard/tests/serialize/unserialize_classes.phpt b/ext/standard/tests/serialize/unserialize_classes.phpt index 2a9d8a743c..2e23ca1b71 100644 --- a/ext/standard/tests/serialize/unserialize_classes.phpt +++ b/ext/standard/tests/serialize/unserialize_classes.phpt @@ -14,7 +14,6 @@ var_dump(unserialize($s, ["allowed_classes" => true])); var_dump(unserialize($s, ["allowed_classes" => ["bar"]])); var_dump(unserialize($s, ["allowed_classes" => ["FOO"]])); var_dump(unserialize($s, ["allowed_classes" => ["bar", "foO"]])); - --EXPECTF-- array(3) { [0]=> diff --git a/ext/standard/tests/serialize/unserialize_error_001.phpt b/ext/standard/tests/serialize/unserialize_error_001.phpt index 6773ec748c..60a1e1c81f 100644 --- a/ext/standard/tests/serialize/unserialize_error_001.phpt +++ b/ext/standard/tests/serialize/unserialize_error_001.phpt @@ -11,7 +11,6 @@ $s = serialize($z); var_dump(unserialize($s, ["allowed_classes" => null])); var_dump(unserialize($s, ["allowed_classes" => 0])); var_dump(unserialize($s, ["allowed_classes" => 1])); - --EXPECTF-- Warning: unserialize(): allowed_classes option should be array or boolean in %s on line %d bool(false) diff --git a/ext/standard/tests/serialize/unserialize_subclasses.phpt b/ext/standard/tests/serialize/unserialize_subclasses.phpt index 1f2384f72b..3c199e3239 100644 --- a/ext/standard/tests/serialize/unserialize_subclasses.phpt +++ b/ext/standard/tests/serialize/unserialize_subclasses.phpt @@ -13,7 +13,6 @@ var_dump(unserialize($c, ["allowed_classes" => ["C"]])); var_dump(unserialize($c, ["allowed_classes" => ["D"]])); var_dump(unserialize($d, ["allowed_classes" => ["C"]])); var_dump(unserialize($d, ["allowed_classes" => ["D"]])); - --EXPECTF-- object(C)#%d (0) { } diff --git a/ext/standard/tests/streams/bug44712.phpt b/ext/standard/tests/streams/bug44712.phpt index ba783fdefc..a5a718351f 100644 --- a/ext/standard/tests/streams/bug44712.phpt +++ b/ext/standard/tests/streams/bug44712.phpt @@ -7,4 +7,3 @@ stream_context_set_params($ctx, array("options" => 1)); ?> --EXPECTF-- Warning: stream_context_set_params(): Invalid stream/context parameter in %sbug44712.php on line %d - diff --git a/ext/standard/tests/streams/bug53903.phpt b/ext/standard/tests/streams/bug53903.phpt index 3b61635d78..fd0b770f6b 100644 --- a/ext/standard/tests/streams/bug53903.phpt +++ b/ext/standard/tests/streams/bug53903.phpt @@ -29,4 +29,3 @@ Array ( [0] => 1 ) - diff --git a/ext/standard/tests/streams/bug54946.phpt b/ext/standard/tests/streams/bug54946.phpt index b51d593a93..f220e9afba 100644 --- a/ext/standard/tests/streams/bug54946.phpt +++ b/ext/standard/tests/streams/bug54946.phpt @@ -36,4 +36,3 @@ string(0) "" string(0) "" string(0) "" ===DONE=== - diff --git a/ext/standard/tests/streams/bug60455_03.phpt b/ext/standard/tests/streams/bug60455_03.phpt index 131da852b7..4cfc373408 100644 --- a/ext/standard/tests/streams/bug60455_03.phpt +++ b/ext/standard/tests/streams/bug60455_03.phpt @@ -42,8 +42,6 @@ while (!feof($f)) { $line = stream_get_line($f, 99, "\n"); var_dump($line); } - - --EXPECT-- string(1) "a" string(1) "b" diff --git a/ext/standard/tests/streams/bug60817.phpt b/ext/standard/tests/streams/bug60817.phpt index 2d4cf2682b..1d5993e377 100644 --- a/ext/standard/tests/streams/bug60817.phpt +++ b/ext/standard/tests/streams/bug60817.phpt @@ -27,7 +27,6 @@ while (!feof($f)) { $line = stream_get_line($f, 99, "\n"); var_dump($line); } - --EXPECT-- Read done string(1) "a" diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt index 67c66d61bc..a7e4cf4931 100644 --- a/ext/standard/tests/streams/bug64433.phpt +++ b/ext/standard/tests/streams/bug64433.phpt @@ -82,5 +82,3 @@ follow=1 307: REDIRECTED 404: REDIRECTED 500: REDIRECTED - - diff --git a/ext/standard/tests/streams/bug67626.phpt b/ext/standard/tests/streams/bug67626.phpt index 7a47456bdf..79aaed55cb 100644 --- a/ext/standard/tests/streams/bug67626.phpt +++ b/ext/standard/tests/streams/bug67626.phpt @@ -42,4 +42,4 @@ try { ?> --EXPECT-- stream_read_exception -stream_write_exception
\ No newline at end of file +stream_write_exception diff --git a/ext/standard/tests/streams/bug68948.phpt b/ext/standard/tests/streams/bug68948.phpt index 7ce9d7ad03..b745ec2a73 100644 --- a/ext/standard/tests/streams/bug68948.phpt +++ b/ext/standard/tests/streams/bug68948.phpt @@ -27,4 +27,3 @@ bool(false) string(10) "0123456789" int(10) bool(true) - diff --git a/ext/standard/tests/streams/bug70198.phpt b/ext/standard/tests/streams/bug70198.phpt index c96a842793..f79a3d03c4 100644 --- a/ext/standard/tests/streams/bug70198.phpt +++ b/ext/standard/tests/streams/bug70198.phpt @@ -58,4 +58,3 @@ unlink($srv_fl); --EXPECT-- int(0) ==DONE== - diff --git a/ext/standard/tests/streams/bug72075.phpt b/ext/standard/tests/streams/bug72075.phpt index 93dce60350..1a57fdd693 100644 --- a/ext/standard/tests/streams/bug72075.phpt +++ b/ext/standard/tests/streams/bug72075.phpt @@ -10,6 +10,5 @@ $e = NULL; $dummy =& $r[0]; print stream_select($r, $w, $e, 0.5); - --EXPECT-- 0 diff --git a/ext/standard/tests/streams/bug72534.phpt b/ext/standard/tests/streams/bug72534.phpt index 38e1208a37..5ffc90b6bd 100644 --- a/ext/standard/tests/streams/bug72534.phpt +++ b/ext/standard/tests/streams/bug72534.phpt @@ -16,4 +16,3 @@ unlink($fname); --EXPECT-- bool(false) bool(false) - diff --git a/ext/standard/tests/streams/proc_open_bug51800.phpt b/ext/standard/tests/streams/proc_open_bug51800.phpt index 53cafd8555..a107875e3e 100644 --- a/ext/standard/tests/streams/proc_open_bug51800.phpt +++ b/ext/standard/tests/streams/proc_open_bug51800.phpt @@ -92,4 +92,3 @@ array(3) { int(10000) int(10000) ===DONE=== - diff --git a/ext/standard/tests/streams/proc_open_bug51800_right.phpt b/ext/standard/tests/streams/proc_open_bug51800_right.phpt index efff8e7110..2753570fb1 100644 --- a/ext/standard/tests/streams/proc_open_bug51800_right.phpt +++ b/ext/standard/tests/streams/proc_open_bug51800_right.phpt @@ -75,4 +75,3 @@ array(3) { int(10000) int(10000) ===DONE=== - diff --git a/ext/standard/tests/streams/proc_open_bug51800_right2.phpt b/ext/standard/tests/streams/proc_open_bug51800_right2.phpt index 8e7c7df2c9..045d3f70db 100644 --- a/ext/standard/tests/streams/proc_open_bug51800_right2.phpt +++ b/ext/standard/tests/streams/proc_open_bug51800_right2.phpt @@ -81,4 +81,3 @@ array(3) { int(1000000) int(1000000) ===DONE=== - diff --git a/ext/standard/tests/streams/proc_open_bug60120.phpt b/ext/standard/tests/streams/proc_open_bug60120.phpt index 08cc7a2147..d12833864a 100644 --- a/ext/standard/tests/streams/proc_open_bug60120.phpt +++ b/ext/standard/tests/streams/proc_open_bug60120.phpt @@ -68,4 +68,3 @@ string(2049) "%s" string(0) "" string(0) "" ===DONE=== - diff --git a/ext/standard/tests/streams/proc_open_bug64438.phpt b/ext/standard/tests/streams/proc_open_bug64438.phpt index ac7c72036d..454d7748c4 100644 --- a/ext/standard/tests/streams/proc_open_bug64438.phpt +++ b/ext/standard/tests/streams/proc_open_bug64438.phpt @@ -67,4 +67,3 @@ string(4097) "%s" string(0) "" string(0) "" ===DONE=== - diff --git a/ext/standard/tests/streams/stream_resolve_include_path.phpt b/ext/standard/tests/streams/stream_resolve_include_path.phpt index aea5cdd96c..4109b5672e 100644 --- a/ext/standard/tests/streams/stream_resolve_include_path.phpt +++ b/ext/standard/tests/streams/stream_resolve_include_path.phpt @@ -34,4 +34,3 @@ NULL bool(false) string(%d) "%stest_path%sfile" string(%d) "%stest_path%snested%sfile" - diff --git a/ext/standard/tests/streams/stream_set_chunk_size.phpt b/ext/standard/tests/streams/stream_set_chunk_size.phpt index cd0ad07234..8c2ae9865b 100644 --- a/ext/standard/tests/streams/stream_set_chunk_size.phpt +++ b/ext/standard/tests/streams/stream_set_chunk_size.phpt @@ -52,7 +52,6 @@ echo "\nerror conditions\n"; var_dump(stream_set_chunk_size($f, 0)); var_dump(stream_set_chunk_size($f, -1)); var_dump(stream_set_chunk_size($f, array())); - --EXPECTF-- bool(true) should return previous chunk size (8192) diff --git a/ext/standard/tests/streams/user-stream-error.phpt b/ext/standard/tests/streams/user-stream-error.phpt index 2832107993..5cc87e7360 100644 --- a/ext/standard/tests/streams/user-stream-error.phpt +++ b/ext/standard/tests/streams/user-stream-error.phpt @@ -11,7 +11,6 @@ class FailStream { stream_wrapper_register('mystream', 'FailStream'); fopen('mystream://foo', 'r'); echo 'Done'; - --EXPECTF-- Warning: fopen(mystream://foo): failed to open stream: "FailStream::stream_open" call failed in %s%euser-stream-error.php on line %d diff --git a/ext/standard/tests/streams/user_streams_consumed_bug.phpt b/ext/standard/tests/streams/user_streams_consumed_bug.phpt index ebfa1f095d..57766324ab 100644 --- a/ext/standard/tests/streams/user_streams_consumed_bug.phpt +++ b/ext/standard/tests/streams/user_streams_consumed_bug.phpt @@ -29,4 +29,3 @@ Hello int(6) Goodbye int(8) - diff --git a/ext/standard/tests/strings/add-and-stripcslashes.phpt b/ext/standard/tests/strings/add-and-stripcslashes.phpt index 7c7e36edc5..79923f42db 100644 --- a/ext/standard/tests/strings/add-and-stripcslashes.phpt +++ b/ext/standard/tests/strings/add-and-stripcslashes.phpt @@ -14,8 +14,6 @@ echo stripcslashes('\065\x64')."\n"; echo stripcslashes('')."\n"; ?> --EXPECT-- - - kaboemkara! foo\b\a\r\b\az \f\o\o\[ \] @@ -23,4 +21,3 @@ foo\b\a\r\b\az \abcd\e\f\g\h\i\j\k\l\m\n\o\pqrstuvwxy\z 1 5d - diff --git a/ext/standard/tests/strings/basename_invalid_path.phpt b/ext/standard/tests/strings/basename_invalid_path.phpt index 9211f1f7c2..573f8f014a 100644 --- a/ext/standard/tests/strings/basename_invalid_path.phpt +++ b/ext/standard/tests/strings/basename_invalid_path.phpt @@ -16,7 +16,6 @@ if((substr(PHP_OS, 0, 3) == "WIN")) var_dump(basename(chr(-1))); echo "Done\n"; - --EXPECT-- string(0) "" Done diff --git a/ext/standard/tests/strings/basename_invalid_path_win.phpt b/ext/standard/tests/strings/basename_invalid_path_win.phpt index 3cb74c21ed..bd6435a4b0 100644 --- a/ext/standard/tests/strings/basename_invalid_path_win.phpt +++ b/ext/standard/tests/strings/basename_invalid_path_win.phpt @@ -16,7 +16,6 @@ if((substr(PHP_OS, 0, 3) != "WIN")) var_dump(basename("\377")); echo "Done\n"; - --EXPECTF-- string(1) "%c" Done diff --git a/ext/standard/tests/strings/basename_variation.phpt b/ext/standard/tests/strings/basename_variation.phpt index 1da6c18113..0bcb18e6ac 100644 --- a/ext/standard/tests/strings/basename_variation.phpt +++ b/ext/standard/tests/strings/basename_variation.phpt @@ -85,7 +85,6 @@ echo "*** Testing possible variations in path and suffix ***\n"; check_basename( $file_path_variations ); echo "Done\n"; - --EXPECT-- *** Testing possible variations in path and suffix *** diff --git a/ext/standard/tests/strings/bin2hex_variation1.phpt b/ext/standard/tests/strings/bin2hex_variation1.phpt index 2b8513879c..d7bf15f4f4 100644 --- a/ext/standard/tests/strings/bin2hex_variation1.phpt +++ b/ext/standard/tests/strings/bin2hex_variation1.phpt @@ -125,4 +125,4 @@ NULL string(0) "" -- Iteration 19 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/bug20261.phpt b/ext/standard/tests/strings/bug20261.phpt index 163e905a4a..3c03afb43d 100644 --- a/ext/standard/tests/strings/bug20261.phpt +++ b/ext/standard/tests/strings/bug20261.phpt @@ -23,4 +23,3 @@ Bug #20261 (str_rot13() changes too much) 1: boo 2: boo 3: obb - diff --git a/ext/standard/tests/strings/bug23650.phpt b/ext/standard/tests/strings/bug23650.phpt index 01dc88843d..7950231462 100644 --- a/ext/standard/tests/strings/bug23650.phpt +++ b/ext/standard/tests/strings/bug23650.phpt @@ -28,4 +28,3 @@ echo strip_tags($str, '<abc>'); 4:<abc - def> 5:abc - def 6:</abc> - diff --git a/ext/standard/tests/strings/bug25671.phpt b/ext/standard/tests/strings/bug25671.phpt index ac64790704..ab26ddf772 100644 --- a/ext/standard/tests/strings/bug25671.phpt +++ b/ext/standard/tests/strings/bug25671.phpt @@ -20,4 +20,3 @@ a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0; a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:22:"This is a last strung.";} a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";} a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";} - diff --git a/ext/standard/tests/strings/bug37244.phpt b/ext/standard/tests/strings/bug37244.phpt index 0718c8a4d3..bd9628e877 100644 --- a/ext/standard/tests/strings/bug37244.phpt +++ b/ext/standard/tests/strings/bug37244.phpt @@ -15,4 +15,3 @@ foreach($strings as $string) { string(93) "Implementations MUST reject the encoding if it contains characters outside the base alphabet." bool(false) string(92) "Implemem][ÛœÈUTÕ ™Z™XÝ H[˜ÛÙ[™ÈYˆ]ÛÛZ[œÈÚ\˜XÝ\œÈÝ] ÚYH H˜\ÙH[ X™] " - diff --git a/ext/standard/tests/strings/bug45166.phpt b/ext/standard/tests/strings/bug45166.phpt index eb32e739e0..7140f762ca 100644 --- a/ext/standard/tests/strings/bug45166.phpt +++ b/ext/standard/tests/strings/bug45166.phpt @@ -7,4 +7,4 @@ Bug #45166 (substr() ) ===DONE=== --EXPECT-- cd -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/bug61038.phpt b/ext/standard/tests/strings/bug61038.phpt index 7130804fa4..3c0831a0cb 100644 --- a/ext/standard/tests/strings/bug61038.phpt +++ b/ext/standard/tests/strings/bug61038.phpt @@ -23,4 +23,3 @@ array(1) { [1]=> string(5) "str%c%c" } - diff --git a/ext/standard/tests/strings/bug61116.phpt b/ext/standard/tests/strings/bug61116.phpt index 2bd9f2537f..24dd0e2750 100644 --- a/ext/standard/tests/strings/bug61116.phpt +++ b/ext/standard/tests/strings/bug61116.phpt @@ -24,6 +24,3 @@ Function [ <internal:standard> function get_html_translation_table ] { Parameter #2 [ <optional> $encoding ] } } - - - diff --git a/ext/standard/tests/strings/bug65230.phpt b/ext/standard/tests/strings/bug65230.phpt index 87f9ed4459..4363462934 100644 --- a/ext/standard/tests/strings/bug65230.phpt +++ b/ext/standard/tests/strings/bug65230.phpt @@ -57,4 +57,3 @@ German_Germany.1252 %f: 3,410000 %F: 3.410000 date: 05.12.2014 - diff --git a/ext/standard/tests/strings/bug67252.phpt b/ext/standard/tests/strings/bug67252.phpt index 576524f1d2..eab2112afa 100644 --- a/ext/standard/tests/strings/bug67252.phpt +++ b/ext/standard/tests/strings/bug67252.phpt @@ -8,6 +8,5 @@ var_dump(convert_uudecode($a)); ?> --EXPECTF-- - Warning: convert_uudecode(): The given parameter is not a valid uuencoded string in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/bug68996.phpt b/ext/standard/tests/strings/bug68996.phpt index ce11b3ee47..fea1371a32 100644 --- a/ext/standard/tests/strings/bug68996.phpt +++ b/ext/standard/tests/strings/bug68996.phpt @@ -14,4 +14,3 @@ fopen("\xfc\x63", "r"); --EXPECTF-- <br /> <b>Warning</b>: : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br /> - diff --git a/ext/standard/tests/strings/bug73058.phpt b/ext/standard/tests/strings/bug73058.phpt index f769616f56..3cd908b24a 100644 --- a/ext/standard/tests/strings/bug73058.phpt +++ b/ext/standard/tests/strings/bug73058.phpt @@ -20,4 +20,3 @@ string(60) "$2y$07$usesomesillystringforex.u2VJUMLRWaJNuw0Hu2FvCEimdeYVO" string(60) "$2y$07$usesomesillystringforex.u2VJUMLRWaJNuw0Hu2FvCEimdeYVO" string(60) "$2y$07$usesomesillystringforuw2Gm1ef7lMsvtzSK2p/14F0q1e8uOCO" ==OK== - diff --git a/ext/standard/tests/strings/chop_variation4.phpt b/ext/standard/tests/strings/chop_variation4.phpt Binary files differindex 2d67ed06e1..628c87cbce 100644 --- a/ext/standard/tests/strings/chop_variation4.phpt +++ b/ext/standard/tests/strings/chop_variation4.phpt diff --git a/ext/standard/tests/strings/chunk_split_variation3.phpt b/ext/standard/tests/strings/chunk_split_variation3.phpt index 408d8c8afb..791535371f 100644 --- a/ext/standard/tests/strings/chunk_split_variation3.phpt +++ b/ext/standard/tests/strings/chunk_split_variation3.phpt @@ -157,4 +157,4 @@ string(22) "This is simple string." Warning: chunk_split() expects parameter 3 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt index c3456a70c4..f7fcfb60f3 100644 --- a/ext/standard/tests/strings/chunk_split_variation6.phpt +++ b/ext/standard/tests/strings/chunk_split_variation6.phpt @@ -73,4 +73,4 @@ string(59) " Te):(sting w):(ith ):(multipl):(e space):(s ):(" string(55) "Testing):( invali):(d \k an):(d \m es):(cape ch):(ar):(" -- Iteration 12 -- string(46) "This is):( to che):(ck with):( \n and):( \t):(" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt index 47174defef..89cb6ccc4b 100644 --- a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt @@ -136,4 +136,4 @@ NULL string(0) "" -- Iteration 22 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/crc32_variation1.phpt b/ext/standard/tests/strings/crc32_variation1.phpt index 1d6f33ec2e..21d3fbe0dc 100644 --- a/ext/standard/tests/strings/crc32_variation1.phpt +++ b/ext/standard/tests/strings/crc32_variation1.phpt @@ -5,7 +5,6 @@ Test crc32() function : usage variations - unexpected values if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> - --FILE-- <?php /* Prototype : string crc32(string $str) @@ -194,4 +193,4 @@ int(0) Warning: crc32() expects parameter 1 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/crypt_sha256.phpt b/ext/standard/tests/strings/crypt_sha256.phpt index 5374197e20..c361dc48cb 100644 --- a/ext/standard/tests/strings/crypt_sha256.phpt +++ b/ext/standard/tests/strings/crypt_sha256.phpt @@ -55,4 +55,3 @@ Got <$res>\n"; echo "Passes.";?> --EXPECT-- Passes. - diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt index ffbc5747de..408a5a00c7 100644 --- a/ext/standard/tests/strings/crypt_sha512.phpt +++ b/ext/standard/tests/strings/crypt_sha512.phpt @@ -56,4 +56,3 @@ echo "Passes."; ?> --EXPECT-- Passes. - diff --git a/ext/standard/tests/strings/dirname_basic.phpt b/ext/standard/tests/strings/dirname_basic.phpt index 9006b27619..1fafffde3f 100644 --- a/ext/standard/tests/strings/dirname_basic.phpt +++ b/ext/standard/tests/strings/dirname_basic.phpt @@ -60,7 +60,6 @@ check_dirname( $file_paths ); echo "Done\n"; ?> - --EXPECTREGEX-- \*\*\* Testing basic operations \*\*\* diff --git a/ext/standard/tests/strings/dirname_variation.phpt b/ext/standard/tests/strings/dirname_variation.phpt index 71a2e4db2e..314fd3e742 100644 --- a/ext/standard/tests/strings/dirname_variation.phpt +++ b/ext/standard/tests/strings/dirname_variation.phpt @@ -140,4 +140,4 @@ string\(0\) "" --Iteration 24 -- string\(0\) "" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/explode_error.phpt b/ext/standard/tests/strings/explode_error.phpt index e88b1b0c6b..d86e1edb1f 100644 --- a/ext/standard/tests/strings/explode_error.phpt +++ b/ext/standard/tests/strings/explode_error.phpt @@ -34,4 +34,4 @@ NULL Warning: explode() expects at most 3 parameters, 4 given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/strings/explode_variation3.phpt b/ext/standard/tests/strings/explode_variation3.phpt index 2addd0436d..34c1cdffc3 100644 --- a/ext/standard/tests/strings/explode_variation3.phpt +++ b/ext/standard/tests/strings/explode_variation3.phpt @@ -235,4 +235,4 @@ array(1) { [0]=> string(41) "piece1 piece2 piece3 piece4 piece5 piece6" } -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/strings/explode_variation5.phpt b/ext/standard/tests/strings/explode_variation5.phpt index 754e55222a..e5e6dd75d9 100644 --- a/ext/standard/tests/strings/explode_variation5.phpt +++ b/ext/standard/tests/strings/explode_variation5.phpt @@ -45,4 +45,4 @@ array(3) { -- negative limit (since PHP 5.1) with null string -- array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/explode_variation6.phpt b/ext/standard/tests/strings/explode_variation6.phpt index 14b6d401a2..730e69ba13 100644 --- a/ext/standard/tests/strings/explode_variation6.phpt +++ b/ext/standard/tests/strings/explode_variation6.phpt @@ -67,4 +67,4 @@ string(6) "6f6e65" string(6) "74776f" string(10) "7468726565" string(8) "666f7572" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt index 4e5c5afc14..0f7a896e9f 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt @@ -339,4 +339,4 @@ array(3) { ["<"]=> string(4) "<" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt index 6e144c0c51..595d8fd944 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt @@ -92,4 +92,4 @@ array(3) { ["<"]=> string(4) "<" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/html_entity_decode1.phpt b/ext/standard/tests/strings/html_entity_decode1.phpt index 5eabfc35a5..8d7a07784e 100644 --- a/ext/standard/tests/strings/html_entity_decode1.phpt +++ b/ext/standard/tests/strings/html_entity_decode1.phpt @@ -64,4 +64,4 @@ echo "Done.\n"; &aa;$ &;& &;$ -Done.
\ No newline at end of file +Done. diff --git a/ext/standard/tests/strings/html_entity_decode2.phpt b/ext/standard/tests/strings/html_entity_decode2.phpt index b8a6e49eb3..1eb643bd0e 100644 --- a/ext/standard/tests/strings/html_entity_decode2.phpt +++ b/ext/standard/tests/strings/html_entity_decode2.phpt @@ -30,4 +30,4 @@ echo "Done.\n"; ' *** XML 1.0 *** ' -Done.
\ No newline at end of file +Done. diff --git a/ext/standard/tests/strings/html_entity_decode_cp866.phpt b/ext/standard/tests/strings/html_entity_decode_cp866.phpt index 18f6f3c90b..685e0f66a6 100644 --- a/ext/standard/tests/strings/html_entity_decode_cp866.phpt +++ b/ext/standard/tests/strings/html_entity_decode_cp866.phpt @@ -529,5 +529,3 @@ BLACK SQUARE: ■ => fe NO-BREAK SPACE:   => ff ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt index 09fd5df02b..f41a5e16f5 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt @@ -401,5 +401,3 @@ LATIN SMALL LETTER THORN: þ => fe LATIN SMALL LETTER Y WITH DIAERESIS: ÿ => ff ÿ => ff - - diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt index 070ed536f4..eb13827cee 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt @@ -401,5 +401,3 @@ CYRILLIC SMALL LETTER SHORT U: ў => 2623783435453b CYRILLIC SMALL LETTER DZHE: џ => 2623783435463b ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt index e8523f6a09..adaa8563bd 100644 --- a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt +++ b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt @@ -529,5 +529,3 @@ CYRILLIC CAPITAL LETTER CHE: Ч => fe CYRILLIC CAPITAL LETTER HARD SIGN: Ъ => ff ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_macroman.phpt b/ext/standard/tests/strings/html_entity_decode_macroman.phpt index 4f500dc4e7..c4c9dd493b 100644 --- a/ext/standard/tests/strings/html_entity_decode_macroman.phpt +++ b/ext/standard/tests/strings/html_entity_decode_macroman.phpt @@ -536,5 +536,3 @@ OGONEK: ˛ => fe CARON: ˇ => ff ÿ => d8 - - diff --git a/ext/standard/tests/strings/html_entity_decode_win1251.phpt b/ext/standard/tests/strings/html_entity_decode_win1251.phpt index e60d7074bf..4b96f01774 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1251.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1251.phpt @@ -533,5 +533,3 @@ CYRILLIC SMALL LETTER YU: ю => fe CYRILLIC SMALL LETTER YA: я => ff ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_win1252.phpt b/ext/standard/tests/strings/html_entity_decode_win1252.phpt index 6163ef24ae..436b0d464a 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1252.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1252.phpt @@ -165,5 +165,3 @@ LATIN SMALL LETTER Z WITH CARON: ž => 9e LATIN CAPITAL LETTER Y WITH DIAERESIS: Ÿ => 9f Ÿ => Ÿ - - diff --git a/ext/standard/tests/strings/htmlentities24.phpt b/ext/standard/tests/strings/htmlentities24.phpt index 51271bdddf..5a023df701 100644 --- a/ext/standard/tests/strings/htmlentities24.phpt +++ b/ext/standard/tests/strings/htmlentities24.phpt @@ -43,7 +43,6 @@ var_dump( htmlentities("\x84\x91",ENT_QUOTES, 'cp1252', "test1") ); echo "Done\n"; ?> - --EXPECTF-- *** Retrieving htmlentities for 256 characters *** string(12) "636872283029" @@ -328,4 +327,3 @@ Warning: htmlentities() expects at least 1 parameter, 0 given in %s on line %d NULL string(14) "„‘" Done - diff --git a/ext/standard/tests/strings/htmlentities_html5.phpt b/ext/standard/tests/strings/htmlentities_html5.phpt index 427ba0bc35..4a91012bd7 100644 --- a/ext/standard/tests/strings/htmlentities_html5.phpt +++ b/ext/standard/tests/strings/htmlentities_html5.phpt @@ -1621,4 +1621,4 @@ foreach ($mpcent as $i) { ⫆̸ U+02AC6 U+00338 ⫋︀ U+02ACB U+0FE00 ⫌︀ U+02ACC U+0FE00 -⫽︀ U+02AFD U+0FE00
\ No newline at end of file +⫽︀ U+02AFD U+0FE00 diff --git a/ext/standard/tests/strings/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt index 2c886b9af7..8506c73e72 100644 --- a/ext/standard/tests/strings/htmlspecialchars.phpt +++ b/ext/standard/tests/strings/htmlspecialchars.phpt @@ -328,4 +328,3 @@ Warning: htmlspecialchars() expects at least 1 parameter, 0 given in %s on line NULL string(10) "<br>" Done - diff --git a/ext/standard/tests/strings/htmlspecialchars_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_basic.phpt index 44396b0e2b..4ac7733702 100644 --- a/ext/standard/tests/strings/htmlspecialchars_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_basic.phpt @@ -94,4 +94,4 @@ Test 27: "300 < 400" Try with double decode TRUE Test 28: &quot;&amp;xyz&gt;abc&quot; Test 29: &quot;&amp;123&lt;456&quot; -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt index 4b4af9c63f..35719186e4 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt @@ -158,4 +158,4 @@ string(0) "" Warning: htmlspecialchars_decode() expects parameter 1 to be string, resource given in %s on line %d NULL ===DONE=== -
\ No newline at end of file + diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt index 96a32351b4..de96c04db4 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt @@ -96,4 +96,4 @@ string(153) "<html>< This's a string with quotes: "strings in double quote" & 'strings in single quote' " this\line is 'single quoted' /with\slashes </html>" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt index 8aa9479e5c..b07f21acf6 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -73,4 +73,4 @@ string(30) " 1 3 & gt; 11 but 11 & lt; 12" string(30) " 1 3 & gt; 11 but 11 & lt; 12" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt index 1755df9edd..e298fec6ae 100644 --- a/ext/standard/tests/strings/join_variation1.phpt +++ b/ext/standard/tests/strings/join_variation1.phpt @@ -164,4 +164,4 @@ string(%d) "element1Resource id #%delement2" string(16) "element1element2" -- Iteration 26 -- string(16) "element1element2" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/ltrim_error.phpt b/ext/standard/tests/strings/ltrim_error.phpt index 4d6e413672..694d9fea18 100644 --- a/ext/standard/tests/strings/ltrim_error.phpt +++ b/ext/standard/tests/strings/ltrim_error.phpt @@ -58,4 +58,4 @@ string(14) " Hello World Warning: ltrim(): Invalid '..'-range in %s on line %d string(14) " Hello World " -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/ltrim_variation1.phpt b/ext/standard/tests/strings/ltrim_variation1.phpt index 48b76e9be7..f476b9b793 100644 --- a/ext/standard/tests/strings/ltrim_variation1.phpt +++ b/ext/standard/tests/strings/ltrim_variation1.phpt @@ -135,4 +135,4 @@ NULL string(0) "" -- Iteration 22 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/ltrim_variation2.phpt b/ext/standard/tests/strings/ltrim_variation2.phpt index 40254843a1..5dc260e8a1 100644 --- a/ext/standard/tests/strings/ltrim_variation2.phpt +++ b/ext/standard/tests/strings/ltrim_variation2.phpt @@ -135,4 +135,4 @@ NULL string(19) "!---Hello World---!" -- Iteration 22 -- string(19) "!---Hello World---!" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/md5_basic2.phpt b/ext/standard/tests/strings/md5_basic2.phpt index 73bcc33bec..e72fd40077 100644 --- a/ext/standard/tests/strings/md5_basic2.phpt +++ b/ext/standard/tests/strings/md5_basic2.phpt @@ -27,4 +27,4 @@ if (strcmp(bin2hex($md5_raw), $md5) == 0 ) { *** Testing md5() : basic functionality - with raw output*** string(32) "b10a8db164e0754105b7a99be72e3fe5" TEST PASSED -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/md5_error.phpt b/ext/standard/tests/strings/md5_error.phpt index dbdbdcb2a5..138df1b8bd 100644 --- a/ext/standard/tests/strings/md5_error.phpt +++ b/ext/standard/tests/strings/md5_error.phpt @@ -32,4 +32,4 @@ NULL Warning: md5() expects at most 2 parameters, 3 given in %s on line %d NULL -===DONE==
\ No newline at end of file +===DONE== diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt Binary files differindex 8e91776781..3e996eccd3 100644 --- a/ext/standard/tests/strings/md5_file.phpt +++ b/ext/standard/tests/strings/md5_file.phpt diff --git a/ext/standard/tests/strings/money_format_basic1.phpt b/ext/standard/tests/strings/money_format_basic1.phpt index 61fd816dae..dc9b167ebf 100644 --- a/ext/standard/tests/strings/money_format_basic1.phpt +++ b/ext/standard/tests/strings/money_format_basic1.phpt @@ -77,4 +77,3 @@ Format again suppress currency symbol string string ===DONE=== - diff --git a/ext/standard/tests/strings/nl_langinfo_basic.phpt b/ext/standard/tests/strings/nl_langinfo_basic.phpt index 82fd6c0f95..c940479065 100644 --- a/ext/standard/tests/strings/nl_langinfo_basic.phpt +++ b/ext/standard/tests/strings/nl_langinfo_basic.phpt @@ -34,4 +34,4 @@ string(9) "Wednesday" string(3) "Jul" string(5) "April" string(1) "." -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/pack_A.phpt b/ext/standard/tests/strings/pack_A.phpt index 59fc22e122..b5a7b97fc3 100644 --- a/ext/standard/tests/strings/pack_A.phpt +++ b/ext/standard/tests/strings/pack_A.phpt @@ -22,4 +22,3 @@ array(1) { [1]=> string(3) "foo" } - diff --git a/ext/standard/tests/strings/parse_str_error1.phpt b/ext/standard/tests/strings/parse_str_error1.phpt index dcc3888e7e..9683a7d901 100644 --- a/ext/standard/tests/strings/parse_str_error1.phpt +++ b/ext/standard/tests/strings/parse_str_error1.phpt @@ -29,4 +29,4 @@ Warning: parse_str() expects at least 1 parameter, 0 given in %s on line %d -- Testing htmlentities() function with more than expected no. of arguments -- Warning: parse_str() expects at most 2 parameters, 3 given in %s on line %d -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/print_variation1.phpt b/ext/standard/tests/strings/print_variation1.phpt index 101d567749..19a28678f2 100644 --- a/ext/standard/tests/strings/print_variation1.phpt +++ b/ext/standard/tests/strings/print_variation1.phpt @@ -153,4 +153,4 @@ int(1) -- Iteration 21 -- int(1) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/printf_basic3.phpt b/ext/standard/tests/strings/printf_basic3.phpt index 2fd6050da2..711327cd6d 100644 --- a/ext/standard/tests/strings/printf_basic3.phpt +++ b/ext/standard/tests/strings/printf_basic3.phpt @@ -79,4 +79,4 @@ int(19) int(29) 11.110000 22.220000 33.330000 int(29) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/printf_basic5.phpt b/ext/standard/tests/strings/printf_basic5.phpt index 3cdcc1abf4..e7bebd6df7 100644 --- a/ext/standard/tests/strings/printf_basic5.phpt +++ b/ext/standard/tests/strings/printf_basic5.phpt @@ -58,4 +58,4 @@ int(3) -- Calling printf() with three arguments -- A B C int(5) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/printf_basic9.phpt b/ext/standard/tests/strings/printf_basic9.phpt index cff579de03..cb9513d975 100644 --- a/ext/standard/tests/strings/printf_basic9.phpt +++ b/ext/standard/tests/strings/printf_basic9.phpt @@ -80,4 +80,4 @@ b 84 b1 int(7) B 84 B1 int(7) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt index bce0c4d0d7..a88390bc04 100644 --- a/ext/standard/tests/strings/printf_error.phpt +++ b/ext/standard/tests/strings/printf_error.phpt @@ -67,4 +67,4 @@ bool(false) Warning: printf(): Too few arguments in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt index 37081b3cf1..d2694db6b6 100644 --- a/ext/standard/tests/strings/quotemeta_basic.phpt +++ b/ext/standard/tests/strings/quotemeta_basic.phpt @@ -20,4 +20,4 @@ var_dump(quotemeta("\+*?[^]($)")); string(20) "Hello how are you \?" string(19) "\(100 \+ 50\) \* 10" string(20) "\\\+\*\?\[\^\]\(\$\)" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/quotemeta_error.phpt b/ext/standard/tests/strings/quotemeta_error.phpt index 76efe085ca..a4284eca55 100644 --- a/ext/standard/tests/strings/quotemeta_error.phpt +++ b/ext/standard/tests/strings/quotemeta_error.phpt @@ -31,4 +31,4 @@ NULL Warning: quotemeta() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/rtrim_basic.phpt b/ext/standard/tests/strings/rtrim_basic.phpt index dbbd6c6154..9946f90c6e 100644 --- a/ext/standard/tests/strings/rtrim_basic.phpt +++ b/ext/standard/tests/strings/rtrim_basic.phpt @@ -51,4 +51,4 @@ string(10) "0123456789" -- Trim the ASCII control characters at the beginning of a string -- string(14) "Example string" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sha1_basic.phpt b/ext/standard/tests/strings/sha1_basic.phpt index 00b764f416..0761fe4cfd 100644 --- a/ext/standard/tests/strings/sha1_basic.phpt +++ b/ext/standard/tests/strings/sha1_basic.phpt @@ -67,4 +67,4 @@ string(40) "c12252ceda8be8994d5fa0290a47231c1d16aae3" string(40) "32d10c7b8cf96570ca04ce37f2a19d84240d3a89" string(40) "761c457bf73b14d27e9e9265c46f4b4dda11f940" string(40) "50abf5706a150990a08b2c5ea40fa0e585554732" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt index f7bb9dec00..bf77e3bc06 100644 --- a/ext/standard/tests/strings/sprintf_variation1.phpt +++ b/ext/standard/tests/strings/sprintf_variation1.phpt @@ -267,4 +267,4 @@ string(0) "" string(%d) "Resource id #%d" string(%d) "Resource id #%d" string(%d) "Resource id #%d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation12.phpt b/ext/standard/tests/strings/sprintf_variation12.phpt index b0fc221a0b..6657ff9cca 100644 --- a/ext/standard/tests/strings/sprintf_variation12.phpt +++ b/ext/standard/tests/strings/sprintf_variation12.phpt @@ -260,4 +260,4 @@ string(8) "1.000000" string(30) " 1.000000" string(4) "0-9]" string(1) "f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation13.phpt b/ext/standard/tests/strings/sprintf_variation13.phpt index de40856c36..10900c1438 100644 --- a/ext/standard/tests/strings/sprintf_variation13.phpt +++ b/ext/standard/tests/strings/sprintf_variation13.phpt @@ -355,4 +355,4 @@ string(10) "123.456000" string(30) " 123.456000" string(4) "0-9]" string(1) "f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation14.phpt b/ext/standard/tests/strings/sprintf_variation14.phpt index 7ee6f4a66e..49f4d5f12a 100644 --- a/ext/standard/tests/strings/sprintf_variation14.phpt +++ b/ext/standard/tests/strings/sprintf_variation14.phpt @@ -99,4 +99,4 @@ string(8) "0.000000" string(30) " 0.000000" string(4) "0-9]" string(1) "f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt Binary files differindex 308bb7ebcc..d908d40632 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_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index 009b45ef31..2bf9322c83 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -229,4 +229,4 @@ string(5) "Array" string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt index 967949a09c..1bab5dc862 100644 --- a/ext/standard/tests/strings/sprintf_variation2.phpt +++ b/ext/standard/tests/strings/sprintf_variation2.phpt @@ -218,4 +218,4 @@ string(0) "" -- Iteration 28 -- string(%d) "Resource id #%d" string(%d) "Resource id #%d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation20.phpt b/ext/standard/tests/strings/sprintf_variation20.phpt index 016e6c5bf1..a110311127 100644 --- a/ext/standard/tests/strings/sprintf_variation20.phpt +++ b/ext/standard/tests/strings/sprintf_variation20.phpt @@ -99,4 +99,4 @@ string(4) " " string(30) " " string(10) "a-zA-Z0-9]" string(1) "s" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation22.phpt b/ext/standard/tests/strings/sprintf_variation22.phpt Binary files differindex 0280a6a0e8..e12da7f75f 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 b4e8f51e91..e3324ce417 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 1e81c7137a..195ec29ea1 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 0b1170142b..b6e52fe948 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 b660334741..0dc39db05d 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_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt index af285dab23..a9a43bd15f 100644 --- a/ext/standard/tests/strings/sprintf_variation31.phpt +++ b/ext/standard/tests/strings/sprintf_variation31.phpt @@ -243,4 +243,4 @@ string(4) " 1" string(30) " 1" string(4) "0-7]" string(1) "o" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation32.phpt b/ext/standard/tests/strings/sprintf_variation32.phpt index 03caa63493..2d4352e75b 100644 --- a/ext/standard/tests/strings/sprintf_variation32.phpt +++ b/ext/standard/tests/strings/sprintf_variation32.phpt @@ -339,4 +339,4 @@ string(4) " 0" string(30) " 0" string(4) "0-7]" string(1) "o" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation33.phpt b/ext/standard/tests/strings/sprintf_variation33.phpt index b629dbabfe..54b2403f14 100644 --- a/ext/standard/tests/strings/sprintf_variation33.phpt +++ b/ext/standard/tests/strings/sprintf_variation33.phpt @@ -99,4 +99,4 @@ string(4) " 0" string(30) " 0" string(4) "0-7]" string(1) "o" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation37.phpt b/ext/standard/tests/strings/sprintf_variation37.phpt index d474ee0e1a..a76f7efd5c 100644 --- a/ext/standard/tests/strings/sprintf_variation37.phpt +++ b/ext/standard/tests/strings/sprintf_variation37.phpt @@ -227,4 +227,4 @@ string(4) " 1" string(30) " 1" string(10) "0-9A-Fa-f]" string(1) "x" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation38.phpt b/ext/standard/tests/strings/sprintf_variation38.phpt index 5a34280b95..a48a77a6d5 100644 --- a/ext/standard/tests/strings/sprintf_variation38.phpt +++ b/ext/standard/tests/strings/sprintf_variation38.phpt @@ -323,4 +323,4 @@ string(4) " 0" string(30) " 0" string(10) "0-9A-Fa-f]" string(1) "x" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation39.phpt b/ext/standard/tests/strings/sprintf_variation39.phpt index f9d9dbe222..0d842af057 100644 --- a/ext/standard/tests/strings/sprintf_variation39.phpt +++ b/ext/standard/tests/strings/sprintf_variation39.phpt @@ -99,4 +99,4 @@ string(4) " 0" string(30) " 0" string(10) "0-9A-Fa-f]" string(1) "x" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation43.phpt b/ext/standard/tests/strings/sprintf_variation43.phpt index ea34bc8813..0c86b468f5 100644 --- a/ext/standard/tests/strings/sprintf_variation43.phpt +++ b/ext/standard/tests/strings/sprintf_variation43.phpt @@ -259,4 +259,4 @@ string(4) " 1" string(30) " 1" string(4) "0-9]" string(1) "u" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation45.phpt b/ext/standard/tests/strings/sprintf_variation45.phpt index 5cdf9da998..d6bf31c56b 100644 --- a/ext/standard/tests/strings/sprintf_variation45.phpt +++ b/ext/standard/tests/strings/sprintf_variation45.phpt @@ -99,4 +99,4 @@ string(4) " 0" string(30) " 0" string(4) "0-9]" string(1) "u" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation47.phpt b/ext/standard/tests/strings/sprintf_variation47.phpt index 72212b6244..56ab7c5fc8 100644 --- a/ext/standard/tests/strings/sprintf_variation47.phpt +++ b/ext/standard/tests/strings/sprintf_variation47.phpt @@ -340,4 +340,4 @@ string(11) "1.050000e+6" string(30) " 1.050000e+6" string(4) "0-1]" string(1) "e" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation49.phpt b/ext/standard/tests/strings/sprintf_variation49.phpt index 31177ef521..f3ab223a06 100644 --- a/ext/standard/tests/strings/sprintf_variation49.phpt +++ b/ext/standard/tests/strings/sprintf_variation49.phpt @@ -275,4 +275,4 @@ string(11) "1.000000e+0" string(30) " 1.000000e+0" string(4) "0-1]" string(1) "e" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation50.phpt b/ext/standard/tests/strings/sprintf_variation50.phpt index d4f55d47e1..ccd8bf1bd4 100644 --- a/ext/standard/tests/strings/sprintf_variation50.phpt +++ b/ext/standard/tests/strings/sprintf_variation50.phpt @@ -340,4 +340,4 @@ string(12) "3.333333e+29" string(30) " 3.333333e+29" string(4) "0-1]" string(1) "e" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation51.phpt b/ext/standard/tests/strings/sprintf_variation51.phpt index 0ee0c52c65..ab056b3f2f 100644 --- a/ext/standard/tests/strings/sprintf_variation51.phpt +++ b/ext/standard/tests/strings/sprintf_variation51.phpt @@ -99,4 +99,4 @@ string(11) "0.000000e+0" string(30) " 0.000000e+0" string(4) "0-1]" string(1) "e" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation53.phpt b/ext/standard/tests/strings/sprintf_variation53.phpt index 2993dd00f1..b3a034c5a7 100644 --- a/ext/standard/tests/strings/sprintf_variation53.phpt +++ b/ext/standard/tests/strings/sprintf_variation53.phpt @@ -67,4 +67,4 @@ string(3) "4D2" string(11) "1.234000E+3" string(11) "1.234000E+3" string(11) "1.234000E+3" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation6.phpt b/ext/standard/tests/strings/sprintf_variation6.phpt index 1bf35df284..1480e45a0f 100644 --- a/ext/standard/tests/strings/sprintf_variation6.phpt +++ b/ext/standard/tests/strings/sprintf_variation6.phpt @@ -275,4 +275,4 @@ string(4) " 1" string(30) " 1" string(4) "0-9]" string(1) "d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation7.phpt b/ext/standard/tests/strings/sprintf_variation7.phpt index a37280df13..e910bfb687 100644 --- a/ext/standard/tests/strings/sprintf_variation7.phpt +++ b/ext/standard/tests/strings/sprintf_variation7.phpt @@ -99,4 +99,4 @@ string(4) " 0" string(30) " 0" string(4) "0-9]" string(1) "d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation8.phpt b/ext/standard/tests/strings/sprintf_variation8.phpt index 73efcc0583..c20cfcc588 100644 --- a/ext/standard/tests/strings/sprintf_variation8.phpt +++ b/ext/standard/tests/strings/sprintf_variation8.phpt @@ -371,4 +371,4 @@ string(4) " 0" string(30) " 0" string(4) "0-9]" string(1) "d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation9.phpt b/ext/standard/tests/strings/sprintf_variation9.phpt index f2564abd53..d0f9632c98 100644 --- a/ext/standard/tests/strings/sprintf_variation9.phpt +++ b/ext/standard/tests/strings/sprintf_variation9.phpt @@ -516,4 +516,4 @@ string(9) "-0.000000" string(30) " -0.000000" string(4) "0-9]" string(1) "f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sscanf_basic4.phpt b/ext/standard/tests/strings/sscanf_basic4.phpt index 8ed760afde..726bc08a10 100644 --- a/ext/standard/tests/strings/sscanf_basic4.phpt +++ b/ext/standard/tests/strings/sscanf_basic4.phpt @@ -40,4 +40,4 @@ string(1) "X" string(1) "A" string(1) "B" string(1) "C" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic8.phpt b/ext/standard/tests/strings/sscanf_basic8.phpt index bcec81eab4..f4f237fec4 100644 --- a/ext/standard/tests/strings/sscanf_basic8.phpt +++ b/ext/standard/tests/strings/sscanf_basic8.phpt @@ -62,4 +62,4 @@ int(4667) int(-4667) int(6844) int(1) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sscanf_error.phpt b/ext/standard/tests/strings/sscanf_error.phpt index f2a3dcbfec..ca967758ab 100644 --- a/ext/standard/tests/strings/sscanf_error.phpt +++ b/ext/standard/tests/strings/sscanf_error.phpt @@ -41,4 +41,4 @@ NULL Warning: sscanf(): Variable is not assigned by any conversion specifiers in %s on line %d int(-1) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sscanf_variation1.phpt b/ext/standard/tests/strings/sscanf_variation1.phpt index f5c4664526..cb5cdc754a 100644 --- a/ext/standard/tests/strings/sscanf_variation1.phpt +++ b/ext/standard/tests/strings/sscanf_variation1.phpt @@ -166,4 +166,4 @@ NULL NULL -- Iteration 21 -- NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sscanf_variation2.phpt b/ext/standard/tests/strings/sscanf_variation2.phpt index 9d2904ff72..dede6e8d98 100644 --- a/ext/standard/tests/strings/sscanf_variation2.phpt +++ b/ext/standard/tests/strings/sscanf_variation2.phpt @@ -150,4 +150,4 @@ array(0) { -- Iteration 21 -- array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_replace_array_refs2.phpt b/ext/standard/tests/strings/str_replace_array_refs2.phpt index 2050711493..e12681e079 100644 --- a/ext/standard/tests/strings/str_replace_array_refs2.phpt +++ b/ext/standard/tests/strings/str_replace_array_refs2.phpt @@ -21,7 +21,6 @@ var_dump(str_replace(array_keys($obj->prop), $obj->prop, "x property")); $array = ['x' => 'property']; $array = $closure($array, ['x'], 'a'); var_dump(str_replace(array_keys($array), $array, "x property")); - --EXPECT-- string(10) "a property" string(10) "a property" diff --git a/ext/standard/tests/strings/str_replace_error.phpt b/ext/standard/tests/strings/str_replace_error.phpt index b66fd8c9ec..c2d1d4fe2b 100644 --- a/ext/standard/tests/strings/str_replace_error.phpt +++ b/ext/standard/tests/strings/str_replace_error.phpt @@ -38,4 +38,4 @@ NULL Warning: str_replace() expects at most 4 parameters, 5 given in %sstr_replace_error.php on line 16 NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt Binary files differindex 5cf7f7c014..cbb2e0e5ed 100644 --- a/ext/standard/tests/strings/str_replace_variation2.phpt +++ b/ext/standard/tests/strings/str_replace_variation2.phpt diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt index 109fdc51cc..7f5fc1405c 100644 --- a/ext/standard/tests/strings/str_rot13_basic.phpt +++ b/ext/standard/tests/strings/str_rot13_basic.phpt @@ -52,4 +52,4 @@ Strings unequal : TEST FAILED Ensure strings round trip Strings equal : TEST PASSED -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_rot13_error.phpt b/ext/standard/tests/strings/str_rot13_error.phpt index 2361c0abb5..ee0ea4165e 100644 --- a/ext/standard/tests/strings/str_rot13_error.phpt +++ b/ext/standard/tests/strings/str_rot13_error.phpt @@ -29,4 +29,4 @@ NULL Warning: str_rot13() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_shuffle.phpt b/ext/standard/tests/strings/str_shuffle.phpt index 32f387287b..878cb283dd 100644 --- a/ext/standard/tests/strings/str_shuffle.phpt +++ b/ext/standard/tests/strings/str_shuffle.phpt @@ -9,4 +9,4 @@ var_dump($s); ?> --EXPECTF-- string(3) %s -string(3) "123"
\ No newline at end of file +string(3) "123" diff --git a/ext/standard/tests/strings/str_shuffle_basic.phpt b/ext/standard/tests/strings/str_shuffle_basic.phpt index 348f1bb731..350600891b 100644 --- a/ext/standard/tests/strings/str_shuffle_basic.phpt +++ b/ext/standard/tests/strings/str_shuffle_basic.phpt @@ -56,4 +56,4 @@ if ($combinations != 24) { *** Testing str_shuffle() : basic functionality *** string(47) "%s" TEST PASSED -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_shuffle_error.phpt b/ext/standard/tests/strings/str_shuffle_error.phpt index 8b83b5e2d0..46911407f0 100644 --- a/ext/standard/tests/strings/str_shuffle_error.phpt +++ b/ext/standard/tests/strings/str_shuffle_error.phpt @@ -30,4 +30,4 @@ NULL Warning: str_shuffle() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_shuffle_variation1.phpt b/ext/standard/tests/strings/str_shuffle_variation1.phpt index 367a25af0a..d5681392b5 100644 --- a/ext/standard/tests/strings/str_shuffle_variation1.phpt +++ b/ext/standard/tests/strings/str_shuffle_variation1.phpt @@ -132,4 +132,4 @@ NULL string(0) "" -- Iteration 21 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt index 2f3f5a2f46..81247bc0ab 100644 --- a/ext/standard/tests/strings/str_split_variation5.phpt +++ b/ext/standard/tests/strings/str_split_variation5.phpt @@ -173,4 +173,4 @@ whic" [7]=> string(7) "e slash" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation1.phpt b/ext/standard/tests/strings/strcspn_variation1.phpt index 81bd018a8a..89a4e5cc72 100644 --- a/ext/standard/tests/strings/strcspn_variation1.phpt +++ b/ext/standard/tests/strings/strcspn_variation1.phpt @@ -270,4 +270,4 @@ NULL Warning: strcspn() expects parameter 1 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation10.phpt b/ext/standard/tests/strings/strcspn_variation10.phpt index 7f572283db..1ad369f5dd 100644 --- a/ext/standard/tests/strings/strcspn_variation10.phpt +++ b/ext/standard/tests/strings/strcspn_variation10.phpt @@ -269,4 +269,4 @@ int(5) int(5) int(21) int(5) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation11.phpt b/ext/standard/tests/strings/strcspn_variation11.phpt index 96926564b0..9acefd074c 100644 --- a/ext/standard/tests/strings/strcspn_variation11.phpt +++ b/ext/standard/tests/strings/strcspn_variation11.phpt @@ -1303,4 +1303,4 @@ int(1) int(2) bool(false) int(5) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation12.phpt b/ext/standard/tests/strings/strcspn_variation12.phpt index 55b6b6e2e2..4495e7c26d 100644 --- a/ext/standard/tests/strings/strcspn_variation12.phpt +++ b/ext/standard/tests/strings/strcspn_variation12.phpt @@ -2479,4 +2479,4 @@ int(2) int(6) int(6) int(0) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation2.phpt b/ext/standard/tests/strings/strcspn_variation2.phpt index 4935cf4b30..d7d25f2ec0 100644 --- a/ext/standard/tests/strings/strcspn_variation2.phpt +++ b/ext/standard/tests/strings/strcspn_variation2.phpt @@ -269,4 +269,4 @@ NULL Warning: strcspn() expects parameter 2 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation3.phpt b/ext/standard/tests/strings/strcspn_variation3.phpt index a330c1111a..745fe88b4c 100644 --- a/ext/standard/tests/strings/strcspn_variation3.phpt +++ b/ext/standard/tests/strings/strcspn_variation3.phpt @@ -240,4 +240,4 @@ NULL Warning: strcspn() expects parameter 3 to be int, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation7.phpt b/ext/standard/tests/strings/strcspn_variation7.phpt index ada8681914..1f53e20d6f 100644 --- a/ext/standard/tests/strings/strcspn_variation7.phpt +++ b/ext/standard/tests/strings/strcspn_variation7.phpt @@ -609,4 +609,4 @@ int(1) int(2) bool(false) int(6) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation8.phpt b/ext/standard/tests/strings/strcspn_variation8.phpt index 6881b07e50..10c42731e7 100644 --- a/ext/standard/tests/strings/strcspn_variation8.phpt +++ b/ext/standard/tests/strings/strcspn_variation8.phpt @@ -1889,4 +1889,4 @@ int(2) int(6) int(6) int(0) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strip_tags_variation1.phpt b/ext/standard/tests/strings/strip_tags_variation1.phpt index 5c7fd642ad..cca444c0e0 100644 --- a/ext/standard/tests/strings/strip_tags_variation1.phpt +++ b/ext/standard/tests/strings/strip_tags_variation1.phpt @@ -156,4 +156,4 @@ string(0) "" Warning: strip_tags() expects parameter 1 to be string, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strip_tags_variation3.phpt b/ext/standard/tests/strings/strip_tags_variation3.phpt index 2117c1306c..d6dc34a080 100644 --- a/ext/standard/tests/strings/strip_tags_variation3.phpt +++ b/ext/standard/tests/strings/strip_tags_variation3.phpt @@ -156,4 +156,4 @@ string(0) "" Warning: strip_tags() expects parameter 1 to be string, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index de8f3aa962..e6b19540e3 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -101,4 +101,4 @@ string(150) "<html>This's a string with quotes:</html> "strings in double quote"; 'strings in single quote'; <html>this\line is single quoted /with\slashes </html>" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/stripcslashes_basic.phpt b/ext/standard/tests/strings/stripcslashes_basic.phpt index 24a23810d5..493e669131 100644 --- a/ext/standard/tests/strings/stripcslashes_basic.phpt +++ b/ext/standard/tests/strings/stripcslashes_basic.phpt @@ -37,4 +37,3 @@ string(2) "0c" string(2) "09" string(2) "0b" ===DONE=== - diff --git a/ext/standard/tests/strings/stripslashes_basic.phpt b/ext/standard/tests/strings/stripslashes_basic.phpt Binary files differindex 3286765b3a..3e0fb6f2ab 100644 --- a/ext/standard/tests/strings/stripslashes_basic.phpt +++ b/ext/standard/tests/strings/stripslashes_basic.phpt diff --git a/ext/standard/tests/strings/strnatcasecmp_error.phpt b/ext/standard/tests/strings/strnatcasecmp_error.phpt index 2105904aac..6a0fca76e9 100644 --- a/ext/standard/tests/strings/strnatcasecmp_error.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_error.phpt @@ -30,4 +30,4 @@ NULL Warning: strnatcasecmp() expects exactly 2 parameters, 3 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strnatcmp_basic.phpt b/ext/standard/tests/strings/strnatcmp_basic.phpt index c80a8e062e..734e5f57da 100644 --- a/ext/standard/tests/strings/strnatcmp_basic.phpt +++ b/ext/standard/tests/strings/strnatcmp_basic.phpt @@ -77,4 +77,4 @@ int(1) int(1) int(1) int(1) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strnatcmp_leftalign.phpt b/ext/standard/tests/strings/strnatcmp_leftalign.phpt index fde2f164b9..d00b3b83f0 100644 --- a/ext/standard/tests/strings/strnatcmp_leftalign.phpt +++ b/ext/standard/tests/strings/strnatcmp_leftalign.phpt @@ -20,7 +20,6 @@ $str1 = " 0"; $str2 = " 00"; var_dump( strnatcmp( $str1, $str2) ); ?> - --EXPECT-- -- Testing strnatcmp() function whitespace, left-align, digit -- -- Leading whitespace, digits, string 1 longer -- diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt Binary files differindex 6b46273836..5043128945 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_variation10.phpt b/ext/standard/tests/strings/strrchr_variation10.phpt index 7b106a1c2a..3b06b20be1 100644 --- a/ext/standard/tests/strings/strrchr_variation10.phpt +++ b/ext/standard/tests/strings/strrchr_variation10.phpt @@ -233,4 +233,4 @@ bool(false) Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrchr_variation11.phpt b/ext/standard/tests/strings/strrchr_variation11.phpt index 67939daba5..108ba2e0f2 100644 --- a/ext/standard/tests/strings/strrchr_variation11.phpt +++ b/ext/standard/tests/strings/strrchr_variation11.phpt @@ -192,4 +192,4 @@ bool(false) Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrchr_variation12.phpt b/ext/standard/tests/strings/strrchr_variation12.phpt Binary files differindex 7ec5b830ba..730811ea47 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 4e42818938..ddce2c2ccb 100644 --- a/ext/standard/tests/strings/strrchr_variation2.phpt +++ b/ext/standard/tests/strings/strrchr_variation2.phpt @@ -227,4 +227,4 @@ string(37) "*+-./:;<=>?@hello123456he \x234 \101 " -- Iteration 45 -- string(63) "Hello,\t\n\0\n $&!#%\o,()*+-./:;<=>?@hello123456he \x234 \101 " -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrchr_variation8.phpt b/ext/standard/tests/strings/strrchr_variation8.phpt index b1a2e8b33e..6b49b698f4 100644 --- a/ext/standard/tests/strings/strrchr_variation8.phpt +++ b/ext/standard/tests/strings/strrchr_variation8.phpt @@ -42,4 +42,4 @@ Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s o bool(false) bool(false) bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strripos.phpt b/ext/standard/tests/strings/strripos.phpt index 924505f6c9..291ff78cd7 100644 --- a/ext/standard/tests/strings/strripos.phpt +++ b/ext/standard/tests/strings/strripos.phpt @@ -34,4 +34,3 @@ bool(false) bool(false) int(1) bool(false) - diff --git a/ext/standard/tests/strings/strripos_variation1.phpt b/ext/standard/tests/strings/strripos_variation1.phpt index 5a8f7332bb..59d7a64686 100644 --- a/ext/standard/tests/strings/strripos_variation1.phpt +++ b/ext/standard/tests/strings/strripos_variation1.phpt @@ -283,4 +283,4 @@ int(0) bool(false) bool(false) int(0) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strripos_variation2.phpt b/ext/standard/tests/strings/strripos_variation2.phpt index 866a75dfc2..7b47b787be 100644 --- a/ext/standard/tests/strings/strripos_variation2.phpt +++ b/ext/standard/tests/strings/strripos_variation2.phpt @@ -297,4 +297,4 @@ int(0) bool(false) bool(false) int(0) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strrpos_variation1.phpt b/ext/standard/tests/strings/strrpos_variation1.phpt index 4d23db75da..fd236d04d4 100644 --- a/ext/standard/tests/strings/strrpos_variation1.phpt +++ b/ext/standard/tests/strings/strrpos_variation1.phpt @@ -195,4 +195,4 @@ bool(false) -- Iteration 35 -- int(0) bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation10.phpt b/ext/standard/tests/strings/strrpos_variation10.phpt index 32980450b2..b9b24b9cb1 100644 --- a/ext/standard/tests/strings/strrpos_variation10.phpt +++ b/ext/standard/tests/strings/strrpos_variation10.phpt @@ -195,4 +195,4 @@ bool(false) Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation11.phpt b/ext/standard/tests/strings/strrpos_variation11.phpt index 7822b759e2..94c1b9d96d 100644 --- a/ext/standard/tests/strings/strrpos_variation11.phpt +++ b/ext/standard/tests/strings/strrpos_variation11.phpt @@ -268,4 +268,4 @@ bool(false) Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation2.phpt b/ext/standard/tests/strings/strrpos_variation2.phpt index 2ab0aa76b9..9c0a320785 100644 --- a/ext/standard/tests/strings/strrpos_variation2.phpt +++ b/ext/standard/tests/strings/strrpos_variation2.phpt @@ -203,4 +203,4 @@ bool(false) -- Iteration 36 -- int(0) bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation3.phpt b/ext/standard/tests/strings/strrpos_variation3.phpt index 6599c7167c..460f18cca5 100644 --- a/ext/standard/tests/strings/strrpos_variation3.phpt +++ b/ext/standard/tests/strings/strrpos_variation3.phpt @@ -34,4 +34,4 @@ int(44) int(44) bool(false) int(55) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation4.phpt b/ext/standard/tests/strings/strrpos_variation4.phpt index 1e07fd9b5b..1d9184d787 100644 --- a/ext/standard/tests/strings/strrpos_variation4.phpt +++ b/ext/standard/tests/strings/strrpos_variation4.phpt @@ -38,4 +38,4 @@ int(39) int(55) int(55) int(57) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation5.phpt b/ext/standard/tests/strings/strrpos_variation5.phpt index 46a727516f..6a7f37beeb 100644 --- a/ext/standard/tests/strings/strrpos_variation5.phpt +++ b/ext/standard/tests/strings/strrpos_variation5.phpt @@ -31,4 +31,4 @@ int(13) int(19) int(13) int(19) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation6.phpt b/ext/standard/tests/strings/strrpos_variation6.phpt index cc961f75b0..46f754dbc8 100644 --- a/ext/standard/tests/strings/strrpos_variation6.phpt +++ b/ext/standard/tests/strings/strrpos_variation6.phpt @@ -32,4 +32,4 @@ int(88) int(59) int(59) int(59) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation7.phpt b/ext/standard/tests/strings/strrpos_variation7.phpt index 8481191e7a..54db4b372e 100644 --- a/ext/standard/tests/strings/strrpos_variation7.phpt +++ b/ext/standard/tests/strings/strrpos_variation7.phpt @@ -33,4 +33,4 @@ bool(false) Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation8.phpt b/ext/standard/tests/strings/strrpos_variation8.phpt index fe4706ca24..caf4928e24 100644 --- a/ext/standard/tests/strings/strrpos_variation8.phpt +++ b/ext/standard/tests/strings/strrpos_variation8.phpt @@ -56,4 +56,4 @@ bool(false) bool(false) -- Iteration 15 -- bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strspn_basic.phpt b/ext/standard/tests/strings/strspn_basic.phpt index 44eddff3cb..cab4349677 100644 --- a/ext/standard/tests/strings/strspn_basic.phpt +++ b/ext/standard/tests/strings/strspn_basic.phpt @@ -38,4 +38,4 @@ echo "Done" int(11) int(11) int(2) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation1.phpt b/ext/standard/tests/strings/strspn_variation1.phpt index 6b73b212ea..db6e8f9a15 100644 --- a/ext/standard/tests/strings/strspn_variation1.phpt +++ b/ext/standard/tests/strings/strspn_variation1.phpt @@ -270,4 +270,4 @@ NULL Warning: strspn() expects parameter 1 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation10.phpt b/ext/standard/tests/strings/strspn_variation10.phpt index 63071e3320..d8eb52aa6f 100644 --- a/ext/standard/tests/strings/strspn_variation10.phpt +++ b/ext/standard/tests/strings/strspn_variation10.phpt @@ -271,4 +271,4 @@ int(4) int(4) int(0) int(4) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation11.phpt b/ext/standard/tests/strings/strspn_variation11.phpt index bc21ce6523..ecbe6a4967 100644 --- a/ext/standard/tests/strings/strspn_variation11.phpt +++ b/ext/standard/tests/strings/strspn_variation11.phpt @@ -1303,4 +1303,4 @@ int(0) int(1) bool(false) int(4) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation12.phpt b/ext/standard/tests/strings/strspn_variation12.phpt index 8086c53f66..1c404c1914 100644 --- a/ext/standard/tests/strings/strspn_variation12.phpt +++ b/ext/standard/tests/strings/strspn_variation12.phpt @@ -2875,4 +2875,4 @@ int(2) int(4) int(4) int(0) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation2.phpt b/ext/standard/tests/strings/strspn_variation2.phpt index b968ce1436..1d31a1c802 100644 --- a/ext/standard/tests/strings/strspn_variation2.phpt +++ b/ext/standard/tests/strings/strspn_variation2.phpt @@ -269,4 +269,4 @@ NULL Warning: strspn() expects parameter 2 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation3.phpt b/ext/standard/tests/strings/strspn_variation3.phpt index 11a37c6f94..76f11acc26 100644 --- a/ext/standard/tests/strings/strspn_variation3.phpt +++ b/ext/standard/tests/strings/strspn_variation3.phpt @@ -240,4 +240,4 @@ NULL Warning: strspn() expects parameter 3 to be int, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation4.phpt b/ext/standard/tests/strings/strspn_variation4.phpt index 82da538057..858a4fb608 100644 --- a/ext/standard/tests/strings/strspn_variation4.phpt +++ b/ext/standard/tests/strings/strspn_variation4.phpt @@ -193,4 +193,4 @@ int(0) Warning: strspn() expects parameter 4 to be int, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation5.phpt b/ext/standard/tests/strings/strspn_variation5.phpt Binary files differindex eccf5dff34..229fc1fbb6 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_variation7.phpt b/ext/standard/tests/strings/strspn_variation7.phpt index 5b229dad3c..bbfe5d4868 100644 --- a/ext/standard/tests/strings/strspn_variation7.phpt +++ b/ext/standard/tests/strings/strspn_variation7.phpt @@ -609,4 +609,4 @@ int(0) int(0) bool(false) int(2) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation8.phpt b/ext/standard/tests/strings/strspn_variation8.phpt index 57e0f80ed6..0ff0000132 100644 --- a/ext/standard/tests/strings/strspn_variation8.phpt +++ b/ext/standard/tests/strings/strspn_variation8.phpt @@ -1891,4 +1891,4 @@ int(2) int(4) int(4) int(0) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt Binary files differindex 3cff71936e..2908de7a27 100644 --- a/ext/standard/tests/strings/strstr.phpt +++ b/ext/standard/tests/strings/strstr.phpt diff --git a/ext/standard/tests/strings/strtr.phpt b/ext/standard/tests/strings/strtr.phpt index 80ed722b8e..77666ced8c 100644 --- a/ext/standard/tests/strings/strtr.phpt +++ b/ext/standard/tests/strings/strtr.phpt @@ -7,4 +7,4 @@ $trans = array("hello"=>"hi", "hi"=>"hello", "a"=>"A", "world"=>"planet"); var_dump(strtr("# hi all, I said hello world! #", $trans)); ?> --EXPECT-- -string(32) "# hello All, I sAid hi planet! #"
\ No newline at end of file +string(32) "# hello All, I sAid hi planet! #" diff --git a/ext/standard/tests/strings/strtr_variation3.phpt b/ext/standard/tests/strings/strtr_variation3.phpt index 9feb237645..5bec076e7e 100644 --- a/ext/standard/tests/strings/strtr_variation3.phpt +++ b/ext/standard/tests/strings/strtr_variation3.phpt @@ -100,4 +100,4 @@ string(8) "\"quotes" -- Iteration 11 -- string(54) "SesSTsttETTtestTTstrtrTTtestETstrtrT$variableTT"quotes" string(52) " es \sttT\test\\strtrtttestTstrtrt$variablet\"quotes" -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt index 8140c1cdb1..65f1c98366 100644 --- a/ext/standard/tests/strings/strval_basic.phpt +++ b/ext/standard/tests/strings/strval_basic.phpt @@ -74,4 +74,4 @@ string(5) "0xABC" -- Iteration 7 -- string(21) "Simple HEREDOC string" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strval_error.phpt b/ext/standard/tests/strings/strval_error.phpt index 94ed70263a..37ecfd14d5 100644 --- a/ext/standard/tests/strings/strval_error.phpt +++ b/ext/standard/tests/strings/strval_error.phpt @@ -48,4 +48,4 @@ NULL -- Testing strval() function with object which has not toString() method -- -Recoverable fatal error: Object of class MyClass could not be converted to string in %s on line %d
\ No newline at end of file +Recoverable fatal error: Object of class MyClass could not be converted to string in %s on line %d diff --git a/ext/standard/tests/strings/strval_variation1.phpt b/ext/standard/tests/strings/strval_variation1.phpt index 2eb665631e..5918c286e2 100644 --- a/ext/standard/tests/strings/strval_variation1.phpt +++ b/ext/standard/tests/strings/strval_variation1.phpt @@ -187,4 +187,4 @@ string(0) "" -- Iteration 31 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strval_variation2.phpt b/ext/standard/tests/strings/strval_variation2.phpt index 947d47f20f..3fa99f7718 100644 --- a/ext/standard/tests/strings/strval_variation2.phpt +++ b/ext/standard/tests/strings/strval_variation2.phpt @@ -79,4 +79,4 @@ c0c1c2c3c4c5c6c7c8c9cacbcccdcecf d0d1d2d3d4d5d6d7d8d9dadbdcdddedf e0e1e2e3e4e5e6e7e8e9eaebecedeeef f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/substr_replace.phpt b/ext/standard/tests/strings/substr_replace.phpt index 27620de964..852c014b50 100644 --- a/ext/standard/tests/strings/substr_replace.phpt +++ b/ext/standard/tests/strings/substr_replace.phpt @@ -807,4 +807,3 @@ array(2) { [1]=> string(10) "trbala his" } - diff --git a/ext/standard/tests/strings/trim.phpt b/ext/standard/tests/strings/trim.phpt index a69f17c6d7..44276284e1 100644 --- a/ext/standard/tests/strings/trim.phpt +++ b/ext/standard/tests/strings/trim.phpt @@ -22,6 +22,5 @@ $tests = <<<TESTS TESTS; include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); - --EXPECT-- OK diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt Binary files differindex 2096b61f22..d0e4070d80 100644 --- a/ext/standard/tests/strings/trim1.phpt +++ b/ext/standard/tests/strings/trim1.phpt diff --git a/ext/standard/tests/strings/trim_error.phpt b/ext/standard/tests/strings/trim_error.phpt index e34cd144cd..b845cee1ac 100644 --- a/ext/standard/tests/strings/trim_error.phpt +++ b/ext/standard/tests/strings/trim_error.phpt @@ -58,4 +58,4 @@ string(14) " Hello World Warning: trim(): Invalid '..'-range in %s on line %d string(14) " Hello World " -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/trim_variation1.phpt b/ext/standard/tests/strings/trim_variation1.phpt index cbbd5b9e4c..56578fb75c 100644 --- a/ext/standard/tests/strings/trim_variation1.phpt +++ b/ext/standard/tests/strings/trim_variation1.phpt @@ -135,4 +135,4 @@ NULL string(0) "" -- Iteration 22 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/trim_variation2.phpt b/ext/standard/tests/strings/trim_variation2.phpt index b4c0352404..d38f898862 100644 --- a/ext/standard/tests/strings/trim_variation2.phpt +++ b/ext/standard/tests/strings/trim_variation2.phpt @@ -135,4 +135,4 @@ NULL string(19) "!---Hello World---!" -- Iteration 22 -- string(19) "!---Hello World---!" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/unpack.phpt b/ext/standard/tests/strings/unpack.phpt index 26f3f2eaf9..3a6068be71 100644 --- a/ext/standard/tests/strings/unpack.phpt +++ b/ext/standard/tests/strings/unpack.phpt @@ -8,4 +8,4 @@ Invalid format type validation --EXPECTF-- Warning: unpack(): Invalid format type - in %sunpack.php on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/unpack_bug68225.phpt b/ext/standard/tests/strings/unpack_bug68225.phpt index 8d96369691..b02b0383bf 100644 --- a/ext/standard/tests/strings/unpack_bug68225.phpt +++ b/ext/standard/tests/strings/unpack_bug68225.phpt @@ -36,4 +36,3 @@ array(4) { int(2) } ===DONE=== - diff --git a/ext/standard/tests/strings/unpack_offset.phpt b/ext/standard/tests/strings/unpack_offset.phpt index c8c08e74f2..64cb089bc3 100644 --- a/ext/standard/tests/strings/unpack_offset.phpt +++ b/ext/standard/tests/strings/unpack_offset.phpt @@ -14,4 +14,3 @@ printf("0x%08x 0x%08x\n", --EXPECT-- 0x01020304 0x05060708 0x01020304 0x05060708 - diff --git a/ext/standard/tests/strings/url_t.phpt b/ext/standard/tests/strings/url_t.phpt index e172061ec2..79ff3bc4a8 100644 --- a/ext/standard/tests/strings/url_t.phpt +++ b/ext/standard/tests/strings/url_t.phpt @@ -783,4 +783,3 @@ string(7) "hideout" string(10) "/index.php" string(31) "test=1&test2=char&test3=mixesCI" string(16) "some_page_ref123" - diff --git a/ext/standard/tests/strings/utf8_decode_error.phpt b/ext/standard/tests/strings/utf8_decode_error.phpt index 49e9c19562..de2ca2b80e 100644 --- a/ext/standard/tests/strings/utf8_decode_error.phpt +++ b/ext/standard/tests/strings/utf8_decode_error.phpt @@ -35,4 +35,3 @@ NULL Warning: utf8_decode() expects exactly 1 parameter, 2 given in %s on line %d NULL Done - diff --git a/ext/standard/tests/strings/utf8_decode_variation1.phpt b/ext/standard/tests/strings/utf8_decode_variation1.phpt index 63ccf7d7d1..10d4f31ca4 100644 --- a/ext/standard/tests/strings/utf8_decode_variation1.phpt +++ b/ext/standard/tests/strings/utf8_decode_variation1.phpt @@ -167,4 +167,3 @@ string(0) "" Arg value string(0) "" Done - diff --git a/ext/standard/tests/strings/utf8_encode_error.phpt b/ext/standard/tests/strings/utf8_encode_error.phpt index e247c38fbb..bcc9335c58 100644 --- a/ext/standard/tests/strings/utf8_encode_error.phpt +++ b/ext/standard/tests/strings/utf8_encode_error.phpt @@ -35,4 +35,3 @@ NULL Warning: utf8_encode() expects exactly 1 parameter, 2 given in %s on line %d NULL Done - diff --git a/ext/standard/tests/strings/utf8_encode_variation1.phpt b/ext/standard/tests/strings/utf8_encode_variation1.phpt index a06b8d869e..a0212ea45e 100644 --- a/ext/standard/tests/strings/utf8_encode_variation1.phpt +++ b/ext/standard/tests/strings/utf8_encode_variation1.phpt @@ -167,4 +167,3 @@ string(0) "" Arg value string(0) "" Done - diff --git a/ext/standard/tests/strings/vfprintf_basic2.phpt b/ext/standard/tests/strings/vfprintf_basic2.phpt index db28f5fb70..970640f071 100644 --- a/ext/standard/tests/strings/vfprintf_basic2.phpt +++ b/ext/standard/tests/strings/vfprintf_basic2.phpt @@ -49,5 +49,3 @@ unlink($data_file); 111 222 111 222 333 ===DONE=== - - diff --git a/ext/standard/tests/strings/vfprintf_basic3.phpt b/ext/standard/tests/strings/vfprintf_basic3.phpt index bd9efaa2e0..a940ccffe8 100644 --- a/ext/standard/tests/strings/vfprintf_basic3.phpt +++ b/ext/standard/tests/strings/vfprintf_basic3.phpt @@ -61,4 +61,3 @@ unlink($data_file); 11.110000 22.220000 33.330000 11.110000 22.220000 33.330000 ===DONE=== - diff --git a/ext/standard/tests/strings/vfprintf_basic4.phpt b/ext/standard/tests/strings/vfprintf_basic4.phpt index e653f63306..c8a170c670 100644 --- a/ext/standard/tests/strings/vfprintf_basic4.phpt +++ b/ext/standard/tests/strings/vfprintf_basic4.phpt @@ -44,4 +44,3 @@ unlink($data_file); 1 0 1 0 1 ===DONE=== - diff --git a/ext/standard/tests/strings/vfprintf_basic5.phpt b/ext/standard/tests/strings/vfprintf_basic5.phpt index a7a7697dc2..f89ab53f5c 100644 --- a/ext/standard/tests/strings/vfprintf_basic5.phpt +++ b/ext/standard/tests/strings/vfprintf_basic5.phpt @@ -44,5 +44,3 @@ A A B A B C ===DONE=== - - diff --git a/ext/standard/tests/strings/vfprintf_basic6.phpt b/ext/standard/tests/strings/vfprintf_basic6.phpt index 332370b5de..9e888939d2 100644 --- a/ext/standard/tests/strings/vfprintf_basic6.phpt +++ b/ext/standard/tests/strings/vfprintf_basic6.phpt @@ -46,4 +46,3 @@ unlink($data_file); 1.000000e+3 2.000000e+3 1.000000e+3 2.000000e+3 3.000000e+3 ===DONE=== - diff --git a/ext/standard/tests/strings/vfprintf_basic7.phpt b/ext/standard/tests/strings/vfprintf_basic7.phpt index f235c1cd6f..a9f286f5a8 100644 --- a/ext/standard/tests/strings/vfprintf_basic7.phpt +++ b/ext/standard/tests/strings/vfprintf_basic7.phpt @@ -49,5 +49,3 @@ unlink($data_file); 4294966185 4293732729 4294966185 4293732729 4292621864 ===DONE=== - - diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt index 254bd8c2c1..010028c387 100644 --- a/ext/standard/tests/strings/vfprintf_variation16.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16.phpt @@ -109,4 +109,4 @@ unlink($data_file); 1 1 0 #0 1 $1 _0 0 1 1 1 -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation21.phpt b/ext/standard/tests/strings/vfprintf_variation21.phpt index 5d8c63e207..874b279763 100644 --- a/ext/standard/tests/strings/vfprintf_variation21.phpt +++ b/ext/standard/tests/strings/vfprintf_variation21.phpt @@ -165,4 +165,3 @@ string -- Iteration 23 -- Resource id #%d ===DONE=== - diff --git a/ext/standard/tests/strings/vfprintf_variation3.phpt b/ext/standard/tests/strings/vfprintf_variation3.phpt index 99db0bf00b..e3e7b9636a 100644 --- a/ext/standard/tests/strings/vfprintf_variation3.phpt +++ b/ext/standard/tests/strings/vfprintf_variation3.phpt @@ -84,4 +84,3 @@ unlink($data_file); -- Iteration 8 -- 1 2 3 4 ===DONE=== - diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt index 55bfd465bb..9dad0eff58 100644 --- a/ext/standard/tests/strings/vfprintf_variation4.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4.phpt @@ -110,4 +110,4 @@ unlink($data_file); 1 0 1 0000 #0 1 $1 _0 0 1 1 1 -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation5.phpt b/ext/standard/tests/strings/vfprintf_variation5.phpt index 9845a3ff2c..ffe6c347bc 100644 --- a/ext/standard/tests/strings/vfprintf_variation5.phpt +++ b/ext/standard/tests/strings/vfprintf_variation5.phpt @@ -83,4 +83,3 @@ unlink($data_file); -- Iteration 8 -- 1.110000 2.220000 3.330000 4.440000 ===DONE=== - diff --git a/ext/standard/tests/strings/vprintf_basic1.phpt b/ext/standard/tests/strings/vprintf_basic1.phpt index e550ea1c8d..280649f70d 100644 --- a/ext/standard/tests/strings/vprintf_basic1.phpt +++ b/ext/standard/tests/strings/vprintf_basic1.phpt @@ -40,4 +40,3 @@ int(7) one two three int(13) ===DONE=== - diff --git a/ext/standard/tests/strings/vsprintf_variation10.phpt b/ext/standard/tests/strings/vsprintf_variation10.phpt Binary files differindex d81d6c6a87..205be0ac45 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 286c3d0b01..defcd593e0 100644 --- a/ext/standard/tests/strings/vsprintf_variation11.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11.phpt @@ -55,7 +55,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECT-- *** Testing vsprintf() : octal formats with octal values *** diff --git a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt index 50e3e86ab7..127d3f594d 100644 --- a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt @@ -55,7 +55,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECT-- *** Testing vsprintf() : octal formats with octal values *** diff --git a/ext/standard/tests/strings/vsprintf_variation13.phpt b/ext/standard/tests/strings/vsprintf_variation13.phpt index 6cb751f2a0..6899766b0a 100644 --- a/ext/standard/tests/strings/vsprintf_variation13.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13.phpt @@ -55,7 +55,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECT-- *** Testing vsprintf() : hexa formats with hexa values *** diff --git a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt index fe43c7faec..3828414360 100644 --- a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt @@ -55,7 +55,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECT-- *** Testing vsprintf() : hexa formats with hexa values *** diff --git a/ext/standard/tests/strings/vsprintf_variation2.phpt b/ext/standard/tests/strings/vsprintf_variation2.phpt index 9061c092fe..838093cdb1 100644 --- a/ext/standard/tests/strings/vsprintf_variation2.phpt +++ b/ext/standard/tests/strings/vsprintf_variation2.phpt @@ -174,4 +174,4 @@ bool(false) -- Iteration 23 -- string(%d) "Resource id #%d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/vsprintf_variation3.phpt b/ext/standard/tests/strings/vsprintf_variation3.phpt index 86924cd438..4fa51c92de 100644 --- a/ext/standard/tests/strings/vsprintf_variation3.phpt +++ b/ext/standard/tests/strings/vsprintf_variation3.phpt @@ -52,7 +52,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECT-- *** Testing vsprintf() : int formats with int values *** diff --git a/ext/standard/tests/strings/vsprintf_variation5.phpt b/ext/standard/tests/strings/vsprintf_variation5.phpt index 723cd2236c..8c7046021b 100644 --- a/ext/standard/tests/strings/vsprintf_variation5.phpt +++ b/ext/standard/tests/strings/vsprintf_variation5.phpt @@ -52,7 +52,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECT-- *** Testing vsprintf() : int formats with float values *** diff --git a/ext/standard/tests/strings/vsprintf_variation7.phpt b/ext/standard/tests/strings/vsprintf_variation7.phpt Binary files differindex 8f5b8862c2..57ac54fda9 100644 --- a/ext/standard/tests/strings/vsprintf_variation7.phpt +++ b/ext/standard/tests/strings/vsprintf_variation7.phpt diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt index 109d8b626e..0efd8bb008 100644 --- a/ext/standard/tests/strings/vsprintf_variation8.phpt +++ b/ext/standard/tests/strings/vsprintf_variation8.phpt @@ -100,4 +100,4 @@ string(79) "1 1 1 0001 0000 #0 1 $1 _0 1 1 1" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/vsprintf_variation9.phpt b/ext/standard/tests/strings/vsprintf_variation9.phpt Binary files differindex f1ed093218..fc9b16dbee 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.phpt b/ext/standard/tests/strings/wordwrap.phpt index c1f3b05bda..50531b5e93 100644 --- a/ext/standard/tests/strings/wordwrap.phpt +++ b/ext/standard/tests/strings/wordwrap.phpt @@ -32,6 +32,5 @@ FALSE === @wordwrap(chr(0), 0, "") TESTS; include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); - --EXPECT-- OK diff --git a/ext/standard/tests/strings/wordwrap_variation1.phpt b/ext/standard/tests/strings/wordwrap_variation1.phpt index 59462448c8..86f6fac482 100644 --- a/ext/standard/tests/strings/wordwrap_variation1.phpt +++ b/ext/standard/tests/strings/wordwrap_variation1.phpt @@ -332,4 +332,4 @@ string(0) "" string(0) "" string(0) "" string(0) "" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/time/strptime_basic.phpt b/ext/standard/tests/time/strptime_basic.phpt index e9384fd9b9..f352e9d06a 100644 --- a/ext/standard/tests/time/strptime_basic.phpt +++ b/ext/standard/tests/time/strptime_basic.phpt @@ -7,7 +7,6 @@ Test strptime() function : basic functionality } if(PHP_OS == 'Darwin') die("skip - strptime() behaves differently on Darwin"); ?> - --FILE-- <?php /* Prototype : array strptime ( string $date , string $format ) diff --git a/ext/standard/tests/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt index a84216f4ff..f49025be44 100644 --- a/ext/standard/tests/time/strptime_error.phpt +++ b/ext/standard/tests/time/strptime_error.phpt @@ -58,4 +58,3 @@ NULL -- Testing strptime() function on failure -- bool(false) ===DONE=== - diff --git a/ext/standard/tests/time/strptime_parts.phpt b/ext/standard/tests/time/strptime_parts.phpt index 6a772d588c..085b0e600f 100644 --- a/ext/standard/tests/time/strptime_parts.phpt +++ b/ext/standard/tests/time/strptime_parts.phpt @@ -6,7 +6,6 @@ Test strptime() function : basic functionality die("skip - strptime() function not available in this build"); } ?> - --FILE-- <?php /* Prototype : array strptime ( string $date , string $format ) diff --git a/ext/standard/tests/url/base64_decode_basic_001.phpt b/ext/standard/tests/url/base64_decode_basic_001.phpt index 7edbf7fc0d..2ce6ce6354 100644 --- a/ext/standard/tests/url/base64_decode_basic_001.phpt +++ b/ext/standard/tests/url/base64_decode_basic_001.phpt @@ -21,4 +21,4 @@ Decode an input string containing the whole base64 alphabet: string(98) "00108310518720928b30d38f41149351559761969b71d79f8218a39259a7a29aabb2dbafc31cb3d35db7e39ebbf3dfbf55" string(98) "00108310518720928b30d38f41149351559761969b71d79f8218a39259a7a29aabb2dbafc31cb3d35db7e39ebbf3dfbf55" string(98) "00108310518720928b30d38f41149351559761969b71d79f8218a39259a7a29aabb2dbafc31cb3d35db7e39ebbf3dfbf55" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/base64_decode_basic_002.phpt b/ext/standard/tests/url/base64_decode_basic_002.phpt index 63f14cac0e..c538d15997 100644 --- a/ext/standard/tests/url/base64_decode_basic_002.phpt +++ b/ext/standard/tests/url/base64_decode_basic_002.phpt @@ -44,4 +44,4 @@ Other chars outside the base64 alphabet are ignored when $strict===false, but ca string(12) "hello world!" string(12) "hello world!" bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/base64_decode_variation_001.phpt b/ext/standard/tests/url/base64_decode_variation_001.phpt index 7c11ad2c33..10e8736846 100644 --- a/ext/standard/tests/url/base64_decode_variation_001.phpt +++ b/ext/standard/tests/url/base64_decode_variation_001.phpt @@ -178,4 +178,4 @@ string(0) "" -- Arg value resource -- Error: 2 - base64_decode() expects parameter 1 to be string, resource given, %s(%d) NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/url/base64_decode_variation_002.phpt b/ext/standard/tests/url/base64_decode_variation_002.phpt index f527c2ef19..56232f58c4 100644 --- a/ext/standard/tests/url/base64_decode_variation_002.phpt +++ b/ext/standard/tests/url/base64_decode_variation_002.phpt @@ -172,4 +172,4 @@ string(12) "hello world!" -- Arg value resource -- Error: 2 - base64_decode() expects parameter 2 to be bool, resource given, %s(%d) NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/url/base64_encode_error_001.phpt b/ext/standard/tests/url/base64_encode_error_001.phpt index d87e148302..d9f7632175 100644 --- a/ext/standard/tests/url/base64_encode_error_001.phpt +++ b/ext/standard/tests/url/base64_encode_error_001.phpt @@ -34,4 +34,4 @@ NULL Warning: base64_encode() expects exactly 1 parameter, 2 given in %s on line 18 NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/bug53248.phpt b/ext/standard/tests/url/bug53248.phpt index 5cff9f1c47..434478dab7 100644 --- a/ext/standard/tests/url/bug53248.phpt +++ b/ext/standard/tests/url/bug53248.phpt @@ -9,4 +9,4 @@ var_dump(rawurldecode('%41%31%5F%2D%2E%7E')); ?> --EXPECT-- string(6) "A1_-.~" -string(6) "A1_-.~"
\ No newline at end of file +string(6) "A1_-.~" diff --git a/ext/standard/tests/url/bug74780.phpt b/ext/standard/tests/url/bug74780.phpt index ae464d971b..0589064266 100644 --- a/ext/standard/tests/url/bug74780.phpt +++ b/ext/standard/tests/url/bug74780.phpt @@ -35,4 +35,4 @@ array(4) { string(5) "/path" ["query"]=> string(9) "query=1:2" -}
\ No newline at end of file +} diff --git a/ext/standard/tests/url/get_headers_error_001.phpt b/ext/standard/tests/url/get_headers_error_001.phpt index 270c8350c0..cf8dee95fb 100644 --- a/ext/standard/tests/url/get_headers_error_001.phpt +++ b/ext/standard/tests/url/get_headers_error_001.phpt @@ -40,6 +40,3 @@ NULL Warning: get_headers() expects at most 3 parameters, 4 given in %s on line 20 NULL Done - - - diff --git a/ext/standard/tests/url/get_headers_error_002.phpt b/ext/standard/tests/url/get_headers_error_002.phpt index a1bcdba99b..17984534a7 100644 --- a/ext/standard/tests/url/get_headers_error_002.phpt +++ b/ext/standard/tests/url/get_headers_error_002.phpt @@ -52,4 +52,3 @@ NULL Warning: get_headers() expects parameter 2 to be int, object given in %s on line 26 NULL Done - diff --git a/ext/standard/tests/url/get_headers_error_003.phpt b/ext/standard/tests/url/get_headers_error_003.phpt index 81265eecc9..c65305af2c 100644 --- a/ext/standard/tests/url/get_headers_error_003.phpt +++ b/ext/standard/tests/url/get_headers_error_003.phpt @@ -26,6 +26,3 @@ echo "Done"; 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 0adbb06e52..7340d24323 100644 --- a/ext/standard/tests/url/parse_url_basic_001.phpt +++ b/ext/standard/tests/url/parse_url_basic_001.phpt @@ -21,7 +21,6 @@ foreach ($urls as $url) { echo "Done"; ?> --EXPECT-- - --> 64.246.30.37: array(1) { ["path"]=> string(12) "64.246.30.37" diff --git a/ext/standard/tests/url/parse_url_basic_010.phpt b/ext/standard/tests/url/parse_url_basic_010.phpt index 065e0c79ba..8fecb9d8eb 100644 --- a/ext/standard/tests/url/parse_url_basic_010.phpt +++ b/ext/standard/tests/url/parse_url_basic_010.phpt @@ -28,4 +28,4 @@ PHP_URL_PASS: 4 PHP_URL_PATH: 5 PHP_URL_QUERY: 6 PHP_URL_FRAGMENT: 7 -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/parse_url_error_001.phpt b/ext/standard/tests/url/parse_url_error_001.phpt index c2740dedd9..b527a67d1b 100644 --- a/ext/standard/tests/url/parse_url_error_001.phpt +++ b/ext/standard/tests/url/parse_url_error_001.phpt @@ -35,4 +35,4 @@ NULL Warning: parse_url() expects at most 2 parameters, 3 given in %s on line 19 NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/parse_url_error_002.phpt b/ext/standard/tests/url/parse_url_error_002.phpt index 6131f1a457..5af4232e0c 100644 --- a/ext/standard/tests/url/parse_url_error_002.phpt +++ b/ext/standard/tests/url/parse_url_error_002.phpt @@ -44,4 +44,4 @@ echo "Done" --> Above range: Warning: parse_url(): Invalid URL component identifier 99 in %s on line 15 bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/parse_url_relative_scheme.phpt b/ext/standard/tests/url/parse_url_relative_scheme.phpt index 7c8952db71..678e3a3d11 100644 --- a/ext/standard/tests/url/parse_url_relative_scheme.phpt +++ b/ext/standard/tests/url/parse_url_relative_scheme.phpt @@ -8,4 +8,3 @@ array(1) { ["host"]=> string(11) "example.org" } - diff --git a/ext/standard/tests/url/parse_url_unterminated.phpt b/ext/standard/tests/url/parse_url_unterminated.phpt index 00cdeab9a9..c83e458085 100644 --- a/ext/standard/tests/url/parse_url_unterminated.phpt +++ b/ext/standard/tests/url/parse_url_unterminated.phpt @@ -23,7 +23,6 @@ foreach ($urls as $url) { echo "Done"; ?> --EXPECT-- - --> 64.246.30.37: array(1) { ["path"]=> string(12) "64.246.30.37" diff --git a/ext/standard/tests/url/parse_url_variation_001.phpt b/ext/standard/tests/url/parse_url_variation_001.phpt index fe04ad4a09..6c492e36f1 100644 --- a/ext/standard/tests/url/parse_url_variation_001.phpt +++ b/ext/standard/tests/url/parse_url_variation_001.phpt @@ -223,4 +223,4 @@ array(1) { ["path"]=> string(0) "" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt index 85fae69840..70138ffe77 100644 --- a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt @@ -186,4 +186,4 @@ string(4) "http" Arg value string(4) "http" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt index 3d88dfc25c..69ebe274b5 100644 --- a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt @@ -186,4 +186,4 @@ string(4) "http" Arg value string(4) "http" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/rawurldecode_variation_001.phpt b/ext/standard/tests/url/rawurldecode_variation_001.phpt index 6428b96fcf..40b96c775d 100644 --- a/ext/standard/tests/url/rawurldecode_variation_001.phpt +++ b/ext/standard/tests/url/rawurldecode_variation_001.phpt @@ -170,4 +170,4 @@ string(0) "" Arg value string(0) "" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/rawurlencode_error_001.phpt b/ext/standard/tests/url/rawurlencode_error_001.phpt index f8b3e61c37..9bfb8140db 100644 --- a/ext/standard/tests/url/rawurlencode_error_001.phpt +++ b/ext/standard/tests/url/rawurlencode_error_001.phpt @@ -36,4 +36,4 @@ NULL Warning: rawurlencode() expects exactly 1 parameter, 2 given in %s on line 20 NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/rawurlencode_variation_001.phpt b/ext/standard/tests/url/rawurlencode_variation_001.phpt index 1dabc4bde9..105eec6887 100644 --- a/ext/standard/tests/url/rawurlencode_variation_001.phpt +++ b/ext/standard/tests/url/rawurlencode_variation_001.phpt @@ -170,4 +170,4 @@ string(0) "" Arg value string(0) "" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/urldecode_error_001.phpt b/ext/standard/tests/url/urldecode_error_001.phpt index b009d7d53e..44e8b613da 100644 --- a/ext/standard/tests/url/urldecode_error_001.phpt +++ b/ext/standard/tests/url/urldecode_error_001.phpt @@ -36,4 +36,4 @@ NULL Warning: urldecode() expects exactly 1 parameter, 2 given in %s on line 20 NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/urldecode_variation_001.phpt b/ext/standard/tests/url/urldecode_variation_001.phpt index fe538b7072..617648b9e4 100644 --- a/ext/standard/tests/url/urldecode_variation_001.phpt +++ b/ext/standard/tests/url/urldecode_variation_001.phpt @@ -170,4 +170,4 @@ string(0) "" Arg value string(0) "" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/urlencode_error_001.phpt b/ext/standard/tests/url/urlencode_error_001.phpt index 7e43ef73bf..190590bc88 100644 --- a/ext/standard/tests/url/urlencode_error_001.phpt +++ b/ext/standard/tests/url/urlencode_error_001.phpt @@ -36,4 +36,4 @@ NULL Warning: urlencode() expects exactly 1 parameter, 2 given in %s on line 20 NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/url/urlencode_variation_001.phpt b/ext/standard/tests/url/urlencode_variation_001.phpt index d74209d137..9c5296f1c5 100644 --- a/ext/standard/tests/url/urlencode_variation_001.phpt +++ b/ext/standard/tests/url/urlencode_variation_001.phpt @@ -170,4 +170,4 @@ string(0) "" Arg value string(0) "" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/versioning/php_sapi_name.phpt b/ext/standard/tests/versioning/php_sapi_name.phpt index 0747b32d66..fefda8b2a5 100644 --- a/ext/standard/tests/versioning/php_sapi_name.phpt +++ b/ext/standard/tests/versioning/php_sapi_name.phpt @@ -4,6 +4,5 @@ php_sapi_name test <?php var_dump(php_sapi_name()); - --EXPECTF-- string(3) "c%ci" diff --git a/ext/standard/tests/versioning/version_compare.phpt b/ext/standard/tests/versioning/version_compare.phpt index 145fb933ab..17574e9737 100644 --- a/ext/standard/tests/versioning/version_compare.phpt +++ b/ext/standard/tests/versioning/version_compare.phpt @@ -792,4 +792,4 @@ TESTING OPERATORS 1.0pl1 == 1.0pl1 : true 1.0pl1 ne 1.0pl1 : false 1.0pl1 <> 1.0pl1 : false - 1.0pl1 != 1.0pl1 : false
\ No newline at end of file + 1.0pl1 != 1.0pl1 : false |