summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-15 04:33:09 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-15 04:33:09 +0200
commitd679f02295ea079338f029b7f5f4cb65b37f190c (patch)
tree53c519e1f829913a54d9dcea004721a3714cea26
parente84662c35cffaa95ead4322bfe9d61815c185722 (diff)
downloadphp-git-d679f02295ea079338f029b7f5f4cb65b37f190c.tar.gz
Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
-rw-r--r--Zend/tests/033.phpt1
-rw-r--r--Zend/tests/abstract-static.phpt1
-rw-r--r--Zend/tests/add_006.phpt1
-rw-r--r--Zend/tests/add_007.phpt1
-rw-r--r--Zend/tests/anon/001.phpt2
-rw-r--r--Zend/tests/anon/002.phpt1
-rw-r--r--Zend/tests/anon/003.phpt1
-rw-r--r--Zend/tests/anon/006.phpt1
-rw-r--r--Zend/tests/anon/007.phpt1
-rw-r--r--Zend/tests/assert/expect_013.phpt2
-rw-r--r--Zend/tests/assert/expect_014.phpt2
-rw-r--r--Zend/tests/bug26010.phpt1
-rw-r--r--Zend/tests/bug26696.phpt2
-rw-r--r--Zend/tests/bug29896.phpt1
-rw-r--r--Zend/tests/bug29944.phpt1
-rw-r--r--Zend/tests/bug30162.phpt2
-rw-r--r--Zend/tests/bug30519.phpt1
-rw-r--r--Zend/tests/bug32596.phpt1
-rw-r--r--Zend/tests/bug33318.phpt2
-rw-r--r--Zend/tests/bug33558.phpt1
-rw-r--r--Zend/tests/bug34062.phpt1
-rw-r--r--Zend/tests/bug34064.phpt1
-rw-r--r--Zend/tests/bug34199.phpt1
-rw-r--r--Zend/tests/bug34879.phpt2
-rw-r--r--Zend/tests/bug36071.phpt2
-rw-r--r--Zend/tests/bug37138.phpt1
-rw-r--r--Zend/tests/bug37707.phpt1
-rw-r--r--Zend/tests/bug38808.phpt2
-rw-r--r--Zend/tests/bug41401.phpt2
-rw-r--r--Zend/tests/bug42143.phpt1
-rw-r--r--Zend/tests/bug42818.phpt1
-rw-r--r--Zend/tests/bug42820.phpt1
-rw-r--r--Zend/tests/bug43183.phpt2
-rw-r--r--Zend/tests/bug43200.phpt1
-rw-r--r--Zend/tests/bug45180.phpt2
-rw-r--r--Zend/tests/bug45862.phpt1
-rw-r--r--Zend/tests/bug46811.phpt1
-rw-r--r--Zend/tests/bug47109.phpt1
-rw-r--r--Zend/tests/bug48228.phpt1
-rw-r--r--Zend/tests/bug48408.phpt1
-rw-r--r--Zend/tests/bug50394.phpt1
-rw-r--r--Zend/tests/bug51176.phpt2
-rw-r--r--Zend/tests/bug52237.phpt1
-rw-r--r--Zend/tests/bug52361.phpt1
-rw-r--r--Zend/tests/bug53971.phpt2
-rw-r--r--Zend/tests/bug54265.phpt1
-rw-r--r--Zend/tests/bug60536_001.phpt1
-rw-r--r--Zend/tests/bug60738_variation.phpt1
-rw-r--r--Zend/tests/bug60833.phpt1
-rw-r--r--Zend/tests/bug61970_1.phpt1
-rw-r--r--Zend/tests/bug61970_2.phpt1
-rw-r--r--Zend/tests/bug62441.phpt1
-rw-r--r--Zend/tests/bug63111.phpt1
-rw-r--r--Zend/tests/bug63462.phpt2
-rw-r--r--Zend/tests/bug63468.phpt1
-rw-r--r--Zend/tests/bug63762.phpt1
-rw-r--r--Zend/tests/bug64417.phpt1
-rw-r--r--Zend/tests/bug64660.phpt1
-rw-r--r--Zend/tests/bug65419.phpt2
-rw-r--r--Zend/tests/bug67436/bug67436.phpt3
-rw-r--r--Zend/tests/bug67436/bug67436_nohandler.phpt1
-rw-r--r--Zend/tests/bug68446.phpt1
-rw-r--r--Zend/tests/bug69092.2.phpt2
-rw-r--r--Zend/tests/bug69092.phpt2
-rw-r--r--Zend/tests/bug69315.phpt1
-rw-r--r--Zend/tests/bug69537.phpt1
-rw-r--r--Zend/tests/bug69732.phpt1
-rw-r--r--Zend/tests/bug69825.phpt1
-rw-r--r--Zend/tests/bug69832.phpt1
-rw-r--r--Zend/tests/bug69889.phpt1
-rw-r--r--Zend/tests/bug69957.phpt1
-rw-r--r--Zend/tests/bug70083.phpt2
-rw-r--r--Zend/tests/bug71428.1.phpt1
-rw-r--r--Zend/tests/bug71428.2.phpt1
-rw-r--r--Zend/tests/bug71428.3.phpt1
-rw-r--r--Zend/tests/bug71539_6.phpt2
-rw-r--r--Zend/tests/bug71572.phpt2
-rw-r--r--Zend/tests/bug72038.phpt2
-rw-r--r--Zend/tests/bug72057.phpt2
-rw-r--r--Zend/tests/bug72119.phpt1
-rw-r--r--Zend/tests/bug73998.phpt1
-rw-r--r--Zend/tests/bug74657.phpt1
-rw-r--r--Zend/tests/bug75290.phpt1
-rw-r--r--Zend/tests/bug75420.2.phpt1
-rw-r--r--Zend/tests/call_static.phpt1
-rw-r--r--Zend/tests/class_alias_004.phpt2
-rw-r--r--Zend/tests/closure_012.phpt1
-rw-r--r--Zend/tests/closure_022.phpt1
-rw-r--r--Zend/tests/closure_023.phpt1
-rw-r--r--Zend/tests/closure_024.phpt2
-rw-r--r--Zend/tests/closure_031.phpt1
-rw-r--r--Zend/tests/closure_032.phpt1
-rw-r--r--Zend/tests/closure_036.phpt2
-rw-r--r--Zend/tests/closure_037.phpt2
-rw-r--r--Zend/tests/closure_041.phpt1
-rw-r--r--Zend/tests/closure_043.phpt1
-rw-r--r--Zend/tests/closure_044.phpt1
-rw-r--r--Zend/tests/closure_045.phpt1
-rw-r--r--Zend/tests/closure_046.phpt1
-rw-r--r--Zend/tests/closure_049.phpt1
-rw-r--r--Zend/tests/closure_050.phpt2
-rw-r--r--Zend/tests/closure_051.phpt2
-rw-r--r--Zend/tests/closure_052.phpt2
-rw-r--r--Zend/tests/closure_053.phpt2
-rw-r--r--Zend/tests/closure_054.phpt2
-rw-r--r--Zend/tests/closure_055.phpt2
-rw-r--r--Zend/tests/closure_056.phpt2
-rw-r--r--Zend/tests/closure_bug66622.phpt2
-rw-r--r--Zend/tests/closures/closure_from_callable_basic.phpt1
-rw-r--r--Zend/tests/closures/closure_from_callable_error.phpt1
-rw-r--r--Zend/tests/concat_001.phpt1
-rw-r--r--Zend/tests/concat_002.phpt1
-rw-r--r--Zend/tests/const_dereference_002.phpt1
-rw-r--r--Zend/tests/constant_arrays.phpt1
-rw-r--r--Zend/tests/constant_expressions_coalesce_empty_dim.phpt1
-rw-r--r--Zend/tests/constant_expressions_dynamic.phpt1
-rw-r--r--Zend/tests/constant_expressions_self_referencing_array.phpt1
-rw-r--r--Zend/tests/debug_backtrace_with_include_and_this.phpt1
-rw-r--r--Zend/tests/declare_006.phpt1
-rw-r--r--Zend/tests/errmsg_018.phpt1
-rw-r--r--Zend/tests/exception_003.phpt1
-rw-r--r--Zend/tests/flexible-heredoc-error1.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error10.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error11.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error12.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error13.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error2.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error3.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error4.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error5.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error6.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error7.phpt3
-rw-r--r--Zend/tests/flexible-heredoc-error8.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-error9.phpt2
-rw-r--r--Zend/tests/flexible-heredoc-nowdoc.phpt2
-rw-r--r--Zend/tests/flexible-nowdoc-error1.phpt2
-rw-r--r--Zend/tests/flexible-nowdoc-error2.phpt2
-rw-r--r--Zend/tests/flexible-nowdoc-error3.phpt2
-rw-r--r--Zend/tests/flexible-nowdoc-error4.phpt2
-rw-r--r--Zend/tests/flexible-nowdoc-error5.phpt2
-rw-r--r--Zend/tests/flexible-nowdoc-error6.phpt2
-rw-r--r--Zend/tests/flexible-nowdoc-error7.phpt3
-rw-r--r--Zend/tests/flexible-nowdoc-error8.phpt2
-rw-r--r--Zend/tests/foreach_012.phpt2
-rw-r--r--Zend/tests/foreach_015.phpt2
-rw-r--r--Zend/tests/function_arguments/argument_count_correct.phpt2
-rw-r--r--Zend/tests/function_arguments/argument_count_correct_strict.phpt2
-rw-r--r--Zend/tests/function_arguments/argument_count_incorrect_internal.phpt2
-rw-r--r--Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt2
-rw-r--r--Zend/tests/function_arguments/argument_count_incorrect_userland.phpt2
-rw-r--r--Zend/tests/function_arguments_001.phpt1
-rw-r--r--Zend/tests/function_arguments_002.phpt1
-rw-r--r--Zend/tests/function_exists_error.phpt1
-rw-r--r--Zend/tests/function_exists_variation1.phpt2
-rw-r--r--Zend/tests/gc_038.phpt1
-rw-r--r--Zend/tests/generators/basic_yield_from_exception_handling.phpt1
-rw-r--r--Zend/tests/generators/bug71013.phpt1
-rw-r--r--Zend/tests/generators/bug71441.phpt1
-rw-r--r--Zend/tests/generators/bug71601.phpt1
-rw-r--r--Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt1
-rw-r--r--Zend/tests/generators/generator_closure_unused.phpt2
-rw-r--r--Zend/tests/generators/generator_return_without_value.phpt2
-rw-r--r--Zend/tests/generators/generator_throwing_in_foreach.phpt1
-rw-r--r--Zend/tests/generators/generator_with_arg_unpacking.phpt2
-rw-r--r--Zend/tests/generators/multiple_yield_from_on_same_generator.phpt1
-rw-r--r--Zend/tests/generators/recursive_yield_from.phpt1
-rw-r--r--Zend/tests/generators/throw_rethrow.phpt1
-rw-r--r--Zend/tests/generators/yield_from_backtrace.phpt1
-rw-r--r--Zend/tests/generators/yield_from_multi_tree.phpt1
-rw-r--r--Zend/tests/generators/yield_from_multi_tree_exception.phpt1
-rw-r--r--Zend/tests/generators/yield_unary_precedence.phpt2
-rw-r--r--Zend/tests/grammar/regression_001.phpt2
-rw-r--r--Zend/tests/grammar/regression_002.phpt1
-rw-r--r--Zend/tests/grammar/regression_004.phpt1
-rw-r--r--Zend/tests/grammar/regression_005.phpt1
-rw-r--r--Zend/tests/grammar/regression_006.phpt1
-rw-r--r--Zend/tests/grammar/regression_007.phpt1
-rw-r--r--Zend/tests/grammar/regression_008.phpt3
-rw-r--r--Zend/tests/grammar/regression_009.phpt2
-rw-r--r--Zend/tests/grammar/regression_010.phpt2
-rw-r--r--Zend/tests/grammar/regression_012.phpt1
-rw-r--r--Zend/tests/grammar/regression_013.phpt1
-rw-r--r--Zend/tests/grammar/semi_reserved_001.phpt1
-rw-r--r--Zend/tests/grammar/semi_reserved_002.phpt1
-rw-r--r--Zend/tests/grammar/semi_reserved_004.phpt1
-rw-r--r--Zend/tests/grammar/semi_reserved_005.phpt1
-rw-r--r--Zend/tests/grammar/semi_reserved_006.phpt1
-rw-r--r--Zend/tests/grammar/semi_reserved_007.phpt3
-rw-r--r--Zend/tests/grammar/semi_reserved_008.phpt1
-rw-r--r--Zend/tests/grammar/semi_reserved_009.phpt1
-rw-r--r--Zend/tests/grammar/semi_reserved_010.phpt1
-rw-r--r--Zend/tests/halt_compiler1.phpt2
-rw-r--r--Zend/tests/halt_compiler2.phpt2
-rw-r--r--Zend/tests/halt_compiler3.phpt2
-rw-r--r--Zend/tests/halt_compiler4.phpt2
-rw-r--r--Zend/tests/indirect_call_array_003.phpt1
-rw-r--r--Zend/tests/int_special_values.phpt2
-rw-r--r--Zend/tests/int_static_prop_name.phpt1
-rw-r--r--Zend/tests/list_keyed_undefined.phpt1
-rw-r--r--Zend/tests/lsb_006.phpt1
-rw-r--r--Zend/tests/lsb_007.phpt1
-rw-r--r--Zend/tests/lsb_008.phpt1
-rw-r--r--Zend/tests/lsb_009.phpt1
-rw-r--r--Zend/tests/methods-on-non-objects-call-user-func.phpt1
-rw-r--r--Zend/tests/methods-on-non-objects-catch.phpt1
-rw-r--r--Zend/tests/methods-on-non-objects.phpt1
-rw-r--r--Zend/tests/multibyte/multibyte_encoding_006.phptbin629 -> 628 bytes
-rw-r--r--Zend/tests/nested_method_and_function.phpt2
-rw-r--r--Zend/tests/ns_004.phpt2
-rw-r--r--Zend/tests/ns_011.phpt1
-rw-r--r--Zend/tests/ns_012.phpt1
-rw-r--r--Zend/tests/ns_015.phpt1
-rw-r--r--Zend/tests/ns_017.phpt2
-rw-r--r--Zend/tests/ns_026.phpt2
-rw-r--r--Zend/tests/ns_038.phpt1
-rw-r--r--Zend/tests/ns_041.phpt1
-rw-r--r--Zend/tests/ns_053.phpt1
-rw-r--r--Zend/tests/ns_057.phpt2
-rw-r--r--Zend/tests/ns_068.phpt1
-rw-r--r--Zend/tests/ns_080.phpt2
-rw-r--r--Zend/tests/ns_082.phpt2
-rw-r--r--Zend/tests/ns_085.phpt2
-rw-r--r--Zend/tests/ns_086.phpt2
-rw-r--r--Zend/tests/ns_089.phpt1
-rw-r--r--Zend/tests/ns_090.phpt1
-rw-r--r--Zend/tests/ns_091.phpt3
-rw-r--r--Zend/tests/ns_092.phpt1
-rw-r--r--Zend/tests/ns_093.phpt5
-rw-r--r--Zend/tests/ns_094.phpt1
-rw-r--r--Zend/tests/ns_095.phpt1
-rw-r--r--Zend/tests/ns_trailing_comma_error_01.phpt2
-rw-r--r--Zend/tests/ns_trailing_comma_error_02.phpt2
-rw-r--r--Zend/tests/ns_trailing_comma_error_03.phpt2
-rw-r--r--Zend/tests/ns_trailing_comma_error_04.phpt2
-rw-r--r--Zend/tests/ns_trailing_comma_error_05.phpt2
-rw-r--r--Zend/tests/ns_trailing_comma_error_06.phpt2
-rw-r--r--Zend/tests/ns_trailing_comma_error_07.phpt2
-rw-r--r--Zend/tests/ns_trailing_comma_error_08.phpt2
-rw-r--r--Zend/tests/nullable_types/array.phpt2
-rw-r--r--Zend/tests/nullable_types/contravariant_nullable_param_succeeds.phpt3
-rw-r--r--Zend/tests/nullable_types/contravariant_nullable_return_fails.phpt3
-rw-r--r--Zend/tests/nullable_types/covariant_nullable_param_fails.phpt3
-rw-r--r--Zend/tests/nullable_types/covariant_nullable_return_succeds.phpt3
-rw-r--r--Zend/tests/nullable_types/float.phpt2
-rw-r--r--Zend/tests/nullable_types/int.phpt2
-rw-r--r--Zend/tests/nullable_types/invariant_param_and_return_succeeds.phpt3
-rw-r--r--Zend/tests/nullable_types/nullable_type_parameters_do_not_have_default_value.phpt3
-rw-r--r--Zend/tests/nullable_types/string.phpt2
-rw-r--r--Zend/tests/numeric_string_errors.phpt1
-rw-r--r--Zend/tests/numeric_string_errors_assign.phpt1
-rw-r--r--Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt3
-rw-r--r--Zend/tests/object_types/missing_return_type_inheritance_in_interface.phpt1
-rw-r--r--Zend/tests/object_types/return_type_in_class.phpt1
-rw-r--r--Zend/tests/object_types/return_type_in_function.phpt3
-rw-r--r--Zend/tests/object_types/return_type_inheritance_in_class.phpt1
-rw-r--r--Zend/tests/object_types/return_type_inheritance_in_interface.phpt1
-rw-r--r--Zend/tests/object_types/return_type_reflection.phpt3
-rw-r--r--Zend/tests/object_types/type_hint_in_class_method.phpt3
-rw-r--r--Zend/tests/object_types/type_hint_in_function.phpt3
-rw-r--r--Zend/tests/object_types/type_hint_reflection.phpt3
-rw-r--r--Zend/tests/objects_024.phpt1
-rw-r--r--Zend/tests/objects_027.phpt2
-rw-r--r--Zend/tests/offset_string.phpt2
-rw-r--r--Zend/tests/parent_class_name_without_parent.phpt1
-rw-r--r--Zend/tests/result_unused.phpt1
-rw-r--r--Zend/tests/return_types/001.phpt2
-rw-r--r--Zend/tests/return_types/002.phpt2
-rw-r--r--Zend/tests/return_types/003.phpt2
-rw-r--r--Zend/tests/return_types/004.phpt2
-rw-r--r--Zend/tests/return_types/005.phpt2
-rw-r--r--Zend/tests/return_types/006.phpt2
-rw-r--r--Zend/tests/return_types/007.phpt2
-rw-r--r--Zend/tests/return_types/008.phpt2
-rw-r--r--Zend/tests/return_types/009.phpt2
-rw-r--r--Zend/tests/return_types/010.phpt2
-rw-r--r--Zend/tests/return_types/011.phpt2
-rw-r--r--Zend/tests/return_types/012.phpt2
-rw-r--r--Zend/tests/return_types/013.phpt2
-rw-r--r--Zend/tests/return_types/014.phpt2
-rw-r--r--Zend/tests/return_types/015.phpt2
-rw-r--r--Zend/tests/return_types/016.phpt2
-rw-r--r--Zend/tests/return_types/017.phpt2
-rw-r--r--Zend/tests/return_types/018.phpt2
-rw-r--r--Zend/tests/return_types/019.phpt2
-rw-r--r--Zend/tests/return_types/020.phpt2
-rw-r--r--Zend/tests/return_types/021.phpt2
-rw-r--r--Zend/tests/return_types/022.phpt2
-rw-r--r--Zend/tests/return_types/023.phpt2
-rw-r--r--Zend/tests/return_types/024.phpt2
-rw-r--r--Zend/tests/return_types/025.phpt2
-rw-r--r--Zend/tests/return_types/026.phpt1
-rw-r--r--Zend/tests/return_types/027.phpt1
-rw-r--r--Zend/tests/return_types/031.phpt2
-rw-r--r--Zend/tests/return_types/generators001.phpt2
-rw-r--r--Zend/tests/return_types/generators002.phpt2
-rw-r--r--Zend/tests/return_types/generators003.phpt2
-rw-r--r--Zend/tests/return_types/generators004.phpt2
-rw-r--r--Zend/tests/return_types/generators005.phpt2
-rw-r--r--Zend/tests/return_types/inheritance001.phpt2
-rw-r--r--Zend/tests/return_types/inheritance002.phpt2
-rw-r--r--Zend/tests/return_types/inheritance003.phpt2
-rw-r--r--Zend/tests/return_types/inheritance004.phpt2
-rw-r--r--Zend/tests/return_types/inheritance005.phpt2
-rw-r--r--Zend/tests/return_types/inheritance006.phpt3
-rw-r--r--Zend/tests/return_types/inheritance007.phpt3
-rw-r--r--Zend/tests/return_types/inheritance008.phpt3
-rw-r--r--Zend/tests/return_types/inheritance009.phpt3
-rw-r--r--Zend/tests/return_types/return_reference_separation.phpt3
-rw-r--r--Zend/tests/return_types/rfc001.phpt2
-rw-r--r--Zend/tests/return_types/rfc002.phpt2
-rw-r--r--Zend/tests/return_types/rfc003.phpt2
-rw-r--r--Zend/tests/return_types/rfc004.phpt2
-rw-r--r--Zend/tests/self_in_eval.phpt1
-rw-r--r--Zend/tests/temporary_cleaning_016.phpt1
-rw-r--r--Zend/tests/this_in_eval.phpt1
-rw-r--r--Zend/tests/throwable_001.phpt1
-rw-r--r--Zend/tests/throwable_002.phpt1
-rw-r--r--Zend/tests/throwable_003.phpt1
-rw-r--r--Zend/tests/traits/bug55554a.phpt1
-rw-r--r--Zend/tests/traits/bug55554b.phpt3
-rw-r--r--Zend/tests/traits/bug55554c.phpt2
-rw-r--r--Zend/tests/traits/bug55554d.phpt3
-rw-r--r--Zend/tests/traits/bug55554e.phpt4
-rw-r--r--Zend/tests/traits/bug55554f.phpt4
-rw-r--r--Zend/tests/traits/bug55554g.phpt4
-rw-r--r--Zend/tests/traits/bug60153.phpt1
-rw-r--r--Zend/tests/traits/bug60165a.phpt1
-rw-r--r--Zend/tests/traits/bug60165b.phpt1
-rw-r--r--Zend/tests/traits/bug60165c.phpt1
-rw-r--r--Zend/tests/traits/bug60165d.phpt1
-rw-r--r--Zend/tests/traits/bug60173.phpt1
-rw-r--r--Zend/tests/traits/bug60217a.phpt1
-rw-r--r--Zend/tests/traits/bug60217b.phpt1
-rw-r--r--Zend/tests/traits/bug60217c.phpt1
-rw-r--r--Zend/tests/traits/bug60369.phpt2
-rw-r--r--Zend/tests/traits/bug60717.phpt1
-rw-r--r--Zend/tests/traits/bug65576a.phpt2
-rw-r--r--Zend/tests/traits/bug65576b.phpt2
-rw-r--r--Zend/tests/traits/bug76700.phpt1
-rw-r--r--Zend/tests/traits/bug76773.phpt1
-rw-r--r--Zend/tests/traits/bugs/abstract-methods01.phpt2
-rw-r--r--Zend/tests/traits/bugs/abstract-methods02.phpt2
-rw-r--r--Zend/tests/traits/bugs/abstract-methods03.phpt2
-rw-r--r--Zend/tests/traits/bugs/abstract-methods04.phpt2
-rw-r--r--Zend/tests/traits/bugs/alias-semantics.phpt2
-rw-r--r--Zend/tests/traits/bugs/alias-semantics02.phpt2
-rw-r--r--Zend/tests/traits/bugs/missing-trait.phpt2
-rw-r--r--Zend/tests/traits/bugs/overridding-conflicting-methods.phpt2
-rw-r--r--Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt2
-rw-r--r--Zend/tests/traits/conflict001.phpt2
-rw-r--r--Zend/tests/traits/conflict002.phpt2
-rw-r--r--Zend/tests/traits/conflict003.phpt2
-rw-r--r--Zend/tests/traits/flattening001.phpt2
-rw-r--r--Zend/tests/traits/flattening002.phpt2
-rw-r--r--Zend/tests/traits/flattening003.phpt2
-rw-r--r--Zend/tests/traits/inheritance001.phpt2
-rw-r--r--Zend/tests/traits/inheritance002.phpt2
-rw-r--r--Zend/tests/traits/language002.phpt2
-rw-r--r--Zend/tests/traits/language003.phpt2
-rw-r--r--Zend/tests/traits/language004.phpt2
-rw-r--r--Zend/tests/traits/language005.phpt2
-rw-r--r--Zend/tests/traits/language006.phpt2
-rw-r--r--Zend/tests/traits/language007.phpt2
-rw-r--r--Zend/tests/traits/language008a.phpt2
-rw-r--r--Zend/tests/traits/language008b.phpt2
-rw-r--r--Zend/tests/traits/language009.phpt2
-rw-r--r--Zend/tests/traits/language010.phpt2
-rw-r--r--Zend/tests/traits/property009.phpt1
-rw-r--r--Zend/tests/traits/static_001.phpt2
-rw-r--r--Zend/tests/traits/static_002.phpt2
-rw-r--r--Zend/tests/traits/static_003.phpt2
-rw-r--r--Zend/tests/traits/static_004.phpt2
-rw-r--r--Zend/tests/traits/static_forward_static_call.phpt2
-rw-r--r--Zend/tests/traits/static_get_called_class.phpt2
-rw-r--r--Zend/tests/traits/trait_constant_002.phpt2
-rw-r--r--Zend/tests/try/bug72629.phpt1
-rw-r--r--Zend/tests/try/bug74444.phpt1
-rw-r--r--Zend/tests/try/try_finally_012.phpt1
-rw-r--r--Zend/tests/try/try_finally_022.phpt1
-rw-r--r--Zend/tests/try/try_multicatch_006.phpt1
-rw-r--r--Zend/tests/try/try_multicatch_007.phpt1
-rw-r--r--Zend/tests/type_declarations/callable_001.phpt1
-rw-r--r--Zend/tests/type_declarations/callable_002.phpt1
-rw-r--r--Zend/tests/type_declarations/callable_003.phpt1
-rw-r--r--Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt1
-rw-r--r--Zend/tests/type_declarations/iterable_001.phpt1
-rw-r--r--Zend/tests/type_declarations/iterable_002.phpt1
-rw-r--r--Zend/tests/type_declarations/iterable_004.phpt1
-rw-r--r--Zend/tests/type_declarations/iterable_005.phpt1
-rw-r--r--Zend/tests/type_declarations/scalar_basic.phpt1
-rw-r--r--Zend/tests/type_declarations/scalar_float_with_invalid_default.phpt1
-rw-r--r--Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt2
-rw-r--r--Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt2
-rw-r--r--Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt2
-rw-r--r--Zend/tests/type_declarations/scalar_strict_declaration_placement_008.phpt2
-rw-r--r--Zend/tests/type_declarations/strict_call_weak.phpt1
-rw-r--r--Zend/tests/type_declarations/strict_call_weak_explicit.phpt1
-rw-r--r--Zend/tests/varSyntax/constClassMemberAccess.phpt2
-rw-r--r--Zend/tests/zend_signed_multiply-64bit-2.phpt1
-rw-r--r--ext/bcmath/tests/bcadd_error1.phpt2
-rw-r--r--ext/bcmath/tests/bcadd_variation001.phpt2
-rw-r--r--ext/bcmath/tests/bccomp_variation001.phpt2
-rw-r--r--ext/bcmath/tests/bccomp_variation002.phpt2
-rw-r--r--ext/bcmath/tests/bcmod_error2.phpt2
-rw-r--r--ext/bcmath/tests/bcmul_error1.phpt2
-rw-r--r--ext/bcmath/tests/bcpow_error3.phpt2
-rw-r--r--ext/bcmath/tests/bcpow_variation001.phpt2
-rw-r--r--ext/bcmath/tests/bcpowmod.phpt2
-rw-r--r--ext/bcmath/tests/bcscale_variation001.phpt2
-rw-r--r--ext/bcmath/tests/bcscale_variation002.phpt2
-rw-r--r--ext/bcmath/tests/bcsqrt_error2.phpt2
-rw-r--r--ext/bcmath/tests/bcsqrt_variation001.phpt2
-rw-r--r--ext/bcmath/tests/bcsub_error1.phpt2
-rw-r--r--ext/bz2/tests/bug51997.phpt1
-rw-r--r--ext/bz2/tests/bug72613.phpt2
-rw-r--r--ext/bz2/tests/with_files.phpt1
-rw-r--r--ext/bz2/tests/with_strings.phpt1
-rw-r--r--ext/calendar/tests/bug53574_1.phpt1
-rw-r--r--ext/calendar/tests/bug53574_2.phpt1
-rw-r--r--ext/calendar/tests/bug55797_1.phpt1
-rw-r--r--ext/calendar/tests/bug55797_2.phpt1
-rw-r--r--ext/calendar/tests/cal_days_in_month_error1.phpt2
-rw-r--r--ext/calendar/tests/cal_from_jd_error1.phpt2
-rw-r--r--ext/calendar/tests/cal_to_jd_error1.phpt2
-rw-r--r--ext/calendar/tests/gregoriantojd.phpt2
-rw-r--r--ext/calendar/tests/jddayofweek.phpt1
-rw-r--r--ext/calendar/tests/jdtofrench.phpt2
-rw-r--r--ext/calendar/tests/jdtogregorian.phpt2
-rw-r--r--ext/calendar/tests/jdtojewish.phpt2
-rw-r--r--ext/calendar/tests/jdtojulian.phpt2
-rw-r--r--ext/calendar/tests/jdtounix_error1.phpt2
-rw-r--r--ext/calendar/tests/jewishtojd.phpt2
-rw-r--r--ext/calendar/tests/juliantojd.phpt2
-rw-r--r--ext/calendar/tests/unixtojd_error1.phpt2
-rw-r--r--ext/com_dotnet/tests/bug39606.phpt2
-rw-r--r--ext/curl/tests/bug48203.phpt1
-rw-r--r--ext/curl/tests/curl_CURLOPT_READDATA.phpt1
-rw-r--r--ext/curl/tests/curl_basic_011.phpt1
-rw-r--r--ext/curl/tests/curl_basic_012.phpt2
-rw-r--r--ext/curl/tests/curl_basic_013.phpt2
-rw-r--r--ext/curl/tests/curl_file_serialize.phpt1
-rw-r--r--ext/curl/tests/curl_setopt_array_basic.phpt1
-rw-r--r--ext/curl/tests/curl_setopt_basic002.phpt1
-rw-r--r--ext/curl/tests/curl_share_close_basic001.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_clone_basic1.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_compare_basic1.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_extends_basic1.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_getName_basic1.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_getOffset_basic1.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_getOffset_error.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_getTransitions_basic1.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_getTransitions_error.phpt2
-rw-r--r--ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt2
-rw-r--r--ext/date/tests/DateTime_compare_basic1.phpt2
-rw-r--r--ext/date/tests/DateTime_construct_variation2.phpt1
-rw-r--r--ext/date/tests/DateTime_extends_basic2.phpt2
-rw-r--r--ext/date/tests/DateTime_format_basic1.phpt2
-rw-r--r--ext/date/tests/DateTime_getOffset_error.phpt1
-rw-r--r--ext/date/tests/DateTime_modify_error.phpt1
-rw-r--r--ext/date/tests/DateTime_setDate_basic1.phpt2
-rw-r--r--ext/date/tests/bug39782.phpt2
-rw-r--r--ext/date/tests/bug45543.phpt1
-rw-r--r--ext/date/tests/bug48187.phpt2
-rw-r--r--ext/date/tests/bug48476.phpt2
-rw-r--r--ext/date/tests/bug50475.phpt2
-rw-r--r--ext/date/tests/bug52062.phpt2
-rw-r--r--ext/date/tests/bug52290.phpt2
-rw-r--r--ext/date/tests/bug62852.phpt1
-rw-r--r--ext/date/tests/bug62852_var2.phpt1
-rw-r--r--ext/date/tests/bug62852_var3.phpt1
-rw-r--r--ext/date/tests/bug67118.phpt2
-rw-r--r--ext/date/tests/bug67253.phpt1
-rw-r--r--ext/date/tests/bug68406.phpt1
-rw-r--r--ext/date/tests/bug71525.phpt1
-rw-r--r--ext/date/tests/bug71635.phpt2
-rw-r--r--ext/date/tests/checkdate_variation1.phpt1
-rw-r--r--ext/date/tests/checkdate_variation2.phpt1
-rw-r--r--ext/date/tests/date_add_basic2.phpt2
-rw-r--r--ext/date/tests/date_basic1.phpt1
-rw-r--r--ext/date/tests/date_create_from_format_basic.phpt2
-rw-r--r--ext/date/tests/date_create_from_format_basic2.phpt2
-rw-r--r--ext/date/tests/date_get_last_errors_basic.phpt2
-rw-r--r--ext/date/tests/date_interval_create_from_date_string.phpt2
-rw-r--r--ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt2
-rw-r--r--ext/date/tests/date_parse_from_format_basic.phpt2
-rw-r--r--ext/date/tests/date_sun_info_error.phpt2
-rw-r--r--ext/date/tests/date_sunrise_variation9.phpt2
-rw-r--r--ext/date/tests/date_timestamp_set.phpt2
-rw-r--r--ext/date/tests/date_timestamp_set_nullparam.phpt2
-rw-r--r--ext/date/tests/date_timestamp_set_nullparam2.phpt2
-rw-r--r--ext/date/tests/date_timestamp_set_wrongparam_001.phpt2
-rw-r--r--ext/date/tests/date_timestamp_set_wrongparam_002.phpt2
-rw-r--r--ext/date/tests/date_timestamp_set_wrongparam_003.phpt2
-rw-r--r--ext/date/tests/date_timestamp_set_wrongparam_004.phpt2
-rw-r--r--ext/date/tests/date_timezone_get_basic1.phpt2
-rw-r--r--ext/date/tests/date_timezone_set_basic1.phpt1
-rw-r--r--ext/date/tests/date_timezone_set_variation1.phpt1
-rw-r--r--ext/date/tests/date_variation1.phpt1
-rw-r--r--ext/date/tests/date_variation2.phpt1
-rw-r--r--ext/date/tests/getdate_variation7.phpt2
-rw-r--r--ext/date/tests/gmdate_variation14.phpt2
-rw-r--r--ext/date/tests/idate_error.phpt1
-rw-r--r--ext/date/tests/idate_variation3.phpt2
-rw-r--r--ext/date/tests/localtime_error.phpt1
-rw-r--r--ext/date/tests/microtime_error.phpt3
-rw-r--r--ext/date/tests/mktime-3.phpt2
-rw-r--r--ext/date/tests/mktime_basic1.phpt1
-rw-r--r--ext/date/tests/mktime_variation1.phpt2
-rw-r--r--ext/date/tests/mktime_variation6.phpt1
-rw-r--r--ext/date/tests/strftime_variation23.phpt2
-rw-r--r--ext/date/tests/strtotime-mysql-64bit.phpt1
-rw-r--r--ext/date/tests/strtotime_basic2.phpt2
-rw-r--r--ext/date/tests/time_basic.phpt2
-rw-r--r--ext/date/tests/timezone_identifiers_list_basic1.phpt2
-rw-r--r--ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt2
-rw-r--r--ext/date/tests/timezone_location_get.phpt1
-rw-r--r--ext/date/tests/timezone_offset_get_basic1.phpt2
-rw-r--r--ext/date/tests/timezone_transitions_get_basic1.phpt2
-rw-r--r--ext/date/tests/timezone_version_get.phpt2
-rw-r--r--ext/date/tests/timezone_version_get_basic1.phpt2
-rw-r--r--ext/dom/tests/DOMAttr_name_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMAttr_value_basic_001.phpt1
-rw-r--r--ext/dom/tests/DOMCharacterData_appendData_basic.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_appendData_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_insertData_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_length_error_001.phpt1
-rw-r--r--ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMComment_appendData_basic.phpt2
-rw-r--r--ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt2
-rw-r--r--ext/dom/tests/DOMComment_insertData_error2.phpt2
-rw-r--r--ext/dom/tests/DOMComment_replaceData_error2.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_entities_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_name_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_notations_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_publicId_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentType_systemId_error_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_createAttribute_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_createAttribute_error1.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_encoding_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_implementationRead_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_preserveWhiteSpace_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_resolveExternals_basic.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_save_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_savexml_basic.phpt3
-rw-r--r--ext/dom/tests/DOMDocument_standalone_basic.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_validate_on_parse_basic.phpt1
-rw-r--r--ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt1
-rw-r--r--ext/dom/tests/DOMNode_cloneNode_basic.phpt1
-rw-r--r--ext/dom/tests/DOMNode_hasChildNodes_basic.phpt2
-rw-r--r--ext/dom/tests/DOMNode_normalize_basic.phpt2
-rw-r--r--ext/dom/tests/DOMNode_removeChild_basic.phpt1
-rw-r--r--ext/dom/tests/DOMText_appendData_basic.phpt2
-rw-r--r--ext/dom/tests/bug28721.phpt1
-rw-r--r--ext/dom/tests/bug32615.phpt2
-rw-r--r--ext/dom/tests/bug37277.phpt2
-rw-r--r--ext/dom/tests/bug37456.phpt2
-rw-r--r--ext/dom/tests/bug42082.phpt1
-rw-r--r--ext/dom/tests/bug44648.phpt2
-rw-r--r--ext/dom/tests/bug46185.phpt2
-rw-r--r--ext/dom/tests/bug47848.phpt2
-rw-r--r--ext/dom/tests/bug66502.phpt2
-rw-r--r--ext/dom/tests/bug73907.phpt2
-rw-r--r--ext/dom/tests/canonicalization.phpt1
-rw-r--r--ext/dom/tests/dom004.phpt1
-rw-r--r--ext/dom/tests/dom005.phpt1
-rw-r--r--ext/dom/tests/dom007.phpt2
-rw-r--r--ext/dom/tests/dom_comment_basic.phpt2
-rw-r--r--ext/dom/tests/dom_comment_variation.phpt2
-rw-r--r--ext/dom/tests/domattributes.phpt2
-rw-r--r--ext/dom/tests/domchardata.phpt1
-rw-r--r--ext/dom/tests/domdocument_createcomment_error_001.phpt2
-rw-r--r--ext/dom/tests/domdocument_createentityreference_001.phpt2
-rw-r--r--ext/dom/tests/domdocument_createentityreference_002.phpt2
-rw-r--r--ext/dom/tests/domelement.phpt1
-rw-r--r--ext/dom/tests/domxpath.phpt2
-rw-r--r--ext/dom/tests/node_textcontent.phpt1
-rw-r--r--ext/dom/tests/regsiter_node_class.phpt1
-rw-r--r--ext/enchant/tests/bug53070.phpt1
-rw-r--r--ext/exif/tests/bug48378.phpt2
-rw-r--r--ext/exif/tests/bug54002.phpt2
-rw-r--r--ext/exif/tests/bug64739.phpt2
-rw-r--r--ext/exif/tests/bug68547.phpt2
-rw-r--r--ext/exif/tests/bug76423.phpt1
-rw-r--r--ext/exif/tests/exif001.phpt2
-rw-r--r--ext/exif/tests/exif003.phpt2
-rw-r--r--ext/exif/tests/exif005.phpt2
-rw-r--r--ext/exif/tests/exif_imagetype_basic-mb.phpt2
-rw-r--r--ext/exif/tests/exif_imagetype_basic.phpt2
-rw-r--r--ext/exif/tests/exif_imagetype_error.phpt1
-rw-r--r--ext/exif/tests/exif_read_data_0.phpt1
-rw-r--r--ext/exif/tests/exif_read_data_streams.phpt2
-rw-r--r--ext/exif/tests/exif_read_exif_data_basic.phpt2
-rw-r--r--ext/exif/tests/exif_tagname_error.phpt1
-rw-r--r--ext/exif/tests/exif_tagname_variation1-64bit.phpt1
-rw-r--r--ext/exif/tests/exif_tagname_variation1.phpt1
-rw-r--r--ext/exif/tests/exif_thumbnail_streams.phpt2
-rw-r--r--ext/fileinfo/tests/bug67516.phpt1
-rw-r--r--ext/fileinfo/tests/bug67647-mb.phpt1
-rw-r--r--ext/fileinfo/tests/bug67647.phpt1
-rw-r--r--ext/fileinfo/tests/bug68398.phpt1
-rw-r--r--ext/fileinfo/tests/bug69320.phpt1
-rw-r--r--ext/fileinfo/tests/cve-2014-3538-mb.phpt2
-rw-r--r--ext/fileinfo/tests/cve-2014-3538.phpt2
-rw-r--r--ext/fileinfo/tests/finfo_extension_flag.phpt1
-rw-r--r--ext/fileinfo/tests/finfo_open_002.phpt2
-rw-r--r--ext/filter/tests/bug42718-2.phpt1
-rw-r--r--ext/filter/tests/bug67167.01.phpt3
-rw-r--r--ext/filter/tests/bug67167.02.phpt5
-rw-r--r--ext/ftp/tests/006.phpt2
-rw-r--r--ext/ftp/tests/007.phpt2
-rw-r--r--ext/ftp/tests/ftp_alloc_basic1.phpt2
-rw-r--r--ext/ftp/tests/ftp_alloc_basic2.phpt2
-rw-r--r--ext/ftp/tests/ftp_exec_basic.phpt2
-rw-r--r--ext/ftp/tests/ftp_rawlist_basic2.phpt2
-rw-r--r--ext/ftp/tests/ftp_rmdir_basic.phpt2
-rw-r--r--ext/ftp/tests/ftp_ssl_connect_error.phpt1
-rw-r--r--ext/gd/tests/bug38179.phpt1
-rw-r--r--ext/gd/tests/bug38212-mb.phpt1
-rw-r--r--ext/gd/tests/bug38212.phpt1
-rw-r--r--ext/gd/tests/bug39286-mb.phpt1
-rw-r--r--ext/gd/tests/bug39286.phpt1
-rw-r--r--ext/gd/tests/bug39780.phpt1
-rw-r--r--ext/gd/tests/bug39780_extern.phpt2
-rw-r--r--ext/gd/tests/bug42434.phpt2
-rw-r--r--ext/gd/tests/bug45799.phpt1
-rw-r--r--ext/gd/tests/bug49600.phpt2
-rw-r--r--ext/gd/tests/bug66356.phpt2
-rw-r--r--ext/gd/tests/bug70976.phpt2
-rw-r--r--ext/gd/tests/bug71912-mb.phpt1
-rw-r--r--ext/gd/tests/bug71912.phpt1
-rw-r--r--ext/gd/tests/bug71952.phpt2
-rw-r--r--ext/gd/tests/bug72227.phpt2
-rw-r--r--ext/gd/tests/bug72298.phpt2
-rw-r--r--ext/gd/tests/bug72512.phpt1
-rw-r--r--ext/gd/tests/bug72697.phpt2
-rw-r--r--ext/gd/tests/bug72730.phpt2
-rw-r--r--ext/gd/tests/bug73869.phpt2
-rw-r--r--ext/gd/tests/crafted_gd2.phpt2
-rw-r--r--ext/gd/tests/imagealphablending_error1.phpt6
-rw-r--r--ext/gd/tests/imagecolorallocate_basic.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocate_error.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocate_variation3.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_basic.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error1.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error2.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error3.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error4.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error5.phpt2
-rw-r--r--ext/gd/tests/imagecolorresolvealpha_error3.phpt6
-rw-r--r--ext/gd/tests/imagecolorstotal_basic.phpt2
-rw-r--r--ext/gd/tests/imagecreatetruecolor_error3.phpt2
-rw-r--r--ext/gd/tests/imagefilltoborder_error6.phpt2
-rw-r--r--ext/gd/tests/imageflip.phpt2
-rw-r--r--ext/gd/tests/imagegd2_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/imagegd_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/imagegif_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/imageistruecolor_basic.phpt2
-rw-r--r--ext/gd/tests/imageistruecolor_error1.phpt2
-rw-r--r--ext/gd/tests/imagejpeg_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/imagepng_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/imagerectangle_error2.phpt2
-rw-r--r--ext/gd/tests/imagesavealpha_error2.phpt6
-rw-r--r--ext/gd/tests/imagesetthickness_error1.phpt2
-rw-r--r--ext/gd/tests/imagesetthickness_error2.phpt2
-rw-r--r--ext/gd/tests/imagetruecolortopalette_error1.phpt2
-rw-r--r--ext/gd/tests/imagetruecolortopalette_error2.phpt2
-rw-r--r--ext/gd/tests/imagettftext_charmap_order.phpt2
-rw-r--r--ext/gd/tests/imagewbmp_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/libgd00086.phpt1
-rw-r--r--ext/gd/tests/libgd00094-mb.phpt1
-rw-r--r--ext/gd/tests/libgd00094.phpt1
-rw-r--r--ext/gd/tests/lines.phpt1
-rw-r--r--ext/gettext/tests/44938.phpt1
-rw-r--r--ext/gettext/tests/bug66267.phpt1
-rw-r--r--ext/gettext/tests/gettext_basic-enus.phpt2
-rw-r--r--ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt2
-rw-r--r--ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt2
-rw-r--r--ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt2
-rw-r--r--ext/gettext/tests/gettext_bindtextdomain-path.phpt2
-rw-r--r--ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt2
-rw-r--r--ext/gettext/tests/gettext_dcgettext-wrongparams.phpt2
-rw-r--r--ext/gettext/tests/gettext_dcgettext.phpt2
-rw-r--r--ext/gettext/tests/gettext_dngettext-plural.phpt2
-rw-r--r--ext/gettext/tests/gettext_dngettext-wrongparams.phpt2
-rw-r--r--ext/gettext/tests/gettext_textdomain-retval.phpt3
-rw-r--r--ext/gettext/tests/gettext_textdomain-wrongparams.phpt2
-rw-r--r--ext/gmp/tests/gmp_export.phpt1
-rw-r--r--ext/gmp/tests/gmp_import.phpt1
-rw-r--r--ext/hash/tests/bug64745.phpt1
-rw-r--r--ext/hash/tests/hash_hmac_algos.phpt1
-rw-r--r--ext/hash/tests/haval.phpt1
-rw-r--r--ext/hash/tests/md4.phpt2
-rw-r--r--ext/hash/tests/md5.phpt1
-rw-r--r--ext/hash/tests/sha224.phpt1
-rw-r--r--ext/hash/tests/sha256.phpt1
-rw-r--r--ext/hash/tests/sha3.phpt1
-rw-r--r--ext/hash/tests/tiger.phpt1
-rw-r--r--ext/iconv/tests/eucjp2iso2022jp.phpt1
-rw-r--r--ext/iconv/tests/eucjp2sjis.phpt1
-rw-r--r--ext/iconv/tests/eucjp2utf8.phpt1
-rw-r--r--ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt1
-rw-r--r--ext/iconv/tests/iconv_basic.phpt2
-rw-r--r--ext/iconv/tests/iconv_get_encoding_error.phpt2
-rw-r--r--ext/iconv/tests/iconv_ini_encoding.phpt1
-rw-r--r--ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt1
-rw-r--r--ext/iconv/tests/iconv_mime_decode.phpt1
-rw-r--r--ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt1
-rw-r--r--ext/iconv/tests/iconv_mime_decode_headers.phpt1
-rw-r--r--ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt2
-rw-r--r--ext/iconv/tests/iconv_mime_decode_variation1.phpt2
-rw-r--r--ext/iconv/tests/iconv_mime_decode_variation3.phpt2
-rw-r--r--ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt1
-rw-r--r--ext/iconv/tests/iconv_set_encoding_error.phpt2
-rw-r--r--ext/iconv/tests/iconv_set_encoding_variation.phpt2
-rw-r--r--ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt1
-rw-r--r--ext/iconv/tests/iconv_strlen_variation2.phpt3
-rw-r--r--ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt1
-rw-r--r--ext/iconv/tests/iconv_strpos_basic.phpt2
-rw-r--r--ext/iconv/tests/iconv_strpos_variation1.phpt2
-rw-r--r--ext/iconv/tests/iconv_strpos_variation2.phpt2
-rw-r--r--ext/iconv/tests/iconv_strpos_variation4.phpt1
-rw-r--r--ext/iconv/tests/iconv_strpos_variation5.phpt3
-rw-r--r--ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt1
-rw-r--r--ext/iconv/tests/iconv_strrpos_basic.phpt1
-rw-r--r--ext/iconv/tests/iconv_strrpos_error1.phpt2
-rw-r--r--ext/iconv/tests/iconv_strrpos_error2.phpt2
-rw-r--r--ext/iconv/tests/iconv_strrpos_variation1.phpt3
-rw-r--r--ext/iconv/tests/iconv_strrpos_variation2.phpt3
-rw-r--r--ext/iconv/tests/iconv_strrpos_variation3.phpt3
-rw-r--r--ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt1
-rw-r--r--ext/iconv/tests/iconv_substr_error1.phpt1
-rw-r--r--ext/iconv/tests/iconv_substr_error2.phpt1
-rw-r--r--ext/imap/tests/bug31142_2.phpt2
-rw-r--r--ext/imap/tests/bug40854.phpt2
-rw-r--r--ext/imap/tests/imap_append_basic.phpt1
-rw-r--r--ext/imap/tests/imap_body.phpt2
-rw-r--r--ext/imap/tests/imap_fetchheader_variation4.phpt2
-rw-r--r--ext/imap/tests/imap_getsubscribed_basic.phpt2
-rw-r--r--ext/imap/tests/imap_headerinfo_basic.phpt2
-rw-r--r--ext/imap/tests/imap_headers.phpt1
-rw-r--r--ext/imap/tests/imap_list_basic.phpt2
-rw-r--r--ext/imap/tests/imap_lsub_basic.phpt2
-rw-r--r--ext/imap/tests/imap_mail_copy.phpt2
-rw-r--r--ext/imap/tests/imap_mail_copy_basic.phpt2
-rw-r--r--ext/imap/tests/imap_mail_move.phpt2
-rw-r--r--ext/imap/tests/imap_mail_move_basic.phpt2
-rw-r--r--ext/imap/tests/imap_num_msg_error.phpt1
-rw-r--r--ext/imap/tests/imap_rfc822_parse_headers_basic.phpt2
-rw-r--r--ext/imap/tests/imap_savebody_basic.phpt1
-rw-r--r--ext/imap/tests/imap_undelete_basic.phpt2
-rw-r--r--ext/interbase/tests/005.phpt1
-rw-r--r--ext/interbase/tests/006.phpt1
-rw-r--r--ext/interbase/tests/bug46247.phpt1
-rw-r--r--ext/intl/tests/breakiter___construct.phpt1
-rw-r--r--ext/intl/tests/breakiter___construct_error.phpt1
-rw-r--r--ext/intl/tests/breakiter_clone_basic.phpt1
-rw-r--r--ext/intl/tests/breakiter_createCodePointInstance_error.phpt2
-rw-r--r--ext/intl/tests/breakiter_current_basic.phpt2
-rw-r--r--ext/intl/tests/breakiter_factories_basic.phpt1
-rw-r--r--ext/intl/tests/breakiter_factories_error.phpt3
-rw-r--r--ext/intl/tests/breakiter_first_last_previous_current_error.phpt2
-rw-r--r--ext/intl/tests/breakiter_following_basic.phpt2
-rw-r--r--ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt2
-rw-r--r--ext/intl/tests/breakiter_getLocale_error.phpt2
-rw-r--r--ext/intl/tests/breakiter_getPartsIterator_error.phpt1
-rw-r--r--ext/intl/tests/breakiter_getText_error.phpt2
-rw-r--r--ext/intl/tests/breakiter_isBoundary_basic.phpt2
-rw-r--r--ext/intl/tests/breakiter_next_error.phpt2
-rw-r--r--ext/intl/tests/breakiter_previous_basic.phpt2
-rw-r--r--ext/intl/tests/breakiter_setText_error.phpt2
-rw-r--r--ext/intl/tests/bug59597_32.phpt1
-rw-r--r--ext/intl/tests/bug60192-compare.phpt1
-rw-r--r--ext/intl/tests/bug60192-getlocale.phpt1
-rw-r--r--ext/intl/tests/bug60192-getsortkey.phpt1
-rw-r--r--ext/intl/tests/bug60192-sort.phpt2
-rw-r--r--ext/intl/tests/bug60192-sortwithsortkeys.phpt2
-rw-r--r--ext/intl/tests/bug62082.phpt1
-rw-r--r--ext/intl/tests/bug67052-win32.phpt1
-rw-r--r--ext/intl/tests/bug67052.phpt1
-rw-r--r--ext/intl/tests/bug69374.phpt3
-rw-r--r--ext/intl/tests/bug69398.phpt3
-rw-r--r--ext/intl/tests/bug72061.phpt2
-rw-r--r--ext/intl/tests/bug72533.phpt2
-rw-r--r--ext/intl/tests/bug74230.phpt1
-rw-r--r--ext/intl/tests/bug75317.phpt2
-rw-r--r--ext/intl/tests/calendar_add_error.phpt1
-rw-r--r--ext/intl/tests/calendar_createInstance_basic.phpt1
-rw-r--r--ext/intl/tests/calendar_createInstance_error.phpt2
-rw-r--r--ext/intl/tests/calendar_equals_error.phpt1
-rw-r--r--ext/intl/tests/calendar_fieldDifference_error.phpt2
-rw-r--r--ext/intl/tests/calendar_fromDateTime_basic.phpt1
-rw-r--r--ext/intl/tests/calendar_fromDateTime_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getAvailableLocales_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getDayOfWeekType_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getErrorCode_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getErrorMessage_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getLocale_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getNow_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getTimeZone_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getTime_error.phpt1
-rw-r--r--ext/intl/tests/calendar_getType_error.phpt2
-rw-r--r--ext/intl/tests/calendar_getWeekendTransition_error.phpt2
-rw-r--r--ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt3
-rw-r--r--ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt1
-rw-r--r--ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt1
-rw-r--r--ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt4
-rw-r--r--ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt4
-rw-r--r--ext/intl/tests/calendar_inDaylightTime_error.phpt2
-rw-r--r--ext/intl/tests/calendar_isEquivalentTo_error.phpt1
-rw-r--r--ext/intl/tests/calendar_isLenient_error.phpt2
-rw-r--r--ext/intl/tests/calendar_isSet_error.phpt2
-rw-r--r--ext/intl/tests/calendar_isWeekend_error.phpt1
-rw-r--r--ext/intl/tests/calendar_roll_error.phpt1
-rw-r--r--ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setLenient_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt2
-rw-r--r--ext/intl/tests/calendar_setTimeZone_error.phpt1
-rw-r--r--ext/intl/tests/calendar_setTimeZone_error2.phpt2
-rw-r--r--ext/intl/tests/calendar_setTime_error.phpt1
-rw-r--r--ext/intl/tests/calendar_set_error.phpt1
-rw-r--r--ext/intl/tests/calendar_toDateTime_basic.phpt2
-rw-r--r--ext/intl/tests/calendar_toDateTime_error.phpt2
-rw-r--r--ext/intl/tests/cpbi_getLastCodePoint_error.phpt2
-rw-r--r--ext/intl/tests/dateformat___construct_bad_tz_cal.phpt1
-rw-r--r--ext/intl/tests/dateformat_clone_bad_obj.phpt1
-rw-r--r--ext/intl/tests/dateformat_formatObject_calendar.phpt2
-rw-r--r--ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt1
-rw-r--r--ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt1
-rw-r--r--ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt1
-rw-r--r--ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt1
-rw-r--r--ext/intl/tests/dateformat_formatObject_datetime.phpt2
-rw-r--r--ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt1
-rw-r--r--ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt1
-rw-r--r--ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt1
-rw-r--r--ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt1
-rw-r--r--ext/intl/tests/dateformat_formatObject_error.phpt3
-rw-r--r--ext/intl/tests/dateformat_getCalendarObject_error.phpt1
-rw-r--r--ext/intl/tests/dateformat_getTimeZone_error.phpt1
-rw-r--r--ext/intl/tests/dateformat_get_set_pattern2.phpt1
-rw-r--r--ext/intl/tests/dateformat_is_set_lenient.phpt1
-rw-r--r--ext/intl/tests/dateformat_setTimeZone_error.phpt1
-rw-r--r--ext/intl/tests/dateformat_set_timezone_id2.phpt1
-rw-r--r--ext/intl/tests/dateformat_timezone_arg_variations.phpt1
-rw-r--r--ext/intl/tests/dateformat_timezone_arg_variations2.phpt1
-rw-r--r--ext/intl/tests/dateformat_timezone_arg_variations3.phpt1
-rw-r--r--ext/intl/tests/dateformat_timezone_arg_variations4.phpt2
-rw-r--r--ext/intl/tests/formatter_clone_bad_obj.phpt1
-rw-r--r--ext/intl/tests/formatter_get_set_symbol2.phpt1
-rw-r--r--ext/intl/tests/formatter_get_set_text_attribute.phpt2
-rw-r--r--ext/intl/tests/formatter_get_set_text_attribute_var2.phpt2
-rw-r--r--ext/intl/tests/grapheme.phpt2
-rw-r--r--ext/intl/tests/gregoriancalendar___construct_error.phpt1
-rw-r--r--ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt1
-rw-r--r--ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt1
-rw-r--r--ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt1
-rw-r--r--ext/intl/tests/locale_get_script.phpt1
-rw-r--r--ext/intl/tests/msgfmt_clone_bad_obj.phpt1
-rw-r--r--ext/intl/tests/msgfmt_format_error1.phpt1
-rw-r--r--ext/intl/tests/msgfmt_format_error2.phpt2
-rw-r--r--ext/intl/tests/msgfmt_format_error3.phpt2
-rw-r--r--ext/intl/tests/msgfmt_format_error4.phpt2
-rw-r--r--ext/intl/tests/msgfmt_format_error5.phpt1
-rw-r--r--ext/intl/tests/msgfmt_format_error6.phpt2
-rw-r--r--ext/intl/tests/msgfmt_format_mixed_params.phpt2
-rw-r--r--ext/intl/tests/msgfmt_setPattern_cache.phpt2
-rw-r--r--ext/intl/tests/normalizer_get_raw_decomposition.phpt1
-rw-r--r--ext/intl/tests/normalizer_normalize.phpt1
-rw-r--r--ext/intl/tests/rbbiter_getRuleStatus_basic.phpt2
-rw-r--r--ext/intl/tests/timezone_IDforWindowsID_basic.phpt1
-rw-r--r--ext/intl/tests/timezone_IDforWindowsID_basic2.phpt1
-rw-r--r--ext/intl/tests/timezone_countEquivalentIDs_error.phpt3
-rw-r--r--ext/intl/tests/timezone_createDefault_error.phpt3
-rw-r--r--ext/intl/tests/timezone_createEnumeration_error.phpt3
-rw-r--r--ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt2
-rw-r--r--ext/intl/tests/timezone_createTimeZone_error.phpt2
-rw-r--r--ext/intl/tests/timezone_fromDateTimeZone_basic.phpt1
-rw-r--r--ext/intl/tests/timezone_fromDateTimeZone_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getCanonicalID_error.phpt3
-rw-r--r--ext/intl/tests/timezone_getDSTSavings_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getDisplayName_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getEquivalentID_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getErrorCode_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getErrorMessage_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getGMT_error.phpt3
-rw-r--r--ext/intl/tests/timezone_getID_error.phpt3
-rw-r--r--ext/intl/tests/timezone_getOffset_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getRawOffset_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getRegion_error.phpt4
-rw-r--r--ext/intl/tests/timezone_getTZDataVersion_error.phpt2
-rw-r--r--ext/intl/tests/timezone_getUnknown_basic.phpt2
-rw-r--r--ext/intl/tests/timezone_getUnknown_error.phpt2
-rw-r--r--ext/intl/tests/timezone_hasSameRules_error.phpt2
-rw-r--r--ext/intl/tests/timezone_toDateTimeZone_basic.phpt1
-rw-r--r--ext/intl/tests/timezone_toDateTimeZone_error.phpt2
-rw-r--r--ext/intl/tests/timezone_useDaylightTime_error.phpt2
-rw-r--r--ext/intl/tests/timezone_windowsID_basic.phpt1
-rw-r--r--ext/intl/tests/timezone_windowsID_basic2.phpt1
-rw-r--r--ext/intl/tests/transliterator_clone.phpt1
-rw-r--r--ext/intl/tests/transliterator_create_basic.phpt2
-rw-r--r--ext/intl/tests/transliterator_create_from_rule_error.phpt1
-rw-r--r--ext/intl/tests/transliterator_create_inverse_error.phpt1
-rw-r--r--ext/intl/tests/transliterator_get_error_code_error.phpt1
-rw-r--r--ext/intl/tests/transliterator_get_error_message_error.phpt1
-rw-r--r--ext/intl/tests/transliterator_list_ids_error.phpt1
-rw-r--r--ext/intl/tests/uconverter_enum.phpt1
-rw-r--r--ext/intl/tests/uconverter_func_subst.phpt1
-rw-r--r--ext/intl/tests/uconverter_oop_subst.phpt1
-rw-r--r--ext/json/tests/bug72787.phpt1
-rw-r--r--ext/json/tests/fail001.phpt1
-rw-r--r--ext/json/tests/json_last_error_error.phpt1
-rw-r--r--ext/json/tests/json_last_error_msg_error.phpt1
-rw-r--r--ext/json/tests/serialize.phpt2
-rw-r--r--ext/ldap/tests/bug76248.phpt2
-rw-r--r--ext/ldap/tests/ldap_escape_all.phpt2
-rw-r--r--ext/ldap/tests/ldap_escape_both.phpt2
-rw-r--r--ext/ldap/tests/ldap_escape_dn.phpt2
-rw-r--r--ext/ldap/tests/ldap_escape_filter.phpt2
-rw-r--r--ext/ldap/tests/ldap_escape_ignore.phpt2
-rw-r--r--ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt1
-rw-r--r--ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt1
-rw-r--r--ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt1
-rw-r--r--ext/mbstring/tests/bug20087.phpt1
-rw-r--r--ext/mbstring/tests/bug43841.phpt2
-rw-r--r--ext/mbstring/tests/bug43994.phpt2
-rw-r--r--ext/mbstring/tests/bug43998.phpt1
-rw-r--r--ext/mbstring/tests/bug45923.phpt2
-rw-r--r--ext/mbstring/tests/bug54494.phpt1
-rw-r--r--ext/mbstring/tests/bug65045.phpt3
-rw-r--r--ext/mbstring/tests/bug68846.phpt2
-rw-r--r--ext/mbstring/tests/bug72402.phpt2
-rw-r--r--ext/mbstring/tests/bug75944.phpt1
-rw-r--r--ext/mbstring/tests/bug76532.phpt2
-rw-r--r--ext/mbstring/tests/casefold.phpt1
-rw-r--r--ext/mbstring/tests/ini_encoding.phpt2
-rw-r--r--ext/mbstring/tests/ini_encoding2.phpt2
-rw-r--r--ext/mbstring/tests/mb_chr_ord.phpt1
-rw-r--r--ext/mbstring/tests/mb_convert_encoding.phpt3
-rw-r--r--ext/mbstring/tests/mb_convert_encoding_variation1.phpt1
-rw-r--r--ext/mbstring/tests/mb_convert_kana.phpt1
-rw-r--r--ext/mbstring/tests/mb_convert_variables.phpt2
-rw-r--r--ext/mbstring/tests/mb_detect_encoding.phpt2
-rw-r--r--ext/mbstring/tests/mb_detect_order.phpt2
-rw-r--r--ext/mbstring/tests/mb_encode_mimeheader_basic.phpt3
-rw-r--r--ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt1
-rw-r--r--ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt1
-rw-r--r--ext/mbstring/tests/mb_encode_mimeheader_indent.phpt2
-rw-r--r--ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt2
-rw-r--r--ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt1
-rw-r--r--ext/mbstring/tests/mb_ereg.phpt3
-rw-r--r--ext/mbstring/tests/mb_ereg_basic.phpt1
-rw-r--r--ext/mbstring/tests/mb_ereg_match_basic.phpt1
-rw-r--r--ext/mbstring/tests/mb_ereg_match_error1.phpt2
-rw-r--r--ext/mbstring/tests/mb_ereg_replace.phpt2
-rw-r--r--ext/mbstring/tests/mb_ereg_replace_basic.phpt2
-rw-r--r--ext/mbstring/tests/mb_ereg_replace_callback.phpt1
-rw-r--r--ext/mbstring/tests/mb_ereg_replace_named_subpatterns.phpt1
-rw-r--r--ext/mbstring/tests/mb_ereg_replace_variation2.phpt2
-rw-r--r--ext/mbstring/tests/mb_ereg_replace_variation4.phpt2
-rw-r--r--ext/mbstring/tests/mb_ereg_search_pos.phpt2
-rw-r--r--ext/mbstring/tests/mb_ereg_search_setpos.phpt2
-rw-r--r--ext/mbstring/tests/mb_ereg_search_xxx.phpt1
-rw-r--r--ext/mbstring/tests/mb_ereg_variation1.phpt1
-rw-r--r--ext/mbstring/tests/mb_ereg_variation2.phpt1
-rw-r--r--ext/mbstring/tests/mb_ereg_variation3.phpt1
-rw-r--r--ext/mbstring/tests/mb_ereg_variation4.phpt2
-rw-r--r--ext/mbstring/tests/mb_ereg_variation5.phpt2
-rw-r--r--ext/mbstring/tests/mb_ereg_variation6.phpt2
-rw-r--r--ext/mbstring/tests/mb_ereg_variation7.phpt2
-rw-r--r--ext/mbstring/tests/mb_http_input.phpt2
-rw-r--r--ext/mbstring/tests/mb_http_output.phpt2
-rw-r--r--ext/mbstring/tests/mb_internal_encoding.phpt2
-rw-r--r--ext/mbstring/tests/mb_internal_encoding_variation1.phpt1
-rw-r--r--ext/mbstring/tests/mb_internal_encoding_variation2.phpt1
-rw-r--r--ext/mbstring/tests/mb_output_handler_euc_jp.phpt1
-rw-r--r--ext/mbstring/tests/mb_output_handler_shift_jis.phpt1
-rw-r--r--ext/mbstring/tests/mb_preferred_mime_name.phpt1
-rw-r--r--ext/mbstring/tests/mb_regex_encoding_variation2.phpt2
-rw-r--r--ext/mbstring/tests/mb_regex_set_options.phpt1
-rw-r--r--ext/mbstring/tests/mb_split.phpt2
-rw-r--r--ext/mbstring/tests/mb_strcut.phpt3
-rw-r--r--ext/mbstring/tests/mb_strimwidth.phpt1
-rw-r--r--ext/mbstring/tests/mb_stripos_basic2.phpt1
-rw-r--r--ext/mbstring/tests/mb_stripos_variation2.phpt1
-rw-r--r--ext/mbstring/tests/mb_stripos_variation4.phpt1
-rw-r--r--ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt1
-rw-r--r--ext/mbstring/tests/mb_stristr_variation1.phpt1
-rw-r--r--ext/mbstring/tests/mb_stristr_variation2.phpt1
-rw-r--r--ext/mbstring/tests/mb_strlen.phpt4
-rw-r--r--ext/mbstring/tests/mb_strlen_basic.phpt1
-rw-r--r--ext/mbstring/tests/mb_strlen_variation2.phpt1
-rw-r--r--ext/mbstring/tests/mb_strpos_basic.phpt2
-rw-r--r--ext/mbstring/tests/mb_strpos_variation4.phpt1
-rw-r--r--ext/mbstring/tests/mb_strpos_variation5.phpt1
-rw-r--r--ext/mbstring/tests/mb_strrchr_basic.phpt2
-rw-r--r--ext/mbstring/tests/mb_strrchr_variation6.phpt2
-rw-r--r--ext/mbstring/tests/mb_strrichr_variation5.phpt2
-rw-r--r--ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt1
-rw-r--r--ext/mbstring/tests/mb_strripos_variation4.phpt1
-rw-r--r--ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt2
-rw-r--r--ext/mbstring/tests/mb_strrpos_basic.phpt1
-rw-r--r--ext/mbstring/tests/mb_strrpos_variation1.phpt1
-rw-r--r--ext/mbstring/tests/mb_strrpos_variation2.phpt1
-rw-r--r--ext/mbstring/tests/mb_strrpos_variation4.phpt1
-rw-r--r--ext/mbstring/tests/mb_strstr_basic.phpt2
-rw-r--r--ext/mbstring/tests/mb_strtolower_variation1.phpt2
-rw-r--r--ext/mbstring/tests/mb_strtolower_variation3.phpt1
-rw-r--r--ext/mbstring/tests/mb_strtolower_variation4.phpt3
-rw-r--r--ext/mbstring/tests/mb_strtoupper_basic.phpt3
-rw-r--r--ext/mbstring/tests/mb_strtoupper_error1.phpt1
-rw-r--r--ext/mbstring/tests/mb_strtoupper_error2.phpt1
-rw-r--r--ext/mbstring/tests/mb_strtoupper_variation1.phpt3
-rw-r--r--ext/mbstring/tests/mb_strtoupper_variation2.phpt1
-rw-r--r--ext/mbstring/tests/mb_strtoupper_variation3.phpt1
-rw-r--r--ext/mbstring/tests/mb_strtoupper_variation4.phpt3
-rw-r--r--ext/mbstring/tests/mb_strwidth.phpt1
-rw-r--r--ext/mbstring/tests/mb_substitute_character_error.phpt1
-rw-r--r--ext/mbstring/tests/mb_substitute_character_variation1.phpt1
-rw-r--r--ext/mbstring/tests/mb_substr.phpt3
-rw-r--r--ext/mbstring/tests/mb_substr_count_variation3.phpt2
-rw-r--r--ext/mbstring/tests/mb_substr_count_variation4.phpt2
-rw-r--r--ext/mbstring/tests/mb_substr_variation1.phpt1
-rw-r--r--ext/mbstring/tests/mb_substr_variation2.phpt1
-rw-r--r--ext/mbstring/tests/mb_substr_variation4.phpt2
-rw-r--r--ext/mbstring/tests/mb_substr_variation5.phpt2
-rw-r--r--ext/mbstring/tests/mb_substr_variation6.phpt2
-rw-r--r--ext/mbstring/tests/mb_substr_variation7.phpt2
-rw-r--r--ext/mbstring/tests/php_gr_jp_10830.phpt1
-rw-r--r--ext/mbstring/tests/simpletest.phpt1
-rw-r--r--ext/mysqli/tests/001.phpt2
-rw-r--r--ext/mysqli/tests/002.phpt2
-rw-r--r--ext/mysqli/tests/003.phpt2
-rw-r--r--ext/mysqli/tests/004.phpt2
-rw-r--r--ext/mysqli/tests/005.phpt2
-rw-r--r--ext/mysqli/tests/006.phpt2
-rw-r--r--ext/mysqli/tests/007.phpt2
-rw-r--r--ext/mysqli/tests/008.phpt2
-rw-r--r--ext/mysqli/tests/009.phpt2
-rw-r--r--ext/mysqli/tests/013.phpt2
-rw-r--r--ext/mysqli/tests/015.phpt2
-rw-r--r--ext/mysqli/tests/016.phpt2
-rw-r--r--ext/mysqli/tests/017.phpt2
-rw-r--r--ext/mysqli/tests/018.phpt2
-rw-r--r--ext/mysqli/tests/019.phpt2
-rw-r--r--ext/mysqli/tests/020.phpt2
-rw-r--r--ext/mysqli/tests/021.phpt2
-rw-r--r--ext/mysqli/tests/022.phpt2
-rw-r--r--ext/mysqli/tests/023.phpt2
-rw-r--r--ext/mysqli/tests/024.phpt2
-rw-r--r--ext/mysqli/tests/025.phpt2
-rw-r--r--ext/mysqli/tests/026.phpt2
-rw-r--r--ext/mysqli/tests/027.phpt2
-rw-r--r--ext/mysqli/tests/028.phpt2
-rw-r--r--ext/mysqli/tests/029.phpt2
-rw-r--r--ext/mysqli/tests/030.phpt2
-rw-r--r--ext/mysqli/tests/031.phpt2
-rw-r--r--ext/mysqli/tests/032.phpt2
-rw-r--r--ext/mysqli/tests/033.phpt2
-rw-r--r--ext/mysqli/tests/034.phpt2
-rw-r--r--ext/mysqli/tests/035.phpt2
-rw-r--r--ext/mysqli/tests/036.phpt2
-rw-r--r--ext/mysqli/tests/037.phpt2
-rw-r--r--ext/mysqli/tests/039.phpt2
-rw-r--r--ext/mysqli/tests/040.phpt2
-rw-r--r--ext/mysqli/tests/041.phpt2
-rw-r--r--ext/mysqli/tests/042.phpt2
-rw-r--r--ext/mysqli/tests/043.phpt2
-rw-r--r--ext/mysqli/tests/044.phpt2
-rw-r--r--ext/mysqli/tests/046.phpt2
-rw-r--r--ext/mysqli/tests/047.phpt2
-rw-r--r--ext/mysqli/tests/048.phpt2
-rw-r--r--ext/mysqli/tests/049.phpt2
-rw-r--r--ext/mysqli/tests/057.phpt2
-rw-r--r--ext/mysqli/tests/058.phpt2
-rw-r--r--ext/mysqli/tests/059.phpt2
-rw-r--r--ext/mysqli/tests/060.phpt2
-rw-r--r--ext/mysqli/tests/062.phpt2
-rw-r--r--ext/mysqli/tests/063.phpt2
-rw-r--r--ext/mysqli/tests/067.phpt2
-rw-r--r--ext/mysqli/tests/068.phpt2
-rw-r--r--ext/mysqli/tests/069.phpt2
-rw-r--r--ext/mysqli/tests/070.phpt2
-rw-r--r--ext/mysqli/tests/071.phpt2
-rw-r--r--ext/mysqli/tests/072.phpt2
-rw-r--r--ext/mysqli/tests/073.phpt2
-rw-r--r--ext/mysqli/tests/074.phpt2
-rw-r--r--ext/mysqli/tests/bug32490.phpt1
-rw-r--r--ext/mysqli/tests/bug33263.phpt2
-rw-r--r--ext/mysqli/tests/bug35759.phpt2
-rw-r--r--ext/mysqli/tests/bug38710.phpt2
-rw-r--r--ext/mysqli/tests/bug42548.phpt2
-rw-r--r--ext/mysqli/tests/bug44897.phpt1
-rw-r--r--ext/mysqli/tests/bug48909.phpt2
-rw-r--r--ext/mysqli/tests/bug49442.phpt2
-rw-r--r--ext/mysqli/tests/bug50772.phpt2
-rw-r--r--ext/mysqli/tests/bug52082.phpt2
-rw-r--r--ext/mysqli/tests/bug52891.phpt2
-rw-r--r--ext/mysqli/tests/bug53503.phpt2
-rw-r--r--ext/mysqli/tests/bug55283.phpt2
-rw-r--r--ext/mysqli/tests/bug55653.phpt2
-rw-r--r--ext/mysqli/tests/bug62046.phpt2
-rw-r--r--ext/mysqli/tests/bug66124.phpt2
-rw-r--r--ext/mysqli/tests/bug66762.phpt2
-rw-r--r--ext/mysqli/tests/bug70384.phpt2
-rw-r--r--ext/mysqli/tests/bug74737.phpt1
-rw-r--r--ext/mysqli/tests/bug_mysql_49406.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_auth_pam.phpt1
-rw-r--r--ext/mysqli/tests/mysqli_begin_transaction.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_change_user_insert_id.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_change_user_rollback.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_class_mysqli_warning.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_connect.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_connect_errno.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_connect_error.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_connect_oo_defaults.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_connect_oo_warnings.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_connect_twice.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_constants_categories.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_debug_ini.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_disable_reads_from_master.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_driver.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_driver_unclonable.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_embedded_connect.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_enable_reads_from_master.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_expire_password.phpt1
-rw-r--r--ext/mysqli/tests/mysqli_fetch_array_assoc.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_fetch_field_flags.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_fetch_field_types.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_fork.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_get_client_info.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_get_client_stats_off.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_get_client_stats_ps.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_get_client_version.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_get_connection_stats_off.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_get_host_info.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_get_proto_info.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_get_server_info.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_get_server_version.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_init.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_insert_id_variation.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_insert_packet_overflow.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_kill.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_last_insert_id.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_multi_query.phpt1
-rw-r--r--ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_no_reconnect.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_open_bug74432.phpt1
-rw-r--r--ext/mysqli/tests/mysqli_options_init_command.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_options_int_and_float_native.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pam_sha256.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt3
-rw-r--r--ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pconn_disabled.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pconn_kill.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pconn_limits.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pconn_max_links.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pconn_reuse.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pconn_twice.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_pconnect.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_phpinfo.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_poll.phpt3
-rw-r--r--ext/mysqli/tests/mysqli_poll_kill.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt1
-rw-r--r--ext/mysqli/tests/mysqli_prepare_no_object.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_query_iterators.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_query_stored_proc.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_release_savepoint.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_report.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_report_new.phpt3
-rw-r--r--ext/mysqli/tests/mysqli_report_wo_ps.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_result_unclonable.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_savepoint.phpt1
-rw-r--r--ext/mysqli/tests/mysqli_send_query.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_bind_limits.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_datatype_change.phpt3
-rw-r--r--ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_multires.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_result_metadata.phpt1
-rw-r--r--ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_unclonable.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_store_result_copy.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_thread_safe.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_unclonable.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_warning_unclonable.phpt2
-rw-r--r--ext/oci8/tests/bind_number.phpt2
-rw-r--r--ext/oci8/tests/bug70700.phpt3
-rw-r--r--ext/oci8/tests/bug72524.phpt1
-rw-r--r--ext/oci8/tests/conn_attr_2.phpt1
-rw-r--r--ext/oci8/tests/db_op_1.phpt1
-rw-r--r--ext/oci8/tests/db_op_2.phpt1
-rw-r--r--ext/oci8/tests/define3.phpt1
-rw-r--r--ext/oci8/tests/define4.phpt1
-rw-r--r--ext/oci8/tests/define5.phpt1
-rw-r--r--ext/oci8/tests/drcp_connect1.phpt1
-rw-r--r--ext/oci8/tests/drcp_newconnect.phpt1
-rw-r--r--ext/oci8/tests/drcp_privileged.phpt1
-rw-r--r--ext/oci8/tests/drcp_scope3.phpt2
-rw-r--r--ext/oci8/tests/drcp_scope5.phpt2
-rw-r--r--ext/oci8/tests/edition_2.phpt1
-rw-r--r--ext/oci8/tests/fetch_array.phpt1
-rw-r--r--ext/oci8/tests/imp_res_get_cancel.phpt1
-rw-r--r--ext/oci8/tests/imp_res_get_dbmsoutput.phpt1
-rw-r--r--ext/oci8/tests/lob_038.phpt2
-rw-r--r--ext/oci8/tests/lob_041.phpt1
-rw-r--r--ext/opcache/tests/log_verbosity_bug.phpt1
-rw-r--r--ext/opcache/tests/optimize_func_calls.phpt1
-rw-r--r--ext/opcache/tests/ssa_bug_007.phpt1
-rw-r--r--ext/opcache/tests/ssa_bug_008.phpt1
-rw-r--r--ext/opcache/tests/wrong_inlining_001.phpt2
-rw-r--r--ext/opcache/tests/zzz_basic_logging.phpt1
-rw-r--r--ext/openssl/tests/001.phpt2
-rw-r--r--ext/openssl/tests/bug54992.phpt2
-rw-r--r--ext/openssl/tests/bug61124.phpt1
-rw-r--r--ext/openssl/tests/bug61930.phpt1
-rw-r--r--ext/openssl/tests/bug68265.phpt1
-rw-r--r--ext/openssl/tests/bug68879.phpt1
-rw-r--r--ext/openssl/tests/bug69215.phpt1
-rw-r--r--ext/openssl/tests/bug71475.phpt1
-rw-r--r--ext/openssl/tests/bug72333.phpt1
-rw-r--r--ext/openssl/tests/bug74651.phpt2
-rw-r--r--ext/openssl/tests/bug74720_0.phpt1
-rw-r--r--ext/openssl/tests/bug74720_1.phpt1
-rw-r--r--ext/openssl/tests/bug74903.phpt1
-rw-r--r--ext/openssl/tests/bug76296.phpt1
-rw-r--r--ext/openssl/tests/openssl_csr_sign_basic.phpt1
-rw-r--r--ext/openssl/tests/openssl_decrypt_error.phpt1
-rw-r--r--ext/openssl/tests/openssl_encrypt_crash.phpt3
-rw-r--r--ext/openssl/tests/openssl_pkcs7_read_basic.phpt1
-rw-r--r--ext/openssl/tests/openssl_pkey_new_error.phpt2
-rw-r--r--ext/openssl/tests/openssl_public_encrypt_basic.phpt1
-rw-r--r--ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt2
-rw-r--r--ext/openssl/tests/openssl_x509_fingerprint_basic.phpt1
-rw-r--r--ext/openssl/tests/openssl_x509_read_basic.phpt1
-rw-r--r--ext/openssl/tests/stream_crypto_flags_002.phpt1
-rw-r--r--ext/openssl/tests/stream_crypto_flags_003.phpt1
-rw-r--r--ext/pcre/tests/002.phpt1
-rw-r--r--ext/pcre/tests/bug27103.phpt1
-rw-r--r--ext/pcre/tests/bug52732.phpt2
-rw-r--r--ext/pcre/tests/bug73392.phpt1
-rw-r--r--ext/pcre/tests/bug74183.phpt2
-rw-r--r--ext/pcre/tests/bug74873.phpt2
-rw-r--r--ext/pcre/tests/bug76850.phpt1
-rw-r--r--ext/pcre/tests/bug76909.phpt1
-rw-r--r--ext/pcre/tests/match_flags3.phpt1
-rw-r--r--ext/pcre/tests/pcre.constants.phpt2
-rw-r--r--ext/pcre/tests/preg_grep_error.phpt2
-rw-r--r--ext/pcre/tests/preg_grep_error1.phpt3
-rw-r--r--ext/pcre/tests/preg_grep_error2.phpt2
-rw-r--r--ext/pcre/tests/preg_last_error_error.phpt2
-rw-r--r--ext/pcre/tests/preg_match_all_error3.phpt1
-rw-r--r--ext/pcre/tests/preg_match_basic.phpt3
-rw-r--r--ext/pcre/tests/preg_match_basic_002.phpt2
-rw-r--r--ext/pcre/tests/preg_match_basic_edit.phpt3
-rw-r--r--ext/pcre/tests/preg_match_error1.phpt1
-rw-r--r--ext/pcre/tests/preg_match_error2.phpt3
-rw-r--r--ext/pcre/tests/preg_quote_basic.phpt3
-rw-r--r--ext/pcre/tests/preg_quote_error1.phpt2
-rw-r--r--ext/pcre/tests/preg_replace_basic.phpt1
-rw-r--r--ext/pcre/tests/preg_replace_callback_error1.phpt2
-rw-r--r--ext/pcre/tests/preg_replace_error1.phpt1
-rw-r--r--ext/pcre/tests/preg_replace_error2.phpt1
-rw-r--r--ext/pcre/tests/preg_split_error.phpt2
-rw-r--r--ext/pcre/tests/preg_split_error2.phpt2
-rw-r--r--ext/pdo/tests/bug_39656.phpt1
-rw-r--r--ext/pdo/tests/bug_44173.phpt1
-rw-r--r--ext/pdo/tests/bug_52098.phpt2
-rw-r--r--ext/pdo/tests/bug_64172.phpt2
-rw-r--r--ext/pdo/tests/pecl_bug_5772.phpt1
-rw-r--r--ext/pdo/tests/pecl_bug_5809.phpt1
-rw-r--r--ext/pdo_dblib/tests/bug_68957.phpt1
-rw-r--r--ext/pdo_firebird/tests/bug_62024.phpt1
-rw-r--r--ext/pdo_firebird/tests/bug_64037.phpt2
-rw-r--r--ext/pdo_firebird/tests/bug_73087.phpt2
-rw-r--r--ext/pdo_firebird/tests/bug_74462.phpt2
-rw-r--r--ext/pdo_firebird/tests/bug_76488.phpt2
-rw-r--r--ext/pdo_firebird/tests/bug_aaa.phpt2
-rw-r--r--ext/pdo_mysql/tests/bug66141.phpt2
-rw-r--r--ext/pdo_mysql/tests/bug68371.phpt1
-rw-r--r--ext/pdo_mysql/tests/bug_39483.phptbin755 -> 754 bytes
-rw-r--r--ext/pdo_mysql/tests/bug_41698.phpt2
-rw-r--r--ext/pdo_mysql/tests/bug_51670.phpt1
-rw-r--r--ext/pdo_mysql/tests/bug_pecl_12925.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_errmode.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt1
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_prefetch.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_bit.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_commit.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_prepare_native_column.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_rollback.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt2
-rw-r--r--ext/pdo_mysql/tests/pecl_bug_5802.phpt2
-rw-r--r--ext/pdo_oci/tests/bug60994.phpt3
-rw-r--r--ext/pdo_oci/tests/bug_33707.phpt1
-rw-r--r--ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt2
-rw-r--r--ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt2
-rw-r--r--ext/pdo_oci/tests/pdo_oci_stream_1.phpt2
-rw-r--r--ext/pdo_oci/tests/pdo_oci_templob_1.phpt1
-rw-r--r--ext/pdo_oci/tests/pecl_bug_11345.phpt3
-rw-r--r--ext/pdo_oci/tests/pecl_bug_6364.phpt1
-rw-r--r--ext/pdo_odbc/tests/long_columns.phpt1
-rw-r--r--ext/pdo_odbc/tests/max_columns.phpt1
-rw-r--r--ext/pdo_pgsql/tests/bug36727.phpt2
-rw-r--r--ext/pdo_pgsql/tests/bug48764.phpt1
-rw-r--r--ext/pdo_pgsql/tests/bug62479.phpt1
-rw-r--r--ext/pdo_pgsql/tests/bug68371.phpt1
-rw-r--r--ext/pdo_pgsql/tests/bug69344.phpt1
-rw-r--r--ext/pdo_pgsql/tests/bug69362.phpt1
-rw-r--r--ext/pdo_pgsql/tests/bug72294.phpt1
-rw-r--r--ext/pdo_pgsql/tests/bug75402.phpt1
-rw-r--r--ext/pdo_pgsql/tests/bug_33876.phpt3
-rw-r--r--ext/pdo_pgsql/tests/bug_49985.phpt1
-rw-r--r--ext/pdo_pgsql/tests/copy_from.phpt1
-rw-r--r--ext/pdo_pgsql/tests/copy_to.phpt1
-rw-r--r--ext/pdo_sqlite/tests/bug33841.phpt1
-rw-r--r--ext/pdo_sqlite/tests/pdo_sqlite_statement_getattribute.phpt2
-rw-r--r--ext/pgsql/tests/10pg_convert.phpt2
-rw-r--r--ext/pgsql/tests/10pg_convert_9.phpt2
-rw-r--r--ext/pgsql/tests/12pg_insert.phpt2
-rw-r--r--ext/pgsql/tests/12pg_insert_9.phpt2
-rw-r--r--ext/pgsql/tests/13pg_select_9.phpt2
-rw-r--r--ext/pgsql/tests/14pg_update_9.phpt2
-rw-r--r--ext/pgsql/tests/31nb_async_query_prepared.phpt1
-rw-r--r--ext/pgsql/tests/32nb_async_query.phpt1
-rw-r--r--ext/pgsql/tests/bug47199.phpt2
-rw-r--r--ext/pgsql/tests/bug64609.phpt2
-rw-r--r--ext/pgsql/tests/bug72197.phpt1
-rw-r--r--ext/pgsql/tests/pg_insert_001.phpt1
-rw-r--r--ext/pgsql/tests/pg_insert_002.phpt3
-rw-r--r--ext/phar/tests/002.phpt2
-rw-r--r--ext/phar/tests/020.phpt2
-rw-r--r--ext/phar/tests/021.phpt2
-rw-r--r--ext/phar/tests/032.phpt3
-rw-r--r--ext/phar/tests/addfuncs.phpt2
-rw-r--r--ext/phar/tests/bug13786.phpt2
-rw-r--r--ext/phar/tests/bug46178.phpt2
-rw-r--r--ext/phar/tests/bug47085.phpt2
-rw-r--r--ext/phar/tests/bug48377.phpt2
-rw-r--r--ext/phar/tests/bug53872.phpt1
-rw-r--r--ext/phar/tests/bug60164.phpt2
-rw-r--r--ext/phar/tests/bug65028.phpt1
-rw-r--r--ext/phar/tests/bug69324.phpt2
-rw-r--r--ext/phar/tests/bug69720.phpt1
-rw-r--r--ext/phar/tests/bug71354.phpt2
-rw-r--r--ext/phar/tests/bug71391.phpt2
-rw-r--r--ext/phar/tests/bug71488.phpt2
-rw-r--r--ext/phar/tests/bug72928.phpt2
-rw-r--r--ext/phar/tests/bug73035.phpt2
-rw-r--r--ext/phar/tests/bug73764.phpt2
-rw-r--r--ext/phar/tests/bug74383.phpt1
-rw-r--r--ext/phar/tests/cache_list/copyonwrite1.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite10.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite11.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite12.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite13.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite14.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite15.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite16.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite17.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite18.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite19.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite2.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite20.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite21.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite22.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite23.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite24.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite25.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite3.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite4.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite4a.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite5.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite7.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite8.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite9.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller11.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller12.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller13.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller15.phpt1
-rw-r--r--ext/phar/tests/cache_list/frontcontroller16.phpt1
-rw-r--r--ext/phar/tests/cache_list/frontcontroller17.phpt1
-rw-r--r--ext/phar/tests/cache_list/frontcontroller22.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller23.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller24.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller25.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller26.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller27.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller29.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller30.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller31.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller33.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller6.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller8.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller9.phpt2
-rw-r--r--ext/phar/tests/create_new_phar_b.phpt1
-rw-r--r--ext/phar/tests/delete.phpt2
-rw-r--r--ext/phar/tests/delete_in_phar.phpt2
-rw-r--r--ext/phar/tests/dir.phpt2
-rw-r--r--ext/phar/tests/file_get_contents.phpt2
-rw-r--r--ext/phar/tests/fopen_edgecases.phpt2
-rw-r--r--ext/phar/tests/frontcontroller12.phpt2
-rw-r--r--ext/phar/tests/frontcontroller13.phpt2
-rw-r--r--ext/phar/tests/frontcontroller15.phpt1
-rw-r--r--ext/phar/tests/frontcontroller16.phpt1
-rw-r--r--ext/phar/tests/frontcontroller17.phpt1
-rw-r--r--ext/phar/tests/frontcontroller22.phpt2
-rw-r--r--ext/phar/tests/frontcontroller23.phpt2
-rw-r--r--ext/phar/tests/frontcontroller24.phpt2
-rw-r--r--ext/phar/tests/frontcontroller25.phpt2
-rw-r--r--ext/phar/tests/frontcontroller26.phpt2
-rw-r--r--ext/phar/tests/frontcontroller27.phpt2
-rw-r--r--ext/phar/tests/frontcontroller29.phpt2
-rw-r--r--ext/phar/tests/frontcontroller30.phpt2
-rw-r--r--ext/phar/tests/frontcontroller31.phpt2
-rw-r--r--ext/phar/tests/frontcontroller33.phpt2
-rw-r--r--ext/phar/tests/frontcontroller6.phpt2
-rw-r--r--ext/phar/tests/frontcontroller8.phpt2
-rw-r--r--ext/phar/tests/frontcontroller9.phpt2
-rw-r--r--ext/phar/tests/include_path.phpt2
-rw-r--r--ext/phar/tests/include_path_advanced.phpt2
-rw-r--r--ext/phar/tests/invalid_alias.phpt2
-rw-r--r--ext/phar/tests/invalid_setstubalias.phpt2
-rw-r--r--ext/phar/tests/mkdir.phpt2
-rw-r--r--ext/phar/tests/open_for_write_existing_b.phpt1
-rw-r--r--ext/phar/tests/open_for_write_existing_c.phpt1
-rw-r--r--ext/phar/tests/open_for_write_newfile_b.phpt1
-rw-r--r--ext/phar/tests/open_for_write_newfile_c.phpt1
-rw-r--r--ext/phar/tests/opendir.phpt2
-rw-r--r--ext/phar/tests/phar_commitwrite.phpt2
-rw-r--r--ext/phar/tests/phar_create_in_cwd.phpt2
-rw-r--r--ext/phar/tests/phar_ctx_001.phpt2
-rw-r--r--ext/phar/tests/phar_gobyebye.phpt2
-rw-r--r--ext/phar/tests/phar_isvalidpharfilename.phpt1
-rw-r--r--ext/phar/tests/phar_mount.phpt2
-rw-r--r--ext/phar/tests/pharfileinfo_chmod.phpt2
-rw-r--r--ext/phar/tests/pharfileinfo_compression.phpt2
-rw-r--r--ext/phar/tests/pharfileinfo_destruct.phpt2
-rw-r--r--ext/phar/tests/readfile.phpt2
-rw-r--r--ext/phar/tests/rename.phpt2
-rw-r--r--ext/phar/tests/security.phpt2
-rw-r--r--ext/phar/tests/stat.phpt2
-rw-r--r--ext/phar/tests/tar/create_new_phar_b.phpt1
-rw-r--r--ext/phar/tests/tar/delete.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller10.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller12.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller13.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller15.phar.phpt1
-rw-r--r--ext/phar/tests/tar/frontcontroller16.phar.phpt1
-rw-r--r--ext/phar/tests/tar/frontcontroller17.phar.phpt1
-rw-r--r--ext/phar/tests/tar/frontcontroller6.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller8.phar.phpt2
-rw-r--r--ext/phar/tests/tar/links6.phpt2
-rw-r--r--ext/phar/tests/tar/open_for_write_existing_b.phpt1
-rw-r--r--ext/phar/tests/tar/open_for_write_existing_c.phpt1
-rw-r--r--ext/phar/tests/tar/open_for_write_newfile_b.phpt1
-rw-r--r--ext/phar/tests/tar/open_for_write_newfile_c.phpt1
-rw-r--r--ext/phar/tests/test_alias_unset.phpt2
-rw-r--r--ext/phar/tests/test_unset.phpt2
-rw-r--r--ext/phar/tests/webphar_compilefail.phpt2
-rw-r--r--ext/phar/tests/zip/create_new_phar_b.phpt1
-rw-r--r--ext/phar/tests/zip/delete.phpt2
-rw-r--r--ext/phar/tests/zip/delete_in_phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller10.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller12.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller13.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller15.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller16.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller17.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller6.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller8.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller9.phar.phpt2
-rw-r--r--ext/phar/tests/zip/open_for_write_existing_b.phpt1
-rw-r--r--ext/phar/tests/zip/open_for_write_existing_c.phpt1
-rw-r--r--ext/phar/tests/zip/open_for_write_newfile_b.phpt1
-rw-r--r--ext/phar/tests/zip/open_for_write_newfile_c.phpt1
-rw-r--r--ext/phar/tests/zip/rename.phpt2
-rw-r--r--ext/phar/tests/zip/rename_dir.phpt2
-rw-r--r--ext/posix/tests/posix_getgrgid_basic.phpt1
-rw-r--r--ext/posix/tests/posix_getgroups_basic.phpt2
-rw-r--r--ext/posix/tests/posix_getpgid_basic.phpt2
-rw-r--r--ext/posix/tests/posix_getpgrp_basic.phpt2
-rw-r--r--ext/posix/tests/posix_getpid_basic.phpt2
-rw-r--r--ext/posix/tests/posix_getppid_basic.phpt2
-rw-r--r--ext/posix/tests/posix_getpwuid_basic.phpt2
-rw-r--r--ext/posix/tests/posix_getrlimit_basic.phpt2
-rw-r--r--ext/posix/tests/posix_getsid_basic.phpt2
-rw-r--r--ext/posix/tests/posix_kill_basic.phpt1
-rw-r--r--ext/posix/tests/posix_mknod_basic.phpt2
-rw-r--r--ext/posix/tests/posix_setegid_basic.phpt2
-rw-r--r--ext/posix/tests/posix_setgid_basic.phpt2
-rw-r--r--ext/posix/tests/posix_setgid_variation2.phpt1
-rw-r--r--ext/posix/tests/posix_setgid_variation4.phpt1
-rw-r--r--ext/posix/tests/posix_setgid_variation5.phpt1
-rw-r--r--ext/posix/tests/posix_setgid_variation6.phpt2
-rw-r--r--ext/posix/tests/posix_setrlimit.phpt1
-rw-r--r--ext/posix/tests/posix_uname_basic.phpt2
-rw-r--r--ext/readline/tests/readline_info_001.phpt2
-rw-r--r--ext/readline/tests/readline_read_history_open_basedir_001.phpt2
-rw-r--r--ext/readline/tests/readline_write_history_open_basedir_001.phpt2
-rw-r--r--ext/recode/tests/001.phpt2
-rw-r--r--ext/reflection/tests/007.phpt1
-rw-r--r--ext/reflection/tests/ReflectionClass_constructor_002.phpt3
-rw-r--r--ext/reflection/tests/ReflectionClass_export_basic1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_export_basic2.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_getConstant_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_getDocComment_001.phpt4
-rw-r--r--ext/reflection/tests/ReflectionClass_getMethod_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_getNamespaceName.phpt1
-rw-r--r--ext/reflection/tests/ReflectionClass_getParentClass.phpt1
-rw-r--r--ext/reflection/tests/ReflectionClass_getProperties_003.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_getProperty_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt3
-rw-r--r--ext/reflection/tests/ReflectionClass_hasConstant_001.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_hasConstant_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_hasMethod_001.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_hasProperty_001.phpt1
-rw-r--r--ext/reflection/tests/ReflectionClass_isIterateable_001.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt3
-rw-r--r--ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt1
-rw-r--r--ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt3
-rw-r--r--ext/reflection/tests/ReflectionClass_toString_002.phpt4
-rw-r--r--ext/reflection/tests/ReflectionClass_toString_003.phpt2
-rw-r--r--ext/reflection/tests/ReflectionFunction_001.phpt2
-rw-r--r--ext/reflection/tests/ReflectionFunction_getDocComment.001.phpt1
-rw-r--r--ext/reflection/tests/ReflectionFunction_getExtension.phpt1
-rw-r--r--ext/reflection/tests/ReflectionFunction_getExtensionName.phpt1
-rw-r--r--ext/reflection/tests/ReflectionFunction_getFileName.001.phpt2
-rw-r--r--ext/reflection/tests/ReflectionFunction_getFileName.002.phpt1
-rw-r--r--ext/reflection/tests/ReflectionFunction_getNamespaceName.phpt1
-rw-r--r--ext/reflection/tests/ReflectionMethod_basic1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionMethod_constructor_error1.phpt1
-rw-r--r--ext/reflection/tests/ReflectionMethod_constructor_error2.phpt1
-rw-r--r--ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt1
-rw-r--r--ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject___toString_basic1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject___toString_basic2.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject_export_basic1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject_export_basic2.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject_export_basic3.phpt1
-rw-r--r--ext/reflection/tests/ReflectionObject_getName_basic.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionParameter_001.phpt2
-rw-r--r--ext/reflection/tests/ReflectionParameter_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionParameter_export_error.phpt1
-rw-r--r--ext/reflection/tests/ReflectionParameter_export_error3.phpt1
-rw-r--r--ext/reflection/tests/ReflectionProperty_basic1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt1
-rw-r--r--ext/reflection/tests/ReflectionType_002.phpt2
-rw-r--r--ext/reflection/tests/bug46064_2.phpt2
-rw-r--r--ext/reflection/tests/bug67068.phpt2
-rw-r--r--ext/reflection/tests/traits004.phpt1
-rw-r--r--ext/reflection/tests/traits005.phpt1
-rw-r--r--ext/session/tests/001.phpt1
-rw-r--r--ext/session/tests/003.phpt1
-rw-r--r--ext/session/tests/005.phpt1
-rw-r--r--ext/session/tests/009.phpt1
-rw-r--r--ext/session/tests/016.phpt1
-rw-r--r--ext/session/tests/019.phpt2
-rw-r--r--ext/session/tests/bug31454.phpt1
-rw-r--r--ext/session/tests/bug42596.phpt1
-rw-r--r--ext/session/tests/bug53141.phpt2
-rw-r--r--ext/session/tests/bug60634_error_1.phpt1
-rw-r--r--ext/session/tests/bug60860.phpt1
-rw-r--r--ext/session/tests/bug63379.phpt1
-rw-r--r--ext/session/tests/bug63379_nodestroy.phpt1
-rw-r--r--ext/session/tests/bug65475.phpt2
-rw-r--r--ext/session/tests/bug67972.phpt1
-rw-r--r--ext/session/tests/bug70876.phpt2
-rw-r--r--ext/session/tests/bug71603.phpt1
-rw-r--r--ext/session/tests/bug71974.phpt2
-rw-r--r--ext/session/tests/bug73100.phpt1
-rw-r--r--ext/session/tests/bug74833.phpt1
-rw-r--r--ext/session/tests/session_basic2.phpt2
-rw-r--r--ext/session/tests/session_basic4.phpt2
-rw-r--r--ext/session/tests/session_cache_expire_basic.phpt1
-rw-r--r--ext/session/tests/session_cache_expire_error.phpt1
-rw-r--r--ext/session/tests/session_cache_expire_variation1.phpt1
-rw-r--r--ext/session/tests/session_cache_expire_variation2.phpt2
-rw-r--r--ext/session/tests/session_cache_expire_variation3.phpt1
-rw-r--r--ext/session/tests/session_cache_limiter_error.phpt1
-rw-r--r--ext/session/tests/session_commit_basic.phpt1
-rw-r--r--ext/session/tests/session_commit_variation2.phpt1
-rw-r--r--ext/session/tests/session_commit_variation3.phpt1
-rw-r--r--ext/session/tests/session_commit_variation4.phpt1
-rw-r--r--ext/session/tests/session_commit_variation5.phpt1
-rw-r--r--ext/session/tests/session_decode_basic.phpt1
-rw-r--r--ext/session/tests/session_decode_basic_serialize.phpt1
-rw-r--r--ext/session/tests/session_decode_variation1.phpt1
-rw-r--r--ext/session/tests/session_decode_variation2.phpt1
-rw-r--r--ext/session/tests/session_decode_variation4.phpt1
-rw-r--r--ext/session/tests/session_destroy_error.phpt1
-rw-r--r--ext/session/tests/session_destroy_variation1.phpt1
-rw-r--r--ext/session/tests/session_destroy_variation2.phpt1
-rw-r--r--ext/session/tests/session_destroy_variation3.phpt1
-rw-r--r--ext/session/tests/session_encode_basic.phpt1
-rw-r--r--ext/session/tests/session_encode_error.phpt1
-rw-r--r--ext/session/tests/session_encode_serialize.phpt1
-rw-r--r--ext/session/tests/session_gc_basic.phpt2
-rw-r--r--ext/session/tests/session_get_cookie_params_error.phpt1
-rw-r--r--ext/session/tests/session_get_cookie_params_variation1.phpt1
-rw-r--r--ext/session/tests/session_id_basic.phpt1
-rw-r--r--ext/session/tests/session_id_basic2.phpt1
-rw-r--r--ext/session/tests/session_id_error.phpt1
-rw-r--r--ext/session/tests/session_id_error3.phpt1
-rw-r--r--ext/session/tests/session_module_name_variation4.phpt1
-rw-r--r--ext/session/tests/session_name_basic.phpt1
-rw-r--r--ext/session/tests/session_name_error.phpt2
-rw-r--r--ext/session/tests/session_name_variation1.phpt1
-rw-r--r--ext/session/tests/session_name_variation2.phpt1
-rw-r--r--ext/session/tests/session_regenerate_id_basic.phpt1
-rw-r--r--ext/session/tests/session_regenerate_id_cookie.phpt1
-rw-r--r--ext/session/tests/session_regenerate_id_error.phpt1
-rw-r--r--ext/session/tests/session_regenerate_id_variation1.phpt1
-rw-r--r--ext/session/tests/session_save_path_basic.phpt1
-rw-r--r--ext/session/tests/session_save_path_error.phpt1
-rw-r--r--ext/session/tests/session_save_path_variation5.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_class_001.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_class_002.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_class_003.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_class_004.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_class_005.phpt2
-rw-r--r--ext/session/tests/session_set_save_handler_class_012.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_class_013.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_class_014.phpt2
-rw-r--r--ext/session/tests/session_set_save_handler_class_015.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_class_016.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_class_017.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_class_018.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_error.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_error2.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_iface_001.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_iface_002.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_iface_003.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_sid_001.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_sid_002.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_variation2.phpt1
-rw-r--r--ext/session/tests/session_set_save_handler_variation4.phpt1
-rw-r--r--ext/session/tests/session_start_variation2.phpt1
-rw-r--r--ext/session/tests/session_start_variation4.phpt1
-rw-r--r--ext/session/tests/session_start_variation5.phpt1
-rw-r--r--ext/session/tests/session_start_variation6.phpt1
-rw-r--r--ext/session/tests/session_start_variation7.phpt1
-rw-r--r--ext/session/tests/session_start_variation8.phpt1
-rw-r--r--ext/session/tests/session_unset_basic.phpt1
-rw-r--r--ext/session/tests/session_unset_variation1.phpt1
-rw-r--r--ext/session/tests/session_write_close_basic.phpt1
-rw-r--r--ext/session/tests/session_write_close_variation3.phpt1
-rw-r--r--ext/session/tests/session_write_close_variation4.phpt1
-rw-r--r--ext/simplexml/tests/012.phpt1
-rw-r--r--ext/simplexml/tests/018.phpt2
-rw-r--r--ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt2
-rw-r--r--ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt1
-rw-r--r--ext/simplexml/tests/bug41175.phpt2
-rw-r--r--ext/simplexml/tests/bug42369.phpt2
-rw-r--r--ext/simplexml/tests/bug43221.phpt2
-rw-r--r--ext/simplexml/tests/bug44478.phpt2
-rw-r--r--ext/simplexml/tests/bug45553.phpt2
-rw-r--r--ext/simplexml/tests/bug46003.phpt2
-rw-r--r--ext/simplexml/tests/bug46047.phpt2
-rw-r--r--ext/simplexml/tests/bug62639.phpt2
-rw-r--r--ext/simplexml/tests/feature55218.phpt2
-rw-r--r--ext/simplexml/tests/profile09.phpt1
-rw-r--r--ext/simplexml/tests/simplexml_load_file.phpt2
-rw-r--r--ext/simplexml/tests/sxe_003.phpt1
-rw-r--r--ext/snmp/tests/bug72479.phpt2
-rw-r--r--ext/snmp/tests/generic_timeout_error.phpt1
-rw-r--r--ext/snmp/tests/ipv6.phpt2
-rw-r--r--ext/snmp/tests/snmp-object-setSecurity_error.phpt1
-rw-r--r--ext/snmp/tests/snmp_get_quick_print.phpt1
-rw-r--r--ext/soap/tests/bug70388.phpt2
-rw-r--r--ext/soap/tests/bugs/bug27722.phpt2
-rw-r--r--ext/soap/tests/bugs/bug29061.phpt2
-rw-r--r--ext/soap/tests/bugs/bug29109.phpt2
-rw-r--r--ext/soap/tests/bugs/bug42359.phpt1
-rw-r--r--ext/soap/tests/bugs/bug42488.phpt2
-rw-r--r--ext/soap/tests/bugs/bug44686.phpt1
-rw-r--r--ext/soap/tests/bugs/bug47273.phpt1
-rw-r--r--ext/soap/tests/bugs/bug70469.phpt2
-rw-r--r--ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt2
-rw-r--r--ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt2
-rw-r--r--ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt2
-rw-r--r--ext/soap/tests/schema/schema008.phpt1
-rw-r--r--ext/soap/tests/schema/schema068.phpt2
-rw-r--r--ext/soap/tests/server029.phpt2
-rw-r--r--ext/soap/tests/soap12/T27.phpt1
-rw-r--r--ext/soap/tests/soap12/T28.phpt1
-rw-r--r--ext/soap/tests/soap12/T31.phpt1
-rw-r--r--ext/soap/tests/soap12/T40.phpt2
-rw-r--r--ext/soap/tests/soap12/T56.phpt1
-rw-r--r--ext/soap/tests/soap12/T58.phpt1
-rw-r--r--ext/sockets/tests/mcast_ipv4_send.phpt1
-rw-r--r--ext/sockets/tests/mcast_ipv4_send_error.phpt1
-rw-r--r--ext/sockets/tests/mcast_ipv6_recv.phpt1
-rw-r--r--ext/sockets/tests/mcast_ipv6_recv_limited.phpt1
-rw-r--r--ext/sockets/tests/mcast_ipv6_send.phpt1
-rw-r--r--ext/sockets/tests/socket_bind.phpt2
-rw-r--r--ext/sockets/tests/socket_bind_params.phpt1
-rw-r--r--ext/sockets/tests/socket_close_params.phpt1
-rw-r--r--ext/sockets/tests/socket_cmsg_credentials.phpt2
-rw-r--r--ext/sockets/tests/socket_cmsg_rights.phpt1
-rw-r--r--ext/sockets/tests/socket_connect_error.phpt1
-rw-r--r--ext/sockets/tests/socket_connect_params.phpt1
-rw-r--r--ext/sockets/tests/socket_create_listen-nobind.phpt2
-rw-r--r--ext/sockets/tests/socket_create_params.phpt1
-rw-r--r--ext/sockets/tests/socket_export_stream-1.phpt1
-rw-r--r--ext/sockets/tests/socket_export_stream-2.phpt2
-rw-r--r--ext/sockets/tests/socket_export_stream-3.phpt1
-rw-r--r--ext/sockets/tests/socket_export_stream-4-win.phpt1
-rw-r--r--ext/sockets/tests/socket_getpeername.phpt1
-rw-r--r--ext/sockets/tests/socket_getsockname.phpt2
-rw-r--r--ext/sockets/tests/socket_import_stream-1.phpt1
-rw-r--r--ext/sockets/tests/socket_import_stream-2.phpt2
-rw-r--r--ext/sockets/tests/socket_import_stream-3.phpt1
-rw-r--r--ext/sockets/tests/socket_import_stream-4-win.phpt1
-rw-r--r--ext/sockets/tests/socket_listen_params.phpt1
-rw-r--r--ext/sockets/tests/socket_read_params.phpt1
-rw-r--r--ext/sockets/tests/socket_recvmsg.phpt1
-rw-r--r--ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt1
-rw-r--r--ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt2
-rw-r--r--ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt1
-rw-r--r--ext/sockets/tests/socket_set_block-wrongparams.phpt1
-rw-r--r--ext/sockets/tests/socket_set_nonblock.phpt2
-rw-r--r--ext/sockets/tests/socket_set_option_bindtodevice.phpt1
-rw-r--r--ext/sockets/tests/socket_set_option_in6_pktinfo.phpt1
-rw-r--r--ext/sockets/tests/socket_set_option_rcvtimeo.phpt1
-rw-r--r--ext/sockets/tests/socket_set_option_seolinger.phpt1
-rw-r--r--ext/sockets/tests/socket_set_option_sndtimeo.phpt1
-rw-r--r--ext/sockets/tests/socket_strerror.phpt1
-rw-r--r--ext/sockets/tests/socket_write_params.phpt1
-rw-r--r--ext/sockets/tests/wsaprotocol_info_0.phpt1
-rw-r--r--ext/sodium/tests/crypto_secretstream.phpt1
-rw-r--r--ext/sodium/tests/version.phpt1
-rw-r--r--ext/spl/tests/CallbackFilterIteratorTest-002.phpt1
-rw-r--r--ext/spl/tests/DirectoryIterator_empty_constructor.phpt2
-rw-r--r--ext/spl/tests/DirectoryIterator_getExtension_basic.phpt1
-rw-r--r--ext/spl/tests/DirectoryIterator_getInode_error.phpt1
-rw-r--r--ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt1
-rw-r--r--ext/spl/tests/SplArray_fromArray.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_add_missing_parameter1.phpt1
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_add_missing_parameter2.phpt1
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_current_empty.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_getIteratorMode_error.phpt1
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_offsetGet_empty.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_pop_params.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_push_missing_parameter.phpt1
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_unshift_missing_parameter.phpt1
-rw-r--r--ext/spl/tests/SplFileInfo_getGroup_error.phpt1
-rw-r--r--ext/spl/tests/SplFileInfo_getInode_error.phpt1
-rw-r--r--ext/spl/tests/SplFileInfo_getOwner_error.phpt1
-rw-r--r--ext/spl/tests/SplFileInfo_getPerms_error.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation1.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation10.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation11.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation12.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation5.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation6.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation7.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv_variation8.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_seek_error_001.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_setCsvControl_basic.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_setCsvControl_error001.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_setCsvControl_error002.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_setCsvControl_error003.phpt1
-rw-r--r--ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt1
-rw-r--r--ext/spl/tests/SplFixedArray__construct_param_float.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray__construct_param_null.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_count_checkParams.phpt1
-rw-r--r--ext/spl/tests/SplFixedArray_count_param_int.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_key_setsize.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_setSize_filled_to_smaller.phpt2
-rw-r--r--ext/spl/tests/SplFixedArray_setsize_grow.phpt2
-rw-r--r--ext/spl/tests/SplHeap_count_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplHeap_extract_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplHeap_insert_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplHeap_isEmpty.phpt1
-rw-r--r--ext/spl/tests/SplHeap_isEmpty_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_current_empty_storage.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_getInfo_empty_storage.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_offsetGet.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_offsetGet_missing_object.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_setInfo_empty_storage.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_setInfo_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter2.phpt1
-rw-r--r--ext/spl/tests/SplObjectStorage_unserialize_nested.phpt2
-rw-r--r--ext/spl/tests/SplPriorityQueue_extract_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/SplPriorityQueue_insert_invalid_parameter.phpt1
-rw-r--r--ext/spl/tests/arrayObject_count_basic1.phpt2
-rw-r--r--ext/spl/tests/arrayObject_exchangeArray_basic2.phpt2
-rw-r--r--ext/spl/tests/arrayObject_getFlags_basic1.phpt2
-rw-r--r--ext/spl/tests/arrayObject_getFlags_basic2.phpt2
-rw-r--r--ext/spl/tests/arrayObject_natsort_basic1.phpt1
-rw-r--r--ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt2
-rw-r--r--ext/spl/tests/array_013.phpt2
-rw-r--r--ext/spl/tests/bug45622.phpt2
-rw-r--r--ext/spl/tests/bug45622b.phpt2
-rw-r--r--ext/spl/tests/bug48361.phpt1
-rw-r--r--ext/spl/tests/bug52861.phpt1
-rw-r--r--ext/spl/tests/bug53144.phpt2
-rw-r--r--ext/spl/tests/bug54291.phpt1
-rw-r--r--ext/spl/tests/bug54304.phpt1
-rw-r--r--ext/spl/tests/bug54384.phpt1
-rw-r--r--ext/spl/tests/bug55701.phpt3
-rw-r--r--ext/spl/tests/bug61347.phpt2
-rw-r--r--ext/spl/tests/bug62904.phpt2
-rw-r--r--ext/spl/tests/bug64023.phpt1
-rw-r--r--ext/spl/tests/bug64228.phpt1
-rw-r--r--ext/spl/tests/bug66702.phpt2
-rw-r--r--ext/spl/tests/bug68128.phpt1
-rw-r--r--ext/spl/tests/bug70068.phpt2
-rw-r--r--ext/spl/tests/bug70366.phpt2
-rw-r--r--ext/spl/tests/bug70573.phpt2
-rw-r--r--ext/spl/tests/bug70868.phpt1
-rw-r--r--ext/spl/tests/bug71735.phpt2
-rw-r--r--ext/spl/tests/bug74478.phpt2
-rw-r--r--ext/spl/tests/countable_count_variation1.phpt2
-rw-r--r--ext/spl/tests/dit_001_noglob.phpt1
-rw-r--r--ext/spl/tests/fileobject_005.phpt2
-rw-r--r--ext/spl/tests/heap_corruption.phpt2
-rw-r--r--ext/spl/tests/heap_current_variation_001.phpt2
-rw-r--r--ext/spl/tests/iterator_036.phpt1
-rw-r--r--ext/spl/tests/iterator_070.phpt3
-rw-r--r--ext/spl/tests/iterator_071.phpt2
-rw-r--r--ext/spl/tests/limititerator_seek.phpt2
-rw-r--r--ext/spl/tests/pqueue_compare_error.phpt1
-rw-r--r--ext/spl/tests/recursiveiteratoriterator_beginiteration_basic.phpt1
-rw-r--r--ext/spl/tests/recursiveiteratoriterator_enditeration_basic.phpt1
-rw-r--r--ext/spl/tests/recursiveiteratoriterator_getsubiterator_basic.phpt1
-rw-r--r--ext/spl/tests/recursiveiteratoriterator_getsubiterator_error.phpt1
-rw-r--r--ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt1
-rw-r--r--ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_002.phpt1
-rw-r--r--ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_003.phpt1
-rw-r--r--ext/spl/tests/recursiveiteratoriterator_nextelement_basic.phpt1
-rw-r--r--ext/spl/tests/regexiterator_getpregflags.phpt2
-rw-r--r--ext/spl/tests/regexiterator_setflags_exception.phpt2
-rw-r--r--ext/spl/tests/regexiterator_setpregflags.phpt2
-rw-r--r--ext/spl/tests/regexiterator_setpregflags_exception.phpt2
-rw-r--r--ext/spl/tests/spl_autoload_013.phpt2
-rw-r--r--ext/spl/tests/spl_autoload_014.phpt2
-rw-r--r--ext/spl/tests/spl_autoload_bug48541.phpt2
-rw-r--r--ext/spl/tests/spl_classes.phpt1
-rw-r--r--ext/spl/tests/spl_heap_isempty.phpt2
-rw-r--r--ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt2
-rw-r--r--ext/spl/tests/spl_iterator_caching_count_basic.phpt2
-rw-r--r--ext/spl/tests/spl_iterator_caching_count_error.phpt2
-rw-r--r--ext/spl/tests/spl_iterator_caching_getcache_error.phpt2
-rw-r--r--ext/spl/tests/spl_minheap_compare_error.phpt1
-rw-r--r--ext/spl/tests/spl_pq_top_basic.phpt2
-rw-r--r--ext/spl/tests/spl_pq_top_error_args.phpt2
-rw-r--r--ext/spl/tests/splpriorityqueue_extract.phpt2
-rw-r--r--ext/spl/tests/splpriorityqueue_setextractflags.phpt2
-rw-r--r--ext/sqlite3/tests/bug53463.phpt2
-rw-r--r--ext/sqlite3/tests/bug68760.phpt1
-rw-r--r--ext/sqlite3/tests/sqlite3_31_changes.phpt1
-rw-r--r--ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt1
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation1.phpt3
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation2.phpt1
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation3.phpt2
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation4.phpt3
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation5.phpt3
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation6.phpt3
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation7.phpt2
-rw-r--r--ext/standard/tests/array/array_change_key_case_variation8.phpt1
-rw-r--r--ext/standard/tests/array/array_combine.phpt2
-rw-r--r--ext/standard/tests/array/array_count_values_error.phpt2
-rw-r--r--ext/standard/tests/array/array_count_values_variation.phpt1
-rw-r--r--ext/standard/tests/array/array_diff_assoc.phpt3
-rw-r--r--ext/standard/tests/array/array_diff_assoc_error.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_assoc_variation1.phpt3
-rw-r--r--ext/standard/tests/array/array_diff_assoc_variation2.phpt4
-rw-r--r--ext/standard/tests/array/array_diff_assoc_variation3.phpt1
-rw-r--r--ext/standard/tests/array/array_diff_assoc_variation4.phpt5
-rw-r--r--ext/standard/tests/array/array_diff_assoc_variation5.phpt1
-rw-r--r--ext/standard/tests/array/array_diff_assoc_variation6.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_assoc_variation7.phpt5
-rw-r--r--ext/standard/tests/array/array_diff_assoc_variation9.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_error.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_key_basic.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_key_variation1.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_key_variation3.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_key_variation4.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_key_variation5.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_key_variation6.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_key_variation7.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_key_variation8.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_uassoc_basic.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_uassoc_variation14.phpt1
-rw-r--r--ext/standard/tests/array/array_diff_ukey_variation11.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_variation2.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_variation3.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_variation4.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_variation5.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_variation6.phpt2
-rw-r--r--ext/standard/tests/array/array_diff_variation7.phpt4
-rw-r--r--ext/standard/tests/array/array_fill_keys.phpt1
-rw-r--r--ext/standard/tests/array/array_fill_keys_variation1.phpt2
-rw-r--r--ext/standard/tests/array/array_fill_keys_variation2.phpt2
-rw-r--r--ext/standard/tests/array/array_fill_keys_variation3.phpt2
-rw-r--r--ext/standard/tests/array/array_fill_keys_variation4.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_assoc_basic.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_assoc_variation10.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_assoc_variation4.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_key_basic.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_uassoc_basic.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_uassoc_variation1.phpt1
-rw-r--r--ext/standard/tests/array/array_intersect_uassoc_variation11.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_uassoc_variation2.phpt1
-rw-r--r--ext/standard/tests/array/array_intersect_uassoc_variation3.phpt1
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_error.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_variation1.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_variation10.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_variation2.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_variation3.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_variation4.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_variation5.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_variation6.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_variation7.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_variation8.phpt2
-rw-r--r--ext/standard/tests/array/array_intersect_ukey_variation9.phpt2
-rw-r--r--ext/standard/tests/array/array_key_exists_basic.phpt2
-rw-r--r--ext/standard/tests/array/array_key_exists_error.phpt3
-rw-r--r--ext/standard/tests/array/array_key_exists_object1.phpt1
-rw-r--r--ext/standard/tests/array/array_key_exists_object2.phpt1
-rw-r--r--ext/standard/tests/array/array_key_exists_variation1.phpt3
-rw-r--r--ext/standard/tests/array/array_key_exists_variation2.phpt1
-rw-r--r--ext/standard/tests/array/array_key_exists_variation3.phpt3
-rw-r--r--ext/standard/tests/array/array_key_exists_variation4.phpt1
-rw-r--r--ext/standard/tests/array/array_key_exists_variation5.phpt3
-rw-r--r--ext/standard/tests/array/array_key_exists_variation6.phpt3
-rw-r--r--ext/standard/tests/array/array_key_exists_variation7.phpt3
-rw-r--r--ext/standard/tests/array/array_key_exists_variation8.phpt3
-rw-r--r--ext/standard/tests/array/array_map_variation1.phpt3
-rw-r--r--ext/standard/tests/array/array_map_variation19.phpt2
-rw-r--r--ext/standard/tests/array/array_map_variation2.phpt1
-rw-r--r--ext/standard/tests/array/array_merge_basic.phpt3
-rw-r--r--ext/standard/tests/array/array_merge_variation1.phpt1
-rw-r--r--ext/standard/tests/array/array_merge_variation10.phpt3
-rw-r--r--ext/standard/tests/array/array_merge_variation3.phpt3
-rw-r--r--ext/standard/tests/array/array_merge_variation4.phpt2
-rw-r--r--ext/standard/tests/array/array_merge_variation5.phpt3
-rw-r--r--ext/standard/tests/array/array_merge_variation6.phpt3
-rw-r--r--ext/standard/tests/array/array_merge_variation7.phpt3
-rw-r--r--ext/standard/tests/array/array_merge_variation8.phpt3
-rw-r--r--ext/standard/tests/array/array_merge_variation9.phpt1
-rw-r--r--ext/standard/tests/array/array_multisort_basic1.phpt2
-rw-r--r--ext/standard/tests/array/array_multisort_basic2.phpt2
-rw-r--r--ext/standard/tests/array/array_multisort_error.phpt2
-rw-r--r--ext/standard/tests/array/array_multisort_variation1.phpt2
-rw-r--r--ext/standard/tests/array/array_next_error1.phpt3
-rw-r--r--ext/standard/tests/array/array_next_error2.phpt3
-rw-r--r--ext/standard/tests/array/array_product_variation1.phpt2
-rw-r--r--ext/standard/tests/array/array_product_variation3.phpt2
-rw-r--r--ext/standard/tests/array/array_push_basic.phpt3
-rw-r--r--ext/standard/tests/array/array_push_error2.phpt3
-rw-r--r--ext/standard/tests/array/array_push_variation2.phpt2
-rw-r--r--ext/standard/tests/array/array_push_variation3.phpt2
-rw-r--r--ext/standard/tests/array/array_push_variation5.phpt1
-rw-r--r--ext/standard/tests/array/array_push_variation6.phpt1
-rw-r--r--ext/standard/tests/array/array_rand_basic1.phpt1
-rw-r--r--ext/standard/tests/array/array_rand_basic2.phpt1
-rw-r--r--ext/standard/tests/array/array_rand_error.phpt1
-rw-r--r--ext/standard/tests/array/array_rand_variation1.phpt1
-rw-r--r--ext/standard/tests/array/array_rand_variation2.phpt1
-rw-r--r--ext/standard/tests/array/array_rand_variation3.phpt1
-rw-r--r--ext/standard/tests/array/array_rand_variation4.phpt1
-rw-r--r--ext/standard/tests/array/array_rand_variation5.phpt1
-rw-r--r--ext/standard/tests/array/array_rand_variation6.phpt1
-rw-r--r--ext/standard/tests/array/array_reduce_variation2.phpt2
-rw-r--r--ext/standard/tests/array/array_reduce_variation3.phpt2
-rw-r--r--ext/standard/tests/array/array_shift_basic.phpt2
-rw-r--r--ext/standard/tests/array/array_shift_error.phpt2
-rw-r--r--ext/standard/tests/array/array_shift_variation1.phpt2
-rw-r--r--ext/standard/tests/array/array_shift_variation2.phpt2
-rw-r--r--ext/standard/tests/array/array_shift_variation3.phpt2
-rw-r--r--ext/standard/tests/array/array_shift_variation4.phpt2
-rw-r--r--ext/standard/tests/array/array_shift_variation6.phpt2
-rw-r--r--ext/standard/tests/array/array_shift_variation7.phpt2
-rw-r--r--ext/standard/tests/array/array_shift_variation8.phpt2
-rw-r--r--ext/standard/tests/array/array_shuffle_basic.phpt2
-rw-r--r--ext/standard/tests/array/array_slice_basic.phpt3
-rw-r--r--ext/standard/tests/array/array_slice_error.phpt2
-rw-r--r--ext/standard/tests/array/array_slice_variation1.phpt1
-rw-r--r--ext/standard/tests/array/array_slice_variation10.phpt3
-rw-r--r--ext/standard/tests/array/array_slice_variation11.phpt3
-rw-r--r--ext/standard/tests/array/array_slice_variation2.phpt3
-rw-r--r--ext/standard/tests/array/array_slice_variation3.phpt3
-rw-r--r--ext/standard/tests/array/array_slice_variation4.phpt3
-rw-r--r--ext/standard/tests/array/array_slice_variation5.phpt3
-rw-r--r--ext/standard/tests/array/array_slice_variation6.phpt1
-rw-r--r--ext/standard/tests/array/array_slice_variation7.phpt3
-rw-r--r--ext/standard/tests/array/array_slice_variation8.phpt3
-rw-r--r--ext/standard/tests/array/array_slice_variation9.phpt1
-rw-r--r--ext/standard/tests/array/array_splice_errors.phpt1
-rw-r--r--ext/standard/tests/array/array_splice_variation2.phpt1
-rw-r--r--ext/standard/tests/array/array_splice_variation3.phpt1
-rw-r--r--ext/standard/tests/array/array_udiff_assoc_error.phpt2
-rw-r--r--ext/standard/tests/array/array_udiff_uassoc_variation1.phpt2
-rw-r--r--ext/standard/tests/array/array_uintersect_assoc_variation4.phpt2
-rw-r--r--ext/standard/tests/array/array_unshift_basic2.phpt2
-rw-r--r--ext/standard/tests/array/array_values_basic.phpt3
-rw-r--r--ext/standard/tests/array/array_values_error.phpt2
-rw-r--r--ext/standard/tests/array/array_values_variation1.phpt3
-rw-r--r--ext/standard/tests/array/array_values_variation2.phpt3
-rw-r--r--ext/standard/tests/array/array_values_variation3.phpt3
-rw-r--r--ext/standard/tests/array/array_values_variation4.phpt1
-rw-r--r--ext/standard/tests/array/array_values_variation5.phpt3
-rw-r--r--ext/standard/tests/array/array_values_variation6.phpt1
-rw-r--r--ext/standard/tests/array/array_values_variation7.phpt3
-rw-r--r--ext/standard/tests/array/arsort_basic.phpt2
-rw-r--r--ext/standard/tests/array/arsort_error.phpt2
-rw-r--r--ext/standard/tests/array/arsort_object1.phpt2
-rw-r--r--ext/standard/tests/array/arsort_object2.phpt2
-rw-r--r--ext/standard/tests/array/arsort_variation1.phpt2
-rw-r--r--ext/standard/tests/array/arsort_variation10.phpt2
-rw-r--r--ext/standard/tests/array/arsort_variation4.phpt2
-rw-r--r--ext/standard/tests/array/arsort_variation6.phpt2
-rw-r--r--ext/standard/tests/array/arsort_variation8.phpt2
-rw-r--r--ext/standard/tests/array/asort_basic.phpt2
-rw-r--r--ext/standard/tests/array/bug23581.phpt1
-rw-r--r--ext/standard/tests/array/bug31158.phpt1
-rw-r--r--ext/standard/tests/array/bug35821.phpt1
-rw-r--r--ext/standard/tests/array/bug41686.phpt2
-rw-r--r--ext/standard/tests/array/bug42850.phpt1
-rw-r--r--ext/standard/tests/array/bug44181.phpt1
-rw-r--r--ext/standard/tests/array/bug44182.phpt1
-rw-r--r--ext/standard/tests/array/bug71603.phpt1
-rw-r--r--ext/standard/tests/array/bug72116.phpt1
-rw-r--r--ext/standard/tests/array/count_basic.phpt2
-rw-r--r--ext/standard/tests/array/count_error.phpt2
-rw-r--r--ext/standard/tests/array/count_variation1.phpt2
-rw-r--r--ext/standard/tests/array/each.phptbin9680 -> 9679 bytes
-rw-r--r--ext/standard/tests/array/each_error.phpt2
-rw-r--r--ext/standard/tests/array/each_variation1.phpt1
-rw-r--r--ext/standard/tests/array/each_variation2.phpt1
-rw-r--r--ext/standard/tests/array/each_variation3.phpt1
-rw-r--r--ext/standard/tests/array/each_variation4.phpt1
-rw-r--r--ext/standard/tests/array/each_variation5.phpt1
-rw-r--r--ext/standard/tests/array/each_variation6.phpt1
-rw-r--r--ext/standard/tests/array/end_64bit.phpt2
-rw-r--r--ext/standard/tests/array/extract_error.phpt1
-rw-r--r--ext/standard/tests/array/extract_safety.phpt3
-rw-r--r--ext/standard/tests/array/extract_variation1.phpt1
-rw-r--r--ext/standard/tests/array/extract_variation8.phpt1
-rw-r--r--ext/standard/tests/array/key_exists_variation2.phpt1
-rw-r--r--ext/standard/tests/array/krsort_basic.phpt2
-rw-r--r--ext/standard/tests/array/krsort_variation11.phpt2
-rw-r--r--ext/standard/tests/array/ksort_basic.phpt2
-rw-r--r--ext/standard/tests/array/max_basic.phpt1
-rw-r--r--ext/standard/tests/array/max_variation1.phpt1
-rw-r--r--ext/standard/tests/array/max_variation2.phpt1
-rw-r--r--ext/standard/tests/array/min_basic.phpt1
-rw-r--r--ext/standard/tests/array/min_variation1.phpt1
-rw-r--r--ext/standard/tests/array/min_variation2.phpt1
-rw-r--r--ext/standard/tests/array/natcasesort_error.phpt2
-rw-r--r--ext/standard/tests/array/natcasesort_object1.phpt3
-rw-r--r--ext/standard/tests/array/natcasesort_object2.phpt3
-rw-r--r--ext/standard/tests/array/natcasesort_variation1.phpt1
-rw-r--r--ext/standard/tests/array/natcasesort_variation10.phpt1
-rw-r--r--ext/standard/tests/array/natcasesort_variation11.phpt3
-rw-r--r--ext/standard/tests/array/natcasesort_variation2.phpt1
-rw-r--r--ext/standard/tests/array/natcasesort_variation3.phpt1
-rw-r--r--ext/standard/tests/array/natcasesort_variation5.phpt2
-rw-r--r--ext/standard/tests/array/natcasesort_variation6.phpt2
-rw-r--r--ext/standard/tests/array/natcasesort_variation8.phpt2
-rw-r--r--ext/standard/tests/array/natcasesort_variation9.phptbin1770 -> 1769 bytes
-rw-r--r--ext/standard/tests/array/natsort_basic.phpt1
-rw-r--r--ext/standard/tests/array/prev_error3.phpt3
-rw-r--r--ext/standard/tests/array/rsort_basic.phpt3
-rw-r--r--ext/standard/tests/array/rsort_error.phpt3
-rw-r--r--ext/standard/tests/array/rsort_object1.phpt3
-rw-r--r--ext/standard/tests/array/rsort_object2.phpt3
-rw-r--r--ext/standard/tests/array/rsort_variation1.phpt3
-rw-r--r--ext/standard/tests/array/rsort_variation10.phpt3
-rw-r--r--ext/standard/tests/array/rsort_variation2.phpt1
-rw-r--r--ext/standard/tests/array/rsort_variation3.phpt3
-rw-r--r--ext/standard/tests/array/rsort_variation5.phpt1
-rw-r--r--ext/standard/tests/array/rsort_variation6.phpt3
-rw-r--r--ext/standard/tests/array/rsort_variation7.phpt3
-rw-r--r--ext/standard/tests/array/rsort_variation8.phpt3
-rw-r--r--ext/standard/tests/array/shuffle_basic1.phpt1
-rw-r--r--ext/standard/tests/array/shuffle_basic2.phpt1
-rw-r--r--ext/standard/tests/array/shuffle_error.phpt1
-rw-r--r--ext/standard/tests/array/shuffle_variation1.phpt1
-rw-r--r--ext/standard/tests/array/shuffle_variation2.phpt1
-rw-r--r--ext/standard/tests/array/shuffle_variation3.phpt1
-rw-r--r--ext/standard/tests/array/shuffle_variation4.phpt1
-rw-r--r--ext/standard/tests/array/shuffle_variation5.phpt1
-rw-r--r--ext/standard/tests/array/sort_basic.phpt2
-rw-r--r--ext/standard/tests/array/uksort_basic.phpt2
-rw-r--r--ext/standard/tests/array/usort_error1.phpt2
-rw-r--r--ext/standard/tests/array/usort_error2.phpt2
-rw-r--r--ext/standard/tests/array/usort_object1.phpt2
-rw-r--r--ext/standard/tests/array/usort_object2.phpt2
-rw-r--r--ext/standard/tests/array/usort_variation1.phpt2
-rw-r--r--ext/standard/tests/array/usort_variation2.phpt2
-rw-r--r--ext/standard/tests/array/usort_variation5.phpt2
-rw-r--r--ext/standard/tests/array/usort_variation8.phpt2
-rw-r--r--ext/standard/tests/assert/assert04.phpt1
-rw-r--r--ext/standard/tests/assert/assert_basic4.phpt1
-rw-r--r--ext/standard/tests/assert/assert_basic6.phpt1
-rw-r--r--ext/standard/tests/assert/assert_variation.phpt1
-rw-r--r--ext/standard/tests/bug75220.phpt2
-rw-r--r--ext/standard/tests/class_object/class_exists_variation_003.phpt2
-rw-r--r--ext/standard/tests/class_object/get_class_error_001.phpt2
-rw-r--r--ext/standard/tests/class_object/get_class_methods_basic_001.phpt2
-rw-r--r--ext/standard/tests/class_object/get_class_methods_basic_002.phpt2
-rw-r--r--ext/standard/tests/class_object/get_class_methods_basic_003.phpt2
-rw-r--r--ext/standard/tests/class_object/get_class_methods_error_001.phpt2
-rw-r--r--ext/standard/tests/class_object/get_class_methods_variation_001.phpt2
-rw-r--r--ext/standard/tests/class_object/get_class_methods_variation_002.phpt2
-rw-r--r--ext/standard/tests/class_object/get_class_variation_002.phpt2
-rw-r--r--ext/standard/tests/class_object/get_class_vars_error.phpt2
-rw-r--r--ext/standard/tests/class_object/get_declared_classes_basic_001.phpt2
-rw-r--r--ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt2
-rw-r--r--ext/standard/tests/class_object/get_declared_traits_basic_001.phpt2
-rw-r--r--ext/standard/tests/class_object/get_object_vars_basic_001.phpt3
-rw-r--r--ext/standard/tests/class_object/get_object_vars_basic_002.phpt3
-rw-r--r--ext/standard/tests/class_object/get_object_vars_error_001.phpt2
-rw-r--r--ext/standard/tests/class_object/get_object_vars_variation_001.phpt2
-rw-r--r--ext/standard/tests/class_object/get_object_vars_variation_002.phpt2
-rw-r--r--ext/standard/tests/class_object/get_object_vars_variation_003.phpt2
-rw-r--r--ext/standard/tests/class_object/get_parent_class_error_001.phpt2
-rw-r--r--ext/standard/tests/class_object/get_parent_class_variation_001.phpt2
-rw-r--r--ext/standard/tests/class_object/interface_exists_error.phpt2
-rw-r--r--ext/standard/tests/class_object/interface_exists_variation1.phpt2
-rw-r--r--ext/standard/tests/class_object/is_a_error_001.phpt1
-rw-r--r--ext/standard/tests/class_object/is_subclass_of_variation_003.phpt2
-rw-r--r--ext/standard/tests/class_object/method_exists_basic_001.phpt3
-rw-r--r--ext/standard/tests/class_object/method_exists_basic_002.phpt2
-rw-r--r--ext/standard/tests/class_object/method_exists_variation_003.phpt2
-rw-r--r--ext/standard/tests/class_object/property_exists_error.phpt2
-rw-r--r--ext/standard/tests/class_object/trait_class_exists_variation_003.phpt2
-rw-r--r--ext/standard/tests/crypt/bcrypt_invalid_cost.phpt2
-rw-r--r--ext/standard/tests/crypt/des_fallback_invalid_salt.phpt2
-rw-r--r--ext/standard/tests/dir/bug73877.phpt1
-rw-r--r--ext/standard/tests/dir/dir_variation2.phpt2
-rw-r--r--ext/standard/tests/dir/dir_variation7.phpt2
-rw-r--r--ext/standard/tests/dir/opendir_variation5.phpt1
-rw-r--r--ext/standard/tests/directory/bug74589_utf8.phpt1
-rw-r--r--ext/standard/tests/file/001-win32-mb.phpt1
-rw-r--r--ext/standard/tests/file/001-win32.phpt1
-rw-r--r--ext/standard/tests/file/005_error.phpt1
-rw-r--r--ext/standard/tests/file/007_variation2.phpt2
-rw-r--r--ext/standard/tests/file/007_variation4.phpt2
-rw-r--r--ext/standard/tests/file/bug38450_2.phpt1
-rw-r--r--ext/standard/tests/file/bug39863.phpt1
-rw-r--r--ext/standard/tests/file/bug41874_1.phpt2
-rw-r--r--ext/standard/tests/file/bug41874_2.phpt2
-rw-r--r--ext/standard/tests/file/bug41874_3.phpt2
-rw-r--r--ext/standard/tests/file/bug51094.phpt1
-rw-r--r--ext/standard/tests/file/bug61961.phpt2
-rw-r--r--ext/standard/tests/file/bug63512.phpt1
-rw-r--r--ext/standard/tests/file/bug69442.phpt2
-rw-r--r--ext/standard/tests/file/chmod_variation3.phpt1
-rw-r--r--ext/standard/tests/file/chmod_variation4.phpt1
-rw-r--r--ext/standard/tests/file/copy_basic.phpt3
-rw-r--r--ext/standard/tests/file/copy_error.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation1.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation10.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation11.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation12-win32.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation12.phpt3
-rw-r--r--ext/standard/tests/file/copy_variation13.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation14.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation15.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation16-win32.phpt1
-rw-r--r--ext/standard/tests/file/copy_variation16.phpt1
-rw-r--r--ext/standard/tests/file/copy_variation17.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation18.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation2-win32-mb.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation2-win32.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation2.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation3-win32.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation3.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation4.phptbin4961 -> 4959 bytes
-rw-r--r--ext/standard/tests/file/copy_variation5-win32.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation5.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation6-win32.phpt1
-rw-r--r--ext/standard/tests/file/copy_variation6.phpt1
-rw-r--r--ext/standard/tests/file/copy_variation7.phpt3
-rw-r--r--ext/standard/tests/file/copy_variation9.phpt1
-rw-r--r--ext/standard/tests/file/directory_wrapper_fstat_basic.phpt2
-rw-r--r--ext/standard/tests/file/dirname_basic.phpt1
-rw-r--r--ext/standard/tests/file/dirname_error.phpt1
-rw-r--r--ext/standard/tests/file/dirname_variation1.phpt1
-rw-r--r--ext/standard/tests/file/disk_free_space_basic.phpt2
-rw-r--r--ext/standard/tests/file/disk_free_space_error-win32.phpt1
-rw-r--r--ext/standard/tests/file/disk_free_space_error.phpt1
-rw-r--r--ext/standard/tests/file/disk_free_space_variation.phpt3
-rw-r--r--ext/standard/tests/file/disk_total_space_basic.phpt1
-rw-r--r--ext/standard/tests/file/disk_total_space_error-win32.phpt1
-rw-r--r--ext/standard/tests/file/disk_total_space_error.phpt1
-rw-r--r--ext/standard/tests/file/disk_total_space_variation.phpt3
-rw-r--r--ext/standard/tests/file/fflush_basic.phpt2
-rw-r--r--ext/standard/tests/file/fflush_error.phpt3
-rw-r--r--ext/standard/tests/file/fflush_variation1-win32-mb.phpt2
-rw-r--r--ext/standard/tests/file/fflush_variation1-win32.phpt2
-rw-r--r--ext/standard/tests/file/fflush_variation1.phpt2
-rw-r--r--ext/standard/tests/file/fflush_variation2.phpt1
-rw-r--r--ext/standard/tests/file/fflush_variation3.phpt1
-rw-r--r--ext/standard/tests/file/fflush_variation4.phpt1
-rw-r--r--ext/standard/tests/file/fgetc_basic.phpt2
-rw-r--r--ext/standard/tests/file/fgetc_variation4.phpt2
-rw-r--r--ext/standard/tests/file/fgetcsv_variation11.phpt2
-rw-r--r--ext/standard/tests/file/fgetcsv_variation13.phpt1
-rw-r--r--ext/standard/tests/file/fgetcsv_variation20.phpt2
-rw-r--r--ext/standard/tests/file/fgets_basic.phpt2
-rw-r--r--ext/standard/tests/file/fgets_error.phpt1
-rw-r--r--ext/standard/tests/file/fgets_variation2.phpt1
-rw-r--r--ext/standard/tests/file/fgets_variation3.phpt2
-rw-r--r--ext/standard/tests/file/fgets_variation4.phpt2
-rw-r--r--ext/standard/tests/file/fgets_variation5.phpt2
-rw-r--r--ext/standard/tests/file/fgets_variation6.phpt2
-rw-r--r--ext/standard/tests/file/file_basic.phpt1
-rw-r--r--ext/standard/tests/file/file_error.phpt1
-rw-r--r--ext/standard/tests/file/file_exists_error.phpt1
-rw-r--r--ext/standard/tests/file/file_exists_variation1.phpt3
-rw-r--r--ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt1
-rw-r--r--ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt1
-rw-r--r--ext/standard/tests/file/file_get_contents_variation4.phpt2
-rw-r--r--ext/standard/tests/file/file_get_contents_variation7-win32.phpt2
-rw-r--r--ext/standard/tests/file/file_get_contents_variation9.phpt1
-rw-r--r--ext/standard/tests/file/file_put_contents_variation3.phpt2
-rw-r--r--ext/standard/tests/file/file_put_contents_variation8.phptbin2384 -> 2383 bytes
-rw-r--r--ext/standard/tests/file/file_variation.phpt2
-rw-r--r--ext/standard/tests/file/file_variation8-win32.phpt2
-rw-r--r--ext/standard/tests/file/file_variation8.phpt2
-rw-r--r--ext/standard/tests/file/file_variation9.phpt2
-rw-r--r--ext/standard/tests/file/filegroup_basic.phpt2
-rw-r--r--ext/standard/tests/file/filegroup_error.phpt2
-rw-r--r--ext/standard/tests/file/filegroup_variation1.phpt1
-rw-r--r--ext/standard/tests/file/filegroup_variation2.phpt1
-rw-r--r--ext/standard/tests/file/fileinode_error.phpt1
-rw-r--r--ext/standard/tests/file/fileinode_variation.phpt1
-rw-r--r--ext/standard/tests/file/fileinode_variation1.phpt1
-rw-r--r--ext/standard/tests/file/fileinode_variation2.phpt1
-rw-r--r--ext/standard/tests/file/fileowner_basic.phpt3
-rw-r--r--ext/standard/tests/file/fileowner_error.phpt2
-rw-r--r--ext/standard/tests/file/fileowner_variation1.phpt1
-rw-r--r--ext/standard/tests/file/fileowner_variation2.phpt1
-rw-r--r--ext/standard/tests/file/fileperms_variation1.phpt1
-rw-r--r--ext/standard/tests/file/fileperms_variation2.phpt1
-rw-r--r--ext/standard/tests/file/filesize_basic.phpt1
-rw-r--r--ext/standard/tests/file/filesize_error.phpt1
-rw-r--r--ext/standard/tests/file/filesize_variation1.phpt1
-rw-r--r--ext/standard/tests/file/fopen_variation10-win32.phpt1
-rw-r--r--ext/standard/tests/file/fopen_variation11-win32.phpt1
-rw-r--r--ext/standard/tests/file/fopen_variation14-win32.phpt1
-rw-r--r--ext/standard/tests/file/fopen_variation14.phpt2
-rw-r--r--ext/standard/tests/file/fopen_variation15-win32.phpt1
-rw-r--r--ext/standard/tests/file/fopen_variation15.phpt2
-rw-r--r--ext/standard/tests/file/fopen_variation5.phpt2
-rw-r--r--ext/standard/tests/file/fopen_variation8.phpt2
-rw-r--r--ext/standard/tests/file/fpassthru_variation1.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_002.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_error.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation1.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation10.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation11.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation12.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation13.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation14.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation2.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation3.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation4.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation5.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation6.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation7.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation8.phpt1
-rw-r--r--ext/standard/tests/file/fputcsv_variation9.phpt1
-rw-r--r--ext/standard/tests/file/fread_fwrite_basic.phpt2
-rw-r--r--ext/standard/tests/file/fread_variation1.phpt2
-rw-r--r--ext/standard/tests/file/fread_variation3-win32.phpt2
-rw-r--r--ext/standard/tests/file/fread_variation3.phpt2
-rw-r--r--ext/standard/tests/file/fread_variation4-win32.phpt2
-rw-r--r--ext/standard/tests/file/fread_variation4.phpt2
-rw-r--r--ext/standard/tests/file/fscanf_error.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation1.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation10.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation11.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation12.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation13.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation14.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation15.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation16.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation17.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation18.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation19.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation2.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation20.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation21.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation22.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation23.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation24.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation25.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation26.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation27.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation29.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation3.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation30.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation31.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation32.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation33.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation34.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation35.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation36.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation37.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation38.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation39.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation4.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation40.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation41.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation42.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation43.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation44.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation45.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation46.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation47.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation49.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation5.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation50.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation51.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation52.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation53.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation54.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation55.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation6.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation7.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation8.phpt1
-rw-r--r--ext/standard/tests/file/fscanf_variation9.phpt1
-rw-r--r--ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt1
-rw-r--r--ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt1
-rw-r--r--ext/standard/tests/file/fseek_variation1.phpt1
-rw-r--r--ext/standard/tests/file/fseek_variation2.phpt1
-rw-r--r--ext/standard/tests/file/fstat_basic.phpt2
-rw-r--r--ext/standard/tests/file/fstat_error.phpt3
-rw-r--r--ext/standard/tests/file/fstat_variation1.phpt3
-rw-r--r--ext/standard/tests/file/fstat_variation2.phpt3
-rw-r--r--ext/standard/tests/file/fstat_variation3.phpt3
-rw-r--r--ext/standard/tests/file/fstat_variation4.phpt3
-rw-r--r--ext/standard/tests/file/fstat_variation5.phpt3
-rw-r--r--ext/standard/tests/file/fstat_variation6.phpt2
-rw-r--r--ext/standard/tests/file/fstat_variation7.phpt3
-rw-r--r--ext/standard/tests/file/fstat_variation8.phpt2
-rw-r--r--ext/standard/tests/file/fwrite_basic-win32-mb.phpt2
-rw-r--r--ext/standard/tests/file/fwrite_basic-win32.phpt2
-rw-r--r--ext/standard/tests/file/fwrite_basic.phpt2
-rw-r--r--ext/standard/tests/file/fwrite_error.phpt1
-rw-r--r--ext/standard/tests/file/fwrite_variation5.phpt1
-rw-r--r--ext/standard/tests/file/include_userstream_003.phpt2
-rw-r--r--ext/standard/tests/file/is_dir_basic.phpt1
-rw-r--r--ext/standard/tests/file/is_dir_error.phpt1
-rw-r--r--ext/standard/tests/file/is_dir_variation3.phpt1
-rw-r--r--ext/standard/tests/file/is_executable_variation3.phpt1
-rw-r--r--ext/standard/tests/file/is_file_error.phpt1
-rw-r--r--ext/standard/tests/file/is_file_variation2.phpt1
-rw-r--r--ext/standard/tests/file/is_file_variation3.phpt1
-rw-r--r--ext/standard/tests/file/is_readable_variation3.phpt1
-rw-r--r--ext/standard/tests/file/is_uploaded_file_basic.phpt1
-rw-r--r--ext/standard/tests/file/is_writable_variation3.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation1.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation10.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation11.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation12.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation13.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation14.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation15.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation16.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation17.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation18.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation19.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation2.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation20.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation21.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation4.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation5.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation6.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation7.phpt1
-rw-r--r--ext/standard/tests/file/lstat_stat_variation9.phpt1
-rw-r--r--ext/standard/tests/file/mkdir_variation4.phpt2
-rw-r--r--ext/standard/tests/file/move_uploaded_file_basic.phpt1
-rw-r--r--ext/standard/tests/file/parse_ini_file_variation4.phpt1
-rw-r--r--ext/standard/tests/file/parse_ini_file_variation5.phpt1
-rw-r--r--ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt2
-rw-r--r--ext/standard/tests/file/parse_ini_file_variation6-win32.phpt2
-rw-r--r--ext/standard/tests/file/parse_ini_file_variation6.phpt2
-rw-r--r--ext/standard/tests/file/pathinfo_basic1.phpt1
-rw-r--r--ext/standard/tests/file/pathinfo_basic2.phpt1
-rw-r--r--ext/standard/tests/file/pathinfo_variation3.phpt2
-rw-r--r--ext/standard/tests/file/pclose_variation1.phpt1
-rw-r--r--ext/standard/tests/file/php_fd_wrapper_04.phpt1
-rw-r--r--ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt2
-rw-r--r--ext/standard/tests/file/popen_pclose_basic-win32.phpt2
-rw-r--r--ext/standard/tests/file/popen_pclose_basic.phpt2
-rw-r--r--ext/standard/tests/file/popen_pclose_error-sunos.phpt1
-rw-r--r--ext/standard/tests/file/popen_pclose_error-win32-debug.phpt2
-rw-r--r--ext/standard/tests/file/popen_pclose_error-win32.phpt2
-rw-r--r--ext/standard/tests/file/popen_pclose_error.phpt1
-rw-r--r--ext/standard/tests/file/readfile_variation8-win32-mb.phpt2
-rw-r--r--ext/standard/tests/file/readfile_variation8-win32.phpt2
-rw-r--r--ext/standard/tests/file/readfile_variation9.phpt2
-rw-r--r--ext/standard/tests/file/readlink_variation1.phpt1
-rw-r--r--ext/standard/tests/file/realpath_variation2.phpt2
-rw-r--r--ext/standard/tests/file/rename_variation-win32.phpt1
-rw-r--r--ext/standard/tests/file/rename_variation1-win32.phpt1
-rw-r--r--ext/standard/tests/file/rename_variation11-win32.phpt2
-rw-r--r--ext/standard/tests/file/rename_variation12-win32.phpt2
-rw-r--r--ext/standard/tests/file/rename_variation2-win32.phpt1
-rw-r--r--ext/standard/tests/file/rename_variation3-win32.phpt1
-rw-r--r--ext/standard/tests/file/rename_variation8-win32.phpt1
-rw-r--r--ext/standard/tests/file/rename_variation8.phpt1
-rw-r--r--ext/standard/tests/file/rename_variation9.phpt1
-rw-r--r--ext/standard/tests/file/rmdir_variation3-win32.phpt2
-rw-r--r--ext/standard/tests/file/rmdir_variation3.phpt2
-rw-r--r--ext/standard/tests/file/stat_basic-win32-mb.phpt1
-rw-r--r--ext/standard/tests/file/stat_basic-win32.phpt1
-rw-r--r--ext/standard/tests/file/stat_error-win32.phpt1
-rw-r--r--ext/standard/tests/file/stat_variation1-win32-mb.phpt2
-rw-r--r--ext/standard/tests/file/stat_variation1-win32.phpt2
-rw-r--r--ext/standard/tests/file/stat_variation2-win32.phpt2
-rw-r--r--ext/standard/tests/file/stat_variation3-win32.phpt3
-rw-r--r--ext/standard/tests/file/stat_variation4-win32.phpt2
-rw-r--r--ext/standard/tests/file/stat_variation5-win32.phpt3
-rw-r--r--ext/standard/tests/file/stat_variation6-win32.phpt3
-rw-r--r--ext/standard/tests/file/stat_variation7-win32.phpt2
-rw-r--r--ext/standard/tests/file/stat_variation8-win32.phpt2
-rw-r--r--ext/standard/tests/file/stream_rfc2397_001.phpt2
-rw-r--r--ext/standard/tests/file/stream_rfc2397_004.phpt2
-rw-r--r--ext/standard/tests/file/stream_rfc2397_005.phpt2
-rw-r--r--ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt1
-rw-r--r--ext/standard/tests/file/tempnam_variation3.phpt1
-rw-r--r--ext/standard/tests/file/tempnam_variation7-win32.phpt1
-rw-r--r--ext/standard/tests/file/tempnam_variation7.phpt1
-rw-r--r--ext/standard/tests/file/touch.phpt1
-rw-r--r--ext/standard/tests/file/touch_basic-win32-mb.phpt1
-rw-r--r--ext/standard/tests/file/touch_basic-win32.phpt1
-rw-r--r--ext/standard/tests/file/touch_error.phpt1
-rw-r--r--ext/standard/tests/file/touch_variation1.phpt2
-rw-r--r--ext/standard/tests/file/touch_variation3-win32-mb.phpt1
-rw-r--r--ext/standard/tests/file/touch_variation3-win32.phpt1
-rw-r--r--ext/standard/tests/file/touch_variation3.phpt1
-rw-r--r--ext/standard/tests/file/touch_variation4-win32.phpt1
-rw-r--r--ext/standard/tests/file/touch_variation4.phpt1
-rw-r--r--ext/standard/tests/file/touch_variation5-win32.phpt1
-rw-r--r--ext/standard/tests/file/touch_variation5.phpt1
-rw-r--r--ext/standard/tests/file/touch_variation6-win32.phpt1
-rw-r--r--ext/standard/tests/file/umask_variation3.phpt1
-rw-r--r--ext/standard/tests/file/unlink_variation1.phpt2
-rw-r--r--ext/standard/tests/file/unlink_variation10.phpt2
-rw-r--r--ext/standard/tests/file/userstreams_006.phpt1
-rw-r--r--ext/standard/tests/file/userstreams_007.phpt2
-rw-r--r--ext/standard/tests/file/userwrapper.phpt1
-rw-r--r--ext/standard/tests/file/windows_links/bug48746.phpt2
-rw-r--r--ext/standard/tests/file/windows_links/bug48746_1.phpt2
-rw-r--r--ext/standard/tests/file/windows_links/bug48746_2.phpt2
-rw-r--r--ext/standard/tests/file/windows_links/bug48746_3.phpt2
-rw-r--r--ext/standard/tests/file/windows_links/bug73962.phpt1
-rw-r--r--ext/standard/tests/file/windows_links/bug76335.phpt1
-rw-r--r--ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt2
-rw-r--r--ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt2
-rw-r--r--ext/standard/tests/file/windows_mb_path/recursive_it.phpt1
-rw-r--r--ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt5
-rw-r--r--ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt1
-rw-r--r--ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt1
-rw-r--r--ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt5
-rw-r--r--ext/standard/tests/general_functions/005.phpt1
-rw-r--r--ext/standard/tests/general_functions/008.phpt2
-rw-r--r--ext/standard/tests/general_functions/bug31190.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug43293_1.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug43293_2.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug43293_3.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug44461.phpt2
-rw-r--r--ext/standard/tests/general_functions/bug47857.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug49847.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug60227_1.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug60227_2.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug69646.phpt1
-rw-r--r--ext/standard/tests/general_functions/debug_zval_dump_e.phpt1
-rw-r--r--ext/standard/tests/general_functions/debug_zval_dump_v.phpt1
-rw-r--r--ext/standard/tests/general_functions/dl-cve-2007-4887.phpt1
-rw-r--r--ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt2
-rw-r--r--ext/standard/tests/general_functions/escapeshellarg_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt2
-rw-r--r--ext/standard/tests/general_functions/floatval_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/floatval_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/floatval_variation1.phpt1
-rw-r--r--ext/standard/tests/general_functions/get_defined_constants_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_defined_constants_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_defined_vars_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_include_path_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_included_files.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_loaded_extensions_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_resource_type_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_resource_type_variation1.phpt2
-rw-r--r--ext/standard/tests/general_functions/getmypid_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/getopt_002.phpt2
-rw-r--r--ext/standard/tests/general_functions/getopt_003.phpt2
-rw-r--r--ext/standard/tests/general_functions/getopt_004.phpt2
-rw-r--r--ext/standard/tests/general_functions/getopt_005.phpt2
-rw-r--r--ext/standard/tests/general_functions/is_resource_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/isset_basic1.phpt2
-rw-r--r--ext/standard/tests/general_functions/isset_basic2.phpt2
-rw-r--r--ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt1
-rw-r--r--ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt1
-rw-r--r--ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt1
-rw-r--r--ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt1
-rw-r--r--ext/standard/tests/general_functions/php_uname_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/php_uname_variation1.phpt2
-rw-r--r--ext/standard/tests/general_functions/print_r_64bit.phpt1
-rw-r--r--ext/standard/tests/general_functions/sys_getloadavg.phpt1
-rw-r--r--ext/standard/tests/general_functions/uniqid_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/var_dump.phpt1
-rw-r--r--ext/standard/tests/general_functions/var_dump_64bit.phpt1
-rw-r--r--ext/standard/tests/general_functions/var_export_basic2.phpt2
-rw-r--r--ext/standard/tests/general_functions/var_export_basic4.phpt2
-rw-r--r--ext/standard/tests/general_functions/var_export_error2.phpt1
-rw-r--r--ext/standard/tests/general_functions/var_export_error3.phpt1
-rw-r--r--ext/standard/tests/http/bug47021.phpt1
-rw-r--r--ext/standard/tests/http/bug60570.phpt2
-rw-r--r--ext/standard/tests/http/http_response_header_04.phpt1
-rw-r--r--ext/standard/tests/http/http_response_header_05.phpt1
-rw-r--r--ext/standard/tests/image/bug72278.phpt1
-rw-r--r--ext/standard/tests/image/getimagesize_basic.phpt2
-rw-r--r--ext/standard/tests/image/getimagesize_error1.phpt2
-rw-r--r--ext/standard/tests/image/getimagesize_tif_mm.phpt2
-rw-r--r--ext/standard/tests/image/getimagesize_variation1.phpt2
-rw-r--r--ext/standard/tests/image/getimagesize_variation2.phpt2
-rw-r--r--ext/standard/tests/image/getimagesize_variation3.phpt2
-rw-r--r--ext/standard/tests/image/getimagesize_variation4.phpt2
-rw-r--r--ext/standard/tests/image/getimagesize_variation_003.phpt2
-rw-r--r--ext/standard/tests/image/getimagesizefromstring1.phpt1
-rw-r--r--ext/standard/tests/image/image_type_to_mime_type_error.phpt2
-rw-r--r--ext/standard/tests/math/abs_basic.phpt2
-rw-r--r--ext/standard/tests/math/atan2_variation1.phpt2
-rw-r--r--ext/standard/tests/math/atan2_variation2.phpt2
-rw-r--r--ext/standard/tests/math/base_convert_basic.phpt1
-rw-r--r--ext/standard/tests/math/base_convert_error.phpt2
-rw-r--r--ext/standard/tests/math/base_convert_variation2.phpt2
-rw-r--r--ext/standard/tests/math/base_convert_variation3.phpt2
-rw-r--r--ext/standard/tests/math/bindec_error.phpt2
-rw-r--r--ext/standard/tests/math/bindec_variation1.phpt2
-rw-r--r--ext/standard/tests/math/bindec_variation1_64bit.phpt2
-rw-r--r--ext/standard/tests/math/bug30695.phpt1
-rw-r--r--ext/standard/tests/math/constants.phpt1
-rw-r--r--ext/standard/tests/math/decbin_basic.phpt1
-rw-r--r--ext/standard/tests/math/decbin_error.phpt1
-rw-r--r--ext/standard/tests/math/decbin_variation1.phpt2
-rw-r--r--ext/standard/tests/math/decbin_variation1_64bit.phpt2
-rw-r--r--ext/standard/tests/math/dechex_error.phpt2
-rw-r--r--ext/standard/tests/math/dechex_variation1.phpt2
-rw-r--r--ext/standard/tests/math/dechex_variation1_64bit.phpt2
-rw-r--r--ext/standard/tests/math/decoct_variation1_64bit.phpt2
-rw-r--r--ext/standard/tests/math/exp_basic.phpt1
-rw-r--r--ext/standard/tests/math/exp_error.phpt1
-rw-r--r--ext/standard/tests/math/expm1_variation1.phpt2
-rw-r--r--ext/standard/tests/math/floor_error.phpt2
-rw-r--r--ext/standard/tests/math/fmod_basic.phpt1
-rw-r--r--ext/standard/tests/math/fmod_error.phpt1
-rw-r--r--ext/standard/tests/math/getrandmax_basic.phpt2
-rw-r--r--ext/standard/tests/math/hexdec_basic_64bit.phpt2
-rw-r--r--ext/standard/tests/math/hexdec_error.phpt2
-rw-r--r--ext/standard/tests/math/hexdec_variation1.phpt2
-rw-r--r--ext/standard/tests/math/hexdec_variation1_64bit.phpt2
-rw-r--r--ext/standard/tests/math/hypot_basic.phpt2
-rw-r--r--ext/standard/tests/math/hypot_error.phpt2
-rw-r--r--ext/standard/tests/math/hypot_variation1.phpt2
-rw-r--r--ext/standard/tests/math/hypot_variation2.phpt2
-rw-r--r--ext/standard/tests/math/intdiv_64bit.phpt2
-rw-r--r--ext/standard/tests/math/is_finite_basic.phpt2
-rw-r--r--ext/standard/tests/math/is_finite_error.phpt2
-rw-r--r--ext/standard/tests/math/is_infinite_basic.phpt3
-rw-r--r--ext/standard/tests/math/is_infinite_error.phpt1
-rw-r--r--ext/standard/tests/math/is_nan_basic.phpt4
-rw-r--r--ext/standard/tests/math/is_nan_error.phpt5
-rw-r--r--ext/standard/tests/math/lcg_value_basic.phpt2
-rw-r--r--ext/standard/tests/math/log1p_error.phpt2
-rw-r--r--ext/standard/tests/math/log1p_variation1.phpt2
-rw-r--r--ext/standard/tests/math/log_basic.phpt1
-rw-r--r--ext/standard/tests/math/log_variation1.phpt2
-rw-r--r--ext/standard/tests/math/log_variation2.phpt2
-rw-r--r--ext/standard/tests/math/mt_getrandmax_basic.phpt2
-rw-r--r--ext/standard/tests/math/mt_getrandmax_error.phpt2
-rw-r--r--ext/standard/tests/math/mt_rand_error.phpt2
-rw-r--r--ext/standard/tests/math/mt_srand_basic.phpt2
-rw-r--r--ext/standard/tests/math/mt_srand_error.phpt3
-rw-r--r--ext/standard/tests/math/octdec_basic.phpt2
-rw-r--r--ext/standard/tests/math/octdec_error.phpt2
-rw-r--r--ext/standard/tests/math/pow-operator.phpt1
-rw-r--r--ext/standard/tests/math/pow.phpt1
-rw-r--r--ext/standard/tests/math/pow_basic.phpt2
-rw-r--r--ext/standard/tests/math/pow_basic2.phpt3
-rw-r--r--ext/standard/tests/math/pow_error.phpt3
-rw-r--r--ext/standard/tests/math/rand_basic.phpt1
-rw-r--r--ext/standard/tests/math/rand_error.phpt1
-rw-r--r--ext/standard/tests/math/round_variation2.phpt2
-rw-r--r--ext/standard/tests/math/tan_basiclong_64bit.phpt1
-rw-r--r--ext/standard/tests/network/gethostbyname_basic003.phpt2
-rw-r--r--ext/standard/tests/network/gethostbynamel_basic1.phpt2
-rw-r--r--ext/standard/tests/network/long2ip_error.phpt2
-rw-r--r--ext/standard/tests/network/setcookie_error.phpt1
-rw-r--r--ext/standard/tests/network/socket_bug74429.phpt1
-rw-r--r--ext/standard/tests/password/password_bcrypt_errors.phpt2
-rw-r--r--ext/standard/tests/password/password_deprecated_salts.phpt1
-rw-r--r--ext/standard/tests/password/password_get_info_argon2.phpt2
-rw-r--r--ext/standard/tests/password/password_hash.phpt2
-rw-r--r--ext/standard/tests/password/password_hash_argon2.phpt2
-rw-r--r--ext/standard/tests/password/password_hash_error_argon2.phpt2
-rw-r--r--ext/standard/tests/password/password_needs_rehash_argon2.phpt2
-rw-r--r--ext/standard/tests/password/password_verify_argon2.phpt2
-rw-r--r--ext/standard/tests/password/password_verify_error.phpt1
-rw-r--r--ext/standard/tests/serialize/bug65806.phpt1
-rw-r--r--ext/standard/tests/serialize/bug69210.phpt2
-rw-r--r--ext/standard/tests/serialize/bug71311.phpt2
-rw-r--r--ext/standard/tests/serialize/serialization_arrays_002.phpt2
-rw-r--r--ext/standard/tests/serialize/serialization_arrays_003.phpt4
-rw-r--r--ext/standard/tests/serialize/serialization_objects_001.phptbin2429 -> 2428 bytes
-rw-r--r--ext/standard/tests/serialize/serialization_objects_004.phpt2
-rw-r--r--ext/standard/tests/serialize/serialization_objects_008.phpt3
-rw-r--r--ext/standard/tests/serialize/serialization_objects_009.phpt2
-rw-r--r--ext/standard/tests/serialize/serialization_objects_010.phpt2
-rw-r--r--ext/standard/tests/serialize/serialization_objects_011.phpt2
-rw-r--r--ext/standard/tests/serialize/serialization_objects_012.phpt4
-rw-r--r--ext/standard/tests/serialize/serialization_objects_013.phpt1
-rw-r--r--ext/standard/tests/serialize/serialization_objects_014.phpt1
-rw-r--r--ext/standard/tests/serialize/serialization_precision_001.phpt2
-rw-r--r--ext/standard/tests/serialize/serialization_precision_002.phpt2
-rw-r--r--ext/standard/tests/serialize/serialization_resources_001.phpt2
-rw-r--r--ext/standard/tests/serialize/unserializeS.phpt1
-rw-r--r--ext/standard/tests/serialize/unserialize_classes.phpt1
-rw-r--r--ext/standard/tests/serialize/unserialize_error_001.phpt1
-rw-r--r--ext/standard/tests/serialize/unserialize_subclasses.phpt1
-rw-r--r--ext/standard/tests/streams/bug44712.phpt1
-rw-r--r--ext/standard/tests/streams/bug53903.phpt1
-rw-r--r--ext/standard/tests/streams/bug54946.phpt1
-rw-r--r--ext/standard/tests/streams/bug60455_03.phpt2
-rw-r--r--ext/standard/tests/streams/bug60817.phpt1
-rw-r--r--ext/standard/tests/streams/bug64433.phpt2
-rw-r--r--ext/standard/tests/streams/bug67626.phpt2
-rw-r--r--ext/standard/tests/streams/bug68948.phpt1
-rw-r--r--ext/standard/tests/streams/bug70198.phpt1
-rw-r--r--ext/standard/tests/streams/bug72075.phpt1
-rw-r--r--ext/standard/tests/streams/bug72534.phpt1
-rw-r--r--ext/standard/tests/streams/proc_open_bug51800.phpt1
-rw-r--r--ext/standard/tests/streams/proc_open_bug51800_right.phpt1
-rw-r--r--ext/standard/tests/streams/proc_open_bug51800_right2.phpt1
-rw-r--r--ext/standard/tests/streams/proc_open_bug60120.phpt1
-rw-r--r--ext/standard/tests/streams/proc_open_bug64438.phpt1
-rw-r--r--ext/standard/tests/streams/stream_resolve_include_path.phpt1
-rw-r--r--ext/standard/tests/streams/stream_set_chunk_size.phpt1
-rw-r--r--ext/standard/tests/streams/user-stream-error.phpt1
-rw-r--r--ext/standard/tests/streams/user_streams_consumed_bug.phpt1
-rw-r--r--ext/standard/tests/strings/add-and-stripcslashes.phpt3
-rw-r--r--ext/standard/tests/strings/basename_invalid_path.phpt1
-rw-r--r--ext/standard/tests/strings/basename_invalid_path_win.phpt1
-rw-r--r--ext/standard/tests/strings/basename_variation.phpt1
-rw-r--r--ext/standard/tests/strings/bin2hex_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/bug20261.phpt1
-rw-r--r--ext/standard/tests/strings/bug23650.phpt1
-rw-r--r--ext/standard/tests/strings/bug25671.phpt1
-rw-r--r--ext/standard/tests/strings/bug37244.phpt1
-rw-r--r--ext/standard/tests/strings/bug45166.phpt2
-rw-r--r--ext/standard/tests/strings/bug61038.phpt1
-rw-r--r--ext/standard/tests/strings/bug61116.phpt3
-rw-r--r--ext/standard/tests/strings/bug65230.phpt1
-rw-r--r--ext/standard/tests/strings/bug67252.phpt1
-rw-r--r--ext/standard/tests/strings/bug68996.phpt1
-rw-r--r--ext/standard/tests/strings/bug73058.phpt1
-rw-r--r--ext/standard/tests/strings/chop_variation4.phptbin1835 -> 1836 bytes
-rw-r--r--ext/standard/tests/strings/chunk_split_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/chunk_split_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/convert_cyr_string_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/crc32_variation1.phpt3
-rw-r--r--ext/standard/tests/strings/crypt_sha256.phpt1
-rw-r--r--ext/standard/tests/strings/crypt_sha512.phpt1
-rw-r--r--ext/standard/tests/strings/dirname_basic.phpt1
-rw-r--r--ext/standard/tests/strings/dirname_variation.phpt2
-rw-r--r--ext/standard/tests/strings/explode_error.phpt2
-rw-r--r--ext/standard/tests/strings/explode_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/explode_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/explode_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/get_html_translation_table_basic7.phpt2
-rw-r--r--ext/standard/tests/strings/get_html_translation_table_basic9.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode1.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode2.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_cp866.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_koi8-r.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_macroman.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_win1251.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_win1252.phpt2
-rw-r--r--ext/standard/tests/strings/htmlentities24.phpt2
-rw-r--r--ext/standard/tests/strings/htmlentities_html5.phpt2
-rw-r--r--ext/standard/tests/strings/htmlspecialchars.phpt1
-rw-r--r--ext/standard/tests/strings/htmlspecialchars_basic.phpt2
-rw-r--r--ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/join_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/ltrim_error.phpt2
-rw-r--r--ext/standard/tests/strings/ltrim_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/ltrim_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/md5_basic2.phpt2
-rw-r--r--ext/standard/tests/strings/md5_error.phpt2
-rw-r--r--ext/standard/tests/strings/md5_file.phptbin2847 -> 2846 bytes
-rw-r--r--ext/standard/tests/strings/money_format_basic1.phpt1
-rw-r--r--ext/standard/tests/strings/nl_langinfo_basic.phpt2
-rw-r--r--ext/standard/tests/strings/pack_A.phpt1
-rw-r--r--ext/standard/tests/strings/parse_str_error1.phpt2
-rw-r--r--ext/standard/tests/strings/print_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/printf_basic3.phpt2
-rw-r--r--ext/standard/tests/strings/printf_basic5.phpt2
-rw-r--r--ext/standard/tests/strings/printf_basic9.phpt2
-rw-r--r--ext/standard/tests/strings/printf_error.phpt2
-rw-r--r--ext/standard/tests/strings/quotemeta_basic.phpt2
-rw-r--r--ext/standard/tests/strings/quotemeta_error.phpt2
-rw-r--r--ext/standard/tests/strings/rtrim_basic.phpt2
-rw-r--r--ext/standard/tests/strings/sha1_basic.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation12.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation13.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation14.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation15.phptbin7411 -> 7412 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation18.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation20.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation22.phptbin2512 -> 2513 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation24.phptbin3457 -> 3458 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation25.phptbin4650 -> 4651 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation26.phptbin1692 -> 1693 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation27.phptbin2686 -> 2687 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation31.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation32.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation33.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation37.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation38.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation39.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation43.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation45.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation47.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation49.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation50.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation51.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation53.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation7.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation9.phpt2
-rw-r--r--ext/standard/tests/strings/sscanf_basic4.phpt2
-rw-r--r--ext/standard/tests/strings/sscanf_basic8.phpt2
-rw-r--r--ext/standard/tests/strings/sscanf_error.phpt2
-rw-r--r--ext/standard/tests/strings/sscanf_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/sscanf_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/str_replace_array_refs2.phpt1
-rw-r--r--ext/standard/tests/strings/str_replace_error.phpt2
-rw-r--r--ext/standard/tests/strings/str_replace_variation2.phptbin12674 -> 12675 bytes
-rw-r--r--ext/standard/tests/strings/str_rot13_basic.phpt2
-rw-r--r--ext/standard/tests/strings/str_rot13_error.phpt2
-rw-r--r--ext/standard/tests/strings/str_shuffle.phpt2
-rw-r--r--ext/standard/tests/strings/str_shuffle_basic.phpt2
-rw-r--r--ext/standard/tests/strings/str_shuffle_error.phpt2
-rw-r--r--ext/standard/tests/strings/str_shuffle_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/str_split_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation10.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation11.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation12.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation7.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/strip_tags_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strip_tags_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/strip_tags_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/stripcslashes_basic.phpt1
-rw-r--r--ext/standard/tests/strings/stripslashes_basic.phptbin2032 -> 2033 bytes
-rw-r--r--ext/standard/tests/strings/strnatcasecmp_error.phpt2
-rw-r--r--ext/standard/tests/strings/strnatcmp_basic.phpt2
-rw-r--r--ext/standard/tests/strings/strnatcmp_leftalign.phpt1
-rw-r--r--ext/standard/tests/strings/strrchr_variation1.phptbin4853 -> 4854 bytes
-rw-r--r--ext/standard/tests/strings/strrchr_variation10.phpt2
-rw-r--r--ext/standard/tests/strings/strrchr_variation11.phpt2
-rw-r--r--ext/standard/tests/strings/strrchr_variation12.phptbin1764 -> 1765 bytes
-rw-r--r--ext/standard/tests/strings/strrchr_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/strrchr_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/strripos.phpt1
-rw-r--r--ext/standard/tests/strings/strripos_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strripos_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation10.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation11.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation4.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation7.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_basic.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation10.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation11.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation12.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation4.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation5.phptbin2413 -> 2414 bytes
-rw-r--r--ext/standard/tests/strings/strspn_variation7.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/strstr.phptbin11492 -> 11493 bytes
-rw-r--r--ext/standard/tests/strings/strtr.phpt2
-rw-r--r--ext/standard/tests/strings/strtr_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/strval_basic.phpt2
-rw-r--r--ext/standard/tests/strings/strval_error.phpt2
-rw-r--r--ext/standard/tests/strings/strval_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strval_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/substr_replace.phpt1
-rw-r--r--ext/standard/tests/strings/trim.phpt1
-rw-r--r--ext/standard/tests/strings/trim1.phptbin2046 -> 2045 bytes
-rw-r--r--ext/standard/tests/strings/trim_error.phpt2
-rw-r--r--ext/standard/tests/strings/trim_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/trim_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/unpack.phpt2
-rw-r--r--ext/standard/tests/strings/unpack_bug68225.phpt1
-rw-r--r--ext/standard/tests/strings/unpack_offset.phpt1
-rw-r--r--ext/standard/tests/strings/url_t.phpt1
-rw-r--r--ext/standard/tests/strings/utf8_decode_error.phpt1
-rw-r--r--ext/standard/tests/strings/utf8_decode_variation1.phpt1
-rw-r--r--ext/standard/tests/strings/utf8_encode_error.phpt1
-rw-r--r--ext/standard/tests/strings/utf8_encode_variation1.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_basic2.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic3.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_basic4.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_basic5.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic6.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_basic7.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation16.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation21.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_variation3.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_variation4.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation5.phpt1
-rw-r--r--ext/standard/tests/strings/vprintf_basic1.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation10.phptbin2771 -> 2772 bytes
-rw-r--r--ext/standard/tests/strings/vsprintf_variation11.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation11_64bit.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation13.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation13_64bit.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/vsprintf_variation3.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation5.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation7.phptbin2234 -> 2233 bytes
-rw-r--r--ext/standard/tests/strings/vsprintf_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/vsprintf_variation9.phptbin1702 -> 1701 bytes
-rw-r--r--ext/standard/tests/strings/wordwrap.phpt1
-rw-r--r--ext/standard/tests/strings/wordwrap_variation1.phpt2
-rw-r--r--ext/standard/tests/time/strptime_basic.phpt1
-rw-r--r--ext/standard/tests/time/strptime_error.phpt1
-rw-r--r--ext/standard/tests/time/strptime_parts.phpt1
-rw-r--r--ext/standard/tests/url/base64_decode_basic_001.phpt2
-rw-r--r--ext/standard/tests/url/base64_decode_basic_002.phpt2
-rw-r--r--ext/standard/tests/url/base64_decode_variation_001.phpt2
-rw-r--r--ext/standard/tests/url/base64_decode_variation_002.phpt2
-rw-r--r--ext/standard/tests/url/base64_encode_error_001.phpt2
-rw-r--r--ext/standard/tests/url/bug53248.phpt2
-rw-r--r--ext/standard/tests/url/bug74780.phpt2
-rw-r--r--ext/standard/tests/url/get_headers_error_001.phpt3
-rw-r--r--ext/standard/tests/url/get_headers_error_002.phpt1
-rw-r--r--ext/standard/tests/url/get_headers_error_003.phpt3
-rw-r--r--ext/standard/tests/url/parse_url_basic_001.phpt1
-rw-r--r--ext/standard/tests/url/parse_url_basic_010.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_error_001.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_error_002.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_relative_scheme.phpt1
-rw-r--r--ext/standard/tests/url/parse_url_unterminated.phpt1
-rw-r--r--ext/standard/tests/url/parse_url_variation_001.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_variation_002_32bit.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_variation_002_64bit.phpt2
-rw-r--r--ext/standard/tests/url/rawurldecode_variation_001.phpt2
-rw-r--r--ext/standard/tests/url/rawurlencode_error_001.phpt2
-rw-r--r--ext/standard/tests/url/rawurlencode_variation_001.phpt2
-rw-r--r--ext/standard/tests/url/urldecode_error_001.phpt2
-rw-r--r--ext/standard/tests/url/urldecode_variation_001.phpt2
-rw-r--r--ext/standard/tests/url/urlencode_error_001.phpt2
-rw-r--r--ext/standard/tests/url/urlencode_variation_001.phpt2
-rw-r--r--ext/standard/tests/versioning/php_sapi_name.phpt1
-rw-r--r--ext/standard/tests/versioning/version_compare.phpt2
-rw-r--r--ext/sysvshm/tests/005.phpt1
-rw-r--r--ext/sysvshm/tests/006.phpt1
-rw-r--r--ext/sysvshm/tests/007.phpt2
-rw-r--r--ext/sysvshm/tests/shutdown_crash_0.phpt2
-rw-r--r--ext/tidy/tests/002.phpt2
-rw-r--r--ext/tidy/tests/005-mb.phpt2
-rw-r--r--ext/tidy/tests/005.phpt2
-rw-r--r--ext/tidy/tests/006.phpt2
-rw-r--r--ext/tidy/tests/008.phpt2
-rw-r--r--ext/tidy/tests/009.phpt2
-rw-r--r--ext/tidy/tests/011.phpt2
-rw-r--r--ext/tidy/tests/014.phpt2
-rw-r--r--ext/tidy/tests/015.phpt2
-rw-r--r--ext/tidy/tests/017.phpt2
-rw-r--r--ext/tidy/tests/tidy_error.phpt1
-rw-r--r--ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt2
-rw-r--r--ext/tokenizer/tests/token_get_all_basic.phpt2
-rw-r--r--ext/tokenizer/tests/token_get_all_error.phpt2
-rw-r--r--ext/wddx/tests/bug45901.phpt3
-rw-r--r--ext/wddx/tests/bug70661.phpt2
-rw-r--r--ext/wddx/tests/bug70741.phpt3
-rw-r--r--ext/wddx/tests/bug72750.phpt2
-rw-r--r--ext/wddx/tests/bug72790.phpt2
-rw-r--r--ext/wddx/tests/bug72799.phpt2
-rw-r--r--ext/wddx/tests/bug72860.phpt2
-rw-r--r--ext/wddx/tests/bug73065.phpt2
-rw-r--r--ext/wddx/tests/bug73331.phpt2
-rw-r--r--ext/wddx/tests/bug74145.phpt2
-rw-r--r--ext/xml/tests/bug72099.phpt2
-rw-r--r--ext/xml/tests/xml_error_string_error.phpt1
-rw-r--r--ext/xml/tests/xml_error_string_variation1.phpt2
-rw-r--r--ext/xml/tests/xml_get_current_byte_index_error.phpt1
-rw-r--r--ext/xml/tests/xml_get_current_byte_index_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_get_current_column_number_error.phpt1
-rw-r--r--ext/xml/tests/xml_get_current_column_number_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_get_current_line_number_error.phpt1
-rw-r--r--ext/xml/tests/xml_get_current_line_number_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_get_error_code_error.phpt1
-rw-r--r--ext/xml/tests/xml_get_error_code_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_parse_error.phpt1
-rw-r--r--ext/xml/tests/xml_parse_into_struct_error.phpt1
-rw-r--r--ext/xml/tests/xml_parse_into_struct_variation.phpt2
-rw-r--r--ext/xml/tests/xml_parse_into_struct_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_parse_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_parser_create_ns_error.phpt2
-rw-r--r--ext/xml/tests/xml_parser_create_variation1.phpt2
-rw-r--r--ext/xml/tests/xml_parser_free_error.phpt1
-rw-r--r--ext/xml/tests/xml_parser_free_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_parser_get_option_error.phpt1
-rw-r--r--ext/xml/tests/xml_parser_get_option_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_parser_get_option_variation2.phpt1
-rw-r--r--ext/xml/tests/xml_parser_set_option_error.phpt1
-rw-r--r--ext/xml/tests/xml_parser_set_option_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_parser_set_option_variation2.phpt1
-rw-r--r--ext/xml/tests/xml_set_character_data_handler_error.phpt1
-rw-r--r--ext/xml/tests/xml_set_character_data_handler_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_set_default_handler_error.phpt1
-rw-r--r--ext/xml/tests/xml_set_default_handler_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_set_element_handler_error.phpt1
-rw-r--r--ext/xml/tests/xml_set_element_handler_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt1
-rw-r--r--ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt1
-rw-r--r--ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_set_notation_decl_handler_error.phpt1
-rw-r--r--ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_set_object_error.phpt1
-rw-r--r--ext/xml/tests/xml_set_object_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_set_object_variation2.phpt1
-rw-r--r--ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt2
-rw-r--r--ext/xml/tests/xml_set_processing_instruction_handler_error.phpt1
-rw-r--r--ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt1
-rw-r--r--ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt1
-rw-r--r--ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt1
-rw-r--r--ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt1
-rw-r--r--ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt1
-rw-r--r--ext/xmlreader/tests/002.phpt1
-rw-r--r--ext/xmlreader/tests/expand.phpt2
-rw-r--r--ext/xmlreader/tests/expand_error.phpt2
-rw-r--r--ext/xmlrpc/tests/003.phpt3
-rw-r--r--ext/xmlrpc/tests/004.phpt3
-rw-r--r--ext/xmlrpc/tests/005.phpt6
-rw-r--r--ext/xmlrpc/tests/006.phpt6
-rw-r--r--ext/xmlrpc/tests/007.phpt6
-rw-r--r--ext/xmlwriter/tests/bug48204.phpt1
-rw-r--r--ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt1
-rw-r--r--ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt1
-rw-r--r--ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt1
-rw-r--r--ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt1
-rw-r--r--ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt1
-rw-r--r--ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt1
-rw-r--r--ext/xmlwriter/tests/xmlwriter_write_attribute_ns_basic_001.phpt1
-rw-r--r--ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt1
-rw-r--r--ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt1
-rw-r--r--ext/xsl/tests/bug26384.phpt1
-rw-r--r--ext/xsl/tests/bug54446.phpt3
-rw-r--r--ext/xsl/tests/bug54446_with_ini.phpt1
-rw-r--r--ext/xsl/tests/xslt001.phpt2
-rw-r--r--ext/xsl/tests/xslt002.phpt2
-rw-r--r--ext/xsl/tests/xslt003.phpt2
-rw-r--r--ext/xsl/tests/xslt004.phpt2
-rw-r--r--ext/xsl/tests/xslt005.phpt2
-rw-r--r--ext/xsl/tests/xslt006.phpt2
-rw-r--r--ext/xsl/tests/xslt007.phpt2
-rw-r--r--ext/xsl/tests/xslt008-mb.phpt2
-rw-r--r--ext/xsl/tests/xslt008.phpt2
-rw-r--r--ext/xsl/tests/xslt009.phpt2
-rw-r--r--ext/xsl/tests/xslt010.phpt1
-rw-r--r--ext/xsl/tests/xslt010_gt10129.phpt1
-rw-r--r--ext/xsl/tests/xslt011.phpt2
-rw-r--r--ext/xsl/tests/xslt012.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_hasExsltSupport_wrongparam_001.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt1
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToDoc.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToDoc_nullparam.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_001.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_003.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_004.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToURI.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToURI_nullparam.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_001.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_002.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_003.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_004.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToXML.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_001.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_003.phpt2
-rw-r--r--ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_004.phpt2
-rw-r--r--ext/zip/tests/bug47667.phpt1
-rw-r--r--ext/zip/tests/bug49072.phpt1
-rw-r--r--ext/zip/tests/bug53603.phpt3
-rw-r--r--ext/zip/tests/bug8009.phpt1
-rw-r--r--ext/zip/tests/bug8700.phpt1
-rw-r--r--ext/zip/tests/oo_getstatusstring.phpt1
-rw-r--r--ext/zip/tests/oo_properties.phpt1
-rw-r--r--ext/zip/tests/zip_entry_compressionmethod.phpt1
-rw-r--r--ext/zlib/tests/005.phpt1
-rw-r--r--ext/zlib/tests/deflate_add_block_v123.phpt1
-rw-r--r--ext/zlib/tests/deflate_add_error.phpt1
-rw-r--r--ext/zlib/tests/deflate_init_error.phpt1
-rw-r--r--ext/zlib/tests/gzclose_error.phpt3
-rw-r--r--ext/zlib/tests/gzeof_basic.phpt2
-rw-r--r--ext/zlib/tests/gzeof_error.phpt3
-rw-r--r--ext/zlib/tests/gzfile_error.phpt3
-rw-r--r--ext/zlib/tests/gzfile_variation1.phpt1
-rw-r--r--ext/zlib/tests/gzfile_variation10.phpt2
-rw-r--r--ext/zlib/tests/gzfile_variation12.phpt2
-rw-r--r--ext/zlib/tests/gzfile_variation13.phpt2
-rw-r--r--ext/zlib/tests/gzfile_variation14.phpt3
-rw-r--r--ext/zlib/tests/gzfile_variation15.phpt1
-rw-r--r--ext/zlib/tests/gzfile_variation2.phpt3
-rw-r--r--ext/zlib/tests/gzfile_variation3.phpt2
-rw-r--r--ext/zlib/tests/gzfile_variation5.phpt2
-rw-r--r--ext/zlib/tests/gzfile_variation7.phpt1
-rw-r--r--ext/zlib/tests/gzfile_variation8.phpt3
-rw-r--r--ext/zlib/tests/gzfile_variation9.phpt2
-rw-r--r--ext/zlib/tests/gzgetc_error.phpt3
-rw-r--r--ext/zlib/tests/gzgets_basic.phpt2
-rw-r--r--ext/zlib/tests/gzgets_error.phpt3
-rw-r--r--ext/zlib/tests/gzinflate_error1.phpt2
-rw-r--r--ext/zlib/tests/gzinflate_length.phpt1
-rw-r--r--ext/zlib/tests/gzopen_variation1.phpt1
-rw-r--r--ext/zlib/tests/gzopen_variation4.phpt1
-rw-r--r--ext/zlib/tests/gzopen_variation7.phpt2
-rw-r--r--ext/zlib/tests/gzopen_variation9.phpt2
-rw-r--r--ext/zlib/tests/gzpassthru_basic.phpt2
-rw-r--r--ext/zlib/tests/gzpassthru_error.phpt3
-rw-r--r--ext/zlib/tests/gzputs_basic.phpt2
-rw-r--r--ext/zlib/tests/gzread_basic.phpt2
-rw-r--r--ext/zlib/tests/gzread_error.phpt3
-rw-r--r--ext/zlib/tests/gzread_error2.phpt2
-rw-r--r--ext/zlib/tests/gzread_variation1.phpt2
-rw-r--r--ext/zlib/tests/gzrewind_basic.phpt2
-rw-r--r--ext/zlib/tests/gzrewind_basic2.phpt2
-rw-r--r--ext/zlib/tests/gzrewind_error.phpt2
-rw-r--r--ext/zlib/tests/gzrewind_variation1.phpt2
-rw-r--r--ext/zlib/tests/gzseek_basic.phpt2
-rw-r--r--ext/zlib/tests/gzseek_error.phpt3
-rw-r--r--ext/zlib/tests/gzseek_variation2.phpt2
-rw-r--r--ext/zlib/tests/gzseek_variation3.phpt2
-rw-r--r--ext/zlib/tests/gzseek_variation6.phpt2
-rw-r--r--ext/zlib/tests/gztell_basic.phpt2
-rw-r--r--ext/zlib/tests/gztell_error.phpt3
-rw-r--r--ext/zlib/tests/gzuncompress_basic1.phpt2
-rw-r--r--ext/zlib/tests/gzwrite_basic.phpt2
-rw-r--r--ext/zlib/tests/gzwrite_error.phpt3
-rw-r--r--ext/zlib/tests/gzwrite_error2.phpt2
-rw-r--r--ext/zlib/tests/gzwrite_variation1.phpt2
-rw-r--r--ext/zlib/tests/inflate_add_error.phpt1
-rw-r--r--ext/zlib/tests/inflate_init_error.phpt1
-rw-r--r--ext/zlib/tests/ob_001.phpt1
-rw-r--r--ext/zlib/tests/ob_002.phpt1
-rw-r--r--ext/zlib/tests/ob_004.phpt1
-rw-r--r--ext/zlib/tests/readgzfile_error.phpt3
-rw-r--r--ext/zlib/tests/readgzfile_variation1.phpt1
-rw-r--r--ext/zlib/tests/readgzfile_variation10.phpt2
-rw-r--r--ext/zlib/tests/readgzfile_variation12.phpt2
-rw-r--r--ext/zlib/tests/readgzfile_variation13.phpt2
-rw-r--r--ext/zlib/tests/readgzfile_variation14.phpt1
-rw-r--r--ext/zlib/tests/readgzfile_variation15.phpt1
-rw-r--r--ext/zlib/tests/readgzfile_variation2.phpt3
-rw-r--r--ext/zlib/tests/readgzfile_variation3.phpt2
-rw-r--r--ext/zlib/tests/readgzfile_variation8.phpt3
-rw-r--r--ext/zlib/tests/readgzfile_variation9.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_copy_basic.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_copy_variation1.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_copy_variation2.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_dir_basic.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_file_basic.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_fopen_basic.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_fopen_variation1.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_rename_basic.phpt3
-rw-r--r--ext/zlib/tests/zlib_scheme_stat_basic.phpt3
-rw-r--r--ext/zlib/tests/zlib_scheme_stat_basic2.phpt2
-rw-r--r--ext/zlib/tests/zlib_scheme_unlink_basic.phpt3
-rw-r--r--ext/zlib/tests/zlib_wrapper_fflush_basic.phpt2
-rw-r--r--ext/zlib/tests/zlib_wrapper_flock_basic.phpt2
-rw-r--r--ext/zlib/tests/zlib_wrapper_fstat_basic.phpt2
-rw-r--r--ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt3
-rw-r--r--ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt2
-rw-r--r--sapi/cli/tests/020.phpt1
-rw-r--r--sapi/cli/tests/bug66830.phpt1
-rw-r--r--sapi/cli/tests/bug67429.phpt1
-rw-r--r--sapi/cli/tests/bug67741.phpt2
-rw-r--r--sapi/cli/tests/php_cli_server_013.phpt2
-rw-r--r--sapi/cli/tests/php_cli_server_014.phpt1
-rw-r--r--sapi/fpm/tests/log-bwd-msg-with-nl.phpt2
-rw-r--r--sapi/fpm/tests/log-bwd-multiple-msgs.phpt2
-rw-r--r--sapi/fpm/tests/pool-apparmor-basic.phpt2
-rw-r--r--sapi/fpm/tests/pool-prefix.phpt2
-rw-r--r--sapi/fpm/tests/proc-user-ignored.phpt2
-rw-r--r--sapi/fpm/tests/socket-uds-acl.phpt2
-rw-r--r--sapi/phpdbg/tests/breakpoints_001.phpt1
-rw-r--r--sapi/phpdbg/tests/breakpoints_002.phpt1
-rw-r--r--sapi/phpdbg/tests/breakpoints_003.phpt1
-rw-r--r--sapi/phpdbg/tests/breakpoints_005.phpt1
-rw-r--r--sapi/phpdbg/tests/breakpoints_006.phpt1
-rw-r--r--sapi/phpdbg/tests/breakpoints_007.phpt1
-rw-r--r--sapi/phpdbg/tests/breakpoints_008.phpt1
-rw-r--r--sapi/phpdbg/tests/include_once.phpt1
-rw-r--r--sapi/phpdbg/tests/phpdbg_oplog_001.phpt1
-rw-r--r--sapi/tests/test001.phpt2
-rw-r--r--sapi/tests/test002.phpt2
-rw-r--r--sapi/tests/test003.phpt2
-rw-r--r--sapi/tests/test004.phpt2
-rw-r--r--sapi/tests/test006.phpt1
-rw-r--r--sapi/tests/test007.phpt1
-rw-r--r--tests/basic/bug20539.phpt1
-rw-r--r--tests/classes/__call_003.phpt1
-rw-r--r--tests/classes/abstract_derived.phpt1
-rw-r--r--tests/classes/abstract_final.phpt1
-rw-r--r--tests/classes/abstract_inherit.phpt1
-rw-r--r--tests/classes/abstract_redeclare.phpt1
-rw-r--r--tests/classes/array_access_012.phpt1
-rw-r--r--tests/classes/autoload_018.phpt1
-rw-r--r--tests/classes/class_example.phpt1
-rw-r--r--tests/classes/constants_basic_001.phpt1
-rw-r--r--tests/classes/constants_basic_002.phpt1
-rw-r--r--tests/classes/constants_basic_004.phpt1
-rw-r--r--tests/classes/constants_basic_005.phpt1
-rw-r--r--tests/classes/constants_error_001.phpt1
-rw-r--r--tests/classes/constants_error_003.phpt1
-rw-r--r--tests/classes/constants_error_006.phpt1
-rw-r--r--tests/classes/constants_error_007.phpt1
-rw-r--r--tests/classes/constants_scope_001.phpt1
-rw-r--r--tests/classes/constants_visibility_006.phpt1
-rw-r--r--tests/classes/constants_visibility_error_003.phpt2
-rw-r--r--tests/classes/constants_visibility_error_004.phpt2
-rw-r--r--tests/classes/factory_and_singleton_006.phpt1
-rw-r--r--tests/classes/final_abstract.phpt1
-rw-r--r--tests/classes/implicit_instantiation_001.phpt2
-rw-r--r--tests/classes/inheritance_003.phpt1
-rw-r--r--tests/classes/inheritance_004.phpt1
-rw-r--r--tests/classes/interface_constant_inheritance_001.phpt1
-rw-r--r--tests/classes/interface_constant_inheritance_002.phpt1
-rw-r--r--tests/classes/interface_constant_inheritance_003.phpt1
-rw-r--r--tests/classes/interface_constant_inheritance_005.phpt2
-rw-r--r--tests/classes/interface_constant_inheritance_006.phpt1
-rw-r--r--tests/classes/interface_constant_inheritance_007.phpt1
-rw-r--r--tests/classes/interface_method.phpt1
-rw-r--r--tests/classes/interface_method_final.phpt1
-rw-r--r--tests/classes/interface_method_private.phpt1
-rw-r--r--tests/classes/interface_optional_arg.phpt1
-rw-r--r--tests/classes/interfaces_001.phpt1
-rw-r--r--tests/classes/interfaces_002.phpt1
-rw-r--r--tests/classes/interfaces_003.phpt1
-rw-r--r--tests/classes/property_override_protectedStatic_private.phpt2
-rw-r--r--tests/classes/property_override_protectedStatic_privateStatic.phpt2
-rw-r--r--tests/classes/property_override_protectedStatic_protected.phpt2
-rw-r--r--tests/classes/property_override_protectedStatic_public.phpt2
-rw-r--r--tests/classes/property_override_protectedStatic_publicStatic.phpt1
-rw-r--r--tests/classes/property_override_protected_private.phpt1
-rw-r--r--tests/classes/property_override_protected_privateStatic.phpt1
-rw-r--r--tests/classes/property_override_protected_protectedStatic.phpt1
-rw-r--r--tests/classes/property_override_protected_publicStatic.phpt1
-rw-r--r--tests/classes/property_override_publicStatic_private.phpt2
-rw-r--r--tests/classes/property_override_publicStatic_privateStatic.phpt2
-rw-r--r--tests/classes/property_override_publicStatic_protected.phpt2
-rw-r--r--tests/classes/property_override_publicStatic_protectedStatic.phpt2
-rw-r--r--tests/classes/property_override_publicStatic_public.phpt2
-rw-r--r--tests/classes/property_override_public_private.phpt2
-rw-r--r--tests/classes/property_override_public_privateStatic.phpt1
-rw-r--r--tests/classes/property_override_public_protected.phpt2
-rw-r--r--tests/classes/property_override_public_protectedStatic.phpt1
-rw-r--r--tests/classes/property_override_public_publicStatic.phpt1
-rw-r--r--tests/classes/static_properties_003_error1.phpt1
-rw-r--r--tests/classes/static_properties_003_error2.phpt1
-rw-r--r--tests/classes/static_properties_003_error3.phpt1
-rw-r--r--tests/classes/static_properties_003_error4.phpt1
-rw-r--r--tests/classes/tostring_004.phpt1
-rw-r--r--tests/classes/type_hinting_001.phpt1
-rw-r--r--tests/classes/unset_properties.phpt1
-rw-r--r--tests/func/003.phpt1
-rw-r--r--tests/func/004.phpt1
-rw-r--r--tests/func/005.phpt1
-rw-r--r--tests/func/ini_alter.phpt1
-rw-r--r--tests/lang/028.phpt1
-rw-r--r--tests/lang/032.phpt1
-rw-r--r--tests/lang/bug21094.phpt1
-rw-r--r--tests/lang/bug22690.phpt1
-rw-r--r--tests/lang/bug24054.phpt1
-rw-r--r--tests/lang/bug24573.phpt1
-rw-r--r--tests/lang/bug28800.phpt2
-rw-r--r--tests/lang/bug43958.phpt1
-rw-r--r--tests/lang/bug44827.phpt1
-rw-r--r--tests/lang/bug71897.phpt1
-rw-r--r--tests/lang/compare_objects_basic1.phpt1
-rw-r--r--tests/lang/compare_objects_basic2.phpt1
-rw-r--r--tests/lang/each_binary_safety.phpt1
-rw-r--r--tests/lang/engine_assignExecutionOrder_001.phpt2
-rw-r--r--tests/lang/foreachLoop.002.phpt1
-rw-r--r--tests/lang/foreachLoop.003.phpt1
-rw-r--r--tests/lang/foreachLoop.009.phpt2
-rw-r--r--tests/lang/foreachLoop.011.phpt1
-rw-r--r--tests/lang/foreachLoop.012.phpt1
-rw-r--r--tests/lang/foreachLoop.013.phpt1
-rw-r--r--tests/lang/foreachLoop.015.phpt1
-rw-r--r--tests/lang/foreachLoop.016.phpt1
-rw-r--r--tests/lang/foreachLoopObjects.001.phpt2
-rw-r--r--tests/lang/foreachLoopObjects.005.phpt1
-rw-r--r--tests/lang/foreach_with_references_001.phpt1
-rw-r--r--tests/lang/func_get_arg_variation.phpt1
-rw-r--r--tests/lang/func_get_args.002.phpt1
-rw-r--r--tests/lang/func_get_args.004.phpt1
-rw-r--r--tests/lang/func_num_args.003.phpt1
-rw-r--r--tests/lang/func_num_args.004.phpt2
-rw-r--r--tests/lang/operators/bitwiseOr_basiclong_64bit.phpt1
-rw-r--r--tests/lang/operators/bitwiseXor_basiclong_64bit.phpt1
-rw-r--r--tests/lang/operators/nan-comparison-false.phpt1
-rw-r--r--tests/lang/operators/operator_identical_recusion-01.phpt2
-rw-r--r--tests/lang/passByReference_003.phpt1
-rw-r--r--tests/lang/passByReference_005.phpt1
-rw-r--r--tests/lang/passByReference_006.phpt1
-rw-r--r--tests/lang/passByReference_008.phpt2
-rw-r--r--tests/lang/passByReference_010.phpt2
-rw-r--r--tests/lang/returnByReference.002.phpt1
-rw-r--r--tests/lang/returnByReference.003.phpt1
-rw-r--r--tests/lang/returnByReference.004.phpt1
-rw-r--r--tests/lang/returnByReference.005.phpt1
-rw-r--r--tests/lang/returnByReference.007.phpt1
-rw-r--r--tests/lang/returnByReference.008.phpt1
-rw-r--r--tests/lang/returnByReference.009.phpt1
-rw-r--r--tests/lang/static_basic_001.phpt1
-rw-r--r--tests/lang/string/unicode_escape.phpt2
-rw-r--r--tests/lang/string/unicode_escape_legacy.phpt1
-rw-r--r--tests/lang/string/unicode_escape_surrogates.phpt1
-rw-r--r--tests/lang/string_decimals_001.phpt1
-rw-r--r--tests/lang/type_hints_001.phpt1
-rw-r--r--tests/lang/type_hints_002.phpt1
-rw-r--r--tests/lang/type_hints_003.phpt1
-rw-r--r--tests/output/bug60768.phpt1
-rw-r--r--tests/output/bug65593.phpt1
-rw-r--r--tests/output/ob_end_clean_basic_001.phpt2
-rw-r--r--tests/output/ob_end_clean_error_001.phpt1
-rw-r--r--tests/output/ob_get_clean_error_001.phpt1
-rw-r--r--tests/output/ob_get_length_error_001.phpt1
-rw-r--r--tests/output/ob_start_basic_004.phpt1
-rw-r--r--tests/run-test/bug75042-3.phpt2
-rw-r--r--tests/security/open_basedir_001.phpt1
-rw-r--r--tests/security/open_basedir_chdir.phpt1
-rw-r--r--tests/security/open_basedir_chmod.phpt1
-rw-r--r--tests/security/open_basedir_copy.phpt1
-rw-r--r--tests/security/open_basedir_copy_variation1.phpt1
-rw-r--r--tests/security/open_basedir_dir.phpt1
-rw-r--r--tests/security/open_basedir_error_log.phpt1
-rw-r--r--tests/security/open_basedir_error_log_variation.phpt1
-rw-r--r--tests/security/open_basedir_file.phpt1
-rw-r--r--tests/security/open_basedir_file_exists.phpt1
-rw-r--r--tests/security/open_basedir_file_put_contents.phpt1
-rw-r--r--tests/security/open_basedir_fileatime.phpt1
-rw-r--r--tests/security/open_basedir_filectime.phpt1
-rw-r--r--tests/security/open_basedir_filegroup.phpt1
-rw-r--r--tests/security/open_basedir_fileinode.phpt1
-rw-r--r--tests/security/open_basedir_filemtime.phpt1
-rw-r--r--tests/security/open_basedir_fileowner.phpt1
-rw-r--r--tests/security/open_basedir_fileperms.phpt1
-rw-r--r--tests/security/open_basedir_filesize.phpt1
-rw-r--r--tests/security/open_basedir_filetype.phpt1
-rw-r--r--tests/security/open_basedir_fopen.phpt1
-rw-r--r--tests/security/open_basedir_glob.phpt1
-rw-r--r--tests/security/open_basedir_glob_variation.phpt1
-rw-r--r--tests/security/open_basedir_is_dir.phpt1
-rw-r--r--tests/security/open_basedir_is_file.phpt1
-rw-r--r--tests/security/open_basedir_is_link.phpt1
-rw-r--r--tests/security/open_basedir_is_readable.phpt1
-rw-r--r--tests/security/open_basedir_is_writable.phpt1
-rw-r--r--tests/security/open_basedir_link.phpt1
-rw-r--r--tests/security/open_basedir_linkinfo.phpt1
-rw-r--r--tests/security/open_basedir_lstat.phpt1
-rw-r--r--tests/security/open_basedir_opendir.phpt1
-rw-r--r--tests/security/open_basedir_parse_ini_file.phpt1
-rw-r--r--tests/security/open_basedir_readlink.phpt1
-rw-r--r--tests/security/open_basedir_realpath.phpt1
-rw-r--r--tests/security/open_basedir_rename.phpt1
-rw-r--r--tests/security/open_basedir_rmdir.phpt1
-rw-r--r--tests/security/open_basedir_scandir.phpt1
-rw-r--r--tests/security/open_basedir_stat.phpt1
-rw-r--r--tests/security/open_basedir_symlink.phpt1
-rw-r--r--tests/security/open_basedir_tempnam.phpt1
-rw-r--r--tests/security/open_basedir_touch.phpt1
-rw-r--r--tests/security/open_basedir_unlink.phpt1
-rw-r--r--tests/strings/offsets_chaining_1.phpt1
-rw-r--r--tests/strings/offsets_chaining_2.phpt1
-rw-r--r--tests/strings/offsets_chaining_3.phpt1
-rw-r--r--tests/strings/offsets_chaining_4.phpt1
-rw-r--r--tests/strings/offsets_general.phpt1
3401 files changed, 1530 insertions, 4009 deletions
diff --git a/Zend/tests/033.phpt b/Zend/tests/033.phpt
index b506f9172e..a76a322ccf 100644
--- a/Zend/tests/033.phpt
+++ b/Zend/tests/033.phpt
@@ -17,7 +17,6 @@ $arr[][]->bar = 2;
?>
--EXPECTF--
-
Notice: Undefined variable: arr in %s on line %d
Notice: Undefined variable: arr in %s on line %d
diff --git a/Zend/tests/abstract-static.phpt b/Zend/tests/abstract-static.phpt
index 1742d4b408..2f9bc9a1fd 100644
--- a/Zend/tests/abstract-static.phpt
+++ b/Zend/tests/abstract-static.phpt
@@ -9,5 +9,4 @@ abstract class TestClass
?>
===DONE===
--EXPECT--
-
===DONE===
diff --git a/Zend/tests/add_006.phpt b/Zend/tests/add_006.phpt
index c1124e026c..2e7f76b4ee 100644
--- a/Zend/tests/add_006.phpt
+++ b/Zend/tests/add_006.phpt
@@ -38,7 +38,6 @@ var_dump($c);
echo "Done\n";
?>
--EXPECTF--
-
Warning: A non-numeric value encountered in %s on line %d
int(75636)
diff --git a/Zend/tests/add_007.phpt b/Zend/tests/add_007.phpt
index 6d9af8a9f5..3b24a1c99c 100644
--- a/Zend/tests/add_007.phpt
+++ b/Zend/tests/add_007.phpt
@@ -19,7 +19,6 @@ var_dump($c);
echo "Done\n";
?>
--EXPECTF--
-
Warning: A non-numeric value encountered in %s on line %d
Exception: Unsupported operand types
diff --git a/Zend/tests/anon/001.phpt b/Zend/tests/anon/001.phpt
index 75589550a8..65ba15148b 100644
--- a/Zend/tests/anon/001.phpt
+++ b/Zend/tests/anon/001.phpt
@@ -6,5 +6,3 @@ var_dump(new class{});
--EXPECTF--
object(class@%s)#%d (0) {
}
-
-
diff --git a/Zend/tests/anon/002.phpt b/Zend/tests/anon/002.phpt
index fdb8915267..80a91eed78 100644
--- a/Zend/tests/anon/002.phpt
+++ b/Zend/tests/anon/002.phpt
@@ -18,4 +18,3 @@ var_dump($a instanceof A, $a instanceof B);
--EXPECT--
bool(true)
bool(true)
-
diff --git a/Zend/tests/anon/003.phpt b/Zend/tests/anon/003.phpt
index ac023f43a5..7c95e86632 100644
--- a/Zend/tests/anon/003.phpt
+++ b/Zend/tests/anon/003.phpt
@@ -51,4 +51,3 @@ object(class@%s)#1 (1) {
["i"]=>
int(10)
}
-
diff --git a/Zend/tests/anon/006.phpt b/Zend/tests/anon/006.phpt
index 2b8888c497..0be1c33317 100644
--- a/Zend/tests/anon/006.phpt
+++ b/Zend/tests/anon/006.phpt
@@ -12,4 +12,3 @@ namespace {
--EXPECTF--
object(class@%s)#1 (0) {
}
-
diff --git a/Zend/tests/anon/007.phpt b/Zend/tests/anon/007.phpt
index 59d2441760..dbc86c593e 100644
--- a/Zend/tests/anon/007.phpt
+++ b/Zend/tests/anon/007.phpt
@@ -20,4 +20,3 @@ namespace lone {
--EXPECTF--
object(class@%s)#2 (0) {
}
-
diff --git a/Zend/tests/assert/expect_013.phpt b/Zend/tests/assert/expect_013.phpt
index cf8fa1cd02..b5d037fea6 100644
--- a/Zend/tests/assert/expect_013.phpt
+++ b/Zend/tests/assert/expect_013.phpt
@@ -8,4 +8,4 @@ assert.exception=1
var_dump(assert(false));
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/Zend/tests/assert/expect_014.phpt b/Zend/tests/assert/expect_014.phpt
index 7cf4fb1931..def99402ec 100644
--- a/Zend/tests/assert/expect_014.phpt
+++ b/Zend/tests/assert/expect_014.phpt
@@ -9,4 +9,4 @@ assert(false);
var_dump(true);
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/Zend/tests/bug26010.phpt b/Zend/tests/bug26010.phpt
index a3c41faefc..9761700bb8 100644
--- a/Zend/tests/bug26010.phpt
+++ b/Zend/tests/bug26010.phpt
@@ -16,4 +16,3 @@ array(1) {
["public"]=>
string(6) "public"
}
-
diff --git a/Zend/tests/bug26696.phpt b/Zend/tests/bug26696.phpt
index 62ceacda58..14083dfb9f 100644
--- a/Zend/tests/bug26696.phpt
+++ b/Zend/tests/bug26696.phpt
@@ -19,4 +19,4 @@ for ($i = 0; $i < $len; $i++) {
===DONE===
--EXPECT--
a-s-d-d-/-?+
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/Zend/tests/bug29896.phpt b/Zend/tests/bug29896.phpt
index 1e2eb0b067..35a92d459c 100644
--- a/Zend/tests/bug29896.phpt
+++ b/Zend/tests/bug29896.phpt
@@ -25,4 +25,3 @@ GenerateError2("Test2");
#0 userErrorHandler(8, Undefined variable: b, %sbug29896.php, 11, Array ([A1] => Test1)) called at [%sbug29896.php:11]
#1 GenerateError1(Test1) called at [%sbug29896.php:16]
#2 GenerateError2(Test2) called at [%sbug29896.php:19]
-
diff --git a/Zend/tests/bug29944.phpt b/Zend/tests/bug29944.phpt
index 6c0cf1ec7a..41a8159d52 100644
--- a/Zend/tests/bug29944.phpt
+++ b/Zend/tests/bug29944.phpt
@@ -13,4 +13,3 @@ switch ($a) {
?>
--EXPECT--
ok
-
diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/bug30162.phpt
index 9cd3e9d524..55d26a3e3a 100644
--- a/Zend/tests/bug30162.phpt
+++ b/Zend/tests/bug30162.phpt
@@ -51,4 +51,4 @@ object(hariCow)#%d (2) {
["y"]=>
string(1) "y"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/Zend/tests/bug30519.phpt b/Zend/tests/bug30519.phpt
index 7d70cba071..f633d11445 100644
--- a/Zend/tests/bug30519.phpt
+++ b/Zend/tests/bug30519.phpt
@@ -7,4 +7,3 @@ class test implements a {
?>
--EXPECTF--
Fatal error: Interface 'a' not found in %sbug30519.php on line 2
-
diff --git a/Zend/tests/bug32596.phpt b/Zend/tests/bug32596.phpt
index 287495d150..40bd70382b 100644
--- a/Zend/tests/bug32596.phpt
+++ b/Zend/tests/bug32596.phpt
@@ -24,4 +24,3 @@ echo "this is still executed\n";
BUG
please fix this thing, it wasted a nice part of my life!
this is still executed
-
diff --git a/Zend/tests/bug33318.phpt b/Zend/tests/bug33318.phpt
index 74ac9552bc..3b79588757 100644
--- a/Zend/tests/bug33318.phpt
+++ b/Zend/tests/bug33318.phpt
@@ -8,4 +8,4 @@ throw 1;
Fatal error: Uncaught Error: Can only throw objects in %sbug33318.php:2
Stack trace:
#0 {main}
- thrown in %sbug33318.php on line 2 \ No newline at end of file
+ thrown in %sbug33318.php on line 2
diff --git a/Zend/tests/bug33558.phpt b/Zend/tests/bug33558.phpt
index 9c87fc6017..5c00ad7ca6 100644
--- a/Zend/tests/bug33558.phpt
+++ b/Zend/tests/bug33558.phpt
@@ -18,4 +18,3 @@ echo "$a\n";
?>
--EXPECT--
ok
-
diff --git a/Zend/tests/bug34062.phpt b/Zend/tests/bug34062.phpt
index bcb4ad8c64..f1c0e477a9 100644
--- a/Zend/tests/bug34062.phpt
+++ b/Zend/tests/bug34062.phpt
@@ -21,4 +21,3 @@ try {
(((
here
)))
-
diff --git a/Zend/tests/bug34064.phpt b/Zend/tests/bug34064.phpt
index 1b61f34775..83c6902803 100644
--- a/Zend/tests/bug34064.phpt
+++ b/Zend/tests/bug34064.phpt
@@ -36,4 +36,3 @@ Stack trace:
#0 %s(%d): XmlTest->run()
#1 {main}
thrown in %sbug34064.php on line 18
-
diff --git a/Zend/tests/bug34199.phpt b/Zend/tests/bug34199.phpt
index 3012d808fa..d9b8e43c39 100644
--- a/Zend/tests/bug34199.phpt
+++ b/Zend/tests/bug34199.phpt
@@ -15,4 +15,3 @@ if(!$kids) echo "ok\n"; else echo "bug\n";
bool(false)
ok
ok
-
diff --git a/Zend/tests/bug34879.phpt b/Zend/tests/bug34879.phpt
index 606142bde7..6c422ca268 100644
--- a/Zend/tests/bug34879.phpt
+++ b/Zend/tests/bug34879.phpt
@@ -8,4 +8,4 @@ print_r(str_replace('a', 'b', array(-1 =>-1)));
Array
(
[-1] => -1
-) \ No newline at end of file
+)
diff --git a/Zend/tests/bug36071.phpt b/Zend/tests/bug36071.phpt
index 31179ea3f9..945118fef3 100644
--- a/Zend/tests/bug36071.phpt
+++ b/Zend/tests/bug36071.phpt
@@ -11,4 +11,4 @@ $a[0]->b = 0;
Fatal error: Uncaught Error: __clone method called on non-object in %sbug36071.php:2
Stack trace:
#0 {main}
- thrown in %sbug36071.php on line 2 \ No newline at end of file
+ thrown in %sbug36071.php on line 2
diff --git a/Zend/tests/bug37138.phpt b/Zend/tests/bug37138.phpt
index e39ad199a1..4a084d4bb1 100644
--- a/Zend/tests/bug37138.phpt
+++ b/Zend/tests/bug37138.phpt
@@ -18,4 +18,3 @@ stch::g ();
EHLO
EHLO
EHLO
-
diff --git a/Zend/tests/bug37707.phpt b/Zend/tests/bug37707.phpt
index 1964958526..ac2dfb8777 100644
--- a/Zend/tests/bug37707.phpt
+++ b/Zend/tests/bug37707.phpt
@@ -13,4 +13,3 @@ echo "NO LEAK\n";
--EXPECT--
clonned
NO LEAK
-
diff --git a/Zend/tests/bug38808.phpt b/Zend/tests/bug38808.phpt
index 0fc4bfecdc..487a569b6d 100644
--- a/Zend/tests/bug38808.phpt
+++ b/Zend/tests/bug38808.phpt
@@ -14,4 +14,4 @@ echo $current($a)."\n";
?>
--EXPECT--
one
-two \ No newline at end of file
+two
diff --git a/Zend/tests/bug41401.phpt b/Zend/tests/bug41401.phpt
index 50d2109cac..096091e439 100644
--- a/Zend/tests/bug41401.phpt
+++ b/Zend/tests/bug41401.phpt
@@ -7,4 +7,4 @@ echo "\n";
echo 6/+2*-3;
--EXPECT--
-2.5
--9 \ No newline at end of file
+-9
diff --git a/Zend/tests/bug42143.phpt b/Zend/tests/bug42143.phpt
index 8a73d41bf8..87c48f0859 100644
--- a/Zend/tests/bug42143.phpt
+++ b/Zend/tests/bug42143.phpt
@@ -35,4 +35,3 @@ bool(false)
bool(true)
bool(true)
bool(false)
-
diff --git a/Zend/tests/bug42818.phpt b/Zend/tests/bug42818.phpt
index 4ebe9cc35d..b37ce13fd1 100644
--- a/Zend/tests/bug42818.phpt
+++ b/Zend/tests/bug42818.phpt
@@ -9,4 +9,3 @@ Fatal error: Uncaught Error: __clone method called on non-object in %sbug42818.p
Stack trace:
#0 {main}
thrown in %sbug42818.php on line 2
-
diff --git a/Zend/tests/bug42820.phpt b/Zend/tests/bug42820.phpt
index 921f0090a9..a53ed1af68 100644
--- a/Zend/tests/bug42820.phpt
+++ b/Zend/tests/bug42820.phpt
@@ -28,4 +28,3 @@ bool(true)
bool(false)
bool(false)
bool(false)
-
diff --git a/Zend/tests/bug43183.phpt b/Zend/tests/bug43183.phpt
index a8ca698e9f..88641e862a 100644
--- a/Zend/tests/bug43183.phpt
+++ b/Zend/tests/bug43183.phpt
@@ -9,4 +9,4 @@ class Bar {}
use Test\Bar;
echo "ok\n";
--EXPECT--
-ok \ No newline at end of file
+ok
diff --git a/Zend/tests/bug43200.phpt b/Zend/tests/bug43200.phpt
index 7a995aab3e..35b96b1ba1 100644
--- a/Zend/tests/bug43200.phpt
+++ b/Zend/tests/bug43200.phpt
@@ -48,4 +48,3 @@ Class [ <user> class x extends c implements a, b ] {
}
}
}
-
diff --git a/Zend/tests/bug45180.phpt b/Zend/tests/bug45180.phpt
index f1ca434272..285543aaf0 100644
--- a/Zend/tests/bug45180.phpt
+++ b/Zend/tests/bug45180.phpt
@@ -58,4 +58,4 @@ string(1) "C"
__callstatic:
string(3) "FOO"
__callstatic:
-string(3) "FOO" \ No newline at end of file
+string(3) "FOO"
diff --git a/Zend/tests/bug45862.phpt b/Zend/tests/bug45862.phpt
index f70c14234c..734a498eba 100644
--- a/Zend/tests/bug45862.phpt
+++ b/Zend/tests/bug45862.phpt
@@ -28,7 +28,6 @@ $child->test();
?>
--EXPECT--
-
From parent scope
array(1) {
["prot"]=>
diff --git a/Zend/tests/bug46811.phpt b/Zend/tests/bug46811.phpt
index 06e10d78fa..88a9001e47 100644
--- a/Zend/tests/bug46811.phpt
+++ b/Zend/tests/bug46811.phpt
@@ -10,4 +10,3 @@ var_dump(ini_get("arg_separator.output"));
--EXPECT--
bool(false)
string(1) "&"
-
diff --git a/Zend/tests/bug47109.phpt b/Zend/tests/bug47109.phpt
index 4d157345b2..0b86a2bcd3 100644
--- a/Zend/tests/bug47109.phpt
+++ b/Zend/tests/bug47109.phpt
@@ -8,4 +8,3 @@ $a->{"a"."b"};
Notice: Undefined variable: a in %sbug47109.php on line 2
Notice: Trying to get property 'ab' of non-object in %sbug47109.php on line 2
-
diff --git a/Zend/tests/bug48228.phpt b/Zend/tests/bug48228.phpt
index 9be02aa4d8..d91ded28be 100644
--- a/Zend/tests/bug48228.phpt
+++ b/Zend/tests/bug48228.phpt
@@ -23,7 +23,6 @@ $l_aa=new aa();
$l_aa->dosome();
?>
--EXPECTF--
-
Fatal error: Uncaught Exception in %s
Stack trace:
#0 %s(%d): do_throw()
diff --git a/Zend/tests/bug48408.phpt b/Zend/tests/bug48408.phpt
index 7ae32a5d48..3315f40962 100644
--- a/Zend/tests/bug48408.phpt
+++ b/Zend/tests/bug48408.phpt
@@ -22,7 +22,6 @@ catch(Exception $e){
}
?>
--EXPECTF--
-
Fatal error: Uncaught Exception in %s
Stack trace:
#0 %s(%d): C->generate(0)
diff --git a/Zend/tests/bug50394.phpt b/Zend/tests/bug50394.phpt
index 4e6c9761dd..60b9d34582 100644
--- a/Zend/tests/bug50394.phpt
+++ b/Zend/tests/bug50394.phpt
@@ -21,4 +21,3 @@ var_dump($arg);
bar called!
bar called!
int(3)
-
diff --git a/Zend/tests/bug51176.phpt b/Zend/tests/bug51176.phpt
index 272ba1286f..c5185cc5fa 100644
--- a/Zend/tests/bug51176.phpt
+++ b/Zend/tests/bug51176.phpt
@@ -29,4 +29,4 @@ $foo->start();
--EXPECT--
instance
instance
-instance \ No newline at end of file
+instance
diff --git a/Zend/tests/bug52237.phpt b/Zend/tests/bug52237.phpt
index 47d39f8e9d..44f8f3f688 100644
--- a/Zend/tests/bug52237.phpt
+++ b/Zend/tests/bug52237.phpt
@@ -7,6 +7,5 @@ preg_match('//', '', $data->info);
var_dump($data);
?>
--EXPECTF--
-
Warning: Attempt to modify property 'info' of non-object in %sbug52237.php on line 3
string(4) "test"
diff --git a/Zend/tests/bug52361.phpt b/Zend/tests/bug52361.phpt
index 4159ac0b8c..74ed8a8d17 100644
--- a/Zend/tests/bug52361.phpt
+++ b/Zend/tests/bug52361.phpt
@@ -32,4 +32,3 @@ Stack trace:
Stack trace:
#0 %sbug52361.php(16): bbb()
#1 {main}
-
diff --git a/Zend/tests/bug53971.phpt b/Zend/tests/bug53971.phpt
index a1e66cc51e..60e9c3d81f 100644
--- a/Zend/tests/bug53971.phpt
+++ b/Zend/tests/bug53971.phpt
@@ -7,5 +7,3 @@ var_dump(isset($s[0][0]));
?>
--EXPECT--
bool(false)
-
-
diff --git a/Zend/tests/bug54265.phpt b/Zend/tests/bug54265.phpt
index 43db028a2a..417e1b5564 100644
--- a/Zend/tests/bug54265.phpt
+++ b/Zend/tests/bug54265.phpt
@@ -14,4 +14,3 @@ echo "ok\n";
--EXPECT--
EROOR: Creating default object from empty value
ok
-
diff --git a/Zend/tests/bug60536_001.phpt b/Zend/tests/bug60536_001.phpt
index 37a5a6d813..0847b81d40 100644
--- a/Zend/tests/bug60536_001.phpt
+++ b/Zend/tests/bug60536_001.phpt
@@ -22,6 +22,5 @@ $a->__construct();
echo "DONE";
?>
--EXPECTF--
-
Notice: Undefined property: Z::$x in %s on line 14
DONE
diff --git a/Zend/tests/bug60738_variation.phpt b/Zend/tests/bug60738_variation.phpt
index f9e2e73458..cf2ea607a0 100644
--- a/Zend/tests/bug60738_variation.phpt
+++ b/Zend/tests/bug60738_variation.phpt
@@ -20,4 +20,3 @@ Fatal error: Uncaught Exception: Exception! in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
-
diff --git a/Zend/tests/bug60833.phpt b/Zend/tests/bug60833.phpt
index deb6c0f691..fee6d01362 100644
--- a/Zend/tests/bug60833.phpt
+++ b/Zend/tests/bug60833.phpt
@@ -37,4 +37,3 @@ object(B)#%d (4) {
["v4"]=>
string(1) "B"
}
-
diff --git a/Zend/tests/bug61970_1.phpt b/Zend/tests/bug61970_1.phpt
index 978884adba..15dc781385 100644
--- a/Zend/tests/bug61970_1.phpt
+++ b/Zend/tests/bug61970_1.phpt
@@ -10,6 +10,5 @@ abstract class Foo {
class Bar extends Foo {
protected function __construct(){}
}
-
--EXPECTF--
Fatal error: Access level to Bar::__construct() must be public (as in class Foo) in %s
diff --git a/Zend/tests/bug61970_2.phpt b/Zend/tests/bug61970_2.phpt
index 56203f7685..d1e11e9407 100644
--- a/Zend/tests/bug61970_2.phpt
+++ b/Zend/tests/bug61970_2.phpt
@@ -14,6 +14,5 @@ class Bar extends Foo {
class Baz extends Bar {
protected function __construct(){}
}
-
--EXPECTF--
Fatal error: Access level to Baz::__construct() must be public (as in class Bar) in %s
diff --git a/Zend/tests/bug62441.phpt b/Zend/tests/bug62441.phpt
index fba76cb290..581c0dad68 100644
--- a/Zend/tests/bug62441.phpt
+++ b/Zend/tests/bug62441.phpt
@@ -17,4 +17,3 @@ namespace ns {
?>
--EXPECTF--
Fatal error: Declaration of ns\Foo::method(ns\stdClass $o) must be compatible with Iface::method(stdClass $o) in %s on line %d
-
diff --git a/Zend/tests/bug63111.phpt b/Zend/tests/bug63111.phpt
index 3ac4618aea..077e350bc2 100644
--- a/Zend/tests/bug63111.phpt
+++ b/Zend/tests/bug63111.phpt
@@ -35,4 +35,3 @@ Fatal error: Uncaught Error: Cannot call abstract method Foo::bar() in %sbug6311
Stack trace:
#0 {main}
thrown in %sbug63111.php on line 20
-
diff --git a/Zend/tests/bug63462.phpt b/Zend/tests/bug63462.phpt
index 6e60d12d43..45c9507bba 100644
--- a/Zend/tests/bug63462.phpt
+++ b/Zend/tests/bug63462.phpt
@@ -49,7 +49,6 @@ $test->protectedProperty = 'value';
$test->privateProperty = 'value';
?>
-
--EXPECTF--
__get nonExisting
@@ -71,4 +70,3 @@ __set nonExisting
__set publicProperty
__set protectedProperty
__set privateProperty
-
diff --git a/Zend/tests/bug63468.phpt b/Zend/tests/bug63468.phpt
index 00b5a41c90..02c3c06c17 100644
--- a/Zend/tests/bug63468.phpt
+++ b/Zend/tests/bug63468.phpt
@@ -27,4 +27,3 @@ $x = new Bar;
var_dump($x->run());
--EXPECT--
string(3) "Bar"
-
diff --git a/Zend/tests/bug63762.phpt b/Zend/tests/bug63762.phpt
index 8de177dcf8..d848b74f55 100644
--- a/Zend/tests/bug63762.phpt
+++ b/Zend/tests/bug63762.phpt
@@ -50,4 +50,3 @@ Warning: Value for function is no string in %s on line %d
Warning: args element is no array in %s on line %d
string(60) "#0 [unknown function][unknown][unknown][unknown]()
#1 {main}"
-
diff --git a/Zend/tests/bug64417.phpt b/Zend/tests/bug64417.phpt
index f3ef740b43..9b192f31b5 100644
--- a/Zend/tests/bug64417.phpt
+++ b/Zend/tests/bug64417.phpt
@@ -36,4 +36,3 @@ $o['x'] = 1;
echo $o['x'], "\n";
--EXPECT--
2
-
diff --git a/Zend/tests/bug64660.phpt b/Zend/tests/bug64660.phpt
index e2b89da1cd..f8611ae9d9 100644
--- a/Zend/tests/bug64660.phpt
+++ b/Zend/tests/bug64660.phpt
@@ -7,5 +7,4 @@ function a() {
}
echo "Done\n";
--EXPECTF--
-
Parse error: memory exhausted in %s on line %d
diff --git a/Zend/tests/bug65419.phpt b/Zend/tests/bug65419.phpt
index c10a518376..0472f64de7 100644
--- a/Zend/tests/bug65419.phpt
+++ b/Zend/tests/bug65419.phpt
@@ -20,4 +20,4 @@ ghi::def();
?>
--EXPECT--
ghi
-ghi \ No newline at end of file
+ghi
diff --git a/Zend/tests/bug67436/bug67436.phpt b/Zend/tests/bug67436/bug67436.phpt
index 2bd06a0745..0ef339dc47 100644
--- a/Zend/tests/bug67436/bug67436.phpt
+++ b/Zend/tests/bug67436/bug67436.phpt
@@ -1,9 +1,7 @@
--TEST--
bug67436: Autoloader isn't called if user defined error handler is present
-
--INI--
error_reporting=-1
-
--FILE--
<?php
@@ -20,7 +18,6 @@ a::staticTest();
$b = new b();
$b->test();
-
--EXPECT--
b::test()
a::test(c::TESTCONSTANT)
diff --git a/Zend/tests/bug67436/bug67436_nohandler.phpt b/Zend/tests/bug67436/bug67436_nohandler.phpt
index 088761e00b..74ea394f5d 100644
--- a/Zend/tests/bug67436/bug67436_nohandler.phpt
+++ b/Zend/tests/bug67436/bug67436_nohandler.phpt
@@ -13,7 +13,6 @@ a::staticTest();
$b = new b();
$b->test();
-
--EXPECTF--
Warning: Declaration of b::test() should be compatible with a::test($arg = c::TESTCONSTANT) in %s%ebug67436%eb.inc on line %d
b::test()
diff --git a/Zend/tests/bug68446.phpt b/Zend/tests/bug68446.phpt
index 994699e5de..9648966691 100644
--- a/Zend/tests/bug68446.phpt
+++ b/Zend/tests/bug68446.phpt
@@ -37,4 +37,3 @@ Stack trace:
#0 %s(%d): a(NULL)
#1 {main}
thrown in %s on line %d
-
diff --git a/Zend/tests/bug69092.2.phpt b/Zend/tests/bug69092.2.phpt
index b3f4bff175..d19116c598 100644
--- a/Zend/tests/bug69092.2.phpt
+++ b/Zend/tests/bug69092.2.phpt
@@ -15,4 +15,4 @@ echo "Bye"
--EXPECTF--
Warning: declare(encoding=...) ignored because Zend multibyte feature is turned off by settings in %s on line %d
-Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d \ No newline at end of file
+Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d
diff --git a/Zend/tests/bug69092.phpt b/Zend/tests/bug69092.phpt
index 1963d7be02..d80954b16f 100644
--- a/Zend/tests/bug69092.phpt
+++ b/Zend/tests/bug69092.phpt
@@ -19,4 +19,4 @@ function foo() {
echo "Bye"
?>
--EXPECTF--
-Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d \ No newline at end of file
+Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d
diff --git a/Zend/tests/bug69315.phpt b/Zend/tests/bug69315.phpt
index 71dac4298f..296e3bb9c6 100644
--- a/Zend/tests/bug69315.phpt
+++ b/Zend/tests/bug69315.phpt
@@ -12,7 +12,6 @@ var_dump(defined("PHP_VERSION"));
var_dump(constant("PHP_VERSION"));
var_dump(call_user_func("strlen"));
var_dump(is_string("xxx"));
-
--EXPECTF--
bool(false)
bool(true)
diff --git a/Zend/tests/bug69537.phpt b/Zend/tests/bug69537.phpt
index 3151c35081..e2c79b9afe 100644
--- a/Zend/tests/bug69537.phpt
+++ b/Zend/tests/bug69537.phpt
@@ -16,4 +16,3 @@ object(Foo)#%d (%d) {
[""]=>
int(1)
}
-
diff --git a/Zend/tests/bug69732.phpt b/Zend/tests/bug69732.phpt
index 06dd5389dd..f5571627fe 100644
--- a/Zend/tests/bug69732.phpt
+++ b/Zend/tests/bug69732.phpt
@@ -28,4 +28,3 @@ Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in
Stack trace:
#0 {main}
thrown in %s on line %d
-
diff --git a/Zend/tests/bug69825.phpt b/Zend/tests/bug69825.phpt
index 1349dee5ae..18bd9cc5d7 100644
--- a/Zend/tests/bug69825.phpt
+++ b/Zend/tests/bug69825.phpt
@@ -27,4 +27,3 @@ bool(true)
bool(false)
bool(true)
bool(true)
-
diff --git a/Zend/tests/bug69832.phpt b/Zend/tests/bug69832.phpt
index 2617c7b24d..5ad88d94bc 100644
--- a/Zend/tests/bug69832.phpt
+++ b/Zend/tests/bug69832.phpt
@@ -29,4 +29,3 @@ string(4) "Test"
bool(true)
int(1)
string(4) "Test"
-
diff --git a/Zend/tests/bug69889.phpt b/Zend/tests/bug69889.phpt
index 8aae7c16f7..dd555ab407 100644
--- a/Zend/tests/bug69889.phpt
+++ b/Zend/tests/bug69889.phpt
@@ -19,4 +19,3 @@ string(7) "default"
string(7) "default"
string(7) "default"
string(7) "default"
-
diff --git a/Zend/tests/bug69957.phpt b/Zend/tests/bug69957.phpt
index d578f9c8d2..01b024e778 100644
--- a/Zend/tests/bug69957.phpt
+++ b/Zend/tests/bug69957.phpt
@@ -81,4 +81,3 @@ float(INF)
Double mod
Type: DivisionByZeroError
Message: Modulo by zero
-
diff --git a/Zend/tests/bug70083.phpt b/Zend/tests/bug70083.phpt
index 0391ea2327..6b20eabb39 100644
--- a/Zend/tests/bug70083.phpt
+++ b/Zend/tests/bug70083.phpt
@@ -18,9 +18,7 @@ var_dump($foo);
?>
--EXPECTF--
-
Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
-
diff --git a/Zend/tests/bug71428.1.phpt b/Zend/tests/bug71428.1.phpt
index e4d3a22f67..2e9a52d3d0 100644
--- a/Zend/tests/bug71428.1.phpt
+++ b/Zend/tests/bug71428.1.phpt
@@ -10,4 +10,3 @@ class B extends A {
}
--EXPECTF--
Warning: Declaration of B::m(array $a = Array) should be compatible with A::m(?array $a = NULL) in %sbug71428.1.php on line 7
-
diff --git a/Zend/tests/bug71428.2.phpt b/Zend/tests/bug71428.2.phpt
index 9a98ba7760..9fc15fc8c5 100644
--- a/Zend/tests/bug71428.2.phpt
+++ b/Zend/tests/bug71428.2.phpt
@@ -20,4 +20,3 @@ echo "ok";
?>
--EXPECT--
ok
-
diff --git a/Zend/tests/bug71428.3.phpt b/Zend/tests/bug71428.3.phpt
index 558e87c56e..78fff6e70d 100644
--- a/Zend/tests/bug71428.3.phpt
+++ b/Zend/tests/bug71428.3.phpt
@@ -8,4 +8,3 @@ class C extends B { public function m(A $a , $n) { echo "C.m";} };
?>
--EXPECTF--
Warning: Declaration of C::m(A $a, $n) should be compatible with B::m(?A $a, $n) in %sbug71428.3.php on line 4
-
diff --git a/Zend/tests/bug71539_6.phpt b/Zend/tests/bug71539_6.phpt
index 2bf4f6b1e0..d690538595 100644
--- a/Zend/tests/bug71539_6.phpt
+++ b/Zend/tests/bug71539_6.phpt
@@ -12,4 +12,4 @@ for ($i = 0; $i < 100000; $i++) {
?>
OK
--EXPECT--
-OK \ No newline at end of file
+OK
diff --git a/Zend/tests/bug71572.phpt b/Zend/tests/bug71572.phpt
index 4a823ec72f..4eb16246a1 100644
--- a/Zend/tests/bug71572.phpt
+++ b/Zend/tests/bug71572.phpt
@@ -24,4 +24,4 @@ NULL
Warning: Cannot assign an empty string to a string offset in %s on line %d
NULL
string(3) "abc"
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/Zend/tests/bug72038.phpt b/Zend/tests/bug72038.phpt
index 1e32af4c18..9ce82268c1 100644
--- a/Zend/tests/bug72038.phpt
+++ b/Zend/tests/bug72038.phpt
@@ -16,7 +16,6 @@ function test(&$param) {
?>
--EXPECTF--
-
Notice: Only variables should be passed by reference in %s on line %d
object(stdClass)#1 (0) {
}
@@ -24,4 +23,3 @@ object(stdClass)#1 (0) {
Notice: Only variables should be passed by reference in %s on line %d
int(2)
int(1)
-
diff --git a/Zend/tests/bug72057.phpt b/Zend/tests/bug72057.phpt
index e1a129bbc2..406efe3efc 100644
--- a/Zend/tests/bug72057.phpt
+++ b/Zend/tests/bug72057.phpt
@@ -10,9 +10,7 @@ set_error_handler(
);
(function (int $i) { bar(); })("7as");
-
--EXPECTF--
-
Fatal error: Uncaught Exception: My custom error in %s:%d
Stack trace:
#0 %s(%d): {closure}(8, 'A non well form...', '%s', %d, Array)
diff --git a/Zend/tests/bug72119.phpt b/Zend/tests/bug72119.phpt
index 064381ada0..7afac3cd5b 100644
--- a/Zend/tests/bug72119.phpt
+++ b/Zend/tests/bug72119.phpt
@@ -16,4 +16,3 @@ echo "OK\n";
?>
--EXPECTF--
Fatal error: Declaration of Hello::bar(array $baz = Array) must be compatible with Foo::bar(?array $baz = NULL) in %s on line %d
-
diff --git a/Zend/tests/bug73998.phpt b/Zend/tests/bug73998.phpt
index 41813269d1..72d1e59924 100644
--- a/Zend/tests/bug73998.phpt
+++ b/Zend/tests/bug73998.phpt
@@ -16,4 +16,3 @@ echo "Value: {$properties[1234]}\n";
--EXPECT--
bool(true)
Value: Numeric
-
diff --git a/Zend/tests/bug74657.phpt b/Zend/tests/bug74657.phpt
index 41e28ce58b..4c84bde7bd 100644
--- a/Zend/tests/bug74657.phpt
+++ b/Zend/tests/bug74657.phpt
@@ -23,4 +23,3 @@ Fatal error: Uncaught Error: Undefined class constant 'I::FOO' in %sbug74657.php
Stack trace:
#0 {main}
thrown in %sbug74657.php on line %d
-
diff --git a/Zend/tests/bug75290.phpt b/Zend/tests/bug75290.phpt
index 416af065c6..3b28e621d2 100644
--- a/Zend/tests/bug75290.phpt
+++ b/Zend/tests/bug75290.phpt
@@ -23,4 +23,3 @@ object(Closure)#2 (1) {
string(10) "<required>"
}
}
-
diff --git a/Zend/tests/bug75420.2.phpt b/Zend/tests/bug75420.2.phpt
index 3e7a63ffed..994327d195 100644
--- a/Zend/tests/bug75420.2.phpt
+++ b/Zend/tests/bug75420.2.phpt
@@ -17,4 +17,3 @@ var_dump($name);
string(6) "foofoo"
int(42)
int(24)
-
diff --git a/Zend/tests/call_static.phpt b/Zend/tests/call_static.phpt
index c37bc72230..355a1570f3 100644
--- a/Zend/tests/call_static.phpt
+++ b/Zend/tests/call_static.phpt
@@ -13,7 +13,6 @@ class Test
call_user_func("Test::Two", 'A', 'B');
call_user_func(array("Test", "Three"), NULL, 0, false);
Test::Four(5, 6, 7, 8);
-
--EXPECT--
Two() called with 2 arguments
Three() called with 3 arguments
diff --git a/Zend/tests/class_alias_004.phpt b/Zend/tests/class_alias_004.phpt
index f99152c96a..ea3501ed57 100644
--- a/Zend/tests/class_alias_004.phpt
+++ b/Zend/tests/class_alias_004.phpt
@@ -12,4 +12,4 @@ class_alias('foo', 'test');
?>
--EXPECTF--
-Warning: Cannot declare class test, because the name is already in use in %s on line %d \ No newline at end of file
+Warning: Cannot declare class test, because the name is already in use in %s on line %d
diff --git a/Zend/tests/closure_012.phpt b/Zend/tests/closure_012.phpt
index 7e1b7a2793..bae8f56878 100644
--- a/Zend/tests/closure_012.phpt
+++ b/Zend/tests/closure_012.phpt
@@ -21,4 +21,3 @@ Notice: Undefined variable: i in %sclosure_012.php on line 2
Notice: Undefined variable: i in %sclosure_012.php on line 7
NULL
int(2)
-
diff --git a/Zend/tests/closure_022.phpt b/Zend/tests/closure_022.phpt
index b1ffebc0b4..8977e963df 100644
--- a/Zend/tests/closure_022.phpt
+++ b/Zend/tests/closure_022.phpt
@@ -12,4 +12,3 @@ Fatal error: Uncaught Error: Closure object cannot have properties in %sclosure_
Stack trace:
#0 {main}
thrown in %sclosure_022.php on line 5
-
diff --git a/Zend/tests/closure_023.phpt b/Zend/tests/closure_023.phpt
index 634fb6dd50..a91d357c06 100644
--- a/Zend/tests/closure_023.phpt
+++ b/Zend/tests/closure_023.phpt
@@ -11,4 +11,3 @@ class foo {
foo::bar();
--EXPECT--
Done
-
diff --git a/Zend/tests/closure_024.phpt b/Zend/tests/closure_024.phpt
index 68fd29c687..39f0062fec 100644
--- a/Zend/tests/closure_024.phpt
+++ b/Zend/tests/closure_024.phpt
@@ -23,4 +23,4 @@ echo "Done.\n";
11
12
12
-Done. \ No newline at end of file
+Done.
diff --git a/Zend/tests/closure_031.phpt b/Zend/tests/closure_031.phpt
index 241ddb42cd..042bf8c145 100644
--- a/Zend/tests/closure_031.phpt
+++ b/Zend/tests/closure_031.phpt
@@ -16,4 +16,3 @@ try {
?>
--EXPECT--
Error: Closure object cannot have properties
-
diff --git a/Zend/tests/closure_032.phpt b/Zend/tests/closure_032.phpt
index 412a923a38..601db15989 100644
--- a/Zend/tests/closure_032.phpt
+++ b/Zend/tests/closure_032.phpt
@@ -67,4 +67,3 @@ Array
)
#0 {closure}(23) called at [%s:%d]
#1 test(Closure Object ()) called at [%s:%d]
-
diff --git a/Zend/tests/closure_036.phpt b/Zend/tests/closure_036.phpt
index f71188cd08..9123a1ba47 100644
--- a/Zend/tests/closure_036.phpt
+++ b/Zend/tests/closure_036.phpt
@@ -30,4 +30,4 @@ var_dump($cb2());
--EXPECT--
int(1)
int(11)
-int(12) \ No newline at end of file
+int(12)
diff --git a/Zend/tests/closure_037.phpt b/Zend/tests/closure_037.phpt
index cabd99bfac..1257d6bc7e 100644
--- a/Zend/tests/closure_037.phpt
+++ b/Zend/tests/closure_037.phpt
@@ -44,4 +44,4 @@ Done.
1
42
forty two
-Done. \ No newline at end of file
+Done.
diff --git a/Zend/tests/closure_041.phpt b/Zend/tests/closure_041.phpt
index a7e9eab482..33cf03b14c 100644
--- a/Zend/tests/closure_041.phpt
+++ b/Zend/tests/closure_041.phpt
@@ -63,7 +63,6 @@ $d = $nonstaticUnscoped->bindTo(new B); $d(); echo " (should be scoped to dummy
$d = $nonstaticScoped->bindTo(new B); $d(); echo "\n";
echo "Done.\n";
-
--EXPECTF--
Before binding
scoped to A: bool(false)
diff --git a/Zend/tests/closure_043.phpt b/Zend/tests/closure_043.phpt
index 92b96575b5..2390aa153b 100644
--- a/Zend/tests/closure_043.phpt
+++ b/Zend/tests/closure_043.phpt
@@ -38,7 +38,6 @@ $d = $staticUnscoped->bindTo(new A, 'A');
$d = $staticScoped->bindTo(new A, 'A');
echo "Done.\n";
-
--EXPECTF--
Before binding
bool(false)
diff --git a/Zend/tests/closure_044.phpt b/Zend/tests/closure_044.phpt
index b8da50049a..c71204b130 100644
--- a/Zend/tests/closure_044.phpt
+++ b/Zend/tests/closure_044.phpt
@@ -38,7 +38,6 @@ $d = $nonstaticUnscoped->bindTo(new A, 'A'); $d(); echo "\n";
$d = $nonstaticScoped->bindTo(new A, 'A'); $d(); echo "\n";
echo "Done.\n";
-
--EXPECT--
Before binding
bool(false)
diff --git a/Zend/tests/closure_045.phpt b/Zend/tests/closure_045.phpt
index c309e3c533..2b99476678 100644
--- a/Zend/tests/closure_045.phpt
+++ b/Zend/tests/closure_045.phpt
@@ -13,6 +13,5 @@ $a = A::foo();
$a->bindTo(new A);
echo "Done.\n";
-
--EXPECT--
Done.
diff --git a/Zend/tests/closure_046.phpt b/Zend/tests/closure_046.phpt
index 4e2542b7c0..ef8aff4bbc 100644
--- a/Zend/tests/closure_046.phpt
+++ b/Zend/tests/closure_046.phpt
@@ -38,7 +38,6 @@ echo "After binding, with different instance for the bound one", "\n";
$d = $nonstaticScoped->bindTo(new B, "static"); $d(); echo "\n";
echo "Done.\n";
-
--EXPECT--
Before binding
bool(false)
diff --git a/Zend/tests/closure_049.phpt b/Zend/tests/closure_049.phpt
index 684b33d564..c5ed917f16 100644
--- a/Zend/tests/closure_049.phpt
+++ b/Zend/tests/closure_049.phpt
@@ -1,6 +1,5 @@
--TEST--
Closure 049: static::class in static closure in non-static method.
-
--FILE--
<?php
diff --git a/Zend/tests/closure_050.phpt b/Zend/tests/closure_050.phpt
index d43f325ef1..1ab0c3fa58 100644
--- a/Zend/tests/closure_050.phpt
+++ b/Zend/tests/closure_050.phpt
@@ -1,6 +1,5 @@
--TEST--
Closure 050: static::class in non-static closure in non-static method.
-
--FILE--
<?php
@@ -17,6 +16,5 @@ class B extends A {}
$b = new B;
var_dump($b->foo());
-
--EXPECT--
string(1) "B"
diff --git a/Zend/tests/closure_051.phpt b/Zend/tests/closure_051.phpt
index 78b28d74a3..ab514123c0 100644
--- a/Zend/tests/closure_051.phpt
+++ b/Zend/tests/closure_051.phpt
@@ -1,6 +1,5 @@
--TEST--
Closure 051: static::class in static closure in static method.
-
--FILE--
<?php
@@ -16,6 +15,5 @@ class A {
class B extends A {}
var_dump(B::foo());
-
--EXPECT--
string(1) "B"
diff --git a/Zend/tests/closure_052.phpt b/Zend/tests/closure_052.phpt
index f878515a82..5550cc92dc 100644
--- a/Zend/tests/closure_052.phpt
+++ b/Zend/tests/closure_052.phpt
@@ -1,6 +1,5 @@
--TEST--
Closure 052: static::class in non-static closure in static method.
-
--FILE--
<?php
@@ -16,6 +15,5 @@ class A {
class B extends A {}
var_dump(B::foo());
-
--EXPECT--
string(1) "B"
diff --git a/Zend/tests/closure_053.phpt b/Zend/tests/closure_053.phpt
index b1d76a2561..65c65ae08a 100644
--- a/Zend/tests/closure_053.phpt
+++ b/Zend/tests/closure_053.phpt
@@ -1,6 +1,5 @@
--TEST--
Closure 053: self::class in static closure in non-static method.
-
--FILE--
<?php
@@ -17,6 +16,5 @@ class B extends A {}
$b = new B;
var_dump($b->foo());
-
--EXPECT--
string(1) "A"
diff --git a/Zend/tests/closure_054.phpt b/Zend/tests/closure_054.phpt
index b2f87d1d61..87c46d7a19 100644
--- a/Zend/tests/closure_054.phpt
+++ b/Zend/tests/closure_054.phpt
@@ -1,6 +1,5 @@
--TEST--
Closure 054: self::class in non-static closure in non-static method.
-
--FILE--
<?php
@@ -17,6 +16,5 @@ class B extends A {}
$b = new B;
var_dump($b->foo());
-
--EXPECT--
string(1) "A"
diff --git a/Zend/tests/closure_055.phpt b/Zend/tests/closure_055.phpt
index 047d72a89b..2dc1d47103 100644
--- a/Zend/tests/closure_055.phpt
+++ b/Zend/tests/closure_055.phpt
@@ -1,6 +1,5 @@
--TEST--
Closure 055: self::class in static closure in static method.
-
--FILE--
<?php
@@ -16,6 +15,5 @@ class A {
class B extends A {}
var_dump(B::foo());
-
--EXPECT--
string(1) "A"
diff --git a/Zend/tests/closure_056.phpt b/Zend/tests/closure_056.phpt
index 566de10d83..d1fa848ee6 100644
--- a/Zend/tests/closure_056.phpt
+++ b/Zend/tests/closure_056.phpt
@@ -1,6 +1,5 @@
--TEST--
Closure 056: self::class in non-static closure in static method.
-
--FILE--
<?php
@@ -16,6 +15,5 @@ class A {
class B extends A {}
var_dump(B::foo());
-
--EXPECT--
string(1) "A"
diff --git a/Zend/tests/closure_bug66622.phpt b/Zend/tests/closure_bug66622.phpt
index 1c9577d688..44bbcbaa8d 100644
--- a/Zend/tests/closure_bug66622.phpt
+++ b/Zend/tests/closure_bug66622.phpt
@@ -1,6 +1,5 @@
--TEST--
Bug 66622: Closures do not correctly capture the late bound class (static::) in some cases
-
--FILE--
<?php
class A {
@@ -29,7 +28,6 @@ function test() {
B::baz();
}
test();
-
--EXPECT--
B vs B
B vs B
diff --git a/Zend/tests/closures/closure_from_callable_basic.phpt b/Zend/tests/closures/closure_from_callable_basic.phpt
index 2561bbfaa6..0aacaf2ff5 100644
--- a/Zend/tests/closures/closure_from_callable_basic.phpt
+++ b/Zend/tests/closures/closure_from_callable_basic.phpt
@@ -98,7 +98,6 @@ echo $fn(" OK".PHP_EOL);
?>
===DONE===
--EXPECT--
-
Access public static function OK
Access public static function with different case OK
Access public static function with colon scheme OK
diff --git a/Zend/tests/closures/closure_from_callable_error.phpt b/Zend/tests/closures/closure_from_callable_error.phpt
index d9db90bcad..c6e4a7e0bb 100644
--- a/Zend/tests/closures/closure_from_callable_error.phpt
+++ b/Zend/tests/closures/closure_from_callable_error.phpt
@@ -195,7 +195,6 @@ echo "OK\n";
?>
===DONE===
--EXPECT--
-
Cannot access privateInstance method statically
Cannot access privateInstance method statically with colon scheme
Cannot access privateInstance method
diff --git a/Zend/tests/concat_001.phpt b/Zend/tests/concat_001.phpt
index 805478a0cf..1e657954a9 100644
--- a/Zend/tests/concat_001.phpt
+++ b/Zend/tests/concat_001.phpt
@@ -50,7 +50,6 @@ var_dump($d.$d);
echo "Done\n";
?>
--EXPECTF--
-
Notice: Array to string conversion in %sconcat_001.php on line %d
string(24) "Arraythis is test object"
diff --git a/Zend/tests/concat_002.phpt b/Zend/tests/concat_002.phpt
index 4ec4f1fb32..c9f749518d 100644
--- a/Zend/tests/concat_002.phpt
+++ b/Zend/tests/concat_002.phpt
@@ -21,4 +21,3 @@ echo "Done\n";
--EXPECT--
int(33554432)
Done
-
diff --git a/Zend/tests/const_dereference_002.phpt b/Zend/tests/const_dereference_002.phpt
index ff89519755..1320029baa 100644
--- a/Zend/tests/const_dereference_002.phpt
+++ b/Zend/tests/const_dereference_002.phpt
@@ -7,7 +7,6 @@ error_reporting(E_ALL);
var_dump("foobar"[3]);
var_dump("foobar"[2][0]);
var_dump("foobar"["foo"]["bar"]);
-
--EXPECTF--
string(1) "b"
string(1) "o"
diff --git a/Zend/tests/constant_arrays.phpt b/Zend/tests/constant_arrays.phpt
index 9e099e33fc..06d911328c 100644
--- a/Zend/tests/constant_arrays.phpt
+++ b/Zend/tests/constant_arrays.phpt
@@ -30,7 +30,6 @@ var_dump(define('ELEPHPANT', [new StdClass]));
$recursive = [];
$recursive[0] = &$recursive;
var_dump(define('RECURSION', $recursive));
-
--EXPECTF--
array(4) {
[0]=>
diff --git a/Zend/tests/constant_expressions_coalesce_empty_dim.phpt b/Zend/tests/constant_expressions_coalesce_empty_dim.phpt
index 56ee43b789..b69637c98d 100644
--- a/Zend/tests/constant_expressions_coalesce_empty_dim.phpt
+++ b/Zend/tests/constant_expressions_coalesce_empty_dim.phpt
@@ -8,4 +8,3 @@ const A = [][] ?? 1;
?>
--EXPECTF--
Fatal error: Cannot use [] for reading in %s.php on line %d
-
diff --git a/Zend/tests/constant_expressions_dynamic.phpt b/Zend/tests/constant_expressions_dynamic.phpt
index 686dcc1d11..79f8c772e3 100644
--- a/Zend/tests/constant_expressions_dynamic.phpt
+++ b/Zend/tests/constant_expressions_dynamic.phpt
@@ -45,7 +45,6 @@ var_dump(
?>
--EXPECTF--
-
Warning: A non-numeric value encountered in %s on line %d
int(3)
string(4) "1foo"
diff --git a/Zend/tests/constant_expressions_self_referencing_array.phpt b/Zend/tests/constant_expressions_self_referencing_array.phpt
index c584b5d503..daa7250641 100644
--- a/Zend/tests/constant_expressions_self_referencing_array.phpt
+++ b/Zend/tests/constant_expressions_self_referencing_array.phpt
@@ -13,4 +13,3 @@ Fatal error: Uncaught Error: Cannot declare self-referencing constant 'self::BAR
Stack trace:
#0 {main}
thrown in %s on line %d
-
diff --git a/Zend/tests/debug_backtrace_with_include_and_this.phpt b/Zend/tests/debug_backtrace_with_include_and_this.phpt
index 7cc868105a..5d58279eb5 100644
--- a/Zend/tests/debug_backtrace_with_include_and_this.phpt
+++ b/Zend/tests/debug_backtrace_with_include_and_this.phpt
@@ -36,4 +36,3 @@ Stack trace:
#0 %s(%d): CL->load('class://non.exi...')
#1 {main}
thrown in %s on line %d
-
diff --git a/Zend/tests/declare_006.phpt b/Zend/tests/declare_006.phpt
index af86c5b165..6d41c0d7d6 100644
--- a/Zend/tests/declare_006.phpt
+++ b/Zend/tests/declare_006.phpt
@@ -6,5 +6,4 @@ declare(ticks = UNKNOWN_CONST) {
echo 'Done';
}
--EXPECTF--
-
Fatal error: declare(ticks) value must be a literal in %sdeclare_006.php on line 2
diff --git a/Zend/tests/errmsg_018.phpt b/Zend/tests/errmsg_018.phpt
index b803499e50..fd34c8031e 100644
--- a/Zend/tests/errmsg_018.phpt
+++ b/Zend/tests/errmsg_018.phpt
@@ -10,5 +10,4 @@ class test {
echo "Done\n";
?>
--EXPECTF--
-
Fatal error: Class test contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (test::foo) in %s on line %d
diff --git a/Zend/tests/exception_003.phpt b/Zend/tests/exception_003.phpt
index 813246c5dd..b8efa94be0 100644
--- a/Zend/tests/exception_003.phpt
+++ b/Zend/tests/exception_003.phpt
@@ -7,7 +7,6 @@ throw new Exception(1);
?>
--EXPECTF--
-
Fatal error: Uncaught Exception: 1 in %s:%d
Stack trace:
#0 {main}
diff --git a/Zend/tests/flexible-heredoc-error1.phpt b/Zend/tests/flexible-heredoc-error1.phpt
index dc56d4f8ed..237386834b 100644
--- a/Zend/tests/flexible-heredoc-error1.phpt
+++ b/Zend/tests/flexible-heredoc-error1.phpt
@@ -11,4 +11,4 @@ echo <<<END
?>
--EXPECTF--
-Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d \ No newline at end of file
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error10.phpt b/Zend/tests/flexible-heredoc-error10.phpt
index 6b7fe9ee77..51be4562f1 100644
--- a/Zend/tests/flexible-heredoc-error10.phpt
+++ b/Zend/tests/flexible-heredoc-error10.phpt
@@ -10,4 +10,4 @@ $var
?>
--EXPECTF--
-Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line %d \ No newline at end of file
+Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error11.phpt b/Zend/tests/flexible-heredoc-error11.phpt
index 3e71cbd684..cd952a73f2 100644
--- a/Zend/tests/flexible-heredoc-error11.phpt
+++ b/Zend/tests/flexible-heredoc-error11.phpt
@@ -10,4 +10,4 @@ $a
?>
--EXPECTF--
-Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line 5 \ No newline at end of file
+Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line 5
diff --git a/Zend/tests/flexible-heredoc-error12.phpt b/Zend/tests/flexible-heredoc-error12.phpt
index 022c0811aa..05b71b36b2 100644
--- a/Zend/tests/flexible-heredoc-error12.phpt
+++ b/Zend/tests/flexible-heredoc-error12.phpt
@@ -10,4 +10,4 @@ echo <<<END
?>
--EXPECTF--
-Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line 5 \ No newline at end of file
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line 5
diff --git a/Zend/tests/flexible-heredoc-error13.phpt b/Zend/tests/flexible-heredoc-error13.phpt
index f26b04e460..46d6371b21 100644
--- a/Zend/tests/flexible-heredoc-error13.phpt
+++ b/Zend/tests/flexible-heredoc-error13.phpt
@@ -10,4 +10,4 @@ b
?>
--EXPECTF--
-Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line 5 \ No newline at end of file
+Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line 5
diff --git a/Zend/tests/flexible-heredoc-error2.phpt b/Zend/tests/flexible-heredoc-error2.phpt
index 28e4d74a10..ad410d6b2a 100644
--- a/Zend/tests/flexible-heredoc-error2.phpt
+++ b/Zend/tests/flexible-heredoc-error2.phpt
@@ -11,4 +11,4 @@ echo <<<END
?>
--EXPECTF--
-Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d \ No newline at end of file
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error3.phpt b/Zend/tests/flexible-heredoc-error3.phpt
index 751f6b7926..e0303f1924 100644
--- a/Zend/tests/flexible-heredoc-error3.phpt
+++ b/Zend/tests/flexible-heredoc-error3.phpt
@@ -11,4 +11,4 @@ echo <<<END
?>
--EXPECTF--
-Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d \ No newline at end of file
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error4.phpt b/Zend/tests/flexible-heredoc-error4.phpt
index 4542b015b8..db3454c9c0 100644
--- a/Zend/tests/flexible-heredoc-error4.phpt
+++ b/Zend/tests/flexible-heredoc-error4.phpt
@@ -11,4 +11,4 @@ echo <<<END
?>
--EXPECTF--
-Parse error: Invalid body indentation level (expecting an indentation level of at least 5) in %s on line %d \ No newline at end of file
+Parse error: Invalid body indentation level (expecting an indentation level of at least 5) in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error5.phpt b/Zend/tests/flexible-heredoc-error5.phpt
index fdd6e5c950..79102d76a4 100644
--- a/Zend/tests/flexible-heredoc-error5.phpt
+++ b/Zend/tests/flexible-heredoc-error5.phpt
@@ -8,4 +8,4 @@ echo <<<END
?>
--EXPECTF--
-Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d \ No newline at end of file
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error6.phpt b/Zend/tests/flexible-heredoc-error6.phpt
index c2daa72207..42fb36ddc9 100644
--- a/Zend/tests/flexible-heredoc-error6.phpt
+++ b/Zend/tests/flexible-heredoc-error6.phpt
@@ -7,4 +7,4 @@ Note: the closing ?> has been deliberately elided.
echo <<<END
--EXPECTF--
-Parse error: syntax error, unexpected end of file in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected end of file in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error7.phpt b/Zend/tests/flexible-heredoc-error7.phpt
index a8016547b1..ef52490305 100644
--- a/Zend/tests/flexible-heredoc-error7.phpt
+++ b/Zend/tests/flexible-heredoc-error7.phpt
@@ -6,6 +6,5 @@ Note: the closing ?> has been deliberately elided.
<?php
echo <<<END
-
--EXPECTF--
-Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error8.phpt b/Zend/tests/flexible-heredoc-error8.phpt
index 47e4457637..6140e273f4 100644
--- a/Zend/tests/flexible-heredoc-error8.phpt
+++ b/Zend/tests/flexible-heredoc-error8.phpt
@@ -9,4 +9,4 @@ Flexible heredoc syntax error 8: don't interpret \t as indentation
?>
--EXPECTF--
-Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line %d \ No newline at end of file
+Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-error9.phpt b/Zend/tests/flexible-heredoc-error9.phpt
index 70777f26d1..c98cc996c5 100644
--- a/Zend/tests/flexible-heredoc-error9.phpt
+++ b/Zend/tests/flexible-heredoc-error9.phpt
@@ -11,4 +11,4 @@ $var
?>
--EXPECTF--
-Parse error: Invalid body indentation level (expecting an indentation level of at least 2) in %s on line %d \ No newline at end of file
+Parse error: Invalid body indentation level (expecting an indentation level of at least 2) in %s on line %d
diff --git a/Zend/tests/flexible-heredoc-nowdoc.phpt b/Zend/tests/flexible-heredoc-nowdoc.phpt
index 9f4e19a34b..15d42a5be9 100644
--- a/Zend/tests/flexible-heredoc-nowdoc.phpt
+++ b/Zend/tests/flexible-heredoc-nowdoc.phpt
@@ -125,4 +125,4 @@ e
e
string(3) "Bar"
string(4) "
-Bar" \ No newline at end of file
+Bar"
diff --git a/Zend/tests/flexible-nowdoc-error1.phpt b/Zend/tests/flexible-nowdoc-error1.phpt
index 5c086d2abd..95627c0937 100644
--- a/Zend/tests/flexible-nowdoc-error1.phpt
+++ b/Zend/tests/flexible-nowdoc-error1.phpt
@@ -11,4 +11,4 @@ echo <<<'END'
?>
--EXPECTF--
-Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d \ No newline at end of file
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error2.phpt b/Zend/tests/flexible-nowdoc-error2.phpt
index e6bd544341..0cc7330464 100644
--- a/Zend/tests/flexible-nowdoc-error2.phpt
+++ b/Zend/tests/flexible-nowdoc-error2.phpt
@@ -11,4 +11,4 @@ echo <<<'END'
?>
--EXPECTF--
-Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d \ No newline at end of file
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error3.phpt b/Zend/tests/flexible-nowdoc-error3.phpt
index c50dd4fa4a..8d888df9ba 100644
--- a/Zend/tests/flexible-nowdoc-error3.phpt
+++ b/Zend/tests/flexible-nowdoc-error3.phpt
@@ -11,4 +11,4 @@ echo <<<'END'
?>
--EXPECTF--
-Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d \ No newline at end of file
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error4.phpt b/Zend/tests/flexible-nowdoc-error4.phpt
index 650a9a94f7..f8155656fc 100644
--- a/Zend/tests/flexible-nowdoc-error4.phpt
+++ b/Zend/tests/flexible-nowdoc-error4.phpt
@@ -11,4 +11,4 @@ echo <<<'END'
?>
--EXPECTF--
-Parse error: Invalid body indentation level (expecting an indentation level of at least 5) in %s on line %d \ No newline at end of file
+Parse error: Invalid body indentation level (expecting an indentation level of at least 5) in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error5.phpt b/Zend/tests/flexible-nowdoc-error5.phpt
index 7579c10b72..08c8fde79b 100644
--- a/Zend/tests/flexible-nowdoc-error5.phpt
+++ b/Zend/tests/flexible-nowdoc-error5.phpt
@@ -8,4 +8,4 @@ echo <<<'END'
?>
--EXPECTF--
-Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d \ No newline at end of file
+Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error6.phpt b/Zend/tests/flexible-nowdoc-error6.phpt
index e4f9ded844..4c4dc7f078 100644
--- a/Zend/tests/flexible-nowdoc-error6.phpt
+++ b/Zend/tests/flexible-nowdoc-error6.phpt
@@ -7,4 +7,4 @@ Note: the closing ?> has been deliberately elided.
echo <<<'END'
--EXPECTF--
-Parse error: syntax error, unexpected end of file in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected end of file in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error7.phpt b/Zend/tests/flexible-nowdoc-error7.phpt
index d2cdc86713..d68dab85b6 100644
--- a/Zend/tests/flexible-nowdoc-error7.phpt
+++ b/Zend/tests/flexible-nowdoc-error7.phpt
@@ -6,6 +6,5 @@ Note: the closing ?> has been deliberately elided.
<?php
echo <<<'END'
-
--EXPECTF--
-Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
diff --git a/Zend/tests/flexible-nowdoc-error8.phpt b/Zend/tests/flexible-nowdoc-error8.phpt
index 300b3b8d55..ba6a2b85d8 100644
--- a/Zend/tests/flexible-nowdoc-error8.phpt
+++ b/Zend/tests/flexible-nowdoc-error8.phpt
@@ -8,4 +8,4 @@ eval('<<<\'end\'
?>
--EXPECTF--
-Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
diff --git a/Zend/tests/foreach_012.phpt b/Zend/tests/foreach_012.phpt
index 5e5538cd4d..517e0ac943 100644
--- a/Zend/tests/foreach_012.phpt
+++ b/Zend/tests/foreach_012.phpt
@@ -15,4 +15,4 @@ foreach($a as &$v) {
2
3
14
-15 \ No newline at end of file
+15
diff --git a/Zend/tests/foreach_015.phpt b/Zend/tests/foreach_015.phpt
index adc8085f34..b7482b66a0 100644
--- a/Zend/tests/foreach_015.phpt
+++ b/Zend/tests/foreach_015.phpt
@@ -15,4 +15,4 @@ var_dump($a);
3
4
array(0) {
-} \ No newline at end of file
+}
diff --git a/Zend/tests/function_arguments/argument_count_correct.phpt b/Zend/tests/function_arguments/argument_count_correct.phpt
index 44a87b8ba8..9c73b93520 100644
--- a/Zend/tests/function_arguments/argument_count_correct.phpt
+++ b/Zend/tests/function_arguments/argument_count_correct.phpt
@@ -17,4 +17,4 @@ fclose($fp);
echo "done";
--EXPECT--
-done \ No newline at end of file
+done
diff --git a/Zend/tests/function_arguments/argument_count_correct_strict.phpt b/Zend/tests/function_arguments/argument_count_correct_strict.phpt
index bfce61f0c9..feed8b5964 100644
--- a/Zend/tests/function_arguments/argument_count_correct_strict.phpt
+++ b/Zend/tests/function_arguments/argument_count_correct_strict.phpt
@@ -17,4 +17,4 @@ fclose($fp);
echo "done";
--EXPECT--
-done \ No newline at end of file
+done
diff --git a/Zend/tests/function_arguments/argument_count_incorrect_internal.phpt b/Zend/tests/function_arguments/argument_count_incorrect_internal.phpt
index 9d8d8bb7db..a8ba71c0bf 100644
--- a/Zend/tests/function_arguments/argument_count_incorrect_internal.phpt
+++ b/Zend/tests/function_arguments/argument_count_incorrect_internal.phpt
@@ -7,4 +7,4 @@ array_diff([]);
--EXPECTF--
Warning: substr() expects at least 2 parameters, 1 given in %s
-Warning: array_diff(): at least 2 parameters are required, 1 given in %s \ No newline at end of file
+Warning: array_diff(): at least 2 parameters are required, 1 given in %s
diff --git a/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt b/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt
index 33748649da..8775bece88 100644
--- a/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt
+++ b/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt
@@ -15,4 +15,4 @@ array_diff([]);
ArgumentCountError
substr() expects at least 2 parameters, 1 given
-Warning: array_diff(): at least 2 parameters are required, 1 given in %s \ No newline at end of file
+Warning: array_diff(): at least 2 parameters are required, 1 given in %s
diff --git a/Zend/tests/function_arguments/argument_count_incorrect_userland.phpt b/Zend/tests/function_arguments/argument_count_incorrect_userland.phpt
index 97faa4eb5c..94525c85b7 100644
--- a/Zend/tests/function_arguments/argument_count_incorrect_userland.phpt
+++ b/Zend/tests/function_arguments/argument_count_incorrect_userland.phpt
@@ -41,4 +41,4 @@ Too few arguments to function bar(), 1 passed in %s and exactly 2 expected
ArgumentCountError
Too few arguments to function bat(), 1 passed in %s and exactly 2 expected
ArgumentCountError
-Too few arguments to function bat(), 1 passed in %s and exactly 2 expected \ No newline at end of file
+Too few arguments to function bat(), 1 passed in %s and exactly 2 expected
diff --git a/Zend/tests/function_arguments_001.phpt b/Zend/tests/function_arguments_001.phpt
index 8e3d34d31d..14f71afc0e 100644
--- a/Zend/tests/function_arguments_001.phpt
+++ b/Zend/tests/function_arguments_001.phpt
@@ -6,4 +6,3 @@ function foo($arg1 string) {}
?>
--EXPECTF--
Parse error: %s error, %s)%s in %sfunction_arguments_001.php on line %d
-
diff --git a/Zend/tests/function_arguments_002.phpt b/Zend/tests/function_arguments_002.phpt
index 1b5b7bd908..c9e5a6ec4a 100644
--- a/Zend/tests/function_arguments_002.phpt
+++ b/Zend/tests/function_arguments_002.phpt
@@ -6,4 +6,3 @@ function foo($arg1/) {}
?>
--EXPECTF--
Parse error: %s error, %s)%s in %sfunction_arguments_002.php on line %d
-
diff --git a/Zend/tests/function_exists_error.phpt b/Zend/tests/function_exists_error.phpt
index 8ce8a92885..f07ac53148 100644
--- a/Zend/tests/function_exists_error.phpt
+++ b/Zend/tests/function_exists_error.phpt
@@ -33,4 +33,3 @@ Too few arguments
Warning: function_exists() expects exactly 1 parameter, 0 given in %s on line %d
NULL
===Done===
-
diff --git a/Zend/tests/function_exists_variation1.phpt b/Zend/tests/function_exists_variation1.phpt
index fc26f1e80e..bd74e2f762 100644
--- a/Zend/tests/function_exists_variation1.phpt
+++ b/Zend/tests/function_exists_variation1.phpt
@@ -135,4 +135,4 @@ bool(false)
-- Iteration 22 --
bool(false)
===Done===
- \ No newline at end of file
+
diff --git a/Zend/tests/gc_038.phpt b/Zend/tests/gc_038.phpt
index 7bb7b7a08e..737025ae2d 100644
--- a/Zend/tests/gc_038.phpt
+++ b/Zend/tests/gc_038.phpt
@@ -130,4 +130,3 @@ test_concat();
^= 1
**= 1
.= 1
-
diff --git a/Zend/tests/generators/basic_yield_from_exception_handling.phpt b/Zend/tests/generators/basic_yield_from_exception_handling.phpt
index c696f6486d..6b622847cd 100644
--- a/Zend/tests/generators/basic_yield_from_exception_handling.phpt
+++ b/Zend/tests/generators/basic_yield_from_exception_handling.phpt
@@ -56,4 +56,3 @@ Exception: 4 in %s:%d
Stack trace:
#0 {main}
bool(false)
-
diff --git a/Zend/tests/generators/bug71013.phpt b/Zend/tests/generators/bug71013.phpt
index 6ede86e3ba..1b7bdd7935 100644
--- a/Zend/tests/generators/bug71013.phpt
+++ b/Zend/tests/generators/bug71013.phpt
@@ -46,4 +46,3 @@ Destructing FooBar
NULL
Unsetting $x
Finishing bar()
-
diff --git a/Zend/tests/generators/bug71441.phpt b/Zend/tests/generators/bug71441.phpt
index 3a103888b0..14395d2402 100644
--- a/Zend/tests/generators/bug71441.phpt
+++ b/Zend/tests/generators/bug71441.phpt
@@ -26,4 +26,3 @@ var_dump($gen->getReturn());
int(2002)
Ok
string(7) "Success"
-
diff --git a/Zend/tests/generators/bug71601.phpt b/Zend/tests/generators/bug71601.phpt
index e3f21692e7..09da2a5077 100644
--- a/Zend/tests/generators/bug71601.phpt
+++ b/Zend/tests/generators/bug71601.phpt
@@ -37,4 +37,3 @@ int(1)
Inner finally
Finally
Done
-
diff --git a/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt b/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt
index 4ea1b6505c..e7fc2647be 100644
--- a/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt
+++ b/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt
@@ -14,4 +14,3 @@ Fatal error: Uncaught Exception: You can only iterate a generator by-reference i
Stack trace:
#0 {main}
thrown in %s on line %d
-
diff --git a/Zend/tests/generators/generator_closure_unused.phpt b/Zend/tests/generators/generator_closure_unused.phpt
index 9acf8f9d93..6466c4c2e9 100644
--- a/Zend/tests/generators/generator_closure_unused.phpt
+++ b/Zend/tests/generators/generator_closure_unused.phpt
@@ -6,4 +6,4 @@ Closures can be unused generators
echo "ok\n";
?>
--EXPECT--
-ok \ No newline at end of file
+ok
diff --git a/Zend/tests/generators/generator_return_without_value.phpt b/Zend/tests/generators/generator_return_without_value.phpt
index dfea5aa78d..c507ebeb9c 100644
--- a/Zend/tests/generators/generator_return_without_value.phpt
+++ b/Zend/tests/generators/generator_return_without_value.phpt
@@ -40,4 +40,4 @@ object(Generator)#%d (0) {
object(Generator)#%d (0) {
}
object(Generator)#%d (0) {
-} \ No newline at end of file
+}
diff --git a/Zend/tests/generators/generator_throwing_in_foreach.phpt b/Zend/tests/generators/generator_throwing_in_foreach.phpt
index 44a867404f..a407b01920 100644
--- a/Zend/tests/generators/generator_throwing_in_foreach.phpt
+++ b/Zend/tests/generators/generator_throwing_in_foreach.phpt
@@ -17,4 +17,3 @@ Stack trace:
#0 %s(%d): gen()
#1 {main}
thrown in %s on line %d
-
diff --git a/Zend/tests/generators/generator_with_arg_unpacking.phpt b/Zend/tests/generators/generator_with_arg_unpacking.phpt
index edf0bafd31..316fc490df 100644
--- a/Zend/tests/generators/generator_with_arg_unpacking.phpt
+++ b/Zend/tests/generators/generator_with_arg_unpacking.phpt
@@ -9,4 +9,4 @@ $g = call_user_func_array(function() { yield; }, range(1, 16384));
echo "OK\n";
?>
--EXPECT--
-OK \ No newline at end of file
+OK
diff --git a/Zend/tests/generators/multiple_yield_from_on_same_generator.phpt b/Zend/tests/generators/multiple_yield_from_on_same_generator.phpt
index f56a325684..52dbea89b2 100644
--- a/Zend/tests/generators/multiple_yield_from_on_same_generator.phpt
+++ b/Zend/tests/generators/multiple_yield_from_on_same_generator.phpt
@@ -41,4 +41,3 @@ int(3)
int(5)
NULL
bool(false)
-
diff --git a/Zend/tests/generators/recursive_yield_from.phpt b/Zend/tests/generators/recursive_yield_from.phpt
index dbf2c948ea..2fc1e0a591 100644
--- a/Zend/tests/generators/recursive_yield_from.phpt
+++ b/Zend/tests/generators/recursive_yield_from.phpt
@@ -31,4 +31,3 @@ int(5)
int(7)
int(8)
int(2)
-
diff --git a/Zend/tests/generators/throw_rethrow.phpt b/Zend/tests/generators/throw_rethrow.phpt
index f9e3f78f48..8fbc6743b8 100644
--- a/Zend/tests/generators/throw_rethrow.phpt
+++ b/Zend/tests/generators/throw_rethrow.phpt
@@ -31,4 +31,3 @@ Stack trace:
#1 %s(%d): Generator->throw(Object(RuntimeException))
#2 {main}
thrown in %s on line %d
-
diff --git a/Zend/tests/generators/yield_from_backtrace.phpt b/Zend/tests/generators/yield_from_backtrace.phpt
index 18781e7551..e5d79723e7 100644
--- a/Zend/tests/generators/yield_from_backtrace.phpt
+++ b/Zend/tests/generators/yield_from_backtrace.phpt
@@ -46,4 +46,3 @@ int(2)
int(3)
#0 gen()
#1 Generator->next() called at [%s:%d]
-
diff --git a/Zend/tests/generators/yield_from_multi_tree.phpt b/Zend/tests/generators/yield_from_multi_tree.phpt
index 91ae80e909..9bec138149 100644
--- a/Zend/tests/generators/yield_from_multi_tree.phpt
+++ b/Zend/tests/generators/yield_from_multi_tree.phpt
@@ -329,4 +329,3 @@ int(125)
int(126)
int(127)
int(128)
-
diff --git a/Zend/tests/generators/yield_from_multi_tree_exception.phpt b/Zend/tests/generators/yield_from_multi_tree_exception.phpt
index 2bdeedba7d..4ff2e4e41f 100644
--- a/Zend/tests/generators/yield_from_multi_tree_exception.phpt
+++ b/Zend/tests/generators/yield_from_multi_tree_exception.phpt
@@ -75,4 +75,3 @@ Stack trace:
#0 [internal function]: gen(Object(Generator), 1)
#1 %s(%d): Generator->current()
#2 {main}
-
diff --git a/Zend/tests/generators/yield_unary_precedence.phpt b/Zend/tests/generators/yield_unary_precedence.phpt
index 9357168c80..54eb0feb5f 100644
--- a/Zend/tests/generators/yield_unary_precedence.phpt
+++ b/Zend/tests/generators/yield_unary_precedence.phpt
@@ -14,7 +14,6 @@ for ($gen = gen(); $gen->valid(); $gen->send(1)) {
}
?>
--EXPECT--
-
int(1)
int(1)
@@ -23,4 +22,3 @@ int(1)
NULL
int(-1)
-
diff --git a/Zend/tests/grammar/regression_001.phpt b/Zend/tests/grammar/regression_001.phpt
index 727e11cc45..657b36b853 100644
--- a/Zend/tests/grammar/regression_001.phpt
+++ b/Zend/tests/grammar/regression_001.phpt
@@ -22,9 +22,7 @@ Foo::
);
echo "\nDone\n";
-
--EXPECT--
-
Foo::function
Foo::function
Foo::function
diff --git a/Zend/tests/grammar/regression_002.phpt b/Zend/tests/grammar/regression_002.phpt
index 06bce25d70..52ca62d6ba 100644
--- a/Zend/tests/grammar/regression_002.phpt
+++ b/Zend/tests/grammar/regression_002.phpt
@@ -14,7 +14,6 @@ var_dump(Foo:: CLASS);
var_dump(Foo::
CLASS);
-
--EXPECT--
string(3) "Foo"
string(3) "Foo"
diff --git a/Zend/tests/grammar/regression_004.phpt b/Zend/tests/grammar/regression_004.phpt
index edb32032ea..f032fc882d 100644
--- a/Zend/tests/grammar/regression_004.phpt
+++ b/Zend/tests/grammar/regression_004.phpt
@@ -10,6 +10,5 @@ class Obj
}
function echo(){} // not valid
-
--EXPECTF--
Parse error: syntax error, unexpected 'echo' (T_ECHO), expecting %s in %s on line 9
diff --git a/Zend/tests/grammar/regression_005.phpt b/Zend/tests/grammar/regression_005.phpt
index 7704375d6e..ad83ee717d 100644
--- a/Zend/tests/grammar/regression_005.phpt
+++ b/Zend/tests/grammar/regression_005.phpt
@@ -9,6 +9,5 @@ class Obj
}
const return = 'nope';
-
--EXPECTF--
Parse error: syntax error, unexpected 'return' (T_RETURN), expecting identifier (T_STRING) in %s on line 8
diff --git a/Zend/tests/grammar/regression_006.phpt b/Zend/tests/grammar/regression_006.phpt
index 036ffa7445..072148ca56 100644
--- a/Zend/tests/grammar/regression_006.phpt
+++ b/Zend/tests/grammar/regression_006.phpt
@@ -19,7 +19,6 @@ echo Obj::
USE, PHP_EOL;
echo "\nDone\n";
-
--EXPECT--
declare
return
diff --git a/Zend/tests/grammar/regression_007.phpt b/Zend/tests/grammar/regression_007.phpt
index d75670c7ec..b691ccaef9 100644
--- a/Zend/tests/grammar/regression_007.phpt
+++ b/Zend/tests/grammar/regression_007.phpt
@@ -28,7 +28,6 @@ Foo::{'new'}();
var_dump(Foo::use);
echo "\nDone\n";
-
--EXPECT--
Foo::new
Foo::new
diff --git a/Zend/tests/grammar/regression_008.phpt b/Zend/tests/grammar/regression_008.phpt
index e4259649eb..57ae510722 100644
--- a/Zend/tests/grammar/regression_008.phpt
+++ b/Zend/tests/grammar/regression_008.phpt
@@ -12,10 +12,7 @@ $friday = new Friday;
echo "$friday->require ($friday->require) {$friday->require}", PHP_EOL;
echo "\nDone\n";
-
-
--EXPECT--
-
fun (fun) fun
Done
diff --git a/Zend/tests/grammar/regression_009.phpt b/Zend/tests/grammar/regression_009.phpt
index 6b14c33081..45fc81bcb8 100644
--- a/Zend/tests/grammar/regression_009.phpt
+++ b/Zend/tests/grammar/regression_009.phpt
@@ -12,7 +12,5 @@ class Foo
}
echo PHP_EOL, "Done", PHP_EOL;
-
--EXPECT--
-
Done
diff --git a/Zend/tests/grammar/regression_010.phpt b/Zend/tests/grammar/regression_010.phpt
index 90b864f79b..e5e65e3a85 100644
--- a/Zend/tests/grammar/regression_010.phpt
+++ b/Zend/tests/grammar/regression_010.phpt
@@ -8,7 +8,5 @@ interface A{}
class B implements\A {}
echo "Done", PHP_EOL;
-
--EXPECT--
-
Done
diff --git a/Zend/tests/grammar/regression_012.phpt b/Zend/tests/grammar/regression_012.phpt
index 3b4925afa6..817f337a5c 100644
--- a/Zend/tests/grammar/regression_012.phpt
+++ b/Zend/tests/grammar/regression_012.phpt
@@ -9,5 +9,4 @@ class A {
?>
--EXPECTF--
-
Parse error: syntax error, unexpected 'FOREACH' (T_FOREACH), expecting ']' in %s on line %d
diff --git a/Zend/tests/grammar/regression_013.phpt b/Zend/tests/grammar/regression_013.phpt
index 0379dd26e3..9f5b3e16f1 100644
--- a/Zend/tests/grammar/regression_013.phpt
+++ b/Zend/tests/grammar/regression_013.phpt
@@ -9,5 +9,4 @@ echo "Done", PHP_EOL;
?>
--EXPECT--
-
Done
diff --git a/Zend/tests/grammar/semi_reserved_001.phpt b/Zend/tests/grammar/semi_reserved_001.phpt
index 3abb3a2507..68b35d3f22 100644
--- a/Zend/tests/grammar/semi_reserved_001.phpt
+++ b/Zend/tests/grammar/semi_reserved_001.phpt
@@ -161,7 +161,6 @@ $obj->__DIR__();
$obj->__NAMESPACE__();
echo "\nDone\n";
-
--EXPECT--
Obj::empty
Obj::callable
diff --git a/Zend/tests/grammar/semi_reserved_002.phpt b/Zend/tests/grammar/semi_reserved_002.phpt
index 6a7dc79b74..4aa0f27e5e 100644
--- a/Zend/tests/grammar/semi_reserved_002.phpt
+++ b/Zend/tests/grammar/semi_reserved_002.phpt
@@ -159,7 +159,6 @@ Obj::__DIR__();
Obj::__NAMESPACE__();
echo "\nDone\n";
-
--EXPECT--
Obj::empty
Obj::callable
diff --git a/Zend/tests/grammar/semi_reserved_004.phpt b/Zend/tests/grammar/semi_reserved_004.phpt
index b3889b0bae..5a625a608b 100644
--- a/Zend/tests/grammar/semi_reserved_004.phpt
+++ b/Zend/tests/grammar/semi_reserved_004.phpt
@@ -161,7 +161,6 @@ echo Obj::$__NAMESPACE__, PHP_EOL;
echo Obj::$__halt_compiler, PHP_EOL;
echo "\nDone\n";
-
--EXPECT--
empty
callable
diff --git a/Zend/tests/grammar/semi_reserved_005.phpt b/Zend/tests/grammar/semi_reserved_005.phpt
index 5330828633..2cf7709b15 100644
--- a/Zend/tests/grammar/semi_reserved_005.phpt
+++ b/Zend/tests/grammar/semi_reserved_005.phpt
@@ -157,7 +157,6 @@ echo Obj::__DIR__, PHP_EOL;
echo Obj::__NAMESPACE__, PHP_EOL;
echo "\nDone\n";
-
--EXPECT--
empty
callable
diff --git a/Zend/tests/grammar/semi_reserved_006.phpt b/Zend/tests/grammar/semi_reserved_006.phpt
index 8205435a5f..634ba51285 100644
--- a/Zend/tests/grammar/semi_reserved_006.phpt
+++ b/Zend/tests/grammar/semi_reserved_006.phpt
@@ -58,7 +58,6 @@ Foo::byebye();
Foo::farewell();
echo "\nDone\n";
-
--EXPECT--
TraitA::catch
TraitA::list
diff --git a/Zend/tests/grammar/semi_reserved_007.phpt b/Zend/tests/grammar/semi_reserved_007.phpt
index b1d6daeb9d..64e55a8e2a 100644
--- a/Zend/tests/grammar/semi_reserved_007.phpt
+++ b/Zend/tests/grammar/semi_reserved_007.phpt
@@ -25,7 +25,6 @@ class Bar extends Foo {
new Bar;
echo "\nDone\n";
-
--EXPECT--
From Foo::__construct:
self
@@ -34,4 +33,4 @@ From Bar::__construct:
self
parent
-Done \ No newline at end of file
+Done
diff --git a/Zend/tests/grammar/semi_reserved_008.phpt b/Zend/tests/grammar/semi_reserved_008.phpt
index c10f96b6de..fe478323f8 100644
--- a/Zend/tests/grammar/semi_reserved_008.phpt
+++ b/Zend/tests/grammar/semi_reserved_008.phpt
@@ -61,7 +61,6 @@ Foo /**/
attempt();
echo PHP_EOL, "Done", PHP_EOL;
-
--EXPECT--
TraitB::try
diff --git a/Zend/tests/grammar/semi_reserved_009.phpt b/Zend/tests/grammar/semi_reserved_009.phpt
index 05830f80ed..98ff4ee8f0 100644
--- a/Zend/tests/grammar/semi_reserved_009.phpt
+++ b/Zend/tests/grammar/semi_reserved_009.phpt
@@ -18,7 +18,6 @@ class Foo
Foo::try();
echo PHP_EOL, "Done", PHP_EOL;
-
--EXPECT--
TraitA::as
diff --git a/Zend/tests/grammar/semi_reserved_010.phpt b/Zend/tests/grammar/semi_reserved_010.phpt
index ad92fcfddc..951db73b85 100644
--- a/Zend/tests/grammar/semi_reserved_010.phpt
+++ b/Zend/tests/grammar/semi_reserved_010.phpt
@@ -24,7 +24,6 @@ class Foo
Foo::insteadof();
echo PHP_EOL, "Done", PHP_EOL;
-
--EXPECT--
TraitB::insteadof
diff --git a/Zend/tests/halt_compiler1.phpt b/Zend/tests/halt_compiler1.phpt
index 4987b29b2c..77b3696f22 100644
--- a/Zend/tests/halt_compiler1.phpt
+++ b/Zend/tests/halt_compiler1.phpt
@@ -5,4 +5,4 @@ __HALT_COMPILER();
?>
===DONE===
--EXPECT--
-testint(73) \ No newline at end of file
+testint(73)
diff --git a/Zend/tests/halt_compiler2.phpt b/Zend/tests/halt_compiler2.phpt
index 0ced2142cd..da8ac6cae9 100644
--- a/Zend/tests/halt_compiler2.phpt
+++ b/Zend/tests/halt_compiler2.phpt
@@ -20,4 +20,4 @@ unlink(dirname(__FILE__) . '/test2.php');
--EXPECT--
testint(73)
test2int(74)
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/Zend/tests/halt_compiler3.phpt b/Zend/tests/halt_compiler3.phpt
index 6ee16f79b9..7bd7410c73 100644
--- a/Zend/tests/halt_compiler3.phpt
+++ b/Zend/tests/halt_compiler3.phpt
@@ -7,4 +7,4 @@ define ('__COMPILER_HALT_OFFSET__', 1);
==DONE==
--EXPECTF--
Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/Zend/tests/halt_compiler4.phpt b/Zend/tests/halt_compiler4.phpt
index 43e532ce7d..53a4fc76f9 100644
--- a/Zend/tests/halt_compiler4.phpt
+++ b/Zend/tests/halt_compiler4.phpt
@@ -7,4 +7,4 @@ __HALT_COMPILER();
?>
==DONE==
--EXPECTF--
-Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d \ No newline at end of file
+Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
diff --git a/Zend/tests/indirect_call_array_003.phpt b/Zend/tests/indirect_call_array_003.phpt
index f1dde491f6..b4b713ff64 100644
--- a/Zend/tests/indirect_call_array_003.phpt
+++ b/Zend/tests/indirect_call_array_003.phpt
@@ -36,4 +36,3 @@ From foo::__call:
string(3) "abc"
object(foo)#%d (0) {
}
-
diff --git a/Zend/tests/int_special_values.phpt b/Zend/tests/int_special_values.phpt
index e1a50b6ecb..eedb9ab2c0 100644
--- a/Zend/tests/int_special_values.phpt
+++ b/Zend/tests/int_special_values.phpt
@@ -34,4 +34,4 @@ float(-0)
int(0)
float(NAN)
-int(0) \ No newline at end of file
+int(0)
diff --git a/Zend/tests/int_static_prop_name.phpt b/Zend/tests/int_static_prop_name.phpt
index bfdfc42052..cb47bb6d0a 100644
--- a/Zend/tests/int_static_prop_name.phpt
+++ b/Zend/tests/int_static_prop_name.phpt
@@ -40,4 +40,3 @@ int(24)
Access to undeclared static property: Foo::$42
Access to undeclared static property: Foo::$42
Access to undeclared static property: Foo::$42
-
diff --git a/Zend/tests/list_keyed_undefined.phpt b/Zend/tests/list_keyed_undefined.phpt
index a18e3b4d20..3d1939c5ac 100644
--- a/Zend/tests/list_keyed_undefined.phpt
+++ b/Zend/tests/list_keyed_undefined.phpt
@@ -14,7 +14,6 @@ var_dump($five, $duke);
?>
--EXPECTF--
-
Notice: Undefined offset: 5 in %s on line %d
Notice: Undefined index: duke in %s on line %d
diff --git a/Zend/tests/lsb_006.phpt b/Zend/tests/lsb_006.phpt
index 84cd22a995..b10b742463 100644
--- a/Zend/tests/lsb_006.phpt
+++ b/Zend/tests/lsb_006.phpt
@@ -10,4 +10,3 @@ class Foo extends static {
==DONE==
--EXPECTF--
Parse error: %s error,%sexpecting %s in %s on line %d
-
diff --git a/Zend/tests/lsb_007.phpt b/Zend/tests/lsb_007.phpt
index 607f8efeb4..c28e815be0 100644
--- a/Zend/tests/lsb_007.phpt
+++ b/Zend/tests/lsb_007.phpt
@@ -10,4 +10,3 @@ class Foo implements static {
==DONE==
--EXPECTF--
Parse error: %s error,%sexpecting %s in %s on line %d
-
diff --git a/Zend/tests/lsb_008.phpt b/Zend/tests/lsb_008.phpt
index b700e2df94..79f906bd7e 100644
--- a/Zend/tests/lsb_008.phpt
+++ b/Zend/tests/lsb_008.phpt
@@ -6,4 +6,3 @@ class static {
}
--EXPECTF--
Parse error: %s error,%sexpecting %s in %s on line %d
-
diff --git a/Zend/tests/lsb_009.phpt b/Zend/tests/lsb_009.phpt
index d8d41817c8..9b1686391b 100644
--- a/Zend/tests/lsb_009.phpt
+++ b/Zend/tests/lsb_009.phpt
@@ -6,4 +6,3 @@ interface static {
}
--EXPECTF--
Parse error: %s error,%sexpecting %s in %s on line %d
-
diff --git a/Zend/tests/methods-on-non-objects-call-user-func.phpt b/Zend/tests/methods-on-non-objects-call-user-func.phpt
index f76b7d43a0..027aa64c20 100644
--- a/Zend/tests/methods-on-non-objects-call-user-func.phpt
+++ b/Zend/tests/methods-on-non-objects-call-user-func.phpt
@@ -10,4 +10,3 @@ echo "Alive\n";
Warning: call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object in %s on line %d
NULL
Alive
-
diff --git a/Zend/tests/methods-on-non-objects-catch.phpt b/Zend/tests/methods-on-non-objects-catch.phpt
index 083ae75e49..a52d3a722a 100644
--- a/Zend/tests/methods-on-non-objects-catch.phpt
+++ b/Zend/tests/methods-on-non-objects-catch.phpt
@@ -15,7 +15,6 @@ try {
echo "Alive\n";
?>
--EXPECTF--
-
int(0)
string(%d) "Call to a member function method() on null"
Alive
diff --git a/Zend/tests/methods-on-non-objects.phpt b/Zend/tests/methods-on-non-objects.phpt
index 13002c94a3..0fd93fcecc 100644
--- a/Zend/tests/methods-on-non-objects.phpt
+++ b/Zend/tests/methods-on-non-objects.phpt
@@ -8,7 +8,6 @@ $x->method();
echo "Should not get here!\n";
?>
--EXPECTF--
-
Fatal error: Uncaught Error: Call to a member function method() on null in %s:%d
Stack trace:
#0 {main}
diff --git a/Zend/tests/multibyte/multibyte_encoding_006.phpt b/Zend/tests/multibyte/multibyte_encoding_006.phpt
index b87b434fe4..d518c29e3e 100644
--- a/Zend/tests/multibyte/multibyte_encoding_006.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_006.phpt
Binary files differ
diff --git a/Zend/tests/nested_method_and_function.phpt b/Zend/tests/nested_method_and_function.phpt
index 3fa1b18da1..c63c601eaf 100644
--- a/Zend/tests/nested_method_and_function.phpt
+++ b/Zend/tests/nested_method_and_function.phpt
@@ -36,4 +36,4 @@ string(12) "Baz\Foo::bar"
string(7) "Baz\Foo"
string(13) "Baz\{closure}"
string(13) "Baz\{closure}"
-string(7) "Baz\Foo" \ No newline at end of file
+string(7) "Baz\Foo"
diff --git a/Zend/tests/ns_004.phpt b/Zend/tests/ns_004.phpt
index 44b618cd70..f04f662e0a 100644
--- a/Zend/tests/ns_004.phpt
+++ b/Zend/tests/ns_004.phpt
@@ -9,4 +9,4 @@ echo get_class(new Exception()),"\n";
Fatal error: Uncaught Error: Class 'test\ns1\Exception' not found in %sns_004.php:%d
Stack trace:
#0 {main}
- thrown in %sns_004.php on line %d \ No newline at end of file
+ thrown in %sns_004.php on line %d
diff --git a/Zend/tests/ns_011.phpt b/Zend/tests/ns_011.phpt
index 9ee6888a65..7aa6270a1c 100644
--- a/Zend/tests/ns_011.phpt
+++ b/Zend/tests/ns_011.phpt
@@ -16,7 +16,6 @@ bar();
function bar() {
echo __FUNCTION__,"\n";
}
-
--EXPECT--
test\ns1\foo
test\ns1\foo
diff --git a/Zend/tests/ns_012.phpt b/Zend/tests/ns_012.phpt
index 034f124924..210cba9065 100644
--- a/Zend/tests/ns_012.phpt
+++ b/Zend/tests/ns_012.phpt
@@ -23,7 +23,6 @@ ns3\ns1\bar();
function bar() {
echo __FUNCTION__,"\n";
}
-
--EXPECT--
test\ns1\foo
test\ns1\bar
diff --git a/Zend/tests/ns_015.phpt b/Zend/tests/ns_015.phpt
index ae2c818345..405d3e4518 100644
--- a/Zend/tests/ns_015.phpt
+++ b/Zend/tests/ns_015.phpt
@@ -11,4 +11,3 @@ function strlen($x) {
echo \strlen("Hello"),"\n";
--EXPECT--
5
-
diff --git a/Zend/tests/ns_017.phpt b/Zend/tests/ns_017.phpt
index 888d8e5ef4..d48afd5f01 100644
--- a/Zend/tests/ns_017.phpt
+++ b/Zend/tests/ns_017.phpt
@@ -11,4 +11,4 @@ function strlen($x) {
$x = "strlen";
echo $x("Hello"),"\n";
--EXPECT--
-5 \ No newline at end of file
+5
diff --git a/Zend/tests/ns_026.phpt b/Zend/tests/ns_026.phpt
index b8f8c3f83d..530e135230 100644
--- a/Zend/tests/ns_026.phpt
+++ b/Zend/tests/ns_026.phpt
@@ -35,4 +35,4 @@ Func - Foo\Bar
Fatal error: Uncaught Error: Call to undefined function Foo\Foo\Bar() in %sns_026.php:%d
Stack trace:
#0 {main}
- thrown in %sns_026.php on line %d \ No newline at end of file
+ thrown in %sns_026.php on line %d
diff --git a/Zend/tests/ns_038.phpt b/Zend/tests/ns_038.phpt
index 9cef33d82b..f514de77c9 100644
--- a/Zend/tests/ns_038.phpt
+++ b/Zend/tests/ns_038.phpt
@@ -15,4 +15,3 @@ Fatal error: Uncaught Error: Call to undefined method Exception::bar() in %sns_0
Stack trace:
#0 {main}
thrown in %sns_038.php on line 7
-
diff --git a/Zend/tests/ns_041.phpt b/Zend/tests/ns_041.phpt
index e1f0ba3a97..bd9dfbd093 100644
--- a/Zend/tests/ns_041.phpt
+++ b/Zend/tests/ns_041.phpt
@@ -12,7 +12,6 @@ echo(\test\ns1\FOO);
echo(BAR);
const BAR = "ok\n";
-
--EXPECTF--
ok
ok
diff --git a/Zend/tests/ns_053.phpt b/Zend/tests/ns_053.phpt
index bc5ab12cdb..dd3ff76693 100644
--- a/Zend/tests/ns_053.phpt
+++ b/Zend/tests/ns_053.phpt
@@ -10,4 +10,3 @@ echo \test\ns1\NAME."\n";
--EXPECT--
ns_053.php
ns_053.php
-
diff --git a/Zend/tests/ns_057.phpt b/Zend/tests/ns_057.phpt
index 639687ee0a..6c7a72f86e 100644
--- a/Zend/tests/ns_057.phpt
+++ b/Zend/tests/ns_057.phpt
@@ -59,4 +59,4 @@ ok
Fatal error: Uncaught Error: Undefined constant 'Test\ns1\unknown' in %sns_057.php:%d
Stack trace:
#0 {main}
- thrown in %sns_057.php on line %d \ No newline at end of file
+ thrown in %sns_057.php on line %d
diff --git a/Zend/tests/ns_068.phpt b/Zend/tests/ns_068.phpt
index b6dc258fd3..09075f6c76 100644
--- a/Zend/tests/ns_068.phpt
+++ b/Zend/tests/ns_068.phpt
@@ -10,5 +10,4 @@ echo __NAMESPACE__ . "\n";
?>
===DONE===
--EXPECTF--
-
Fatal error: Namespace declaration statement has to be the very first statement or after any declare call in the script in %sns_068.php on line %d
diff --git a/Zend/tests/ns_080.phpt b/Zend/tests/ns_080.phpt
index 9c81c0d4c8..ce0ac07e7f 100644
--- a/Zend/tests/ns_080.phpt
+++ b/Zend/tests/ns_080.phpt
@@ -12,4 +12,4 @@ echo "should not echo\n";
?>
===DONE===
--EXPECT--
-hi \ No newline at end of file
+hi
diff --git a/Zend/tests/ns_082.phpt b/Zend/tests/ns_082.phpt
index 3220974047..7fa770576e 100644
--- a/Zend/tests/ns_082.phpt
+++ b/Zend/tests/ns_082.phpt
@@ -9,4 +9,4 @@ echo "ok\n";
}
?>
--EXPECT--
-ok \ No newline at end of file
+ok
diff --git a/Zend/tests/ns_085.phpt b/Zend/tests/ns_085.phpt
index 377da6a8dc..7755d809e3 100644
--- a/Zend/tests/ns_085.phpt
+++ b/Zend/tests/ns_085.phpt
@@ -24,4 +24,4 @@ foo::__construct
foo\bar::__construct
foo\bar::__construct
foo::__construct
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/Zend/tests/ns_086.phpt b/Zend/tests/ns_086.phpt
index 00657f6bde..ed4b8a238c 100644
--- a/Zend/tests/ns_086.phpt
+++ b/Zend/tests/ns_086.phpt
@@ -33,4 +33,4 @@ foo::__construct
foo\bar::__construct
foo\bar::__construct
foo::__construct
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/Zend/tests/ns_089.phpt b/Zend/tests/ns_089.phpt
index bb83ae7361..71c6b74a9b 100644
--- a/Zend/tests/ns_089.phpt
+++ b/Zend/tests/ns_089.phpt
@@ -42,7 +42,6 @@ namespace Fiz\Biz\Buz {
var_dump(BOZ);
var_dump(BAR);
}
-
--EXPECT--
Foo\Bar\Baz\A::__construct
Foo\Bar\Baz\B::__construct
diff --git a/Zend/tests/ns_090.phpt b/Zend/tests/ns_090.phpt
index 8511f1c803..166828c8cb 100644
--- a/Zend/tests/ns_090.phpt
+++ b/Zend/tests/ns_090.phpt
@@ -33,7 +33,6 @@ namespace Fiz\Biz\Buz {
var_dump(BOZ);
var_dump(BAR);
}
-
--EXPECT--
Foo\Bar\Baz\A::__construct
Foo\Bar\Baz\B::__construct
diff --git a/Zend/tests/ns_091.phpt b/Zend/tests/ns_091.phpt
index 5732e7e50e..ee979025d2 100644
--- a/Zend/tests/ns_091.phpt
+++ b/Zend/tests/ns_091.phpt
@@ -14,7 +14,6 @@ namespace Fiz\Biz\Buz {
new A;
new B;
}
-
--EXPECT--
Foo\Bar\A::__construct
-Foo\Bar\Baz\B::__construct \ No newline at end of file
+Foo\Bar\Baz\B::__construct
diff --git a/Zend/tests/ns_092.phpt b/Zend/tests/ns_092.phpt
index 21a1dd916a..5618080022 100644
--- a/Zend/tests/ns_092.phpt
+++ b/Zend/tests/ns_092.phpt
@@ -47,7 +47,6 @@ namespace Fiz\Biz\Buz {
boz();
A();
}
-
--EXPECTF--
==== MIXED ====
Foo\Bar\A::__construct
diff --git a/Zend/tests/ns_093.phpt b/Zend/tests/ns_093.phpt
index 6e0b937963..4452a6e175 100644
--- a/Zend/tests/ns_093.phpt
+++ b/Zend/tests/ns_093.phpt
@@ -20,8 +20,5 @@ use Foo\Bar\
};
echo "\nDone\n";
-
-
--EXPECT--
-
-Done \ No newline at end of file
+Done
diff --git a/Zend/tests/ns_094.phpt b/Zend/tests/ns_094.phpt
index f33bf560a9..a809437a1b 100644
--- a/Zend/tests/ns_094.phpt
+++ b/Zend/tests/ns_094.phpt
@@ -10,6 +10,5 @@ use const Foo\Bar\{
const B,
function C
};
-
--EXPECTF--
Parse error: syntax error, unexpected 'const' (T_CONST), expecting '}' in %s on line 7
diff --git a/Zend/tests/ns_095.phpt b/Zend/tests/ns_095.phpt
index 2e1c0e229e..521926330d 100644
--- a/Zend/tests/ns_095.phpt
+++ b/Zend/tests/ns_095.phpt
@@ -37,7 +37,6 @@ namespace Baz {
}
?>
--EXPECT--
-
string(14) "Foo\Bar\ClassA"
string(14) "Foo\Bar\ClassB"
string(14) "Foo\Bar\ClassC"
diff --git a/Zend/tests/ns_trailing_comma_error_01.phpt b/Zend/tests/ns_trailing_comma_error_01.phpt
index 6ada1f7bf2..1b226036cf 100644
--- a/Zend/tests/ns_trailing_comma_error_01.phpt
+++ b/Zend/tests/ns_trailing_comma_error_01.phpt
@@ -5,4 +5,4 @@ Group use declarations mustn't be empty
use Baz\{};
?>
--EXPECTF--
-Parse error: syntax error, unexpected '}', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected '}', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d
diff --git a/Zend/tests/ns_trailing_comma_error_02.phpt b/Zend/tests/ns_trailing_comma_error_02.phpt
index c9d0d92dee..c2123a85f5 100644
--- a/Zend/tests/ns_trailing_comma_error_02.phpt
+++ b/Zend/tests/ns_trailing_comma_error_02.phpt
@@ -5,4 +5,4 @@ Group use declarations mustn't contain just a comma
use Baz\{,};
?>
--EXPECTF--
-Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d
diff --git a/Zend/tests/ns_trailing_comma_error_03.phpt b/Zend/tests/ns_trailing_comma_error_03.phpt
index 9d10c47dcc..a07720becc 100644
--- a/Zend/tests/ns_trailing_comma_error_03.phpt
+++ b/Zend/tests/ns_trailing_comma_error_03.phpt
@@ -5,4 +5,4 @@ Group use declarations mustn't allow more than one comma
use Baz\{Foo,,};
?>
--EXPECTF--
-Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d
diff --git a/Zend/tests/ns_trailing_comma_error_04.phpt b/Zend/tests/ns_trailing_comma_error_04.phpt
index d04b1af272..09d7ebf349 100644
--- a/Zend/tests/ns_trailing_comma_error_04.phpt
+++ b/Zend/tests/ns_trailing_comma_error_04.phpt
@@ -5,4 +5,4 @@ Group use declarations mustn't begin with a comma
use Baz\{,Foo};
?>
--EXPECTF--
-Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d
diff --git a/Zend/tests/ns_trailing_comma_error_05.phpt b/Zend/tests/ns_trailing_comma_error_05.phpt
index 1d43e8fe32..d748747a03 100644
--- a/Zend/tests/ns_trailing_comma_error_05.phpt
+++ b/Zend/tests/ns_trailing_comma_error_05.phpt
@@ -5,4 +5,4 @@ Group use declarations mustn't contain two commas mid-list
use Baz\{Foo,,Bar};
?>
--EXPECTF--
-Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d
diff --git a/Zend/tests/ns_trailing_comma_error_06.phpt b/Zend/tests/ns_trailing_comma_error_06.phpt
index 2f2738e204..8d8b759a5a 100644
--- a/Zend/tests/ns_trailing_comma_error_06.phpt
+++ b/Zend/tests/ns_trailing_comma_error_06.phpt
@@ -5,4 +5,4 @@ Unmixed group use declarations mustn't allow more than one comma
use const Baz\{Foo,,};
?>
--EXPECTF--
-Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d
diff --git a/Zend/tests/ns_trailing_comma_error_07.phpt b/Zend/tests/ns_trailing_comma_error_07.phpt
index c60dd6a4b0..e925a60de8 100644
--- a/Zend/tests/ns_trailing_comma_error_07.phpt
+++ b/Zend/tests/ns_trailing_comma_error_07.phpt
@@ -5,4 +5,4 @@ Unmixed group use declarations mustn't begin with a comma
use function Baz\{,Foo};
?>
--EXPECTF--
-Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) in %s on line %d
diff --git a/Zend/tests/ns_trailing_comma_error_08.phpt b/Zend/tests/ns_trailing_comma_error_08.phpt
index b23446301d..b3804aeb76 100644
--- a/Zend/tests/ns_trailing_comma_error_08.phpt
+++ b/Zend/tests/ns_trailing_comma_error_08.phpt
@@ -5,4 +5,4 @@ Unmixed group use declarations mustn't contain two commas mid-list
use const Baz\{Foo,,Bar};
?>
--EXPECTF--
-Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d \ No newline at end of file
+Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d
diff --git a/Zend/tests/nullable_types/array.phpt b/Zend/tests/nullable_types/array.phpt
index 7b0a2ed4d5..6ee89b3962 100644
--- a/Zend/tests/nullable_types/array.phpt
+++ b/Zend/tests/nullable_types/array.phpt
@@ -9,9 +9,7 @@ function _array_(?array $v): ?array {
var_dump(_array_(null));
var_dump(_array_([]));
-
--EXPECT--
NULL
array(0) {
}
-
diff --git a/Zend/tests/nullable_types/contravariant_nullable_param_succeeds.phpt b/Zend/tests/nullable_types/contravariant_nullable_param_succeeds.phpt
index f4d1e315fc..a618ed2073 100644
--- a/Zend/tests/nullable_types/contravariant_nullable_param_succeeds.phpt
+++ b/Zend/tests/nullable_types/contravariant_nullable_param_succeeds.phpt
@@ -1,6 +1,5 @@
--TEST--
Subtype can add nullability to a parameter (contravariance)
-
--FILE--
<?php
@@ -14,6 +13,4 @@ class B implements A {
$b = new B();
$b->method(null);
-
--EXPECT--
-
diff --git a/Zend/tests/nullable_types/contravariant_nullable_return_fails.phpt b/Zend/tests/nullable_types/contravariant_nullable_return_fails.phpt
index c9be479ead..fe6ebc5654 100644
--- a/Zend/tests/nullable_types/contravariant_nullable_return_fails.phpt
+++ b/Zend/tests/nullable_types/contravariant_nullable_return_fails.phpt
@@ -1,6 +1,5 @@
--TEST--
Return type cannot add nullability (contravariance)
-
--FILE--
<?php
@@ -11,7 +10,5 @@ interface A {
interface B extends A {
function method(): ?int;
}
-
--EXPECTF--
Fatal error: Declaration of B::method(): ?int must be compatible with A::method(): int in %s on line %d
-
diff --git a/Zend/tests/nullable_types/covariant_nullable_param_fails.phpt b/Zend/tests/nullable_types/covariant_nullable_param_fails.phpt
index 65b2858e6b..015f540ac0 100644
--- a/Zend/tests/nullable_types/covariant_nullable_param_fails.phpt
+++ b/Zend/tests/nullable_types/covariant_nullable_param_fails.phpt
@@ -1,6 +1,5 @@
--TEST--
Subtype cannot remove nullable parameter (covariance)
-
--FILE--
<?php
@@ -11,7 +10,5 @@ interface A {
class B implements A {
function method(int $p) { }
}
-
--EXPECTF--
Fatal error: Declaration of B::method(int $p) must be compatible with A::method(?int $p) in %s on line %d
-
diff --git a/Zend/tests/nullable_types/covariant_nullable_return_succeds.phpt b/Zend/tests/nullable_types/covariant_nullable_return_succeds.phpt
index 5776f9b99d..9251d3b4c1 100644
--- a/Zend/tests/nullable_types/covariant_nullable_return_succeds.phpt
+++ b/Zend/tests/nullable_types/covariant_nullable_return_succeds.phpt
@@ -1,6 +1,5 @@
--TEST--
Nullable covariant return types
-
--FILE--
<?php
@@ -11,6 +10,4 @@ interface A {
interface B extends A {
function method(): int;
}
-
--EXPECT--
-
diff --git a/Zend/tests/nullable_types/float.phpt b/Zend/tests/nullable_types/float.phpt
index 8e44524cf0..0c6602109f 100644
--- a/Zend/tests/nullable_types/float.phpt
+++ b/Zend/tests/nullable_types/float.phpt
@@ -9,8 +9,6 @@ function _float_(?float $v): ?float {
var_dump(_float_(null));
var_dump(_float_(1.3));
-
--EXPECT--
NULL
float(1.3)
-
diff --git a/Zend/tests/nullable_types/int.phpt b/Zend/tests/nullable_types/int.phpt
index ec75132edb..b5bafb0956 100644
--- a/Zend/tests/nullable_types/int.phpt
+++ b/Zend/tests/nullable_types/int.phpt
@@ -9,8 +9,6 @@ function _int_(?int $v): ?int {
var_dump(_int_(null));
var_dump(_int_(1));
-
--EXPECT--
NULL
int(1)
-
diff --git a/Zend/tests/nullable_types/invariant_param_and_return_succeeds.phpt b/Zend/tests/nullable_types/invariant_param_and_return_succeeds.phpt
index 0542e52c0f..6ddad67bb8 100644
--- a/Zend/tests/nullable_types/invariant_param_and_return_succeeds.phpt
+++ b/Zend/tests/nullable_types/invariant_param_and_return_succeeds.phpt
@@ -1,6 +1,5 @@
--TEST--
Invariant parameter and return types work with nullable types
-
--FILE--
<?php
@@ -17,8 +16,6 @@ class B implements A {
$b = new B();
var_dump($b->method(null));
var_dump($b->method(1));
-
--EXPECT--
NULL
int(1)
-
diff --git a/Zend/tests/nullable_types/nullable_type_parameters_do_not_have_default_value.phpt b/Zend/tests/nullable_types/nullable_type_parameters_do_not_have_default_value.phpt
index 3050feed53..95442b96b4 100644
--- a/Zend/tests/nullable_types/nullable_type_parameters_do_not_have_default_value.phpt
+++ b/Zend/tests/nullable_types/nullable_type_parameters_do_not_have_default_value.phpt
@@ -1,17 +1,14 @@
--TEST--
Explicit nullable types do not imply a default value
-
--FILE--
<?php
function f(?callable $p) {}
f();
-
--EXPECTF--
Fatal error: Uncaught ArgumentCountError: Too few arguments to function f(), 0 passed in %snullable_type_parameters_do_not_have_default_value.php on line %d and exactly 1 expected in %s:%d
Stack trace:
#%d %s
#%d %s
thrown in %s on line %d
-
diff --git a/Zend/tests/nullable_types/string.phpt b/Zend/tests/nullable_types/string.phpt
index ffc6591b6b..ab469af808 100644
--- a/Zend/tests/nullable_types/string.phpt
+++ b/Zend/tests/nullable_types/string.phpt
@@ -9,8 +9,6 @@ function _string_(?string $v): ?string {
var_dump(_string_(null));
var_dump(_string_("php"));
-
--EXPECT--
NULL
string(3) "php"
-
diff --git a/Zend/tests/numeric_string_errors.phpt b/Zend/tests/numeric_string_errors.phpt
index e98c58dda7..15dcd04461 100644
--- a/Zend/tests/numeric_string_errors.phpt
+++ b/Zend/tests/numeric_string_errors.phpt
@@ -52,7 +52,6 @@ var_dump(-"151 velit");
var_dump(-"esse");
?>
--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/Zend/tests/numeric_string_errors_assign.phpt b/Zend/tests/numeric_string_errors_assign.phpt
index 31cc8a3631..b13a7ec717 100644
--- a/Zend/tests/numeric_string_errors_assign.phpt
+++ b/Zend/tests/numeric_string_errors_assign.phpt
@@ -107,7 +107,6 @@ $a ^= "reprehenderit";
var_dump($a);
?>
--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/Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt b/Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt
index 138ae1f5b5..023ae58634 100644
--- a/Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt
+++ b/Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt
@@ -10,6 +10,5 @@ class One {
class Two extends One {
public function a() {}
}
-
--EXPECTF--
-Fatal error: Declaration of Two::a() must be compatible with One::a(): object in %s on line 9 \ No newline at end of file
+Fatal error: Declaration of Two::a() must be compatible with One::a(): object in %s on line 9
diff --git a/Zend/tests/object_types/missing_return_type_inheritance_in_interface.phpt b/Zend/tests/object_types/missing_return_type_inheritance_in_interface.phpt
index af9032949c..eb0e98b635 100644
--- a/Zend/tests/object_types/missing_return_type_inheritance_in_interface.phpt
+++ b/Zend/tests/object_types/missing_return_type_inheritance_in_interface.phpt
@@ -10,6 +10,5 @@ interface One {
interface Two extends One {
public function a();
}
-
--EXPECTF--
Fatal error: Declaration of Two::a() must be compatible with One::a(): object in %s on line %d
diff --git a/Zend/tests/object_types/return_type_in_class.phpt b/Zend/tests/object_types/return_type_in_class.phpt
index bef0421f8d..c4c1dc0516 100644
--- a/Zend/tests/object_types/return_type_in_class.phpt
+++ b/Zend/tests/object_types/return_type_in_class.phpt
@@ -18,7 +18,6 @@ $three = new class extends Two {
};
$three->a();
--EXPECTF--
-
Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13
Stack trace:
#0 %s(16): class@anonymous->a()
diff --git a/Zend/tests/object_types/return_type_in_function.phpt b/Zend/tests/object_types/return_type_in_function.phpt
index 5597e27b3f..dc7e0463fd 100644
--- a/Zend/tests/object_types/return_type_in_function.phpt
+++ b/Zend/tests/object_types/return_type_in_function.phpt
@@ -8,9 +8,8 @@ function a() : object {
}
a();
--EXPECTF--
-
Fatal error: Uncaught TypeError: Return value of a() must be an object, int returned in %s:4
Stack trace:
#0 %s(6): a()
#1 {main}
- thrown in %s on line 4 \ No newline at end of file
+ thrown in %s on line 4
diff --git a/Zend/tests/object_types/return_type_inheritance_in_class.phpt b/Zend/tests/object_types/return_type_inheritance_in_class.phpt
index 9ecf3cab1c..a7316136fb 100644
--- a/Zend/tests/object_types/return_type_inheritance_in_class.phpt
+++ b/Zend/tests/object_types/return_type_inheritance_in_class.phpt
@@ -17,7 +17,6 @@ $three = new class extends Two {
}
};
$three->a();
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13
Stack trace:
diff --git a/Zend/tests/object_types/return_type_inheritance_in_interface.phpt b/Zend/tests/object_types/return_type_inheritance_in_interface.phpt
index eec1ba260b..4c8f6c08af 100644
--- a/Zend/tests/object_types/return_type_inheritance_in_interface.phpt
+++ b/Zend/tests/object_types/return_type_inheritance_in_interface.phpt
@@ -17,7 +17,6 @@ $three = new class implements Two {
}
};
$three->a();
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13
Stack trace:
diff --git a/Zend/tests/object_types/return_type_reflection.phpt b/Zend/tests/object_types/return_type_reflection.phpt
index 29dd54428b..bcb918287d 100644
--- a/Zend/tests/object_types/return_type_reflection.phpt
+++ b/Zend/tests/object_types/return_type_reflection.phpt
@@ -21,11 +21,10 @@ var_dump($returnTypeTwo->isBuiltin(), (string)$returnTypeTwo);
$returnTypea = (new ReflectionFunction('a'))->getReturnType();
var_dump($returnTypea->isBuiltin(), (string)$returnTypea);
-
--EXPECT--
bool(true)
string(6) "object"
bool(true)
string(6) "object"
bool(true)
-string(6) "object" \ No newline at end of file
+string(6) "object"
diff --git a/Zend/tests/object_types/type_hint_in_class_method.phpt b/Zend/tests/object_types/type_hint_in_class_method.phpt
index 4ea5216c4e..f8814e4bbb 100644
--- a/Zend/tests/object_types/type_hint_in_class_method.phpt
+++ b/Zend/tests/object_types/type_hint_in_class_method.phpt
@@ -11,9 +11,8 @@ $one = new One();
$one->a(new One());
$one->a(123);
--EXPECTF--
-
Fatal error: Uncaught TypeError: Argument 1 passed to One::a() must be an object, int given, called in %s:4
Stack trace:
#0 %s(9): One->a(123)
#1 {main}
- thrown in %s on line 4 \ No newline at end of file
+ thrown in %s on line 4
diff --git a/Zend/tests/object_types/type_hint_in_function.phpt b/Zend/tests/object_types/type_hint_in_function.phpt
index 3e923983d7..39e075efdb 100644
--- a/Zend/tests/object_types/type_hint_in_function.phpt
+++ b/Zend/tests/object_types/type_hint_in_function.phpt
@@ -9,9 +9,8 @@ function a(object $obj) {}
a(new A());
a(123);
--EXPECTF--
-
Fatal error: Uncaught TypeError: Argument 1 passed to a() must be an object, int given, called in %s.php on line 7 and defined in %s:4
Stack trace:
#0 %s(7): a(123)
#1 {main}
- thrown in %s on line 4 \ No newline at end of file
+ thrown in %s on line 4
diff --git a/Zend/tests/object_types/type_hint_reflection.phpt b/Zend/tests/object_types/type_hint_reflection.phpt
index c0dcde3939..6a4f27d8c9 100644
--- a/Zend/tests/object_types/type_hint_reflection.phpt
+++ b/Zend/tests/object_types/type_hint_reflection.phpt
@@ -21,11 +21,10 @@ var_dump($typeHintTwo->isBuiltin(), (string)$typeHintTwo);
$typeHinta = (new ReflectionFunction('a'))->getParameters()[0]->getType();
var_dump($typeHinta->isBuiltin(), (string)$typeHinta);
-
--EXPECT--
bool(true)
string(6) "object"
bool(true)
string(6) "object"
bool(true)
-string(6) "object" \ No newline at end of file
+string(6) "object"
diff --git a/Zend/tests/objects_024.phpt b/Zend/tests/objects_024.phpt
index cbdb1cc202..50659f1604 100644
--- a/Zend/tests/objects_024.phpt
+++ b/Zend/tests/objects_024.phpt
@@ -50,4 +50,3 @@ object(foo)#%d (0) {
int(3)
object(foo)#%d (0) {
}
-
diff --git a/Zend/tests/objects_027.phpt b/Zend/tests/objects_027.phpt
index 1a13f2de0a..6ee7d5a491 100644
--- a/Zend/tests/objects_027.phpt
+++ b/Zend/tests/objects_027.phpt
@@ -40,5 +40,3 @@ Deprecated: %son-static method foo::test() should not be called statically in %s
Deprecated: Non-static method bar::show() should not be called statically in %s on line %d
object(foo)#%d (0) {
}
-
-
diff --git a/Zend/tests/offset_string.phpt b/Zend/tests/offset_string.phpt
index f7cb81bb20..3ad48e7412 100644
--- a/Zend/tests/offset_string.phpt
+++ b/Zend/tests/offset_string.phpt
@@ -62,4 +62,4 @@ string(1) "%s"
Warning: Illegal offset type in %s on line %d
string(1) "i"
-Done \ No newline at end of file
+Done
diff --git a/Zend/tests/parent_class_name_without_parent.phpt b/Zend/tests/parent_class_name_without_parent.phpt
index 622aefeab0..033b5ad4ec 100644
--- a/Zend/tests/parent_class_name_without_parent.phpt
+++ b/Zend/tests/parent_class_name_without_parent.phpt
@@ -22,4 +22,3 @@ Stack trace:
#0 %s(%d): C->f()
#1 {main}
thrown in %s on line 5
-
diff --git a/Zend/tests/result_unused.phpt b/Zend/tests/result_unused.phpt
index 0db744d089..12892e8415 100644
--- a/Zend/tests/result_unused.phpt
+++ b/Zend/tests/result_unused.phpt
@@ -26,4 +26,3 @@ echo "ok\n";
--EXPECTF--
Notice: Uninitialized string offset: 3 in %sresult_unused.php on line %d
ok
-
diff --git a/Zend/tests/return_types/001.phpt b/Zend/tests/return_types/001.phpt
index 13bf93f4df..2b87a562f6 100644
--- a/Zend/tests/return_types/001.phpt
+++ b/Zend/tests/return_types/001.phpt
@@ -1,13 +1,11 @@
--TEST--
Returned nothing, expected array
-
--FILE--
<?php
function test1() : array {
}
test1();
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, none returned in %s:%d
Stack trace:
diff --git a/Zend/tests/return_types/002.phpt b/Zend/tests/return_types/002.phpt
index 5921634553..615317cf83 100644
--- a/Zend/tests/return_types/002.phpt
+++ b/Zend/tests/return_types/002.phpt
@@ -1,6 +1,5 @@
--TEST--
Returned null, expected array
-
--FILE--
<?php
function test1() : array {
@@ -8,7 +7,6 @@ function test1() : array {
}
test1();
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, null returned in %s:%d
Stack trace:
diff --git a/Zend/tests/return_types/003.phpt b/Zend/tests/return_types/003.phpt
index f70500da9f..ed78d51823 100644
--- a/Zend/tests/return_types/003.phpt
+++ b/Zend/tests/return_types/003.phpt
@@ -1,13 +1,11 @@
--TEST--
Returned 1, expected array
-
--FILE--
<?php
function test1() : array {
return 1;
}
test1();
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, int returned in %s:%d
Stack trace:
diff --git a/Zend/tests/return_types/004.phpt b/Zend/tests/return_types/004.phpt
index 7865eb9d4d..6098d51334 100644
--- a/Zend/tests/return_types/004.phpt
+++ b/Zend/tests/return_types/004.phpt
@@ -1,6 +1,5 @@
--TEST--
Returned string, expected array
-
--FILE--
<?php
function test1() : array {
@@ -8,7 +7,6 @@ function test1() : array {
}
test1();
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, string returned in %s:%d
Stack trace:
diff --git a/Zend/tests/return_types/005.phpt b/Zend/tests/return_types/005.phpt
index a114b3ee93..f8d666fae5 100644
--- a/Zend/tests/return_types/005.phpt
+++ b/Zend/tests/return_types/005.phpt
@@ -1,6 +1,5 @@
--TEST--
Return value fails inheritance check in method
-
--FILE--
<?php
class foo {}
@@ -13,7 +12,6 @@ class qux {
$qux = new qux();
$qux->foo();
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of qux::foo() must be an instance of foo, instance of qux returned in %s:%d
Stack trace:
diff --git a/Zend/tests/return_types/006.phpt b/Zend/tests/return_types/006.phpt
index 359b25a28d..a4fcea1d25 100644
--- a/Zend/tests/return_types/006.phpt
+++ b/Zend/tests/return_types/006.phpt
@@ -1,6 +1,5 @@
--TEST--
Return type allowed in child when parent does not have return type
-
--FILE--
<?php
class Comment {}
@@ -15,7 +14,6 @@ $comments = new CommentsIterator([new Comment]);
foreach ($comments as $comment) {
var_dump($comment);
}
-
--EXPECTF--
object(Comment)#%d (%d) {
}
diff --git a/Zend/tests/return_types/007.phpt b/Zend/tests/return_types/007.phpt
index 0bbfb9fbba..21f7023518 100644
--- a/Zend/tests/return_types/007.phpt
+++ b/Zend/tests/return_types/007.phpt
@@ -1,6 +1,5 @@
--TEST--
Return value is subclass of return type
-
--FILE--
<?php
class foo {}
@@ -13,7 +12,6 @@ class qux extends foo {
$qux = new qux();
var_dump($qux->foo());
-
--EXPECTF--
object(qux)#%d (%d) {
}
diff --git a/Zend/tests/return_types/008.phpt b/Zend/tests/return_types/008.phpt
index 47343d0564..f2e01299de 100644
--- a/Zend/tests/return_types/008.phpt
+++ b/Zend/tests/return_types/008.phpt
@@ -1,6 +1,5 @@
--TEST--
Return type covariance in interface implementation
-
--FILE--
<?php
interface foo {
@@ -16,6 +15,5 @@ class qux implements foo {
$qux = new qux();
var_dump($qux->bar());
-
--EXPECTF--
Fatal error: Declaration of qux::bar(): qux must be compatible with foo::bar(): foo in %s008.php on line 7
diff --git a/Zend/tests/return_types/009.phpt b/Zend/tests/return_types/009.phpt
index b83703ede5..7eda8ce27b 100644
--- a/Zend/tests/return_types/009.phpt
+++ b/Zend/tests/return_types/009.phpt
@@ -1,6 +1,5 @@
--TEST--
Return type covariance error
-
--FILE--
<?php
interface foo {
@@ -14,6 +13,5 @@ class qux implements foo {
return $this;
}
}
-
--EXPECTF--
Fatal error: Declaration of qux::bar(): biz must be compatible with foo::bar(): foo in %s on line %d
diff --git a/Zend/tests/return_types/010.phpt b/Zend/tests/return_types/010.phpt
index 1a117d0cbc..2cfe97dac2 100644
--- a/Zend/tests/return_types/010.phpt
+++ b/Zend/tests/return_types/010.phpt
@@ -1,6 +1,5 @@
--TEST--
Returned null, expected array reference
-
--FILE--
<?php
function &foo(array &$in) : array {
@@ -9,7 +8,6 @@ function &foo(array &$in) : array {
$array = [1, 2, 3];
var_dump(foo($array));
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of foo() must be of the type array, null returned in %s:%d
Stack trace:
diff --git a/Zend/tests/return_types/011.phpt b/Zend/tests/return_types/011.phpt
index f3b000a706..23dbc1cfdb 100644
--- a/Zend/tests/return_types/011.phpt
+++ b/Zend/tests/return_types/011.phpt
@@ -1,6 +1,5 @@
--TEST--
Function returned callable, expected callable
-
--FILE--
<?php
function foo() : callable {
@@ -8,7 +7,6 @@ function foo() : callable {
}
var_dump(foo());
-
--EXPECTF--
object(Closure)#%d (%d) {
}
diff --git a/Zend/tests/return_types/012.phpt b/Zend/tests/return_types/012.phpt
index 39fa8e0ec6..b4c02a8ec1 100644
--- a/Zend/tests/return_types/012.phpt
+++ b/Zend/tests/return_types/012.phpt
@@ -1,6 +1,5 @@
--TEST--
Method returned callable, expected callable
-
--FILE--
<?php
class foo {
@@ -14,7 +13,6 @@ class foo {
$baz = new foo();
var_dump($baz->bar());
-
--EXPECT--
object(Closure)#2 (2) {
["static"]=>
diff --git a/Zend/tests/return_types/013.phpt b/Zend/tests/return_types/013.phpt
index 673a8f9dbc..5b2c06748d 100644
--- a/Zend/tests/return_types/013.phpt
+++ b/Zend/tests/return_types/013.phpt
@@ -1,6 +1,5 @@
--TEST--
Closure inside method returned null, expected array
-
--FILE--
<?php
class foo {
@@ -14,7 +13,6 @@ class foo {
$baz = new foo();
var_dump($func=$baz->bar(), $func());
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of foo::{closure}() must be of the type array, null returned in %s:%d
Stack trace:
diff --git a/Zend/tests/return_types/014.phpt b/Zend/tests/return_types/014.phpt
index 3974eb67fa..655c5a9cc6 100644
--- a/Zend/tests/return_types/014.phpt
+++ b/Zend/tests/return_types/014.phpt
@@ -1,12 +1,10 @@
--TEST--
Constructors cannot declare a return type
-
--FILE--
<?php
class Foo {
function __construct() : Foo {}
}
-
--EXPECTF--
Fatal error: Constructor %s::%s() cannot declare a return type in %s on line %d
diff --git a/Zend/tests/return_types/015.phpt b/Zend/tests/return_types/015.phpt
index 1c2cd564ff..973956b6bc 100644
--- a/Zend/tests/return_types/015.phpt
+++ b/Zend/tests/return_types/015.phpt
@@ -1,6 +1,5 @@
--TEST--
Return types allowed in namespace
-
--FILE--
<?php
@@ -18,7 +17,6 @@ class Vector implements Collection {
$v = new Vector;
var_dump($v->values());
-
--EXPECTF--
object(Collections\Vector)#%d (%d) {
}
diff --git a/Zend/tests/return_types/016.phpt b/Zend/tests/return_types/016.phpt
index f3636751c1..cf31d96e6b 100644
--- a/Zend/tests/return_types/016.phpt
+++ b/Zend/tests/return_types/016.phpt
@@ -1,6 +1,5 @@
--TEST--
Fully qualified classes are allowed in return types
-
--FILE--
<?php
@@ -14,7 +13,6 @@ class Foo {
$foo = new Foo;
var_dump($foo->foo(new \EmptyIterator()));
-
--EXPECTF--
object(EmptyIterator)#%d (0) {
}
diff --git a/Zend/tests/return_types/017.phpt b/Zend/tests/return_types/017.phpt
index d44b26fc04..d45cb55d45 100644
--- a/Zend/tests/return_types/017.phpt
+++ b/Zend/tests/return_types/017.phpt
@@ -1,6 +1,5 @@
--TEST--
Fully qualified classes in trait return types
-
--FILE--
<?php
@@ -18,7 +17,6 @@ class Foo {
$foo = new Foo;
var_dump($foo->foo([]));
-
--EXPECTF--
object(EmptyIterator)#%d (%d) {
}
diff --git a/Zend/tests/return_types/018.phpt b/Zend/tests/return_types/018.phpt
index 6c243ac756..2512c6cf49 100644
--- a/Zend/tests/return_types/018.phpt
+++ b/Zend/tests/return_types/018.phpt
@@ -1,12 +1,10 @@
--TEST--
Destructors cannot declare a return type
-
--FILE--
<?php
class Foo {
function __destruct() : Foo {}
}
-
--EXPECTF--
Fatal error: Destructor %s::%s() cannot declare a return type in %s on line %d
diff --git a/Zend/tests/return_types/019.phpt b/Zend/tests/return_types/019.phpt
index b5a83f3732..166b624563 100644
--- a/Zend/tests/return_types/019.phpt
+++ b/Zend/tests/return_types/019.phpt
@@ -1,12 +1,10 @@
--TEST--
__clone cannot declare a return type
-
--FILE--
<?php
class Foo {
function __clone() : Foo {}
}
-
--EXPECTF--
Fatal error: %s::%s() cannot declare a return type in %s on line %d
diff --git a/Zend/tests/return_types/020.phpt b/Zend/tests/return_types/020.phpt
index 101de62dd7..57c93a8dcd 100644
--- a/Zend/tests/return_types/020.phpt
+++ b/Zend/tests/return_types/020.phpt
@@ -1,6 +1,5 @@
--TEST--
Exception thrown from function with return type
-
--FILE--
<?php
function test() : array {
@@ -8,7 +7,6 @@ function test() : array {
}
test();
-
--EXPECTF--
Fatal error: Uncaught Exception in %s:%d
Stack trace:
diff --git a/Zend/tests/return_types/021.phpt b/Zend/tests/return_types/021.phpt
index 051f7dce69..bd37df68f3 100644
--- a/Zend/tests/return_types/021.phpt
+++ b/Zend/tests/return_types/021.phpt
@@ -1,6 +1,5 @@
--TEST--
Return type allows self
-
--FILE--
<?php
class Foo {
@@ -13,7 +12,6 @@ class Bar extends Foo {}
var_dump(Foo::getInstance());
var_dump(Bar::getInstance());
-
--EXPECTF--
object(Foo)#%d (%d) {
}
diff --git a/Zend/tests/return_types/022.phpt b/Zend/tests/return_types/022.phpt
index 8cf6f5164c..b0686ea8ab 100644
--- a/Zend/tests/return_types/022.phpt
+++ b/Zend/tests/return_types/022.phpt
@@ -1,6 +1,5 @@
--TEST--
Hint on closure with lexical vars
-
--FILE--
<?php
$foo = "bar";
@@ -12,6 +11,5 @@ $test = function() use($foo) : Closure {
$callable = $test();
var_dump($callable());
-
--EXPECT--
string(3) "bar"
diff --git a/Zend/tests/return_types/023.phpt b/Zend/tests/return_types/023.phpt
index 04df2caf7b..e8e8732ef1 100644
--- a/Zend/tests/return_types/023.phpt
+++ b/Zend/tests/return_types/023.phpt
@@ -1,13 +1,11 @@
--TEST--
PHP 4 Constructors cannot declare a return type
-
--FILE--
<?php
class Foo {
function foo() : Foo {}
}
-
--EXPECTF--
Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; Foo has a deprecated constructor in %s on line %d
diff --git a/Zend/tests/return_types/024.phpt b/Zend/tests/return_types/024.phpt
index 0579973fbc..45c8162335 100644
--- a/Zend/tests/return_types/024.phpt
+++ b/Zend/tests/return_types/024.phpt
@@ -1,10 +1,8 @@
--TEST--
Return type of self is not allowed in function
-
--FILE--
<?php
function test(): self {}
-
--EXPECTF--
Fatal error: Cannot use "self" when no class scope is active in %s on line 3
diff --git a/Zend/tests/return_types/025.phpt b/Zend/tests/return_types/025.phpt
index 148971250a..c9f0ffef4a 100644
--- a/Zend/tests/return_types/025.phpt
+++ b/Zend/tests/return_types/025.phpt
@@ -1,13 +1,11 @@
--TEST--
Return type of self is allowed in closure
-
--FILE--
<?php
$c = function(): self { return $this; };
class Bar { }
var_dump($c->call(new Bar));
-
--EXPECT--
object(Bar)#2 (0) {
}
diff --git a/Zend/tests/return_types/026.phpt b/Zend/tests/return_types/026.phpt
index 5693e95c7e..f08c527512 100644
--- a/Zend/tests/return_types/026.phpt
+++ b/Zend/tests/return_types/026.phpt
@@ -4,6 +4,5 @@ Return type of parent is not allowed in function
<?php
function test(): parent {}
-
--EXPECTF--
Fatal error: Cannot use "parent" when no class scope is active in %s on line %d
diff --git a/Zend/tests/return_types/027.phpt b/Zend/tests/return_types/027.phpt
index a5d2c321bf..33a9c7f94d 100644
--- a/Zend/tests/return_types/027.phpt
+++ b/Zend/tests/return_types/027.phpt
@@ -8,7 +8,6 @@ class B extends A {}
$c = function(parent $x): parent { return $x; };
var_dump($c->bindTo(null, 'B')(new A));
-
--EXPECTF--
object(A)#%d (0) {
}
diff --git a/Zend/tests/return_types/031.phpt b/Zend/tests/return_types/031.phpt
index 91ee2f8ce4..6d0b71b23b 100644
--- a/Zend/tests/return_types/031.phpt
+++ b/Zend/tests/return_types/031.phpt
@@ -11,4 +11,4 @@ class B extends A {
?>
DONE
--EXPECTF--
-Fatal error: Declaration of B::foo(): ?int must be compatible with A::foo(): int in %s031.php on line 7 \ No newline at end of file
+Fatal error: Declaration of B::foo(): ?int must be compatible with A::foo(): int in %s031.php on line 7
diff --git a/Zend/tests/return_types/generators001.phpt b/Zend/tests/return_types/generators001.phpt
index f2ac88a7ad..9f89d71102 100644
--- a/Zend/tests/return_types/generators001.phpt
+++ b/Zend/tests/return_types/generators001.phpt
@@ -1,6 +1,5 @@
--TEST--
Valid generator return types
-
--FILE--
<?php
function test1() : Generator {
@@ -20,7 +19,6 @@ var_dump(
test2(),
test3()
);
-
--EXPECTF--
object(Generator)#%d (%d) {
}
diff --git a/Zend/tests/return_types/generators002.phpt b/Zend/tests/return_types/generators002.phpt
index 519c97a962..90bada714b 100644
--- a/Zend/tests/return_types/generators002.phpt
+++ b/Zend/tests/return_types/generators002.phpt
@@ -1,11 +1,9 @@
--TEST--
Generator return type must be Generator, Iterator or Traversable
-
--FILE--
<?php
function test1() : StdClass {
yield 1;
}
-
--EXPECTF--
Fatal error: Generators may only declare a return type of Generator, Iterator, Traversable, or iterable, StdClass is not permitted in %s on line %d
diff --git a/Zend/tests/return_types/generators003.phpt b/Zend/tests/return_types/generators003.phpt
index 0ff2524f47..5502318e98 100644
--- a/Zend/tests/return_types/generators003.phpt
+++ b/Zend/tests/return_types/generators003.phpt
@@ -1,6 +1,5 @@
--TEST--
Return type covariance works with generators
-
--FILE--
<?php
interface Collection extends IteratorAggregate {
@@ -17,6 +16,5 @@ class SomeCollection implements Collection {
$some = new SomeCollection();
var_dump($some->getIterator());
-
--EXPECTF--
Fatal error: Declaration of SomeCollection::getIterator(): Generator must be compatible with Collection::getIterator(): Iterator in %sgenerators003.php on line 6
diff --git a/Zend/tests/return_types/generators004.phpt b/Zend/tests/return_types/generators004.phpt
index 74aa801638..4e9aa07f42 100644
--- a/Zend/tests/return_types/generators004.phpt
+++ b/Zend/tests/return_types/generators004.phpt
@@ -1,6 +1,5 @@
--TEST--
Generator with return type does not fail with empty return
-
--FILE--
<?php
@@ -12,6 +11,5 @@ $a = function(): \Iterator {
foreach($a() as $value) {
echo $value;
}
-
--EXPECT--
1
diff --git a/Zend/tests/return_types/generators005.phpt b/Zend/tests/return_types/generators005.phpt
index 21e6c4bef1..a7e3bda042 100644
--- a/Zend/tests/return_types/generators005.phpt
+++ b/Zend/tests/return_types/generators005.phpt
@@ -1,6 +1,5 @@
--TEST--
Return type covariance works with generators
-
--FILE--
<?php
interface Collection extends IteratorAggregate {
@@ -17,7 +16,6 @@ class SomeCollection implements Collection {
$some = new SomeCollection();
var_dump($some->getIterator());
-
--EXPECTF--
object(Generator)#%d (%d) {
}
diff --git a/Zend/tests/return_types/inheritance001.phpt b/Zend/tests/return_types/inheritance001.phpt
index 8e0523eb70..5e154d0482 100644
--- a/Zend/tests/return_types/inheritance001.phpt
+++ b/Zend/tests/return_types/inheritance001.phpt
@@ -1,6 +1,5 @@
--TEST--
Return type covariance; extends class
-
--FILE--
<?php
@@ -11,6 +10,5 @@ class A {
class B extends A {
function foo(): StdClass {}
}
-
--EXPECTF--
Fatal error: Declaration of B::foo(): StdClass must be compatible with A::foo(): A in %s on line %d
diff --git a/Zend/tests/return_types/inheritance002.phpt b/Zend/tests/return_types/inheritance002.phpt
index 8cb63b6fc8..bb00b7e243 100644
--- a/Zend/tests/return_types/inheritance002.phpt
+++ b/Zend/tests/return_types/inheritance002.phpt
@@ -1,6 +1,5 @@
--TEST--
Return type covariance; extends abstract class
-
--FILE--
<?php
@@ -11,6 +10,5 @@ abstract class A {
class B extends A {
function foo(): StdClass {}
}
-
--EXPECTF--
Fatal error: Declaration of B::foo(): StdClass must be compatible with A::foo(): A in %s on line %d
diff --git a/Zend/tests/return_types/inheritance003.phpt b/Zend/tests/return_types/inheritance003.phpt
index 0b22dd55d4..e8ebe90cd1 100644
--- a/Zend/tests/return_types/inheritance003.phpt
+++ b/Zend/tests/return_types/inheritance003.phpt
@@ -1,6 +1,5 @@
--TEST--
Return type mismatch; implements interface
-
--FILE--
<?php
@@ -11,6 +10,5 @@ interface A {
class B implements A {
function foo(): StdClass {}
}
-
--EXPECTF--
Fatal error: Declaration of B::foo(): StdClass must be compatible with A::foo(): A in %s on line %d
diff --git a/Zend/tests/return_types/inheritance004.phpt b/Zend/tests/return_types/inheritance004.phpt
index 66d35564f7..1c8d685a63 100644
--- a/Zend/tests/return_types/inheritance004.phpt
+++ b/Zend/tests/return_types/inheritance004.phpt
@@ -1,6 +1,5 @@
--TEST--
Internal covariant return type of self
-
--FILE--
<?php
class Foo {
@@ -17,7 +16,6 @@ class Bar extends Foo {
var_dump(Bar::test());
var_dump(Foo::test());
-
--EXPECTF--
object(Bar)#%d (0) {
}
diff --git a/Zend/tests/return_types/inheritance005.phpt b/Zend/tests/return_types/inheritance005.phpt
index 31e0e11dd8..7415a72b9f 100644
--- a/Zend/tests/return_types/inheritance005.phpt
+++ b/Zend/tests/return_types/inheritance005.phpt
@@ -1,6 +1,5 @@
--TEST--
Internal covariant return type of self
-
--FILE--
<?php
class Foo {
@@ -14,6 +13,5 @@ class Bar extends Foo {
return new Bar;
}
}
-
--EXPECTF--
Fatal error: Declaration of Bar::test(): Bar must be compatible with Foo::test(): Foo in %sinheritance005.php on line 12
diff --git a/Zend/tests/return_types/inheritance006.phpt b/Zend/tests/return_types/inheritance006.phpt
index 86c11aa57a..7d4bcbe57b 100644
--- a/Zend/tests/return_types/inheritance006.phpt
+++ b/Zend/tests/return_types/inheritance006.phpt
@@ -1,9 +1,7 @@
--TEST--
External covariant return type of self
-
--INI--
opcache.enable_cli=1
-
--FILE--
<?php
require __DIR__ . "/classes.php.inc";
@@ -19,6 +17,5 @@ class Bar extends Foo {
return new B;
}
}
-
--EXPECTF--
Fatal error: Declaration of Bar::test(): B must be compatible with Foo::test(): A in %sinheritance006.php on line 14
diff --git a/Zend/tests/return_types/inheritance007.phpt b/Zend/tests/return_types/inheritance007.phpt
index 86d0bd9d69..af1738f807 100644
--- a/Zend/tests/return_types/inheritance007.phpt
+++ b/Zend/tests/return_types/inheritance007.phpt
@@ -1,9 +1,7 @@
--TEST--
Inheritance Hinting Compile Checking Failure Internal Classes
-
--INI--
opcache.enable_cli=1
-
--FILE--
<?php
class Foo {
@@ -17,6 +15,5 @@ class Bar extends Foo {
return new ArrayObject([1, 2]);
}
}
-
--EXPECTF--
Fatal error: Declaration of Bar::test(): ArrayObject must be compatible with Foo::test(): Traversable in %sinheritance007.php on line 12
diff --git a/Zend/tests/return_types/inheritance008.phpt b/Zend/tests/return_types/inheritance008.phpt
index 242c50dcf0..df353cda05 100644
--- a/Zend/tests/return_types/inheritance008.phpt
+++ b/Zend/tests/return_types/inheritance008.phpt
@@ -1,9 +1,7 @@
--TEST--
External covariant return type of self
-
--INI--
opcache.enable_cli=1
-
--FILE--
<?php
require __DIR__ . "/classes.php.inc";
@@ -22,7 +20,6 @@ class Bar extends Foo {
var_dump(Bar::test());
var_dump(Foo::test());
-
--EXPECTF--
object(B)#%d (0) {
}
diff --git a/Zend/tests/return_types/inheritance009.phpt b/Zend/tests/return_types/inheritance009.phpt
index 382007e8f0..b7d5628e8d 100644
--- a/Zend/tests/return_types/inheritance009.phpt
+++ b/Zend/tests/return_types/inheritance009.phpt
@@ -1,9 +1,7 @@
--TEST--
Inheritance Hinting Compile Checking Failure Internal Classes
-
--INI--
opcache.enable_cli=1
-
--FILE--
<?php
class Foo {
@@ -20,7 +18,6 @@ class Bar extends Foo {
var_dump(Bar::test());
var_dump(Foo::test());
-
--EXPECTF--
object(ArrayObject)#%d (1) {
["storage":"ArrayObject":private]=>
diff --git a/Zend/tests/return_types/return_reference_separation.phpt b/Zend/tests/return_types/return_reference_separation.phpt
index cbf3ed5fd3..0151e5ec31 100644
--- a/Zend/tests/return_types/return_reference_separation.phpt
+++ b/Zend/tests/return_types/return_reference_separation.phpt
@@ -1,6 +1,5 @@
--TEST--
Return value separation
-
--FILE--
<?php
function test1(&$abc) : string {
@@ -31,4 +30,4 @@ int(123)
string(3) "123"
int(123)
string(3) "123"
-string(3) "123" \ No newline at end of file
+string(3) "123"
diff --git a/Zend/tests/return_types/rfc001.phpt b/Zend/tests/return_types/rfc001.phpt
index 3c74acb923..3fdbf3443c 100644
--- a/Zend/tests/return_types/rfc001.phpt
+++ b/Zend/tests/return_types/rfc001.phpt
@@ -1,6 +1,5 @@
--TEST--
RFC example: returned type does not match the type declaration
-
--FILE--
<?php
@@ -9,7 +8,6 @@ function get_config(): array {
}
get_config();
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of get_config() must be of the type array, int returned in %s:%d
Stack trace:
diff --git a/Zend/tests/return_types/rfc002.phpt b/Zend/tests/return_types/rfc002.phpt
index 8d0ed0862f..a2c326c24a 100644
--- a/Zend/tests/return_types/rfc002.phpt
+++ b/Zend/tests/return_types/rfc002.phpt
@@ -1,6 +1,5 @@
--TEST--
RFC example: Scalar Types
-
--FILE--
<?php
function answer(): int {
@@ -8,6 +7,5 @@ function answer(): int {
}
var_dump(answer());
-
--EXPECT--
int(42)
diff --git a/Zend/tests/return_types/rfc003.phpt b/Zend/tests/return_types/rfc003.phpt
index ae4c5b7f60..6b9cc81c69 100644
--- a/Zend/tests/return_types/rfc003.phpt
+++ b/Zend/tests/return_types/rfc003.phpt
@@ -1,6 +1,5 @@
--TEST--
RFC example: cannot return null with a return type declaration
-
--FILE--
<?php
function foo(): DateTime {
@@ -8,7 +7,6 @@ function foo(): DateTime {
}
foo();
-
--EXPECTF--
Fatal error: Uncaught TypeError: Return value of foo() must be an instance of DateTime, null returned in %s:%d
Stack trace:
diff --git a/Zend/tests/return_types/rfc004.phpt b/Zend/tests/return_types/rfc004.phpt
index 654fb92321..ed40e41b09 100644
--- a/Zend/tests/return_types/rfc004.phpt
+++ b/Zend/tests/return_types/rfc004.phpt
@@ -1,6 +1,5 @@
--TEST--
RFC example: missing return type on override
-
--FILE--
<?php
@@ -16,6 +15,5 @@ class UserGateway_MySql implements UserGateway {
return new User;
}
}
-
--EXPECTF--
Fatal error: Declaration of UserGateway_MySql::find($id) must be compatible with UserGateway::find($id): User in %s on line 9
diff --git a/Zend/tests/self_in_eval.phpt b/Zend/tests/self_in_eval.phpt
index 41c2654062..efd81ad266 100644
--- a/Zend/tests/self_in_eval.phpt
+++ b/Zend/tests/self_in_eval.phpt
@@ -25,4 +25,3 @@ int(1)
int(2)
string(1) "C"
string(1) "C"
-
diff --git a/Zend/tests/temporary_cleaning_016.phpt b/Zend/tests/temporary_cleaning_016.phpt
index d7be78e1ff..cdc9bff0cb 100644
--- a/Zend/tests/temporary_cleaning_016.phpt
+++ b/Zend/tests/temporary_cleaning_016.phpt
@@ -13,4 +13,3 @@ try {
DONE
--EXPECT--
DONE
-
diff --git a/Zend/tests/this_in_eval.phpt b/Zend/tests/this_in_eval.phpt
index ed3926cd66..8da70b76a3 100644
--- a/Zend/tests/this_in_eval.phpt
+++ b/Zend/tests/this_in_eval.phpt
@@ -15,4 +15,3 @@ object(C)#1 (0) {
}
object(C)#1 (0) {
}
-
diff --git a/Zend/tests/throwable_001.phpt b/Zend/tests/throwable_001.phpt
index afcdd7224c..306ed13784 100644
--- a/Zend/tests/throwable_001.phpt
+++ b/Zend/tests/throwable_001.phpt
@@ -7,7 +7,6 @@ Aaron Piotrowski <aaron@icicle.io>
throw new Exception('Exception message', 0, new Error('Error message'));
?>
--EXPECTF--
-
Fatal error: Uncaught Error: Error message in %s:%d
Stack trace:
#0 {main}
diff --git a/Zend/tests/throwable_002.phpt b/Zend/tests/throwable_002.phpt
index 10fd82bea5..f51969c6c5 100644
--- a/Zend/tests/throwable_002.phpt
+++ b/Zend/tests/throwable_002.phpt
@@ -7,7 +7,6 @@ Aaron Piotrowski <aaron@icicle.io>
throw new Error('Error message', 0, new Exception('Exception message'));
?>
--EXPECTF--
-
Fatal error: Uncaught Exception: Exception message in %s:%d
Stack trace:
#0 {main}
diff --git a/Zend/tests/throwable_003.phpt b/Zend/tests/throwable_003.phpt
index 19626a3186..3e65027c79 100644
--- a/Zend/tests/throwable_003.phpt
+++ b/Zend/tests/throwable_003.phpt
@@ -7,5 +7,4 @@ Aaron Piotrowski <aaron@icicle.io>
class Failure implements Throwable {}
?>
--EXPECTF--
-
Fatal error: Class Failure cannot implement interface Throwable, extend Exception or Error instead in %s on line %d
diff --git a/Zend/tests/traits/bug55554a.phpt b/Zend/tests/traits/bug55554a.phpt
index b92a81f54f..dd844ba661 100644
--- a/Zend/tests/traits/bug55554a.phpt
+++ b/Zend/tests/traits/bug55554a.phpt
@@ -28,7 +28,6 @@ $o = new NewConstructor;
echo "Legacy constructor: ";
$o = new LegacyConstructor;
-
--EXPECT--
New constructor: ctor executed
Legacy constructor: ctor executed
diff --git a/Zend/tests/traits/bug55554b.phpt b/Zend/tests/traits/bug55554b.phpt
index cf2eadf2f8..65ecb7adaf 100644
--- a/Zend/tests/traits/bug55554b.phpt
+++ b/Zend/tests/traits/bug55554b.phpt
@@ -46,8 +46,6 @@ class ReportCollision {
echo "ReportCollision: ";
$o = new ReportCollision;
-
-
--EXPECTF--
OverridingIsSilent1 __construct
@@ -55,4 +53,3 @@ Deprecated: Methods with the same name as their class will not be constructors i
OverridingIsSilent2 OverridingIsSilent2
Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d
-
diff --git a/Zend/tests/traits/bug55554c.phpt b/Zend/tests/traits/bug55554c.phpt
index ff6f37d3c2..420689259e 100644
--- a/Zend/tests/traits/bug55554c.phpt
+++ b/Zend/tests/traits/bug55554c.phpt
@@ -40,7 +40,5 @@ class ReportCollision {
echo "ReportCollision: ";
$o = new ReportCollision;
-
-
--EXPECT--
ReportCollision: New constructor executed
diff --git a/Zend/tests/traits/bug55554d.phpt b/Zend/tests/traits/bug55554d.phpt
index 10f2e2952d..88564a83c1 100644
--- a/Zend/tests/traits/bug55554d.phpt
+++ b/Zend/tests/traits/bug55554d.phpt
@@ -25,8 +25,5 @@ class ReportCollision {
}
$o = new ReportCollision;
-
--EXPECTF--
-
Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d
-
diff --git a/Zend/tests/traits/bug55554e.phpt b/Zend/tests/traits/bug55554e.phpt
index 5db508fc85..ed1c324831 100644
--- a/Zend/tests/traits/bug55554e.phpt
+++ b/Zend/tests/traits/bug55554e.phpt
@@ -24,7 +24,5 @@ class ReportCollision {
echo "ReportCollision: ";
$o = new ReportCollision;
-
-
--EXPECTF--
-Fatal error: Trait method ReportCollision has not been applied, because there are collisions with other trait methods on ReportCollision in %s on line %d \ No newline at end of file
+Fatal error: Trait method ReportCollision has not been applied, because there are collisions with other trait methods on ReportCollision in %s on line %d
diff --git a/Zend/tests/traits/bug55554f.phpt b/Zend/tests/traits/bug55554f.phpt
index 31f5f534c5..d7d4fc007d 100644
--- a/Zend/tests/traits/bug55554f.phpt
+++ b/Zend/tests/traits/bug55554f.phpt
@@ -23,7 +23,5 @@ class ReportCollision {
echo "ReportCollision: ";
$o = new ReportCollision;
-
-
--EXPECTF--
-Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d \ No newline at end of file
+Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d
diff --git a/Zend/tests/traits/bug55554g.phpt b/Zend/tests/traits/bug55554g.phpt
index 662140cec0..d7de8216b0 100644
--- a/Zend/tests/traits/bug55554g.phpt
+++ b/Zend/tests/traits/bug55554g.phpt
@@ -23,7 +23,5 @@ class ReportCollision {
echo "ReportCollision: ";
$o = new ReportCollision;
-
-
--EXPECTF--
-Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d \ No newline at end of file
+Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d
diff --git a/Zend/tests/traits/bug60153.phpt b/Zend/tests/traits/bug60153.phpt
index 8f01e72c2d..5dcc78a878 100644
--- a/Zend/tests/traits/bug60153.phpt
+++ b/Zend/tests/traits/bug60153.phpt
@@ -14,6 +14,5 @@ trait TFoo {
class C implements IFoo {
use TFoo;
}
-
--EXPECTF--
Fatal error: Declaration of C::oneArgument() must be compatible with IFoo::oneArgument($a) in %s on line %d
diff --git a/Zend/tests/traits/bug60165a.phpt b/Zend/tests/traits/bug60165a.phpt
index 245bb94e97..6bc3352e21 100644
--- a/Zend/tests/traits/bug60165a.phpt
+++ b/Zend/tests/traits/bug60165a.phpt
@@ -12,6 +12,5 @@ class MyClass {
nonExistent as barA;
}
}
-
--EXPECTF--
Fatal error: An alias (barA) was defined for method nonExistent(), but this method does not exist in %s on line %d
diff --git a/Zend/tests/traits/bug60165b.phpt b/Zend/tests/traits/bug60165b.phpt
index 7b4855a646..ac3f070bd8 100644
--- a/Zend/tests/traits/bug60165b.phpt
+++ b/Zend/tests/traits/bug60165b.phpt
@@ -12,6 +12,5 @@ class MyClass {
A::nonExistent as barA;
}
}
-
--EXPECTF--
Fatal error: An alias was defined for A::nonExistent but this method does not exist in %s on line %d
diff --git a/Zend/tests/traits/bug60165c.phpt b/Zend/tests/traits/bug60165c.phpt
index d72491f030..9a8458d65d 100644
--- a/Zend/tests/traits/bug60165c.phpt
+++ b/Zend/tests/traits/bug60165c.phpt
@@ -17,6 +17,5 @@ class MyClass {
baz as foobar;
}
}
-
--EXPECTF--
Fatal error: An alias (foobar) was defined for method baz(), but this method does not exist in %s on line %d
diff --git a/Zend/tests/traits/bug60165d.phpt b/Zend/tests/traits/bug60165d.phpt
index 26ac927a81..6b4a09d059 100644
--- a/Zend/tests/traits/bug60165d.phpt
+++ b/Zend/tests/traits/bug60165d.phpt
@@ -16,6 +16,5 @@ class MyClass {
A::bar insteadof B;
}
}
-
--EXPECTF--
Fatal error: A precedence rule was defined for A::bar but this method does not exist in %s on line %d
diff --git a/Zend/tests/traits/bug60173.phpt b/Zend/tests/traits/bug60173.phpt
index f525a66aee..d4683a9921 100644
--- a/Zend/tests/traits/bug60173.phpt
+++ b/Zend/tests/traits/bug60173.phpt
@@ -7,7 +7,6 @@ trait foo { }
$rc = new ReflectionClass('foo');
$rc->newInstance();
-
--EXPECTF--
Fatal error: Uncaught Error: Cannot instantiate trait foo in %s:%d
Stack trace:
diff --git a/Zend/tests/traits/bug60217a.phpt b/Zend/tests/traits/bug60217a.phpt
index da0d06cd25..20132370c1 100644
--- a/Zend/tests/traits/bug60217a.phpt
+++ b/Zend/tests/traits/bug60217a.phpt
@@ -21,6 +21,5 @@ class C {
$o = new C;
$o->foo();
-
--EXPECT--
C::foo() works.
diff --git a/Zend/tests/traits/bug60217b.phpt b/Zend/tests/traits/bug60217b.phpt
index 8b2b64e534..b349cf2c54 100644
--- a/Zend/tests/traits/bug60217b.phpt
+++ b/Zend/tests/traits/bug60217b.phpt
@@ -21,6 +21,5 @@ class CBroken {
$o = new CBroken;
$o->foo(1);
-
--EXPECTF--
Fatal error: Declaration of TBroken1::foo($a) must be compatible with TBroken2::foo($a, $b = 0) in %s
diff --git a/Zend/tests/traits/bug60217c.phpt b/Zend/tests/traits/bug60217c.phpt
index baa4314a61..401444e978 100644
--- a/Zend/tests/traits/bug60217c.phpt
+++ b/Zend/tests/traits/bug60217c.phpt
@@ -21,6 +21,5 @@ class CBroken {
$o = new CBroken;
$o->foo(1);
-
--EXPECTF--
Fatal error: Declaration of TBroken2::foo($a) must be compatible with TBroken1::foo($a, $b = 0) in %s on line %d
diff --git a/Zend/tests/traits/bug60369.phpt b/Zend/tests/traits/bug60369.phpt
index bfc1ee303f..77a7067232 100644
--- a/Zend/tests/traits/bug60369.phpt
+++ b/Zend/tests/traits/bug60369.phpt
@@ -14,4 +14,4 @@ class Properties {
?>
--EXPECTF--
-Fatal error: Properties and PropertiesTrait define the same property ($same) in the composition of Properties. However, the definition differs and is considered incompatible. Class was composed in %s on line %d \ No newline at end of file
+Fatal error: Properties and PropertiesTrait define the same property ($same) in the composition of Properties. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
diff --git a/Zend/tests/traits/bug60717.phpt b/Zend/tests/traits/bug60717.phpt
index d4bf7ea6de..d38b1c0c24 100644
--- a/Zend/tests/traits/bug60717.phpt
+++ b/Zend/tests/traits/bug60717.phpt
@@ -68,6 +68,5 @@ namespace HTML
$o = new HTMLHelper6;
echo 'Done';
}
-
--EXPECT--
Done
diff --git a/Zend/tests/traits/bug65576a.phpt b/Zend/tests/traits/bug65576a.phpt
index d5a86578ab..51d2463808 100644
--- a/Zend/tests/traits/bug65576a.phpt
+++ b/Zend/tests/traits/bug65576a.phpt
@@ -25,7 +25,5 @@ class B extends A
}
new B();
-
--EXPECT--
Trait constructor
-
diff --git a/Zend/tests/traits/bug65576b.phpt b/Zend/tests/traits/bug65576b.phpt
index 857c582d80..c13ce8c2e1 100644
--- a/Zend/tests/traits/bug65576b.phpt
+++ b/Zend/tests/traits/bug65576b.phpt
@@ -26,8 +26,6 @@ class B extends A
}
new B();
-
--EXPECT--
Parent constructor
Trait constructor
-
diff --git a/Zend/tests/traits/bug76700.phpt b/Zend/tests/traits/bug76700.phpt
index 5b746d5671..a9797f3c9e 100644
--- a/Zend/tests/traits/bug76700.phpt
+++ b/Zend/tests/traits/bug76700.phpt
@@ -26,6 +26,5 @@ class B extends A
$b = new B();
$b->aa();
-
--EXPECT--
123
diff --git a/Zend/tests/traits/bug76773.phpt b/Zend/tests/traits/bug76773.phpt
index 2601d1cdda..683952025d 100644
--- a/Zend/tests/traits/bug76773.phpt
+++ b/Zend/tests/traits/bug76773.phpt
@@ -27,7 +27,6 @@ class ChildClass extends ParentClass
$c = new ChildClass();
$c->hello();
-
--EXPECT--
ChildClass
ParentClass
diff --git a/Zend/tests/traits/bugs/abstract-methods01.phpt b/Zend/tests/traits/bugs/abstract-methods01.phpt
index 5b90ae0f3d..23cdef3a89 100644
--- a/Zend/tests/traits/bugs/abstract-methods01.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods01.phpt
@@ -16,4 +16,4 @@ $test = new TraitsTest();
$test->hello();
?>
--EXPECTF--
-Fatal error: Class %s contains %d abstract method and must therefore be declared abstract or implement the remaining methods (%s) in %s on line %d \ No newline at end of file
+Fatal error: Class %s contains %d abstract method and must therefore be declared abstract or implement the remaining methods (%s) in %s on line %d
diff --git a/Zend/tests/traits/bugs/abstract-methods02.phpt b/Zend/tests/traits/bugs/abstract-methods02.phpt
index 626df3d6eb..73bb65d179 100644
--- a/Zend/tests/traits/bugs/abstract-methods02.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods02.phpt
@@ -23,4 +23,4 @@ $test = new TraitsTest();
$test->hello();
?>
--EXPECT--
-Hello \ No newline at end of file
+Hello
diff --git a/Zend/tests/traits/bugs/abstract-methods03.phpt b/Zend/tests/traits/bugs/abstract-methods03.phpt
index 44746578e0..b871bc8e4b 100644
--- a/Zend/tests/traits/bugs/abstract-methods03.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods03.phpt
@@ -19,4 +19,4 @@ $test = new TraitsTest();
$test->hello();
?>
--EXPECT--
-Hello \ No newline at end of file
+Hello
diff --git a/Zend/tests/traits/bugs/abstract-methods04.phpt b/Zend/tests/traits/bugs/abstract-methods04.phpt
index 5cfc7d7d51..d15bdd9473 100644
--- a/Zend/tests/traits/bugs/abstract-methods04.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods04.phpt
@@ -33,4 +33,4 @@ $test->hello();
?>
--EXPECT--
-HelloHello \ No newline at end of file
+HelloHello
diff --git a/Zend/tests/traits/bugs/alias-semantics.phpt b/Zend/tests/traits/bugs/alias-semantics.phpt
index a940ab0942..eec2de1aff 100644
--- a/Zend/tests/traits/bugs/alias-semantics.phpt
+++ b/Zend/tests/traits/bugs/alias-semantics.phpt
@@ -20,4 +20,4 @@ $test->b();
?>
--EXPECT--
-AA \ No newline at end of file
+AA
diff --git a/Zend/tests/traits/bugs/alias-semantics02.phpt b/Zend/tests/traits/bugs/alias-semantics02.phpt
index 5ce117ea76..bcd75d9cf9 100644
--- a/Zend/tests/traits/bugs/alias-semantics02.phpt
+++ b/Zend/tests/traits/bugs/alias-semantics02.phpt
@@ -22,4 +22,4 @@ $test->b();
?>
--EXPECT--
-AA \ No newline at end of file
+AA
diff --git a/Zend/tests/traits/bugs/missing-trait.phpt b/Zend/tests/traits/bugs/missing-trait.phpt
index 1cdd4f1cc6..d8ede9dfa7 100644
--- a/Zend/tests/traits/bugs/missing-trait.phpt
+++ b/Zend/tests/traits/bugs/missing-trait.phpt
@@ -12,4 +12,4 @@ $test = new TraitsTest();
?>
--EXPECTF--
-Fatal error: Trait 'THello' not found in %s on line %d \ No newline at end of file
+Fatal error: Trait 'THello' not found in %s on line %d
diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
index 9425b9215b..1029dee634 100644
--- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
+++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
@@ -28,4 +28,4 @@ $test = new TraitsTest();
$test->hello();
?>
--EXPECT--
-Hello \ No newline at end of file
+Hello
diff --git a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
index b289651a9b..5c54f0027a 100644
--- a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
+++ b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
@@ -20,4 +20,4 @@ $obj = new baz();
echo $obj->zoo, "\n";
?>
--EXPECTF--
-Fatal error: baz and foo define the same property ($zoo) in the composition of baz. However, the definition differs and is considered incompatible. Class was composed in %s on line %d \ No newline at end of file
+Fatal error: baz and foo define the same property ($zoo) in the composition of baz. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
diff --git a/Zend/tests/traits/conflict001.phpt b/Zend/tests/traits/conflict001.phpt
index dfc9456853..11dababdb5 100644
--- a/Zend/tests/traits/conflict001.phpt
+++ b/Zend/tests/traits/conflict001.phpt
@@ -22,4 +22,4 @@ class TraitsTest {
}
?>
--EXPECTF--
-Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on TraitsTest in %s on line %d \ No newline at end of file
+Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on TraitsTest in %s on line %d
diff --git a/Zend/tests/traits/conflict002.phpt b/Zend/tests/traits/conflict002.phpt
index a723639ee9..1327de1458 100644
--- a/Zend/tests/traits/conflict002.phpt
+++ b/Zend/tests/traits/conflict002.phpt
@@ -29,4 +29,4 @@ $o = new TheWorldIsNotEnough();
$o->sayHello(); // echos Hello Universe!
?>
--EXPECT--
-Hello Universe! \ No newline at end of file
+Hello Universe!
diff --git a/Zend/tests/traits/conflict003.phpt b/Zend/tests/traits/conflict003.phpt
index 577f5c73c3..e274063a6f 100644
--- a/Zend/tests/traits/conflict003.phpt
+++ b/Zend/tests/traits/conflict003.phpt
@@ -28,4 +28,4 @@ class Talker {
?>
--EXPECTF--
-Fatal error: Trait method smallTalk has not been applied, because there are collisions with other trait methods on Talker in %s on line %d \ No newline at end of file
+Fatal error: Trait method smallTalk has not been applied, because there are collisions with other trait methods on Talker in %s on line %d
diff --git a/Zend/tests/traits/flattening001.phpt b/Zend/tests/traits/flattening001.phpt
index eed429111e..db72182bb3 100644
--- a/Zend/tests/traits/flattening001.phpt
+++ b/Zend/tests/traits/flattening001.phpt
@@ -39,4 +39,4 @@ var_dump($o->getText());
--EXPECT--
string(4) "test"
string(3) "foo"
-string(3) "bar" \ No newline at end of file
+string(3) "bar"
diff --git a/Zend/tests/traits/flattening002.phpt b/Zend/tests/traits/flattening002.phpt
index abae314d1f..810681072b 100644
--- a/Zend/tests/traits/flattening002.phpt
+++ b/Zend/tests/traits/flattening002.phpt
@@ -25,4 +25,4 @@ $o = new MyHelloWorld();
$o->sayHello();
?>
--EXPECT--
-Hello World! \ No newline at end of file
+Hello World!
diff --git a/Zend/tests/traits/flattening003.phpt b/Zend/tests/traits/flattening003.phpt
index 276d117bb8..0b4d87a295 100644
--- a/Zend/tests/traits/flattening003.phpt
+++ b/Zend/tests/traits/flattening003.phpt
@@ -29,4 +29,4 @@ $o->sayHello();
$o->sayWorld();
?>
--EXPECT--
-Hello World! \ No newline at end of file
+Hello World!
diff --git a/Zend/tests/traits/inheritance001.phpt b/Zend/tests/traits/inheritance001.phpt
index 90cad90c46..60c5fcfc0b 100644
--- a/Zend/tests/traits/inheritance001.phpt
+++ b/Zend/tests/traits/inheritance001.phpt
@@ -21,4 +21,4 @@ $o = new TheWorldIsNotEnough();
$o->sayHello(); // echos Hello Universe!
?>
--EXPECT--
-Hello Universe! \ No newline at end of file
+Hello Universe!
diff --git a/Zend/tests/traits/inheritance002.phpt b/Zend/tests/traits/inheritance002.phpt
index 0bcaca9f07..31c63a0f25 100644
--- a/Zend/tests/traits/inheritance002.phpt
+++ b/Zend/tests/traits/inheritance002.phpt
@@ -24,4 +24,4 @@ $o = new MyHelloWorld();
$o->sayHello();
?>
--EXPECT--
-World! \ No newline at end of file
+World!
diff --git a/Zend/tests/traits/language002.phpt b/Zend/tests/traits/language002.phpt
index ac29e2a124..2f336b8b8b 100644
--- a/Zend/tests/traits/language002.phpt
+++ b/Zend/tests/traits/language002.phpt
@@ -29,4 +29,4 @@ $o->sayWorld();
$o->sayExclamationMark();
?>
--EXPECT--
-Hello World! \ No newline at end of file
+Hello World!
diff --git a/Zend/tests/traits/language003.phpt b/Zend/tests/traits/language003.phpt
index 2b97a0a150..9525b65b3a 100644
--- a/Zend/tests/traits/language003.phpt
+++ b/Zend/tests/traits/language003.phpt
@@ -26,4 +26,4 @@ $o = new MyHelloWorld();
$o->saySomething();
?>
--EXPECT--
-Hello \ No newline at end of file
+Hello
diff --git a/Zend/tests/traits/language004.phpt b/Zend/tests/traits/language004.phpt
index a582c3cd9d..76959d011d 100644
--- a/Zend/tests/traits/language004.phpt
+++ b/Zend/tests/traits/language004.phpt
@@ -28,4 +28,4 @@ $o->saySomething();
$o->sayWorld();
?>
--EXPECT--
-Hello World \ No newline at end of file
+Hello World
diff --git a/Zend/tests/traits/language005.phpt b/Zend/tests/traits/language005.phpt
index 84b14c3420..762c1e4ac5 100644
--- a/Zend/tests/traits/language005.phpt
+++ b/Zend/tests/traits/language005.phpt
@@ -37,4 +37,4 @@ $t->talk();
?>
--EXPECT--
-bAB \ No newline at end of file
+bAB
diff --git a/Zend/tests/traits/language006.phpt b/Zend/tests/traits/language006.phpt
index e2f77580a3..2ed2fa9c21 100644
--- a/Zend/tests/traits/language006.phpt
+++ b/Zend/tests/traits/language006.phpt
@@ -28,4 +28,4 @@ $o->sayHelloWorld();
?>
--EXPECT--
-Hello World! \ No newline at end of file
+Hello World!
diff --git a/Zend/tests/traits/language007.phpt b/Zend/tests/traits/language007.phpt
index 5ab676853f..67cb7f86c2 100644
--- a/Zend/tests/traits/language007.phpt
+++ b/Zend/tests/traits/language007.phpt
@@ -27,4 +27,4 @@ $o->sayWorld();
?>
--EXPECT--
-Hello World! \ No newline at end of file
+Hello World!
diff --git a/Zend/tests/traits/language008a.phpt b/Zend/tests/traits/language008a.phpt
index 65a792faac..2d87de92e8 100644
--- a/Zend/tests/traits/language008a.phpt
+++ b/Zend/tests/traits/language008a.phpt
@@ -23,4 +23,4 @@ $o->sayHello();
Fatal error: Uncaught Error: Call to protected method MyClass::sayHello() from context '' in %s:%d
Stack trace:
#0 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/Zend/tests/traits/language008b.phpt b/Zend/tests/traits/language008b.phpt
index c1a0d2629f..e40ff59282 100644
--- a/Zend/tests/traits/language008b.phpt
+++ b/Zend/tests/traits/language008b.phpt
@@ -30,4 +30,4 @@ Hello World!Hello World!
Fatal error: Uncaught Error: Call to private method MyClass::sayHelloWorld() from context '' in %s:%d
Stack trace:
#0 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/Zend/tests/traits/language009.phpt b/Zend/tests/traits/language009.phpt
index 998fde8e61..0672532195 100644
--- a/Zend/tests/traits/language009.phpt
+++ b/Zend/tests/traits/language009.phpt
@@ -33,4 +33,4 @@ $t->foo();
?>
--EXPECT--
-b \ No newline at end of file
+b
diff --git a/Zend/tests/traits/language010.phpt b/Zend/tests/traits/language010.phpt
index ac3ab2e29e..cd518f43e2 100644
--- a/Zend/tests/traits/language010.phpt
+++ b/Zend/tests/traits/language010.phpt
@@ -27,4 +27,4 @@ $o->world();
?>
--EXPECTF--
-Fatal error: Trait method world has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d \ No newline at end of file
+Fatal error: Trait method world has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
diff --git a/Zend/tests/traits/property009.phpt b/Zend/tests/traits/property009.phpt
index 0b5918c614..1b05382c0d 100644
--- a/Zend/tests/traits/property009.phpt
+++ b/Zend/tests/traits/property009.phpt
@@ -41,7 +41,6 @@ var_dump($b);
?>
--EXPECT--
-
object(SubclassClassicInheritance)#1 (1) {
["hello"]=>
int(0)
diff --git a/Zend/tests/traits/static_001.phpt b/Zend/tests/traits/static_001.phpt
index 5953c008d5..326481c779 100644
--- a/Zend/tests/traits/static_001.phpt
+++ b/Zend/tests/traits/static_001.phpt
@@ -19,4 +19,4 @@ Simas Toleikis simast@gmail.com
?>
--EXPECT--
-Test \ No newline at end of file
+Test
diff --git a/Zend/tests/traits/static_002.phpt b/Zend/tests/traits/static_002.phpt
index 64ebf6bf14..5c1a92a806 100644
--- a/Zend/tests/traits/static_002.phpt
+++ b/Zend/tests/traits/static_002.phpt
@@ -20,4 +20,4 @@ Simas Toleikis simast@gmail.com
?>
--EXPECT--
-Test \ No newline at end of file
+Test
diff --git a/Zend/tests/traits/static_003.phpt b/Zend/tests/traits/static_003.phpt
index 01953cf724..7417083f69 100644
--- a/Zend/tests/traits/static_003.phpt
+++ b/Zend/tests/traits/static_003.phpt
@@ -24,4 +24,4 @@ Simas Toleikis simast@gmail.com
?>
--EXPECT--
-Test B \ No newline at end of file
+Test B
diff --git a/Zend/tests/traits/static_004.phpt b/Zend/tests/traits/static_004.phpt
index 3c3f380908..ca02a85e80 100644
--- a/Zend/tests/traits/static_004.phpt
+++ b/Zend/tests/traits/static_004.phpt
@@ -19,4 +19,4 @@ Simas Toleikis simast@gmail.com
?>
--EXPECT--
-Test \ No newline at end of file
+Test
diff --git a/Zend/tests/traits/static_forward_static_call.phpt b/Zend/tests/traits/static_forward_static_call.phpt
index 9cda8aee1d..9ba53bf08a 100644
--- a/Zend/tests/traits/static_forward_static_call.phpt
+++ b/Zend/tests/traits/static_forward_static_call.phpt
@@ -25,4 +25,4 @@ Simas Toleikis simast@gmail.com
?>
--EXPECT--
-Forwarded Test A \ No newline at end of file
+Forwarded Test A
diff --git a/Zend/tests/traits/static_get_called_class.phpt b/Zend/tests/traits/static_get_called_class.phpt
index bd7a603712..b1d8fa3d1e 100644
--- a/Zend/tests/traits/static_get_called_class.phpt
+++ b/Zend/tests/traits/static_get_called_class.phpt
@@ -21,4 +21,4 @@ Simas Toleikis simast@gmail.com
?>
--EXPECT--
-B \ No newline at end of file
+B
diff --git a/Zend/tests/traits/trait_constant_002.phpt b/Zend/tests/traits/trait_constant_002.phpt
index ece3f61f9d..ebd75094e6 100644
--- a/Zend/tests/traits/trait_constant_002.phpt
+++ b/Zend/tests/traits/trait_constant_002.phpt
@@ -24,4 +24,4 @@ __TRAIT__: Use outside of traits.
--EXPECT--
string(0) ""
string(0) ""
-string(0) "" \ No newline at end of file
+string(0) ""
diff --git a/Zend/tests/try/bug72629.phpt b/Zend/tests/try/bug72629.phpt
index 2d596c78f8..034a63b306 100644
--- a/Zend/tests/try/bug72629.phpt
+++ b/Zend/tests/try/bug72629.phpt
@@ -11,6 +11,5 @@ try {
} catch (Exception $e) { }
var_dump($var === $e);
-
--EXPECT--
bool(true)
diff --git a/Zend/tests/try/bug74444.phpt b/Zend/tests/try/bug74444.phpt
index 838d12ef03..74e0c9d46f 100644
--- a/Zend/tests/try/bug74444.phpt
+++ b/Zend/tests/try/bug74444.phpt
@@ -72,6 +72,5 @@ function foo()
}
foo();
-
--EXPECT--
12
diff --git a/Zend/tests/try/try_finally_012.phpt b/Zend/tests/try/try_finally_012.phpt
index 32fec7ab29..a099ed3d6b 100644
--- a/Zend/tests/try/try_finally_012.phpt
+++ b/Zend/tests/try/try_finally_012.phpt
@@ -29,4 +29,3 @@ try {
--EXPECT--
finally
exception in main
-
diff --git a/Zend/tests/try/try_finally_022.phpt b/Zend/tests/try/try_finally_022.phpt
index 51f6a26419..ff10dead42 100644
--- a/Zend/tests/try/try_finally_022.phpt
+++ b/Zend/tests/try/try_finally_022.phpt
@@ -38,4 +38,3 @@ try{
?>
--EXPECT--
exception2
-
diff --git a/Zend/tests/try/try_multicatch_006.phpt b/Zend/tests/try/try_multicatch_006.phpt
index e4505f1b24..440e06593c 100644
--- a/Zend/tests/try/try_multicatch_006.phpt
+++ b/Zend/tests/try/try_multicatch_006.phpt
@@ -19,4 +19,3 @@ try {
TRY
Exception3
FINALLY
-
diff --git a/Zend/tests/try/try_multicatch_007.phpt b/Zend/tests/try/try_multicatch_007.phpt
index aa073b0592..40784108a0 100644
--- a/Zend/tests/try/try_multicatch_007.phpt
+++ b/Zend/tests/try/try_multicatch_007.phpt
@@ -19,4 +19,3 @@ try {
TRY
Exception4
FINALLY
-
diff --git a/Zend/tests/type_declarations/callable_001.phpt b/Zend/tests/type_declarations/callable_001.phpt
index 0466288d59..3113bedcf0 100644
--- a/Zend/tests/type_declarations/callable_001.phpt
+++ b/Zend/tests/type_declarations/callable_001.phpt
@@ -36,4 +36,3 @@ array(2) {
}
object(Closure)#%d (0) {
}
-
diff --git a/Zend/tests/type_declarations/callable_002.phpt b/Zend/tests/type_declarations/callable_002.phpt
index 01b6945755..35564ff1af 100644
--- a/Zend/tests/type_declarations/callable_002.phpt
+++ b/Zend/tests/type_declarations/callable_002.phpt
@@ -24,4 +24,3 @@ var_dump($rc->getParameters()[0]->isCallable());
bool(true)
bool(true)
bool(true)
-
diff --git a/Zend/tests/type_declarations/callable_003.phpt b/Zend/tests/type_declarations/callable_003.phpt
index b5e722cae3..3489c32d37 100644
--- a/Zend/tests/type_declarations/callable_003.phpt
+++ b/Zend/tests/type_declarations/callable_003.phpt
@@ -18,4 +18,3 @@ string(6) "strpos"
int(123)
string(6) "strpos"
string(6) "substr"
-
diff --git a/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt b/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt
index 2f6c881017..8aec0c009f 100644
--- a/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt
+++ b/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt
@@ -13,4 +13,3 @@ Stack trace:
#0 %s(%d): foo(NULL)
#1 {main}
thrown in %s on line %d
-
diff --git a/Zend/tests/type_declarations/iterable_001.phpt b/Zend/tests/type_declarations/iterable_001.phpt
index b9e8119436..b6755c49b9 100644
--- a/Zend/tests/type_declarations/iterable_001.phpt
+++ b/Zend/tests/type_declarations/iterable_001.phpt
@@ -22,7 +22,6 @@ try {
} catch (Throwable $e) {
echo $e->getMessage();
}
-
--EXPECTF--
array(3) {
[0]=>
diff --git a/Zend/tests/type_declarations/iterable_002.phpt b/Zend/tests/type_declarations/iterable_002.phpt
index 74f6d83f1e..b9e02e40cd 100644
--- a/Zend/tests/type_declarations/iterable_002.phpt
+++ b/Zend/tests/type_declarations/iterable_002.phpt
@@ -17,5 +17,4 @@ function baz(iterable $iterable = 1) {
?>
--EXPECTF--
-
Fatal error: Default value for parameters with iterable type can only be an array or NULL in %s on line %d
diff --git a/Zend/tests/type_declarations/iterable_004.phpt b/Zend/tests/type_declarations/iterable_004.phpt
index 47e79fa6b3..58b3f67f40 100644
--- a/Zend/tests/type_declarations/iterable_004.phpt
+++ b/Zend/tests/type_declarations/iterable_004.phpt
@@ -21,5 +21,4 @@ class Bar extends Foo {
?>
--EXPECTF--
-
Warning: Declaration of Bar::testScalar(iterable $iterable) should be compatible with Foo::testScalar(int $int) in %s on line %d
diff --git a/Zend/tests/type_declarations/iterable_005.phpt b/Zend/tests/type_declarations/iterable_005.phpt
index 9c0584b51a..39dede3b5c 100644
--- a/Zend/tests/type_declarations/iterable_005.phpt
+++ b/Zend/tests/type_declarations/iterable_005.phpt
@@ -29,5 +29,4 @@ class TestScalar extends Test {
?>
--EXPECTF--
-
Fatal error: Declaration of TestScalar::method(): int must be compatible with Test::method(): iterable in %s on line %d
diff --git a/Zend/tests/type_declarations/scalar_basic.phpt b/Zend/tests/type_declarations/scalar_basic.phpt
index 16e7875ff9..1253f48c16 100644
--- a/Zend/tests/type_declarations/scalar_basic.phpt
+++ b/Zend/tests/type_declarations/scalar_basic.phpt
@@ -59,7 +59,6 @@ foreach ($functions as $type => $function) {
echo PHP_EOL . "Done";
?>
--EXPECTF--
-
Testing 'int' type:
*** Trying int(1)
diff --git a/Zend/tests/type_declarations/scalar_float_with_invalid_default.phpt b/Zend/tests/type_declarations/scalar_float_with_invalid_default.phpt
index 7bc2fda2b9..fd7f96ab95 100644
--- a/Zend/tests/type_declarations/scalar_float_with_invalid_default.phpt
+++ b/Zend/tests/type_declarations/scalar_float_with_invalid_default.phpt
@@ -12,5 +12,4 @@ test();
?>
--EXPECTF--
-
Fatal error: Default value for parameters with a float type can only be float, integer, or NULL in %s on line %d
diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt
index b213bb11dd..88b21be082 100644
--- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt
@@ -11,4 +11,4 @@ var_dump(strlen("abc"));
?>
--EXPECT--
-int(3) \ No newline at end of file
+int(3)
diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt
index 7337ee4379..e0644482cb 100644
--- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt
@@ -22,4 +22,4 @@ var_dump(strlen("abc"));
?>
--EXPECT--
-int(3) \ No newline at end of file
+int(3)
diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt
index deb7a8c976..9afef254a9 100644
--- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt
@@ -22,4 +22,4 @@ var_dump(strlen("abc"));
?>
--EXPECT--
-int(3) \ No newline at end of file
+int(3)
diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_008.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_008.phpt
index 87a09af96c..b5ddc9f0d3 100644
--- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_008.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_008.phpt
@@ -8,4 +8,4 @@ declare(strict_types=1) {
?>
--EXPECTF--
-Fatal error: strict_types declaration must not use block mode in %s on line %d \ No newline at end of file
+Fatal error: strict_types declaration must not use block mode in %s on line %d
diff --git a/Zend/tests/type_declarations/strict_call_weak.phpt b/Zend/tests/type_declarations/strict_call_weak.phpt
index d064161480..d8dc93bc1e 100644
--- a/Zend/tests/type_declarations/strict_call_weak.phpt
+++ b/Zend/tests/type_declarations/strict_call_weak.phpt
@@ -18,4 +18,3 @@ Stack trace:
#0 %s(%d): function_declared_in_weak_mode(1)
#1 {main}
thrown in %sstrict_call_weak_2.inc on line 5
-
diff --git a/Zend/tests/type_declarations/strict_call_weak_explicit.phpt b/Zend/tests/type_declarations/strict_call_weak_explicit.phpt
index e909ee0141..e083d586e6 100644
--- a/Zend/tests/type_declarations/strict_call_weak_explicit.phpt
+++ b/Zend/tests/type_declarations/strict_call_weak_explicit.phpt
@@ -18,4 +18,3 @@ Stack trace:
#0 %s(%d): function_declared_in_weak_mode(1)
#1 {main}
thrown in %sstrict_call_weak_explicit_2.inc on line 5
-
diff --git a/Zend/tests/varSyntax/constClassMemberAccess.phpt b/Zend/tests/varSyntax/constClassMemberAccess.phpt
index 41d871abb3..6df485b5c9 100644
--- a/Zend/tests/varSyntax/constClassMemberAccess.phpt
+++ b/Zend/tests/varSyntax/constClassMemberAccess.phpt
@@ -24,4 +24,4 @@ array(1) {
["b"]=>
string(1) "c"
}
-string(1) "c" \ No newline at end of file
+string(1) "c"
diff --git a/Zend/tests/zend_signed_multiply-64bit-2.phpt b/Zend/tests/zend_signed_multiply-64bit-2.phpt
index 9c61a22bc3..aa8ee47db6 100644
--- a/Zend/tests/zend_signed_multiply-64bit-2.phpt
+++ b/Zend/tests/zend_signed_multiply-64bit-2.phpt
@@ -146,4 +146,3 @@ int(16)
int(922337203685477580)
float(1.4757395258968E+19)
-----------
-
diff --git a/ext/bcmath/tests/bcadd_error1.phpt b/ext/bcmath/tests/bcadd_error1.phpt
index c7d526eec7..17a4bc7944 100644
--- a/ext/bcmath/tests/bcadd_error1.phpt
+++ b/ext/bcmath/tests/bcadd_error1.phpt
@@ -9,4 +9,4 @@ bcmath.scale=0
echo bcadd();
?>
--EXPECTF--
-Warning: bcadd() expects at least 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: bcadd() expects at least 2 parameters, 0 given in %s on line %d
diff --git a/ext/bcmath/tests/bcadd_variation001.phpt b/ext/bcmath/tests/bcadd_variation001.phpt
index 4d80a280b0..4bd828cda3 100644
--- a/ext/bcmath/tests/bcadd_variation001.phpt
+++ b/ext/bcmath/tests/bcadd_variation001.phpt
@@ -13,4 +13,4 @@ echo bcadd("-4.27", "7.3");
--EXPECT--
6.50
-5.1
-3.03000 \ No newline at end of file
+3.03000
diff --git a/ext/bcmath/tests/bccomp_variation001.phpt b/ext/bcmath/tests/bccomp_variation001.phpt
index f8ca5b9da5..9eff0dd33a 100644
--- a/ext/bcmath/tests/bccomp_variation001.phpt
+++ b/ext/bcmath/tests/bccomp_variation001.phpt
@@ -13,4 +13,4 @@ echo bccomp("2.29", "2.3", "2");
--EXPECT--
0
1
--1 \ No newline at end of file
+-1
diff --git a/ext/bcmath/tests/bccomp_variation002.phpt b/ext/bcmath/tests/bccomp_variation002.phpt
index c451a281ff..cb65712f06 100644
--- a/ext/bcmath/tests/bccomp_variation002.phpt
+++ b/ext/bcmath/tests/bccomp_variation002.phpt
@@ -13,4 +13,4 @@ echo bccomp("-2.29", "-2.3", "2");
--EXPECT--
0
-1
-1 \ No newline at end of file
+1
diff --git a/ext/bcmath/tests/bcmod_error2.phpt b/ext/bcmath/tests/bcmod_error2.phpt
index bac49c8e92..714615d7d1 100644
--- a/ext/bcmath/tests/bcmod_error2.phpt
+++ b/ext/bcmath/tests/bcmod_error2.phpt
@@ -9,4 +9,4 @@ bcmath.scale=0
echo bcmod("10", "0");
?>
--EXPECTF--
-Warning: bcmod(): Division by zero in %s on line %d \ No newline at end of file
+Warning: bcmod(): Division by zero in %s on line %d
diff --git a/ext/bcmath/tests/bcmul_error1.phpt b/ext/bcmath/tests/bcmul_error1.phpt
index ec366336c2..8d67b98971 100644
--- a/ext/bcmath/tests/bcmul_error1.phpt
+++ b/ext/bcmath/tests/bcmul_error1.phpt
@@ -9,4 +9,4 @@ bcmath.scale=0
echo bcmul();
?>
--EXPECTF--
-Warning: bcmul() expects at least 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: bcmul() expects at least 2 parameters, 0 given in %s on line %d
diff --git a/ext/bcmath/tests/bcpow_error3.phpt b/ext/bcmath/tests/bcpow_error3.phpt
index 4b937a180b..d661c66b14 100644
--- a/ext/bcmath/tests/bcpow_error3.phpt
+++ b/ext/bcmath/tests/bcpow_error3.phpt
@@ -9,4 +9,4 @@ bcmath.scale=0
echo bcpow();
?>
--EXPECTF--
-Warning: bcpow() expects at least 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: bcpow() expects at least 2 parameters, 0 given in %s on line %d
diff --git a/ext/bcmath/tests/bcpow_variation001.phpt b/ext/bcmath/tests/bcpow_variation001.phpt
index 049374ba40..df55f15ae5 100644
--- a/ext/bcmath/tests/bcpow_variation001.phpt
+++ b/ext/bcmath/tests/bcpow_variation001.phpt
@@ -9,4 +9,4 @@ bcmath.scale=0
echo bcpow("2", "-4");
?>
--EXPECT--
-0 \ No newline at end of file
+0
diff --git a/ext/bcmath/tests/bcpowmod.phpt b/ext/bcmath/tests/bcpowmod.phpt
index 6b1f30e577..5f0fa8a93b 100644
--- a/ext/bcmath/tests/bcpowmod.phpt
+++ b/ext/bcmath/tests/bcpowmod.phpt
@@ -13,4 +13,4 @@ echo bcpowmod("10", "2147483648", "2047");
--EXPECT--
4
-4
-790 \ No newline at end of file
+790
diff --git a/ext/bcmath/tests/bcscale_variation001.phpt b/ext/bcmath/tests/bcscale_variation001.phpt
index 1e6dd372a5..51c6767bd4 100644
--- a/ext/bcmath/tests/bcscale_variation001.phpt
+++ b/ext/bcmath/tests/bcscale_variation001.phpt
@@ -10,4 +10,4 @@ bcscale(-4);
echo bcdiv("20.56", "4");
?>
--EXPECT--
-5 \ No newline at end of file
+5
diff --git a/ext/bcmath/tests/bcscale_variation002.phpt b/ext/bcmath/tests/bcscale_variation002.phpt
index 117756f1d1..11df405bea 100644
--- a/ext/bcmath/tests/bcscale_variation002.phpt
+++ b/ext/bcmath/tests/bcscale_variation002.phpt
@@ -9,4 +9,4 @@ bcmath.scale=-2
echo bcadd("-4.27", "7.3");
?>
--EXPECT--
-3 \ No newline at end of file
+3
diff --git a/ext/bcmath/tests/bcsqrt_error2.phpt b/ext/bcmath/tests/bcsqrt_error2.phpt
index c52e2f3cf5..d7ce2e5c88 100644
--- a/ext/bcmath/tests/bcsqrt_error2.phpt
+++ b/ext/bcmath/tests/bcsqrt_error2.phpt
@@ -9,4 +9,4 @@ bcmath.scale=0
echo bcsqrt();
?>
--EXPECTF--
-Warning: bcsqrt() expects at least 1 parameter, 0 given in %s on line %d \ No newline at end of file
+Warning: bcsqrt() expects at least 1 parameter, 0 given in %s on line %d
diff --git a/ext/bcmath/tests/bcsqrt_variation001.phpt b/ext/bcmath/tests/bcsqrt_variation001.phpt
index 67d1efc2ea..1f3d284c13 100644
--- a/ext/bcmath/tests/bcsqrt_variation001.phpt
+++ b/ext/bcmath/tests/bcsqrt_variation001.phpt
@@ -9,4 +9,4 @@ bcmath.scale=0
echo bcsqrt("0");
?>
--EXPECT--
-0 \ No newline at end of file
+0
diff --git a/ext/bcmath/tests/bcsub_error1.phpt b/ext/bcmath/tests/bcsub_error1.phpt
index 51c020e785..1600652ac1 100644
--- a/ext/bcmath/tests/bcsub_error1.phpt
+++ b/ext/bcmath/tests/bcsub_error1.phpt
@@ -9,4 +9,4 @@ bcmath.scale=0
echo bcsub();
?>
--EXPECTF--
-Warning: bcsub() expects at least 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: bcsub() expects at least 2 parameters, 0 given in %s on line %d
diff --git a/ext/bz2/tests/bug51997.phpt b/ext/bz2/tests/bug51997.phpt
index c53deacc5f..6a8e513e7d 100644
--- a/ext/bz2/tests/bug51997.phpt
+++ b/ext/bz2/tests/bug51997.phpt
@@ -19,6 +19,5 @@ print bzread($bz, 10);
print bzread($bz);
bzclose($bz);
unlink($filename);
-
--EXPECT--
This is a test string.
diff --git a/ext/bz2/tests/bug72613.phpt b/ext/bz2/tests/bug72613.phpt
index 82547e6ae0..049e065554 100644
--- a/ext/bz2/tests/bug72613.phpt
+++ b/ext/bz2/tests/bug72613.phpt
@@ -20,4 +20,4 @@ bzclose($fp);
?>
DONE
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/bz2/tests/with_files.phpt b/ext/bz2/tests/with_files.phpt
index 74bb2bab8b..443a0713dd 100644
--- a/ext/bz2/tests/with_files.phpt
+++ b/ext/bz2/tests/with_files.phpt
@@ -18,6 +18,5 @@ print bzread($bz, 10);
print bzread($bz);
bzclose($bz);
unlink($filename);
-
--EXPECT--
This is a test string.
diff --git a/ext/bz2/tests/with_strings.phpt b/ext/bz2/tests/with_strings.phpt
index f1e71bf3ed..2b6813a9ea 100644
--- a/ext/bz2/tests/with_strings.phpt
+++ b/ext/bz2/tests/with_strings.phpt
@@ -22,6 +22,5 @@ $tests = <<<TESTS
TESTS;
include(dirname(__FILE__) . '/../../../tests/quicktester.inc');
-
--EXPECT--
OK
diff --git a/ext/calendar/tests/bug53574_1.phpt b/ext/calendar/tests/bug53574_1.phpt
index 51f9b4266f..8a52529427 100644
--- a/ext/calendar/tests/bug53574_1.phpt
+++ b/ext/calendar/tests/bug53574_1.phpt
@@ -33,4 +33,3 @@ array(9) {
["monthname"]=>
string(0) ""
}
-
diff --git a/ext/calendar/tests/bug53574_2.phpt b/ext/calendar/tests/bug53574_2.phpt
index 1ac4834cd5..fd7288a079 100644
--- a/ext/calendar/tests/bug53574_2.phpt
+++ b/ext/calendar/tests/bug53574_2.phpt
@@ -33,4 +33,3 @@ array(9) {
["monthname"]=>
string(0) ""
}
-
diff --git a/ext/calendar/tests/bug55797_1.phpt b/ext/calendar/tests/bug55797_1.phpt
index ffd617dfb7..4a8ecfa663 100644
--- a/ext/calendar/tests/bug55797_1.phpt
+++ b/ext/calendar/tests/bug55797_1.phpt
@@ -33,4 +33,3 @@ array(9) {
["monthname"]=>
string(0) ""
}
-
diff --git a/ext/calendar/tests/bug55797_2.phpt b/ext/calendar/tests/bug55797_2.phpt
index 4e4e9a4da9..6559c936a5 100644
--- a/ext/calendar/tests/bug55797_2.phpt
+++ b/ext/calendar/tests/bug55797_2.phpt
@@ -33,4 +33,3 @@ array(9) {
["monthname"]=>
string(0) ""
}
-
diff --git a/ext/calendar/tests/cal_days_in_month_error1.phpt b/ext/calendar/tests/cal_days_in_month_error1.phpt
index c413a8163a..aeb304e8ec 100644
--- a/ext/calendar/tests/cal_days_in_month_error1.phpt
+++ b/ext/calendar/tests/cal_days_in_month_error1.phpt
@@ -14,4 +14,4 @@ Warning: cal_days_in_month(): invalid calendar ID -1 in %s on line %d
bool(false)
Warning: cal_days_in_month(): invalid date in %s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/calendar/tests/cal_from_jd_error1.phpt b/ext/calendar/tests/cal_from_jd_error1.phpt
index 1d2cf39c07..c4873815ac 100644
--- a/ext/calendar/tests/cal_from_jd_error1.phpt
+++ b/ext/calendar/tests/cal_from_jd_error1.phpt
@@ -10,4 +10,4 @@ var_dump(cal_from_jd(1748326, -1));
?>
--EXPECTF--
Warning: cal_from_jd(): invalid calendar ID -1 in %s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/calendar/tests/cal_to_jd_error1.phpt b/ext/calendar/tests/cal_to_jd_error1.phpt
index 9bee0658a5..deb5e80e1d 100644
--- a/ext/calendar/tests/cal_to_jd_error1.phpt
+++ b/ext/calendar/tests/cal_to_jd_error1.phpt
@@ -10,4 +10,4 @@ var_dump(cal_to_jd(-1, 8, 26, 74));
?>
--EXPECTF--
Warning: cal_to_jd(): invalid calendar ID -1 in %s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/calendar/tests/gregoriantojd.phpt b/ext/calendar/tests/gregoriantojd.phpt
index 1a3d0f1712..aeecb3af51 100644
--- a/ext/calendar/tests/gregoriantojd.phpt
+++ b/ext/calendar/tests/gregoriantojd.phpt
@@ -19,4 +19,4 @@ echo gregoriantojd( 11, 24, -4714). "\n";
2440588
2816423
0
-0 \ No newline at end of file
+0
diff --git a/ext/calendar/tests/jddayofweek.phpt b/ext/calendar/tests/jddayofweek.phpt
index c5647804bb..0f3ca8a3f8 100644
--- a/ext/calendar/tests/jddayofweek.phpt
+++ b/ext/calendar/tests/jddayofweek.phpt
@@ -127,4 +127,3 @@ Sat
Sun
Mon
Tue
-
diff --git a/ext/calendar/tests/jdtofrench.phpt b/ext/calendar/tests/jdtofrench.phpt
index 27944091e3..2601d14a07 100644
--- a/ext/calendar/tests/jdtofrench.phpt
+++ b/ext/calendar/tests/jdtofrench.phpt
@@ -17,4 +17,4 @@ echo jdtofrench(2385940). "\n";
1/11/1
4/11/1
5/21/2
-0/0/0 \ No newline at end of file
+0/0/0
diff --git a/ext/calendar/tests/jdtogregorian.phpt b/ext/calendar/tests/jdtogregorian.phpt
index b882d5f08d..e8bf4a49aa 100644
--- a/ext/calendar/tests/jdtogregorian.phpt
+++ b/ext/calendar/tests/jdtogregorian.phpt
@@ -17,4 +17,4 @@ echo jdtogregorian(2816423). "\n";
1/1/1582
10/5/1582
1/1/1970
-1/1/2999 \ No newline at end of file
+1/1/2999
diff --git a/ext/calendar/tests/jdtojewish.phpt b/ext/calendar/tests/jdtojewish.phpt
index 78efd2a3e4..d6971c0663 100644
--- a/ext/calendar/tests/jdtojewish.phpt
+++ b/ext/calendar/tests/jdtojewish.phpt
@@ -39,4 +39,4 @@ string(%d) "2/22/5763
3/16/5765
3/8/13758
-Warning: jdtojewish(): Year out of range (0-9999) in %s on line %d \ No newline at end of file
+Warning: jdtojewish(): Year out of range (0-9999) in %s on line %d
diff --git a/ext/calendar/tests/jdtojulian.phpt b/ext/calendar/tests/jdtojulian.phpt
index 2f8f4aa937..f4082e76ec 100644
--- a/ext/calendar/tests/jdtojulian.phpt
+++ b/ext/calendar/tests/jdtojulian.phpt
@@ -17,4 +17,4 @@ echo jdtojulian(2816423). "\n";
12/22/1581
9/25/1582
12/19/1969
-12/12/2998 \ No newline at end of file
+12/12/2998
diff --git a/ext/calendar/tests/jdtounix_error1.phpt b/ext/calendar/tests/jdtounix_error1.phpt
index a4648451aa..5d4ea38834 100644
--- a/ext/calendar/tests/jdtounix_error1.phpt
+++ b/ext/calendar/tests/jdtounix_error1.phpt
@@ -11,4 +11,4 @@ date.timezone=UTC
var_dump(jdtounix(2440579)) . PHP_EOL;
?>
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/calendar/tests/jewishtojd.phpt b/ext/calendar/tests/jewishtojd.phpt
index a9a2ff0e3d..2dd0381619 100644
--- a/ext/calendar/tests/jewishtojd.phpt
+++ b/ext/calendar/tests/jewishtojd.phpt
@@ -13,4 +13,4 @@ echo jewishtojd(2,22,5763). "\n";
0
0
347998
-2452576 \ No newline at end of file
+2452576
diff --git a/ext/calendar/tests/juliantojd.phpt b/ext/calendar/tests/juliantojd.phpt
index c9ba3955d0..2f65d84f36 100644
--- a/ext/calendar/tests/juliantojd.phpt
+++ b/ext/calendar/tests/juliantojd.phpt
@@ -17,4 +17,4 @@ echo juliantojd( 1, 1, -4713). "\n";
2299161
2440601
2816443
-0 \ No newline at end of file
+0
diff --git a/ext/calendar/tests/unixtojd_error1.phpt b/ext/calendar/tests/unixtojd_error1.phpt
index b19bcd6d16..89be28c792 100644
--- a/ext/calendar/tests/unixtojd_error1.phpt
+++ b/ext/calendar/tests/unixtojd_error1.phpt
@@ -21,4 +21,4 @@ bool(false)
int(%d)
int(%d)
int(%d)
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/com_dotnet/tests/bug39606.phpt b/ext/com_dotnet/tests/bug39606.phpt
index cc8f00f425..27479f9cfb 100644
--- a/ext/com_dotnet/tests/bug39606.phpt
+++ b/ext/com_dotnet/tests/bug39606.phpt
@@ -19,4 +19,4 @@ var_dump(com_load_typelib($typelib));
--EXPECT--
bool(true)
bool(true)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/curl/tests/bug48203.phpt b/ext/curl/tests/bug48203.phpt
index 11855235c5..5973d8a390 100644
--- a/ext/curl/tests/bug48203.phpt
+++ b/ext/curl/tests/bug48203.phpt
@@ -29,4 +29,3 @@ Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr
Hello World!
Hello World!* Closing connection 0
Ok
-
diff --git a/ext/curl/tests/curl_CURLOPT_READDATA.phpt b/ext/curl/tests/curl_CURLOPT_READDATA.phpt
index 25bd0e9b49..eebf4a0c03 100644
--- a/ext/curl/tests/curl_CURLOPT_READDATA.phpt
+++ b/ext/curl/tests/curl_CURLOPT_READDATA.phpt
@@ -36,7 +36,6 @@ curl_close($ch);
// Clean the temporary file
@unlink($tempname);
-
--EXPECT--
array(2) {
["hello"]=>
diff --git a/ext/curl/tests/curl_basic_011.phpt b/ext/curl/tests/curl_basic_011.phpt
index d6b3964c38..cbbc1f59ed 100644
--- a/ext/curl/tests/curl_basic_011.phpt
+++ b/ext/curl/tests/curl_basic_011.phpt
@@ -36,4 +36,3 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
*** Testing curl with cookie ***
string(3) "bar"
===DONE===
-
diff --git a/ext/curl/tests/curl_basic_012.phpt b/ext/curl/tests/curl_basic_012.phpt
index 05a4854e3a..6cc5d599e2 100644
--- a/ext/curl/tests/curl_basic_012.phpt
+++ b/ext/curl/tests/curl_basic_012.phpt
@@ -36,4 +36,4 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
*** Testing curl with HTTP/1.0 ***
string(8) "HTTP/1.0"
===DONE===
- \ No newline at end of file
+
diff --git a/ext/curl/tests/curl_basic_013.phpt b/ext/curl/tests/curl_basic_013.phpt
index 69f0721fda..8aff6fc707 100644
--- a/ext/curl/tests/curl_basic_013.phpt
+++ b/ext/curl/tests/curl_basic_013.phpt
@@ -36,4 +36,4 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
*** Testing curl with HTTP/1.1 ***
string(8) "HTTP/1.1"
===DONE===
- \ No newline at end of file
+
diff --git a/ext/curl/tests/curl_file_serialize.phpt b/ext/curl/tests/curl_file_serialize.phpt
index d8eefb355d..e2f2d14fff 100644
--- a/ext/curl/tests/curl_file_serialize.phpt
+++ b/ext/curl/tests/curl_file_serialize.phpt
@@ -18,4 +18,3 @@ Stack trace:
#1 %s
#2 {main}
thrown in %s on line %d
-
diff --git a/ext/curl/tests/curl_setopt_array_basic.phpt b/ext/curl/tests/curl_setopt_array_basic.phpt
index d858241b78..0ad8fc7eee 100644
--- a/ext/curl/tests/curl_setopt_array_basic.phpt
+++ b/ext/curl/tests/curl_setopt_array_basic.phpt
@@ -54,4 +54,3 @@ isset($tempname) and is_file($tempname) and @unlink($tempname);
== Starting test curl_setopt_array($ch, $options); ==
string(25) "Hello World!
Hello World!"
-
diff --git a/ext/curl/tests/curl_setopt_basic002.phpt b/ext/curl/tests/curl_setopt_basic002.phpt
index 7a11493ed2..72754d989a 100644
--- a/ext/curl/tests/curl_setopt_basic002.phpt
+++ b/ext/curl/tests/curl_setopt_basic002.phpt
@@ -49,4 +49,3 @@ curl_close($ch);
*** Testing curl_setopt with CURLOPT_STDERR
string(%d) "%S"
string(%d) "%S"
-
diff --git a/ext/curl/tests/curl_share_close_basic001.phpt b/ext/curl/tests/curl_share_close_basic001.phpt
index 8addd5de4e..eec1bde099 100644
--- a/ext/curl/tests/curl_share_close_basic001.phpt
+++ b/ext/curl/tests/curl_share_close_basic001.phpt
@@ -16,4 +16,4 @@ var_dump($sh);
?>
--EXPECTF--
resource(%d) of type (curl_share)
-resource(%d) of type (Unknown) \ No newline at end of file
+resource(%d) of type (Unknown)
diff --git a/ext/date/tests/DateTimeZone_clone_basic1.phpt b/ext/date/tests/DateTimeZone_clone_basic1.phpt
index a40efc7411..5f527202cd 100644
--- a/ext/date/tests/DateTimeZone_clone_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_clone_basic1.phpt
@@ -43,5 +43,3 @@ object(DateTimeZone)#%d (2) {
}
TEST PASSED : Objects equal but not indetical
===DONE===
-
-
diff --git a/ext/date/tests/DateTimeZone_compare_basic1.phpt b/ext/date/tests/DateTimeZone_compare_basic1.phpt
index 130b6fa754..790bb6cf7f 100644
--- a/ext/date/tests/DateTimeZone_compare_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_compare_basic1.phpt
@@ -51,4 +51,4 @@ bool(false)
bool(false)
bool(false)
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/DateTimeZone_extends_basic1.phpt b/ext/date/tests/DateTimeZone_extends_basic1.phpt
index 3922454865..462cb155d2 100644
--- a/ext/date/tests/DateTimeZone_extends_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_extends_basic1.phpt
@@ -31,4 +31,4 @@ echo $d . "\n";
-- Invoke __toString --
America/Los_Angeles
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/DateTimeZone_getName_basic1.phpt b/ext/date/tests/DateTimeZone_getName_basic1.phpt
index ad59c8d9a1..c226aa39bb 100644
--- a/ext/date/tests/DateTimeZone_getName_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_getName_basic1.phpt
@@ -29,4 +29,4 @@ var_dump( $tz3->getName() );
string(13) "Europe/London"
string(16) "America/New_York"
string(19) "America/Los_Angeles"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt
index 8c4e409498..ce1c04336e 100644
--- a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt
@@ -30,4 +30,4 @@ var_dump( $tz3->getOffset($date) );
%rint\(0\)|int\(3600\)%r
%rint\(-18000\)|int\(-14400\)%r
%rint\(-28800\)|int\(-25200\)%r
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/DateTimeZone_getOffset_error.phpt b/ext/date/tests/DateTimeZone_getOffset_error.phpt
index 58b852e44b..c2e6e4eed7 100644
--- a/ext/date/tests/DateTimeZone_getOffset_error.phpt
+++ b/ext/date/tests/DateTimeZone_getOffset_error.phpt
@@ -37,4 +37,4 @@ bool(false)
Warning: DateTimeZone::getOffset() 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/date/tests/DateTimeZone_getTransitions_basic1.phpt b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt
index a88a34bf2d..ee88321fca 100644
--- a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt
@@ -47,4 +47,4 @@ array(5) {
["abbr"]=>
string(3) "BST"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/DateTimeZone_getTransitions_error.phpt b/ext/date/tests/DateTimeZone_getTransitions_error.phpt
index e1d0a29420..f50a77ddb9 100644
--- a/ext/date/tests/DateTimeZone_getTransitions_error.phpt
+++ b/ext/date/tests/DateTimeZone_getTransitions_error.phpt
@@ -31,4 +31,4 @@ var_dump( $tz->getTransitions($timestamp_begin, $timestamp_end, $extra_arg) );
Warning: DateTimeZone::getTransitions() expects at most 2 parameters, 3 given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt b/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt
index 4421964d71..26a0c2fca2 100644
--- a/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt
@@ -33,4 +33,4 @@ bool(true)
bool(true)
bool(true)
===DONE===
- \ No newline at end of file
+
diff --git a/ext/date/tests/DateTime_compare_basic1.phpt b/ext/date/tests/DateTime_compare_basic1.phpt
index 7119f0f8dc..0d3f15360d 100644
--- a/ext/date/tests/DateTime_compare_basic1.phpt
+++ b/ext/date/tests/DateTime_compare_basic1.phpt
@@ -74,4 +74,4 @@ bool(false)
bool(true)
bool(true)
bool(true)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt
index 625b24df2d..2e39f32715 100644
--- a/ext/date/tests/DateTime_construct_variation2.phpt
+++ b/ext/date/tests/DateTime_construct_variation2.phpt
@@ -229,4 +229,3 @@ object(DateTime)#%d (3) {
-- resource --
FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, resource given
===DONE===
-
diff --git a/ext/date/tests/DateTime_extends_basic2.phpt b/ext/date/tests/DateTime_extends_basic2.phpt
index e6720c5797..364fd55514 100644
--- a/ext/date/tests/DateTime_extends_basic2.phpt
+++ b/ext/date/tests/DateTime_extends_basic2.phpt
@@ -28,4 +28,4 @@ echo $d->format("F j, Y, g:i:s a") . "\n";
--EXPECT--
*** Testing new DateTime() : with user space __construct magic method ***
May 1, 1967, 10:30:41 pm
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/DateTime_format_basic1.phpt b/ext/date/tests/DateTime_format_basic1.phpt
index 354911875c..883f9a7a8e 100644
--- a/ext/date/tests/DateTime_format_basic1.phpt
+++ b/ext/date/tests/DateTime_format_basic1.phpt
@@ -37,4 +37,4 @@ string(19) "it is the 14th day."
string(28) "Thu Jul 14 22:30:41 BST 2005"
string(19) "22:07:41 m is month"
string(8) "22:30:41"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/DateTime_getOffset_error.phpt b/ext/date/tests/DateTime_getOffset_error.phpt
index 508ac7b940..2cf65f1979 100644
--- a/ext/date/tests/DateTime_getOffset_error.phpt
+++ b/ext/date/tests/DateTime_getOffset_error.phpt
@@ -30,4 +30,3 @@ var_dump( $datetime->getOffset($extra_arg) );
Warning: DateTime::getOffset() expects exactly 0 parameters, 1 given in %s on line %d
bool(false)
===DONE===
-
diff --git a/ext/date/tests/DateTime_modify_error.phpt b/ext/date/tests/DateTime_modify_error.phpt
index 5f0df79884..2562324fd7 100644
--- a/ext/date/tests/DateTime_modify_error.phpt
+++ b/ext/date/tests/DateTime_modify_error.phpt
@@ -39,4 +39,3 @@ bool(false)
Warning: DateTime::modify() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
===DONE===
-
diff --git a/ext/date/tests/DateTime_setDate_basic1.phpt b/ext/date/tests/DateTime_setDate_basic1.phpt
index e74799928c..e3c9c587ac 100644
--- a/ext/date/tests/DateTime_setDate_basic1.phpt
+++ b/ext/date/tests/DateTime_setDate_basic1.phpt
@@ -27,4 +27,4 @@ echo $datetime->format(DATE_RFC2822) . "\n";
*** Testing DateTime::setDate() : basic functionality ***
Fri, 30 Jan 2009 19:34:10 +0000
Fri, 01 Feb 2008 19:34:10 +0000
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/bug39782.phpt b/ext/date/tests/bug39782.phpt
index 99abdd7bc8..99aaeaf380 100644
--- a/ext/date/tests/bug39782.phpt
+++ b/ext/date/tests/bug39782.phpt
@@ -16,4 +16,4 @@ echo $dttTest->format('D M j Y - H:i:s') . "\n";
--EXPECT--
Wed Dec 13 2006 - 00:00:00
Wed Dec 13 2006 - 12:00:00
-Wed Dec 13 2006 - 12:00:00 \ No newline at end of file
+Wed Dec 13 2006 - 12:00:00
diff --git a/ext/date/tests/bug45543.phpt b/ext/date/tests/bug45543.phpt
index 8e36e6287c..42a97ab20c 100644
--- a/ext/date/tests/bug45543.phpt
+++ b/ext/date/tests/bug45543.phpt
@@ -31,4 +31,3 @@ foreach ($test_dates as $test_date)
2008-01-01T12:00:00+0000
2008-01-01T12:00:00+0200
2008-01-01T14:00:00+0200
-
diff --git a/ext/date/tests/bug48187.phpt b/ext/date/tests/bug48187.phpt
index e3af51d767..6dc0f8b56a 100644
--- a/ext/date/tests/bug48187.phpt
+++ b/ext/date/tests/bug48187.phpt
@@ -25,4 +25,4 @@ if (time() - $begin_t < 1) {
?>
--EXPECT--
string(36) "microtime() difference less 1 second"
-string(31) "time() difference less 1 second" \ No newline at end of file
+string(31) "time() difference less 1 second"
diff --git a/ext/date/tests/bug48476.phpt b/ext/date/tests/bug48476.phpt
index 2daa594871..1335025c76 100644
--- a/ext/date/tests/bug48476.phpt
+++ b/ext/date/tests/bug48476.phpt
@@ -29,5 +29,3 @@ bool(false)
Warning: timezone_location_get(): The DateTimeZone object has not been correctly initialized by its constructor in %sbug48476.php on line 18
bool(false)
-
-
diff --git a/ext/date/tests/bug50475.phpt b/ext/date/tests/bug50475.phpt
index 454e86c6b5..3cb5e89d5a 100644
--- a/ext/date/tests/bug50475.phpt
+++ b/ext/date/tests/bug50475.phpt
@@ -15,4 +15,4 @@ var_dump($date->format('Y-m-d H:i:s'));
?>
--EXPECT--
string(19) "2009-02-02 00:00:00"
-string(19) "2009-02-02 08:00:00" \ No newline at end of file
+string(19) "2009-02-02 08:00:00"
diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt
index bc528e21d7..cbcccf84b9 100644
--- a/ext/date/tests/bug52062.phpt
+++ b/ext/date/tests/bug52062.phpt
@@ -28,4 +28,4 @@ string(12) "100000000000"
Warning: DateTime::setTimestamp() expects parameter 1 to be int, float given in %s on line %d
string(32) "5138-11-16 09:46:40 100000000000"
bool(false)
-string(10) "1215752192" \ No newline at end of file
+string(10) "1215752192"
diff --git a/ext/date/tests/bug52290.phpt b/ext/date/tests/bug52290.phpt
index 735df6ad18..c202c0e0cc 100644
--- a/ext/date/tests/bug52290.phpt
+++ b/ext/date/tests/bug52290.phpt
@@ -24,4 +24,4 @@ var_dump($dt->format('o-\WW-N | Y-m-d | H:i:s | U'));
string(47) "2005-W52-7 | 2006-01-01 | 00:00:00 | 1136073600"
string(47) "2005-W52-1 | 2005-12-26 | 00:00:00 | 1135555200"
string(47) "2007-W41-3 | 2007-10-10 | 00:00:00 | 1191974400"
-string(47) "2007-W41-3 | 2007-10-10 | 20:30:40 | 1192048240" \ No newline at end of file
+string(47) "2007-W41-3 | 2007-10-10 | 20:30:40 | 1192048240"
diff --git a/ext/date/tests/bug62852.phpt b/ext/date/tests/bug62852.phpt
index a1b5190281..77c92ce55f 100644
--- a/ext/date/tests/bug62852.phpt
+++ b/ext/date/tests/bug62852.phpt
@@ -9,7 +9,6 @@ $s1 = 'O:8:"DateTime":3:{s:4:"date";s:20:"10007-06-07 03:51:49";s:13:"timezone_t
try {
unserialize( $s1 );
} catch ( Exception $e ) {}
-
--EXPECTF--
Fatal error: Uncaught Error: Invalid serialization data for DateTime object in %sbug62852.php:%d
Stack trace:
diff --git a/ext/date/tests/bug62852_var2.phpt b/ext/date/tests/bug62852_var2.phpt
index 9d742d9363..afec265d50 100644
--- a/ext/date/tests/bug62852_var2.phpt
+++ b/ext/date/tests/bug62852_var2.phpt
@@ -20,7 +20,6 @@ try {
unserialize( $s2 );
} catch ( Exception $e ) {}
var_dump( $foo );
-
--EXPECTF--
Fatal error: Uncaught Error: Invalid serialization data for DateTime object in %sbug62852_var2.php:%d
Stack trace:
diff --git a/ext/date/tests/bug62852_var3.phpt b/ext/date/tests/bug62852_var3.phpt
index bef8d4ec6b..5dbc1efa3f 100644
--- a/ext/date/tests/bug62852_var3.phpt
+++ b/ext/date/tests/bug62852_var3.phpt
@@ -20,7 +20,6 @@ try {
unserialize( $s2 );
} catch ( Exception $e ) {}
var_dump( $foo );
-
--EXPECTF--
Fatal error: Uncaught Error: Invalid serialization data for DateTime object in %sbug62852_var3.php:%d
Stack trace:
diff --git a/ext/date/tests/bug67118.phpt b/ext/date/tests/bug67118.phpt
index 4884d77bac..332142856e 100644
--- a/ext/date/tests/bug67118.phpt
+++ b/ext/date/tests/bug67118.phpt
@@ -23,7 +23,5 @@ class mydt extends datetime
new mydt("Funktionsansvarig rΓ₯dgivning och juridik", "UTC");
?>
--EXPECTF--
-
Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %s on line %d
Bad date
-
diff --git a/ext/date/tests/bug67253.phpt b/ext/date/tests/bug67253.phpt
index c7d38956ff..c18cdebeb1 100644
--- a/ext/date/tests/bug67253.phpt
+++ b/ext/date/tests/bug67253.phpt
@@ -41,4 +41,3 @@ array(12) {
["is_localtime"]=>
bool(false)
}
-
diff --git a/ext/date/tests/bug68406.phpt b/ext/date/tests/bug68406.phpt
index a6a41c1078..f2181d1006 100644
--- a/ext/date/tests/bug68406.phpt
+++ b/ext/date/tests/bug68406.phpt
@@ -17,7 +17,6 @@ if($tz2 == $d->getTimezone()) {
else {
echo "no";
}
-
--EXPECT--
object(DateTimeZone)#4 (2) {
["timezone_type"]=>
diff --git a/ext/date/tests/bug71525.phpt b/ext/date/tests/bug71525.phpt
index d0c99e4f84..9a9d10342d 100644
--- a/ext/date/tests/bug71525.phpt
+++ b/ext/date/tests/bug71525.phpt
@@ -8,7 +8,6 @@ $date = new DateTime('2011-12-25 00:00:00');
$date->modify('first day of next month');
$date->setDate('2012', '1', '29');
var_dump($date);
-
--EXPECTF--
object(DateTime)#%d (3) {
["date"]=>
diff --git a/ext/date/tests/bug71635.phpt b/ext/date/tests/bug71635.phpt
index 8c5ae25db3..422dee60e4 100644
--- a/ext/date/tests/bug71635.phpt
+++ b/ext/date/tests/bug71635.phpt
@@ -8,4 +8,4 @@ $period = new DatePeriod(new DateTimeImmutable("now"), new DateInterval("P2Y4DT6
var_dump($period->getEndDate());
?>
--EXPECT--
-NULL \ No newline at end of file
+NULL
diff --git a/ext/date/tests/checkdate_variation1.phpt b/ext/date/tests/checkdate_variation1.phpt
index a29212b1ae..8913963de0 100644
--- a/ext/date/tests/checkdate_variation1.phpt
+++ b/ext/date/tests/checkdate_variation1.phpt
@@ -199,4 +199,3 @@ bool(false)
Warning: checkdate() expects parameter 1 to be int, resource given in %s on line %d
bool(false)
===DONE===
-
diff --git a/ext/date/tests/checkdate_variation2.phpt b/ext/date/tests/checkdate_variation2.phpt
index 2474ca9e53..8f555314bd 100644
--- a/ext/date/tests/checkdate_variation2.phpt
+++ b/ext/date/tests/checkdate_variation2.phpt
@@ -199,4 +199,3 @@ bool(false)
Warning: checkdate() expects parameter 2 to be int, resource given in %s on line %d
bool(false)
===DONE===
-
diff --git a/ext/date/tests/date_add_basic2.phpt b/ext/date/tests/date_add_basic2.phpt
index 5beef23f45..a54c63658e 100644
--- a/ext/date/tests/date_add_basic2.phpt
+++ b/ext/date/tests/date_add_basic2.phpt
@@ -11,4 +11,4 @@ display_errors=false
var_dump(date_add()); // invalid parameters
?>
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/date/tests/date_basic1.phpt b/ext/date/tests/date_basic1.phpt
index 2b94ac34e7..088bdce6d5 100644
--- a/ext/date/tests/date_basic1.phpt
+++ b/ext/date/tests/date_basic1.phpt
@@ -38,4 +38,3 @@ string(28) "Fri Feb 27 10:44:30 GMT 2009"
string(19) "10:02:30 m is month"
string(8) "10:44:30"
===DONE===
-
diff --git a/ext/date/tests/date_create_from_format_basic.phpt b/ext/date/tests/date_create_from_format_basic.phpt
index 592692b5a7..823a4ccbeb 100644
--- a/ext/date/tests/date_create_from_format_basic.phpt
+++ b/ext/date/tests/date_create_from_format_basic.phpt
@@ -11,4 +11,4 @@ display_errors=false
var_dump(date_create_from_format()); // invalid parameters
?>
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/date/tests/date_create_from_format_basic2.phpt b/ext/date/tests/date_create_from_format_basic2.phpt
index 2b220a7275..61c553ddd4 100644
--- a/ext/date/tests/date_create_from_format_basic2.phpt
+++ b/ext/date/tests/date_create_from_format_basic2.phpt
@@ -10,4 +10,4 @@ date.timezone=UTC
var_dump(date_create_from_format('Y-m-d', '2009---01')); // invalid date
?>
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/date/tests/date_get_last_errors_basic.phpt b/ext/date/tests/date_get_last_errors_basic.phpt
index 5e83a5272f..26e470a7d8 100644
--- a/ext/date/tests/date_get_last_errors_basic.phpt
+++ b/ext/date/tests/date_get_last_errors_basic.phpt
@@ -10,4 +10,4 @@ date.timezone=UTC
var_dump(date_get_last_errors()); // no date was parsed, so no errors
?>
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/date/tests/date_interval_create_from_date_string.phpt b/ext/date/tests/date_interval_create_from_date_string.phpt
index 1333f747eb..abf2b354c6 100644
--- a/ext/date/tests/date_interval_create_from_date_string.phpt
+++ b/ext/date/tests/date_interval_create_from_date_string.phpt
@@ -31,4 +31,4 @@ int(14)
int(3)
int(4)
int(1)
-int(1) \ No newline at end of file
+int(1)
diff --git a/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt b/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt
index 15db956553..fa675fa2fe 100644
--- a/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt
+++ b/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt
@@ -8,4 +8,4 @@ $wrong_parameter = array();
$i = date_interval_create_from_date_string($wrong_parameter);
?>
--EXPECTF--
-Warning: date_interval_create_from_date_string() expects parameter 1 to be string, array given in %s on line %d \ No newline at end of file
+Warning: date_interval_create_from_date_string() expects parameter 1 to be string, array given in %s on line %d
diff --git a/ext/date/tests/date_parse_from_format_basic.phpt b/ext/date/tests/date_parse_from_format_basic.phpt
index 644949a2e8..717dfabe21 100644
--- a/ext/date/tests/date_parse_from_format_basic.phpt
+++ b/ext/date/tests/date_parse_from_format_basic.phpt
@@ -11,4 +11,4 @@ display_errors=false
var_dump(date_parse_from_format()); // invalid parameters
?>
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/date/tests/date_sun_info_error.phpt b/ext/date/tests/date_sun_info_error.phpt
index 8d572479f3..0b27757309 100644
--- a/ext/date/tests/date_sun_info_error.phpt
+++ b/ext/date/tests/date_sun_info_error.phpt
@@ -43,4 +43,4 @@ bool(false)
Warning: date_create() expects at most 2 parameters, 4 given in %s on line %d
bool(false)
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/date/tests/date_sunrise_variation9.phpt b/ext/date/tests/date_sunrise_variation9.phpt
index fb71d52228..75794cc632 100644
--- a/ext/date/tests/date_sunrise_variation9.phpt
+++ b/ext/date/tests/date_sunrise_variation9.phpt
@@ -58,4 +58,4 @@ bool(false)
Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/date_timestamp_set.phpt b/ext/date/tests/date_timestamp_set.phpt
index d17ffcd985..09eeac0d76 100644
--- a/ext/date/tests/date_timestamp_set.phpt
+++ b/ext/date/tests/date_timestamp_set.phpt
@@ -16,4 +16,4 @@ date_timestamp_set($dtms021, 1234567890);
var_dump(date_format($dtms021, 'B => (U) => T Y-M-d H:i:s'));
?>
--EXPECT--
-string(47) "021 => (1234567890) => UTC 2009-Feb-13 23:31:30" \ No newline at end of file
+string(47) "021 => (1234567890) => UTC 2009-Feb-13 23:31:30"
diff --git a/ext/date/tests/date_timestamp_set_nullparam.phpt b/ext/date/tests/date_timestamp_set_nullparam.phpt
index 04cde83346..27b105c998 100644
--- a/ext/date/tests/date_timestamp_set_nullparam.phpt
+++ b/ext/date/tests/date_timestamp_set_nullparam.phpt
@@ -14,4 +14,4 @@ $dtms021 = date_create();
date_timestamp_set(null, 1234567890);
?>
--EXPECTF--
-Warning: date_timestamp_set() expects parameter 1 to be DateTime, null given in %s on line %d \ No newline at end of file
+Warning: date_timestamp_set() expects parameter 1 to be DateTime, null given in %s on line %d
diff --git a/ext/date/tests/date_timestamp_set_nullparam2.phpt b/ext/date/tests/date_timestamp_set_nullparam2.phpt
index ee4477e907..c22dc3011a 100644
--- a/ext/date/tests/date_timestamp_set_nullparam2.phpt
+++ b/ext/date/tests/date_timestamp_set_nullparam2.phpt
@@ -21,4 +21,4 @@ object(DateTime)#1 (3) {
int(3)
["timezone"]=>
string(3) "UTC"
-} \ No newline at end of file
+}
diff --git a/ext/date/tests/date_timestamp_set_wrongparam_001.phpt b/ext/date/tests/date_timestamp_set_wrongparam_001.phpt
index 43fec3796a..a7af0572f3 100644
--- a/ext/date/tests/date_timestamp_set_wrongparam_001.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_001.phpt
@@ -14,4 +14,4 @@ $dtms021 = array();
date_timestamp_set($dtms021, 123456789);
?>
--EXPECTF--
-Warning: date_timestamp_set() expects parameter 1 to be DateTime, array given in %s on line %d \ No newline at end of file
+Warning: date_timestamp_set() expects parameter 1 to be DateTime, array given in %s on line %d
diff --git a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
index 1f436d6c2f..8fe38ff539 100644
--- a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
@@ -12,4 +12,4 @@ $dftz021 = date_default_timezone_get(); //UTC
date_timestamp_set(987654321, 123456789);
?>
--EXPECTF--
-Warning: date_timestamp_set() expects parameter 1 to be DateTime, int given in %s on line %d \ No newline at end of file
+Warning: date_timestamp_set() expects parameter 1 to be DateTime, int given in %s on line %d
diff --git a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt
index 149033660d..bd2a71172a 100644
--- a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt
@@ -16,4 +16,4 @@ $wrong_parameter = array();
date_timestamp_set($dtms021, $wrong_parameter);
?>
--EXPECTF--
-Warning: date_timestamp_set() expects parameter 2 to be int, array given in %s on line %d \ No newline at end of file
+Warning: date_timestamp_set() expects parameter 2 to be int, array given in %s on line %d
diff --git a/ext/date/tests/date_timestamp_set_wrongparam_004.phpt b/ext/date/tests/date_timestamp_set_wrongparam_004.phpt
index a9aab110e2..3a6d304561 100644
--- a/ext/date/tests/date_timestamp_set_wrongparam_004.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_004.phpt
@@ -14,4 +14,4 @@ $dtms021 = new DateTime();
date_timestamp_set($dtms021, 123456789, 'error');
?>
--EXPECTF--
-Warning: date_timestamp_set() expects exactly 2 parameters, 3 given in %s on line %d \ No newline at end of file
+Warning: date_timestamp_set() expects exactly 2 parameters, 3 given in %s on line %d
diff --git a/ext/date/tests/date_timezone_get_basic1.phpt b/ext/date/tests/date_timezone_get_basic1.phpt
index 7e0f32a6ca..9e8e92cde8 100644
--- a/ext/date/tests/date_timezone_get_basic1.phpt
+++ b/ext/date/tests/date_timezone_get_basic1.phpt
@@ -32,4 +32,4 @@ var_dump( timezone_name_get($tz) );
string(13) "Europe/London"
string(16) "America/New_York"
string(19) "America/Los_Angeles"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/date_timezone_set_basic1.phpt b/ext/date/tests/date_timezone_set_basic1.phpt
index b38354dae0..bfab43eda6 100644
--- a/ext/date/tests/date_timezone_set_basic1.phpt
+++ b/ext/date/tests/date_timezone_set_basic1.phpt
@@ -31,4 +31,3 @@ echo "New timezone: " . timezone_name_get($tz) . "\n";
Default timezone: Europe/London
New timezone: America/Los_Angeles
===DONE===
-
diff --git a/ext/date/tests/date_timezone_set_variation1.phpt b/ext/date/tests/date_timezone_set_variation1.phpt
index 4fc44c6667..549993b532 100644
--- a/ext/date/tests/date_timezone_set_variation1.phpt
+++ b/ext/date/tests/date_timezone_set_variation1.phpt
@@ -251,4 +251,3 @@ bool(false)
Warning: date_timezone_set() expects parameter 1 to be DateTime, resource given in %s on line %d
bool(false)
===DONE===
-
diff --git a/ext/date/tests/date_variation1.phpt b/ext/date/tests/date_variation1.phpt
index 0a3b9d4189..533d0d3d7c 100644
--- a/ext/date/tests/date_variation1.phpt
+++ b/ext/date/tests/date_variation1.phpt
@@ -205,4 +205,3 @@ string(0) ""
Warning: date() expects parameter 1 to be string, resource given in %s on line %d
bool(false)
===DONE===
-
diff --git a/ext/date/tests/date_variation2.phpt b/ext/date/tests/date_variation2.phpt
index 10a9f88793..77dc822396 100644
--- a/ext/date/tests/date_variation2.phpt
+++ b/ext/date/tests/date_variation2.phpt
@@ -219,4 +219,3 @@ string(24) "January 1, 1970, 1:00 am"
Warning: date() expects parameter 2 to be int, resource given in %s on line %d
bool(false)
===DONE===
-
diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt
index a6ef3b6fb9..e24f3e6d84 100644
--- a/ext/date/tests/getdate_variation7.phpt
+++ b/ext/date/tests/getdate_variation7.phpt
@@ -34,4 +34,4 @@ bool(false)
Warning: getdate() expects parameter 1 to be int, float given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/gmdate_variation14.phpt b/ext/date/tests/gmdate_variation14.phpt
index 86350f4e7a..5b6c48fca5 100644
--- a/ext/date/tests/gmdate_variation14.phpt
+++ b/ext/date/tests/gmdate_variation14.phpt
@@ -37,4 +37,4 @@ bool(false)
Warning: gmdate() expects parameter 2 to be int, float given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/idate_error.phpt b/ext/date/tests/idate_error.phpt
index b9a8354923..ff277ecd6a 100644
--- a/ext/date/tests/idate_error.phpt
+++ b/ext/date/tests/idate_error.phpt
@@ -34,4 +34,3 @@ bool(false)
Warning: idate() expects at most 2 parameters, 3 given in %s on line %d
bool(false)
===DONE===
-
diff --git a/ext/date/tests/idate_variation3.phpt b/ext/date/tests/idate_variation3.phpt
index 7e5a9eb103..9b6bc567e0 100644
--- a/ext/date/tests/idate_variation3.phpt
+++ b/ext/date/tests/idate_variation3.phpt
@@ -38,4 +38,4 @@ bool(false)
Warning: idate() expects parameter 2 to be int, float given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/localtime_error.phpt b/ext/date/tests/localtime_error.phpt
index 0224c3538e..4c9dee85f7 100644
--- a/ext/date/tests/localtime_error.phpt
+++ b/ext/date/tests/localtime_error.phpt
@@ -30,4 +30,3 @@ var_dump( localtime($timestamp, $assoc, $extra_arg) );
Warning: localtime() expects at most 2 parameters, 3 given in %s on line %d
bool(false)
===DONE===
-
diff --git a/ext/date/tests/microtime_error.phpt b/ext/date/tests/microtime_error.phpt
index 201456b8c0..699416d382 100644
--- a/ext/date/tests/microtime_error.phpt
+++ b/ext/date/tests/microtime_error.phpt
@@ -31,7 +31,6 @@ foreach ($bad_args as $bad_arg) {
?>
===DONE===
--EXPECTF--
-
-- Too many arguments --
Warning: microtime() expects at most 1 parameter, 2 given in %s on line 11
@@ -69,4 +68,4 @@ NULL
--> bad arg: int(1)
float(%s)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/mktime-3.phpt b/ext/date/tests/mktime-3.phpt
index 4347826aa0..ce1a203a20 100644
--- a/ext/date/tests/mktime-3.phpt
+++ b/ext/date/tests/mktime-3.phpt
@@ -56,4 +56,4 @@ Y: 1999 - January 1999-01-01T01:01:01+0100
Y: 2000 - January 2000-01-01T01:01:01+0100
Y: 2001 - January 2001-01-01T01:01:01+0100
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt
index b2cf13da79..955c05f55c 100644
--- a/ext/date/tests/mktime_basic1.phpt
+++ b/ext/date/tests/mktime_basic1.phpt
@@ -38,4 +38,3 @@ int(%i)
int(%i)
int(%i)
===DONE===
-
diff --git a/ext/date/tests/mktime_variation1.phpt b/ext/date/tests/mktime_variation1.phpt
index 59e336d9a5..da4dd1836a 100644
--- a/ext/date/tests/mktime_variation1.phpt
+++ b/ext/date/tests/mktime_variation1.phpt
@@ -221,4 +221,4 @@ int(%i)
Warning: mktime() expects parameter 1 to be int, resource given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/mktime_variation6.phpt b/ext/date/tests/mktime_variation6.phpt
index cf3617039c..82f42634a1 100644
--- a/ext/date/tests/mktime_variation6.phpt
+++ b/ext/date/tests/mktime_variation6.phpt
@@ -220,4 +220,3 @@ int(%i)
Warning: mktime() expects parameter 6 to be int, resource given in %s on line %d
bool(false)
===DONE===
-
diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt
index d1adf052e9..22f079702a 100644
--- a/ext/date/tests/strftime_variation23.phpt
+++ b/ext/date/tests/strftime_variation23.phpt
@@ -39,4 +39,4 @@ bool(false)
Warning: strftime() expects parameter 2 to be int, float given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/strtotime-mysql-64bit.phpt b/ext/date/tests/strtotime-mysql-64bit.phpt
index 38e7f15dff..c511d626e9 100644
--- a/ext/date/tests/strtotime-mysql-64bit.phpt
+++ b/ext/date/tests/strtotime-mysql-64bit.phpt
@@ -25,4 +25,3 @@ foreach($d as $date) {
string(31) "Fri, 23 May 1997 09:15:28 +0000"
string(31) "Sun, 31 Dec 2000 18:58:59 +0000"
string(31) "Wed, 10 Apr 2080 10:10:10 +0000"
-
diff --git a/ext/date/tests/strtotime_basic2.phpt b/ext/date/tests/strtotime_basic2.phpt
index f90e66da87..5f9bcd552e 100644
--- a/ext/date/tests/strtotime_basic2.phpt
+++ b/ext/date/tests/strtotime_basic2.phpt
@@ -10,4 +10,4 @@ date.timezone=UTC
var_dump(strtotime('mayy 2 2009')); // misspelled month name
?>
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/date/tests/time_basic.phpt b/ext/date/tests/time_basic.phpt
index 7b93e9dac2..0ff2f0120c 100644
--- a/ext/date/tests/time_basic.phpt
+++ b/ext/date/tests/time_basic.phpt
@@ -13,4 +13,4 @@ var_dump(time());
===DONE===
--EXPECTF--
int(%d)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/timezone_identifiers_list_basic1.phpt b/ext/date/tests/timezone_identifiers_list_basic1.phpt
index f38ae7f86e..b6b0ca43b8 100644
--- a/ext/date/tests/timezone_identifiers_list_basic1.phpt
+++ b/ext/date/tests/timezone_identifiers_list_basic1.phpt
@@ -33,4 +33,4 @@ bool(true)
bool(true)
bool(true)
===DONE===
- \ No newline at end of file
+
diff --git a/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt b/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt
index 5b8493ba11..39c71ab1db 100644
--- a/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt
+++ b/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt
@@ -12,4 +12,4 @@ print_r(timezone_identifiers_list(4096));
?>
--EXPECTF--
-Notice: timezone_identifiers_list(): A two-letter ISO 3166-1 compatible country code is expected in %s on line %d \ No newline at end of file
+Notice: timezone_identifiers_list(): A two-letter ISO 3166-1 compatible country code is expected in %s on line %d
diff --git a/ext/date/tests/timezone_location_get.phpt b/ext/date/tests/timezone_location_get.phpt
index 93f7ed6d75..a74bf7fd73 100644
--- a/ext/date/tests/timezone_location_get.phpt
+++ b/ext/date/tests/timezone_location_get.phpt
@@ -21,4 +21,3 @@ array(4) {
["comments"]=>
string(0) ""
}
-
diff --git a/ext/date/tests/timezone_offset_get_basic1.phpt b/ext/date/tests/timezone_offset_get_basic1.phpt
index 90fc4bb9a3..c7e197af85 100644
--- a/ext/date/tests/timezone_offset_get_basic1.phpt
+++ b/ext/date/tests/timezone_offset_get_basic1.phpt
@@ -31,4 +31,4 @@ var_dump(timezone_offset_get($tz, $date));
%rint\(0\)|int\(3600\)%r
%rint\(-18000\)|int\(-14400\)%r
%rint\(-28800\)|int\(-25200\)%r
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt
index 3189e35074..2fd44a430d 100644
--- a/ext/date/tests/timezone_transitions_get_basic1.phpt
+++ b/ext/date/tests/timezone_transitions_get_basic1.phpt
@@ -50,4 +50,4 @@ array(5) {
["abbr"]=>
string(3) "BST"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/date/tests/timezone_version_get.phpt b/ext/date/tests/timezone_version_get.phpt
index 2c75de7ebc..c6e88e7bb3 100644
--- a/ext/date/tests/timezone_version_get.phpt
+++ b/ext/date/tests/timezone_version_get.phpt
@@ -10,4 +10,4 @@ date_default_timezone_set("America/Sao_Paulo");
var_dump(timezone_version_get());
?>
--EXPECTREGEX--
-string\([6-7]\) \"20[0-9][0-9]\.[1-9][0-9]?\" \ No newline at end of file
+string\([6-7]\) \"20[0-9][0-9]\.[1-9][0-9]?\"
diff --git a/ext/date/tests/timezone_version_get_basic1.phpt b/ext/date/tests/timezone_version_get_basic1.phpt
index ba0ac00715..f008486b1f 100644
--- a/ext/date/tests/timezone_version_get_basic1.phpt
+++ b/ext/date/tests/timezone_version_get_basic1.phpt
@@ -9,4 +9,4 @@ date.timezone=UTC
<?php $versionTimezone = timezone_version_get();
echo $versionTimezone; ?>
--EXPECTREGEX--
-^[12][0-9]{3}.[0-9]+$ \ No newline at end of file
+^[12][0-9]{3}.[0-9]+$
diff --git a/ext/dom/tests/DOMAttr_name_basic_001.phpt b/ext/dom/tests/DOMAttr_name_basic_001.phpt
index 29ca8c585e..44e0324ff3 100644
--- a/ext/dom/tests/DOMAttr_name_basic_001.phpt
+++ b/ext/dom/tests/DOMAttr_name_basic_001.phpt
@@ -11,4 +11,4 @@ $attr = new DOMAttr('category', 'books');
print $attr->name;
?>
--EXPECT--
-category \ No newline at end of file
+category
diff --git a/ext/dom/tests/DOMAttr_value_basic_001.phpt b/ext/dom/tests/DOMAttr_value_basic_001.phpt
index ca174d7926..9898a406c5 100644
--- a/ext/dom/tests/DOMAttr_value_basic_001.phpt
+++ b/ext/dom/tests/DOMAttr_value_basic_001.phpt
@@ -13,4 +13,3 @@ print $attr->value."\n";
===DONE===
--EXPECT--
===DONE===
-
diff --git a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
index e479c1e8b8..9b37b4443a 100644
--- a/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
+++ b/ext/dom/tests/DOMCharacterData_appendData_basic.phpt
@@ -34,4 +34,4 @@ CDATA Length (two appends): 8
CDATA Content: data><&"
<?xml version="1.0"?>
-<root><cdata><![CDATA[data><&"]]></cdata></root> \ No newline at end of file
+<root><cdata><![CDATA[data><&"]]></cdata></root>
diff --git a/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt b/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt
index 4126f99141..cf38004d85 100644
--- a/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt
@@ -16,4 +16,4 @@ $root->appendChild($cdata);
$cdata->appendData();
?>
--EXPECTF--
-Warning: DOMCharacterData::appendData() expects exactly 1 parameter, 0 given in %s on line %d \ No newline at end of file
+Warning: DOMCharacterData::appendData() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt b/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
index c91071f364..787c5a7cfb 100644
--- a/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
@@ -17,4 +17,4 @@ $cdata->deleteData(1, 10);
var_dump($cdata->data);
?>
--EXPECTF--
-string(%d) "t" \ No newline at end of file
+string(%d) "t"
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt b/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt
index 3fa7fba2db..3726202d10 100644
--- a/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt
@@ -16,4 +16,4 @@ $root->appendChild($cdata);
$cdata->deleteData();
?>
--EXPECTF--
-Warning: DOMCharacterData::deleteData() expects exactly 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: DOMCharacterData::deleteData() expects exactly 2 parameters, 0 given in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt b/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
index 4795f8176c..2faa02eb58 100644
--- a/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
+++ b/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
@@ -20,4 +20,4 @@ Fatal error: Uncaught DOMException: Index Size Error in %s:%d
Stack trace:
#0 %s(%d): DOMCharacterData->deleteData(5, 1)
#1 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt b/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt
index 813a0be52a..55038e369a 100644
--- a/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt
@@ -16,4 +16,4 @@ $root->appendChild($cdata);
$cdata->insertData();
?>
--EXPECTF--
-Warning: DOMCharacterData::insertData() expects exactly 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: DOMCharacterData::insertData() expects exactly 2 parameters, 0 given in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_length_error_001.phpt b/ext/dom/tests/DOMCharacterData_length_error_001.phpt
index 31a17c6186..dd38ae2c36 100644
--- a/ext/dom/tests/DOMCharacterData_length_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_length_error_001.phpt
@@ -14,4 +14,3 @@ print $character_data->length;
--EXPECTF--
Warning: main(): Invalid State Error in %s
===DONE===
-
diff --git a/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt b/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt
index 45d25dd859..fb3e66b4f8 100644
--- a/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt
@@ -16,4 +16,4 @@ $root->appendChild($cdata);
$cdata->replaceData();
?>
--EXPECTF--
-Warning: DOMCharacterData::replaceData() expects exactly 3 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: DOMCharacterData::replaceData() expects exactly 3 parameters, 0 given in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt b/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt
index 8b924f04d5..be58fabd4b 100644
--- a/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt
@@ -18,4 +18,4 @@ print $cdata->substringData(1, 6);
?>
--EXPECT--
-estfes \ No newline at end of file
+estfes
diff --git a/ext/dom/tests/DOMComment_appendData_basic.phpt b/ext/dom/tests/DOMComment_appendData_basic.phpt
index e1540f97c4..a5c21f0ad3 100644
--- a/ext/dom/tests/DOMComment_appendData_basic.phpt
+++ b/ext/dom/tests/DOMComment_appendData_basic.phpt
@@ -18,4 +18,4 @@ echo $dom->saveXML();
?>
--EXPECT--
<?xml version="1.0"?>
-<!--test-comment-more-data--> \ No newline at end of file
+<!--test-comment-more-data-->
diff --git a/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt
index ae06d8a87c..4d39ea4695 100644
--- a/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt
+++ b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt
@@ -34,4 +34,4 @@ Comment Length (two appends): 8
Comment Content: data><&"
<?xml version="1.0"?>
-<root><comment><!--data><&"--></comment></root> \ No newline at end of file
+<root><comment><!--data><&"--></comment></root>
diff --git a/ext/dom/tests/DOMComment_insertData_error2.phpt b/ext/dom/tests/DOMComment_insertData_error2.phpt
index 0ead9624b8..73911cc368 100644
--- a/ext/dom/tests/DOMComment_insertData_error2.phpt
+++ b/ext/dom/tests/DOMComment_insertData_error2.phpt
@@ -21,4 +21,4 @@ try {
?>
--EXPECT--
-Throws DOMException for offset too large \ No newline at end of file
+Throws DOMException for offset too large
diff --git a/ext/dom/tests/DOMComment_replaceData_error2.phpt b/ext/dom/tests/DOMComment_replaceData_error2.phpt
index 7dc8f1e9b9..fbf59d76dc 100644
--- a/ext/dom/tests/DOMComment_replaceData_error2.phpt
+++ b/ext/dom/tests/DOMComment_replaceData_error2.phpt
@@ -21,4 +21,4 @@ try {
?>
--EXPECT--
-Throws DOMException for offest too large \ No newline at end of file
+Throws DOMException for offest too large
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt
index 6ffe510b0d..e0d9dfa6f5 100644
--- a/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt
@@ -11,4 +11,4 @@ $fragment = new DOMDocumentFragment();
$fragment->appendXML();
?>
--EXPECTF--
-Warning: DOMDocumentFragment::appendXML() expects exactly 1 parameter, 0 given in %s on line %d \ No newline at end of file
+Warning: DOMDocumentFragment::appendXML() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
index 7603a01741..b6ce9dcb65 100644
--- a/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
@@ -16,4 +16,4 @@ Fatal error: Uncaught DOMException: No Modification Allowed Error in %s:%d
Stack trace:
#0 %s(%d): DOMDocumentFragment->appendXML('<bait>crankbait...')
#1 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
index 8735ae6ecf..45ef2bc6e9 100644
--- a/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
@@ -16,4 +16,4 @@ $fragment = $document->createDocumentFragment();
$root->appendChild($fragment);
?>
--EXPECTF--
-Warning: DOMNode::appendChild(): Document Fragment is empty in %s on line %d \ No newline at end of file
+Warning: DOMNode::appendChild(): Document Fragment is empty in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_entities_error_001.phpt b/ext/dom/tests/DOMDocumentType_entities_error_001.phpt
index 73655b06d3..4d047a0058 100644
--- a/ext/dom/tests/DOMDocumentType_entities_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_entities_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$entities = $doctype->entities;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt b/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
index c1f7d9b4de..5825914777 100644
--- a/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$internalSubset = $doctype->internalSubset;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_name_error_001.phpt b/ext/dom/tests/DOMDocumentType_name_error_001.phpt
index d2426e88f8..026ea2393a 100644
--- a/ext/dom/tests/DOMDocumentType_name_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_name_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$name = $doctype->name;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_notations_error_001.phpt b/ext/dom/tests/DOMDocumentType_notations_error_001.phpt
index e4d1c3c8ee..a18f47f3f1 100644
--- a/ext/dom/tests/DOMDocumentType_notations_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_notations_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$notations = $doctype->notations;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt b/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
index 49a7eecbf3..18f069ae16 100644
--- a/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
@@ -16,4 +16,4 @@ $doctype = $doc->doctype;
var_dump($doctype->publicId);
?>
--EXPECT--
-string(0) "" \ No newline at end of file
+string(0) ""
diff --git a/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt b/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
index 275bb65e3e..df6c2bd908 100644
--- a/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$publicId = $doctype->publicId;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt b/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
index 56f7ddda97..e689351dda 100644
--- a/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
@@ -16,4 +16,4 @@ $doctype = $doc->doctype;
var_dump($doctype->systemId);
?>
--EXPECT--
-string(0) "" \ No newline at end of file
+string(0) ""
diff --git a/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt b/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
index a4aadd7070..e302fcc7f1 100644
--- a/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
@@ -11,4 +11,4 @@ $doctype = new DOMDocumentType();
$systemId = $doctype->systemId;
?>
--EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d \ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
index 4e00fbb8d8..2a9d5a1d01 100644
--- a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
+++ b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
@@ -23,4 +23,3 @@ echo $doc->saveXML();
--EXPECT--
<?xml version="1.0"?>
<para hahaha=""/>
-
diff --git a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt
index 745873aca9..9a1cba4813 100644
--- a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt
+++ b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt
@@ -26,4 +26,3 @@ catch (DOMException $e) {
?>
--EXPECT--
Test failed!
-
diff --git a/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt b/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
index 9f45f125d5..1c42f23b86 100644
--- a/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
+++ b/ext/dom/tests/DOMDocument_createProcessingInstruction_basic.phpt
@@ -27,4 +27,3 @@ echo $doc->saveXML();
--EXPECT--
<?xml version="1.0"?>
<para><?blablabla?><?blablabla datadata?></para>
-
diff --git a/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt b/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
index a0c12b1fe7..e660b93e7f 100644
--- a/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
+++ b/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt
@@ -28,4 +28,3 @@ catch (DOMException $e)
?>
--EXPECT--
Test failed!
-
diff --git a/ext/dom/tests/DOMDocument_encoding_basic.phpt b/ext/dom/tests/DOMDocument_encoding_basic.phpt
index 9fc099bfe2..6ac405da69 100644
--- a/ext/dom/tests/DOMDocument_encoding_basic.phpt
+++ b/ext/dom/tests/DOMDocument_encoding_basic.phpt
@@ -49,4 +49,3 @@ Adding UTF-8 encoding: UTF-8
UTF-8 Encoding Read: UTF-8
Adding UTF-16 encoding: UTF-16
UTF-16 Encoding Read: UTF-16
-
diff --git a/ext/dom/tests/DOMDocument_implementationRead_basic.phpt b/ext/dom/tests/DOMDocument_implementationRead_basic.phpt
index 17daddf38b..9482780b21 100644
--- a/ext/dom/tests/DOMDocument_implementationRead_basic.phpt
+++ b/ext/dom/tests/DOMDocument_implementationRead_basic.phpt
@@ -18,4 +18,3 @@ var_dump($doc->implementation);
--EXPECTF--
object(DOMImplementation)#%d (0) {
}
-
diff --git a/ext/dom/tests/DOMDocument_preserveWhiteSpace_basic.phpt b/ext/dom/tests/DOMDocument_preserveWhiteSpace_basic.phpt
index a772bc8569..17430d0770 100644
--- a/ext/dom/tests/DOMDocument_preserveWhiteSpace_basic.phpt
+++ b/ext/dom/tests/DOMDocument_preserveWhiteSpace_basic.phpt
@@ -20,4 +20,3 @@ var_dump($doc->preserveWhiteSpace);
--EXPECT--
bool(true)
bool(false)
-
diff --git a/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt b/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
index 0f26e57d0c..3eb6bec21d 100644
--- a/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
+++ b/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
@@ -22,7 +22,6 @@ $result = $doc->relaxNGValidate($rng);
var_dump($result);
?>
--EXPECTF--
-
Warning: DOMDocument::relaxNGValidate(): I/O warning : failed to load external entity "%s/foo.rng" in %s on line %d
Warning: DOMDocument::relaxNGValidate(): xmlRelaxNGParse: could not load %s/foo.rng in %s on line %d
diff --git a/ext/dom/tests/DOMDocument_resolveExternals_basic.phpt b/ext/dom/tests/DOMDocument_resolveExternals_basic.phpt
index ccada3fe99..f228a18c1e 100644
--- a/ext/dom/tests/DOMDocument_resolveExternals_basic.phpt
+++ b/ext/dom/tests/DOMDocument_resolveExternals_basic.phpt
@@ -46,4 +46,4 @@ Read initial resolveExternals:
bool(false)
Set resolveExternals to TRUE, reading again:
bool(true)
-Done \ No newline at end of file
+Done
diff --git a/ext/dom/tests/DOMDocument_save_basic.phpt b/ext/dom/tests/DOMDocument_save_basic.phpt
index e477a1758d..bcad72dce5 100644
--- a/ext/dom/tests/DOMDocument_save_basic.phpt
+++ b/ext/dom/tests/DOMDocument_save_basic.phpt
@@ -30,4 +30,3 @@ echo 'Wrote: ' . $doc->save($temp_filename) . ' bytes'; // Wrote: 72 bytes
?>
--EXPECT--
Wrote: 72 bytes
-
diff --git a/ext/dom/tests/DOMDocument_savexml_basic.phpt b/ext/dom/tests/DOMDocument_savexml_basic.phpt
index 09cc995049..a0978ebb82 100644
--- a/ext/dom/tests/DOMDocument_savexml_basic.phpt
+++ b/ext/dom/tests/DOMDocument_savexml_basic.phpt
@@ -33,7 +33,6 @@ $result = file_get_contents($filename);
var_dump($result == $dom->saveXML());
unlink($filename);
-
--EXPECT--
int(151)
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/dom/tests/DOMDocument_standalone_basic.phpt b/ext/dom/tests/DOMDocument_standalone_basic.phpt
index 2316a3897d..4a79ea6c3f 100644
--- a/ext/dom/tests/DOMDocument_standalone_basic.phpt
+++ b/ext/dom/tests/DOMDocument_standalone_basic.phpt
@@ -45,4 +45,4 @@ string(136) "<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE s1 PUBLIC "http://www.ibm.com/example.dtd" "example.dtd">
<s1>foo</s1>
"
-Done \ No newline at end of file
+Done
diff --git a/ext/dom/tests/DOMDocument_validate_on_parse_basic.phpt b/ext/dom/tests/DOMDocument_validate_on_parse_basic.phpt
index a95b0a3043..449fffb4ee 100644
--- a/ext/dom/tests/DOMDocument_validate_on_parse_basic.phpt
+++ b/ext/dom/tests/DOMDocument_validate_on_parse_basic.phpt
@@ -35,4 +35,3 @@ var_dump($dom->validateOnParse);
Checking documented default value: bool(false)
Setting validateOnParse to TRUE: bool(true)
Setting validateOnParse to FALSE: bool(false)
-
diff --git a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
index 4dfafa267d..cdf36319b3 100644
--- a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
+++ b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
@@ -43,4 +43,3 @@ Warning: DOMDocument::loadXML(): No declaration for element NYPHP in Entity, lin
Warning: DOMDocument::loadXML(): Element from was declared #PCDATA but contains non text nodes in Entity, line: %d in %s on line %d
Error Report Above
-
diff --git a/ext/dom/tests/DOMNode_cloneNode_basic.phpt b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
index be8f491922..538ba968f4 100644
--- a/ext/dom/tests/DOMNode_cloneNode_basic.phpt
+++ b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
@@ -71,7 +71,6 @@ for ($index = 0; $index < $children->length; $index++) {
echo "node $index\n";
dumpcourse($children->item($index));
}
-
--EXPECT--
Start cloneNode test
node 0
diff --git a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt
index 8d1c10efec..cccfff9a65 100644
--- a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt
+++ b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt
@@ -40,4 +40,4 @@ var_dump($text->hasChildNodes());
--EXPECT--
Root has child nodes: bool(true)
Title has child nodes: bool(true)
-Text has child nodes: bool(false) \ No newline at end of file
+Text has child nodes: bool(false)
diff --git a/ext/dom/tests/DOMNode_normalize_basic.phpt b/ext/dom/tests/DOMNode_normalize_basic.phpt
index 7e15c47f13..624466051d 100644
--- a/ext/dom/tests/DOMNode_normalize_basic.phpt
+++ b/ext/dom/tests/DOMNode_normalize_basic.phpt
@@ -61,4 +61,4 @@ var_dump($title->childNodes->length);
Number of child nodes of title = int(1)
Number of child nodes of title after adding second title = int(2)
Number of child nodes of title after normalizing author = int(2)
-Number of child nodes of title after normalizing title = int(1) \ No newline at end of file
+Number of child nodes of title after normalizing title = int(1)
diff --git a/ext/dom/tests/DOMNode_removeChild_basic.phpt b/ext/dom/tests/DOMNode_removeChild_basic.phpt
index 92cb79d128..a4b3917d29 100644
--- a/ext/dom/tests/DOMNode_removeChild_basic.phpt
+++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt
@@ -56,7 +56,6 @@ for ($index = 0; $index < $children->length; $index++) {
$current = $children->item($index);
dumpcourse($current);
}
-
--EXPECT--
original has 5 nodes
node 4
diff --git a/ext/dom/tests/DOMText_appendData_basic.phpt b/ext/dom/tests/DOMText_appendData_basic.phpt
index 0eea699a76..1472a955ea 100644
--- a/ext/dom/tests/DOMText_appendData_basic.phpt
+++ b/ext/dom/tests/DOMText_appendData_basic.phpt
@@ -37,4 +37,4 @@ Text Content: data><&"
<?xml version="1.0"?>
<root><text>data&gt;&lt;&amp;"</text></root>
===DONE===
- \ No newline at end of file
+
diff --git a/ext/dom/tests/bug28721.phpt b/ext/dom/tests/bug28721.phpt
index 818e62973e..941c8eb879 100644
--- a/ext/dom/tests/bug28721.phpt
+++ b/ext/dom/tests/bug28721.phpt
@@ -119,7 +119,6 @@ print_node_r($p);
?>
--EXPECT--
-
name (value): p ( t1 X t2 xxx )
parent: NULL
previousSibling: NULL
diff --git a/ext/dom/tests/bug32615.phpt b/ext/dom/tests/bug32615.phpt
index c6f2b5bf86..7850f064ee 100644
--- a/ext/dom/tests/bug32615.phpt
+++ b/ext/dom/tests/bug32615.phpt
@@ -72,7 +72,6 @@ echo $dom->saveXML();
?>
--EXPECT--
-
<?xml version="1.0"?>
<root><first/><newsecond/><newthird/><newfourth/></root>
@@ -81,4 +80,3 @@ echo $dom->saveXML();
<?xml version="1.0"?>
<root><second/><third/><fourth/></root>
-
diff --git a/ext/dom/tests/bug37277.phpt b/ext/dom/tests/bug37277.phpt
index 112b9f4655..f40df6e7a3 100644
--- a/ext/dom/tests/bug37277.phpt
+++ b/ext/dom/tests/bug37277.phpt
@@ -19,7 +19,5 @@ print $dom2->saveXML();
?>
--EXPECT--
-
<?xml version="1.0" encoding="UTF-8"?>
<foo/>
-
diff --git a/ext/dom/tests/bug37456.phpt b/ext/dom/tests/bug37456.phpt
index 5f0fc28778..d5a833413e 100644
--- a/ext/dom/tests/bug37456.phpt
+++ b/ext/dom/tests/bug37456.phpt
@@ -17,6 +17,4 @@ print $attr->nodeValue;
?>
--EXPECT--
-
newval
-
diff --git a/ext/dom/tests/bug42082.phpt b/ext/dom/tests/bug42082.phpt
index 9708937ff7..498d8f0346 100644
--- a/ext/dom/tests/bug42082.phpt
+++ b/ext/dom/tests/bug42082.phpt
@@ -28,4 +28,3 @@ bool(true)
bool(false)
bool(false)
===DONE===
-
diff --git a/ext/dom/tests/bug44648.phpt b/ext/dom/tests/bug44648.phpt
index 4ff7ac389c..657f193dbd 100644
--- a/ext/dom/tests/bug44648.phpt
+++ b/ext/dom/tests/bug44648.phpt
@@ -42,4 +42,4 @@ Invalid Character Error
Invalid Character Error
Invalid Character Error
Namespace Error
-<root/> \ No newline at end of file
+<root/>
diff --git a/ext/dom/tests/bug46185.phpt b/ext/dom/tests/bug46185.phpt
index 927a6e59e6..eaff4136a2 100644
--- a/ext/dom/tests/bug46185.phpt
+++ b/ext/dom/tests/bug46185.phpt
@@ -20,4 +20,4 @@ echo $aDOM->saveXML();
?>
--EXPECT--
<?xml version="1.0"?>
-<ns1:a xmlns:ns1="urn::ns"><ns1:ok xmlns="urn::REAL"><watch-me xmlns:default="urn::BOGUS"/></ns1:ok></ns1:a> \ No newline at end of file
+<ns1:a xmlns:ns1="urn::ns"><ns1:ok xmlns="urn::REAL"><watch-me xmlns:default="urn::BOGUS"/></ns1:ok></ns1:a>
diff --git a/ext/dom/tests/bug47848.phpt b/ext/dom/tests/bug47848.phpt
index e484e9c5dd..b9f72d3069 100644
--- a/ext/dom/tests/bug47848.phpt
+++ b/ext/dom/tests/bug47848.phpt
@@ -22,4 +22,4 @@ echo $aDOM->saveXML();
?>
--EXPECT--
<?xml version="1.0"?>
-<f2f:a xmlns:f2f="http://friend2friend.net/" xmlns:ai="http://altruists.org" ai:attr="namespaced"/> \ No newline at end of file
+<f2f:a xmlns:f2f="http://friend2friend.net/" xmlns:ai="http://altruists.org" ai:attr="namespaced"/>
diff --git a/ext/dom/tests/bug66502.phpt b/ext/dom/tests/bug66502.phpt
index 5b35b41e93..62ca4424d7 100644
--- a/ext/dom/tests/bug66502.phpt
+++ b/ext/dom/tests/bug66502.phpt
@@ -17,4 +17,4 @@ $comment->__construct("Comment 3");
echo 'DONE', PHP_EOL;
?>
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/dom/tests/bug73907.phpt b/ext/dom/tests/bug73907.phpt
index 346d8135bb..597736665d 100644
--- a/ext/dom/tests/bug73907.phpt
+++ b/ext/dom/tests/bug73907.phpt
@@ -17,4 +17,4 @@ var_dump($attr);
object(DOMElement)#%d (%d) {%A
["nextSibling"]=>
NULL
-%A} \ No newline at end of file
+%A}
diff --git a/ext/dom/tests/canonicalization.phpt b/ext/dom/tests/canonicalization.phpt
index 8908aba55d..350d3034bf 100644
--- a/ext/dom/tests/canonicalization.phpt
+++ b/ext/dom/tests/canonicalization.phpt
@@ -49,7 +49,6 @@ echo $doc->c14N(TRUE, FALSE,
echo $doc->C14N(TRUE, FALSE, NULL, array('test'));
?>
--EXPECT--
-
<contain xmlns="http://www.example.com/ns/foo" xmlns:fubar="http://www.example.com/ns/fubar" xmlns:test="urn::test">
<bar><test1></test1></bar>
<bar><test2></test2></bar>
diff --git a/ext/dom/tests/dom004.phpt b/ext/dom/tests/dom004.phpt
index 5b65f24ba1..3a9295feb3 100644
--- a/ext/dom/tests/dom004.phpt
+++ b/ext/dom/tests/dom004.phpt
@@ -10,7 +10,6 @@ in_array('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib wrap
$dom = new domdocument;
$dom->load("compress.zlib://".dirname(__FILE__)."/book.xml.gz");
print $dom->saveXML();
-
--EXPECT--
<?xml version="1.0"?>
<books>
diff --git a/ext/dom/tests/dom005.phpt b/ext/dom/tests/dom005.phpt
index 0aceb881bf..d7e828cc32 100644
--- a/ext/dom/tests/dom005.phpt
+++ b/ext/dom/tests/dom005.phpt
@@ -16,7 +16,6 @@ print adjustDoctype($dom->saveHTML());
function adjustDoctype($xml) {
return str_replace(array("DOCTYPE HTML",'<p>','</p>'),array("DOCTYPE html",'',''),$xml);
}
-
--EXPECT--
--- save as XML
<?xml version="1.0" standalone="yes"?>
diff --git a/ext/dom/tests/dom007.phpt b/ext/dom/tests/dom007.phpt
index 5d12aa344d..b0062e8e4a 100644
--- a/ext/dom/tests/dom007.phpt
+++ b/ext/dom/tests/dom007.phpt
@@ -88,8 +88,6 @@ $node = $ents->item(3);
var_dump($node);
$node = $ents->getNamedItem('xxx');
var_dump($node);
-
-
--EXPECT--
Length: 1
Key GIF: GIF (image/gif) (-)
diff --git a/ext/dom/tests/dom_comment_basic.phpt b/ext/dom/tests/dom_comment_basic.phpt
index ecabe73334..e9d0f89bf8 100644
--- a/ext/dom/tests/dom_comment_basic.phpt
+++ b/ext/dom/tests/dom_comment_basic.phpt
@@ -26,7 +26,6 @@ for ($index = 0; $index < $children->length; $index++) {
echo get_class($current), "\n";
var_dump($current->textContent);
}
-
--EXPECT--
bool(true)
--- child 0 ---
@@ -40,4 +39,3 @@ string(14) " Hello World! "
DOMText
string(1) "
"
-
diff --git a/ext/dom/tests/dom_comment_variation.phpt b/ext/dom/tests/dom_comment_variation.phpt
index d44babdeaa..8982f34abe 100644
--- a/ext/dom/tests/dom_comment_variation.phpt
+++ b/ext/dom/tests/dom_comment_variation.phpt
@@ -23,10 +23,8 @@ for ($index = 0; $index < $children->length; $index++) {
echo get_class($current), "\n";
var_dump($current->textContent);
}
-
--EXPECT--
bool(true)
--- child 0 ---
DOMComment
string(14) " Hello World! "
-
diff --git a/ext/dom/tests/domattributes.phpt b/ext/dom/tests/domattributes.phpt
index 9097a887e9..a9663f1543 100644
--- a/ext/dom/tests/domattributes.phpt
+++ b/ext/dom/tests/domattributes.phpt
@@ -35,9 +35,7 @@ print $dom->saveXML($top_element);
?>
--EXPECT--
-
Language: en
Language: en-US
Is ID?: NO
<chapter language="en-US" num="1"/>
-
diff --git a/ext/dom/tests/domchardata.phpt b/ext/dom/tests/domchardata.phpt
index 6baff6d148..52bfef2fd2 100644
--- a/ext/dom/tests/domchardata.phpt
+++ b/ext/dom/tests/domchardata.phpt
@@ -62,7 +62,6 @@ $text3 = $text2->splitText(1);
echo "Is Whitespace?: ".($text2->isElementContentWhitespace()?'YES':'NO');
?>
--EXPECT--
-
Comment Length: 42
New Comment Length: 15
New Comment Data: Updated comment
diff --git a/ext/dom/tests/domdocument_createcomment_error_001.phpt b/ext/dom/tests/domdocument_createcomment_error_001.phpt
index 24104a1a0b..e73e1f163a 100644
--- a/ext/dom/tests/domdocument_createcomment_error_001.phpt
+++ b/ext/dom/tests/domdocument_createcomment_error_001.phpt
@@ -13,4 +13,4 @@ Clint Priest @ PhpTek09
--EXPECTF--
Warning: DOMDocument::createComment() expects exactly 1 parameter, 0 given in %s
===DONE===
- \ No newline at end of file
+
diff --git a/ext/dom/tests/domdocument_createentityreference_001.phpt b/ext/dom/tests/domdocument_createentityreference_001.phpt
index 9a43599914..481b47225b 100644
--- a/ext/dom/tests/domdocument_createentityreference_001.phpt
+++ b/ext/dom/tests/domdocument_createentityreference_001.phpt
@@ -15,4 +15,4 @@ Clint Priest @ PhpTek09
--EXPECT--
Test
===DONE===
- \ No newline at end of file
+
diff --git a/ext/dom/tests/domdocument_createentityreference_002.phpt b/ext/dom/tests/domdocument_createentityreference_002.phpt
index 90754100dd..f981362890 100644
--- a/ext/dom/tests/domdocument_createentityreference_002.phpt
+++ b/ext/dom/tests/domdocument_createentityreference_002.phpt
@@ -14,4 +14,4 @@ Clint Priest @ PhpTek09
--EXPECTF--
Warning: DOMDocument::createEntityReference() expects exactly 1 parameter, 0 given in %s
===DONE===
- \ No newline at end of file
+
diff --git a/ext/dom/tests/domelement.phpt b/ext/dom/tests/domelement.phpt
index bc69af602c..43a6e98603 100644
--- a/ext/dom/tests/domelement.phpt
+++ b/ext/dom/tests/domelement.phpt
@@ -85,7 +85,6 @@ for ($x = 0; $x < $mylen; $x++) {
echo 'Element Name: '.(($elem = $dom->getElementByID('n3'))?$elem->nodeName:'Not Found')."\n";
?>
--EXPECT--
-
Tag Name: chapter
Chapter: 1
Attribute num exists?: Yes
diff --git a/ext/dom/tests/domxpath.phpt b/ext/dom/tests/domxpath.phpt
index e63c96ba93..da91142ef5 100644
--- a/ext/dom/tests/domxpath.phpt
+++ b/ext/dom/tests/domxpath.phpt
@@ -55,4 +55,4 @@ var_dump($avg);
myval
float(1)
bool(true)
-float(4) \ No newline at end of file
+float(4)
diff --git a/ext/dom/tests/node_textcontent.phpt b/ext/dom/tests/node_textcontent.phpt
index 288278412f..d346bfba38 100644
--- a/ext/dom/tests/node_textcontent.phpt
+++ b/ext/dom/tests/node_textcontent.phpt
@@ -36,4 +36,3 @@ var_dump($dom->saveHTML($node));
string(8) "hi there"
bool(true)
string(63) "<div id="test">&lt;p&gt;hello world &amp;trade;&lt;/p&gt;</div>"
-
diff --git a/ext/dom/tests/regsiter_node_class.phpt b/ext/dom/tests/regsiter_node_class.phpt
index 311433b12c..1511a1e507 100644
--- a/ext/dom/tests/regsiter_node_class.phpt
+++ b/ext/dom/tests/regsiter_node_class.phpt
@@ -30,7 +30,6 @@ echo get_class($attr), "\n";
print $attr->testit()."\n";
?>
--EXPECTF--
-
myElement
HELLO Element
myAttribute
diff --git a/ext/enchant/tests/bug53070.phpt b/ext/enchant/tests/bug53070.phpt
index 2183960716..b35f19c7db 100644
--- a/ext/enchant/tests/bug53070.phpt
+++ b/ext/enchant/tests/bug53070.phpt
@@ -12,7 +12,6 @@ var_dump(enchant_broker_get_dict_path($broker, ENCHANT_MYSPELL));
var_dump(enchant_broker_get_dict_path($broker, ENCHANT_ISPELL));
?>
--EXPECTF--
-
Warning: enchant_broker_get_dict_path(): dict_path not set in %s on line %d
bool(false)
diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt
index a66aba3a51..cd2e48a0d4 100644
--- a/ext/exif/tests/bug48378.phpt
+++ b/ext/exif/tests/bug48378.phpt
@@ -15,5 +15,3 @@ Warning: exif_read_data(%s): Invalid IFD start in %s48378.php on line %d
Warning: exif_read_data(%s): Error reading from file: got=x08B4(=2228) != itemlen-2=x1FFE(=8190) in %s48378.php on line %d
Warning: exif_read_data(%s): Invalid JPEG file in %s48378.php on line %d
-
-
diff --git a/ext/exif/tests/bug54002.phpt b/ext/exif/tests/bug54002.phpt
index 8f85339190..031afad072 100644
--- a/ext/exif/tests/bug54002.phpt
+++ b/ext/exif/tests/bug54002.phpt
@@ -13,4 +13,4 @@ exif_read_data(__DIR__ . '/bug54002_2.jpeg');
--EXPECTF--
Warning: exif_read_data(bug54002_1.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d
-Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d \ No newline at end of file
+Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d
diff --git a/ext/exif/tests/bug64739.phpt b/ext/exif/tests/bug64739.phpt
index 185d39c1d5..d47f8849a2 100644
--- a/ext/exif/tests/bug64739.phpt
+++ b/ext/exif/tests/bug64739.phpt
@@ -39,4 +39,4 @@ bool(true)
bool(true)
string(8) "55845364"
string(13) "100420.000000"
-Done \ No newline at end of file
+Done
diff --git a/ext/exif/tests/bug68547.phpt b/ext/exif/tests/bug68547.phpt
index 894c76806d..f16eaa9459 100644
--- a/ext/exif/tests/bug68547.phpt
+++ b/ext/exif/tests/bug68547.phpt
@@ -9,4 +9,4 @@ exif_read_data(__DIR__ . DIRECTORY_SEPARATOR . 'bug68547.jpg');
===DONE===
--EXPECTF--
Warning: exif_read_data(bug68547.jpg): Process tag(x9C9E=Keywords ): Illegal components(%d) in %sbug68547.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/exif/tests/bug76423.phpt b/ext/exif/tests/bug76423.phpt
index 4c8cd45dc9..f917074410 100644
--- a/ext/exif/tests/bug76423.phpt
+++ b/ext/exif/tests/bug76423.phpt
@@ -10,7 +10,6 @@ exif_read_data(__DIR__ . '/bug76423.jpg', 0, true, true);
?>
===DONE===
--EXPECTF--
-
Warning: exif_read_data(%s.jpg): Thumbnail goes IFD boundary or end of file reached in %s on line %d
Warning: exif_read_data(%s.jpg): File structure corrupted in %s on line %d
diff --git a/ext/exif/tests/exif001.phpt b/ext/exif/tests/exif001.phpt
index 8fac4286ca..543a9bd4f5 100644
--- a/ext/exif/tests/exif001.phpt
+++ b/ext/exif/tests/exif001.phpt
@@ -81,4 +81,4 @@ array(5) {
[2]=>
string(13) "Comment #3end"
}
-} \ No newline at end of file
+}
diff --git a/ext/exif/tests/exif003.phpt b/ext/exif/tests/exif003.phpt
index d0a1b7b3ba..daaf77d83a 100644
--- a/ext/exif/tests/exif003.phpt
+++ b/ext/exif/tests/exif003.phpt
@@ -88,4 +88,4 @@ array(5) {
[2]=>
string(13) "Comment #3end"
}
-} \ No newline at end of file
+}
diff --git a/ext/exif/tests/exif005.phpt b/ext/exif/tests/exif005.phpt
index e34e3a0421..b472aa826f 100644
--- a/ext/exif/tests/exif005.phpt
+++ b/ext/exif/tests/exif005.phpt
@@ -19,4 +19,4 @@ array(2) {
string(11) "Ifd00000009"
["DateTime"]=>
string(19) "2002:10:18 20:06:00"
-} \ No newline at end of file
+}
diff --git a/ext/exif/tests/exif_imagetype_basic-mb.phpt b/ext/exif/tests/exif_imagetype_basic-mb.phpt
index 936e25777a..a37090da41 100644
--- a/ext/exif/tests/exif_imagetype_basic-mb.phpt
+++ b/ext/exif/tests/exif_imagetype_basic-mb.phpt
@@ -20,4 +20,4 @@ var_dump(exif_imagetype(dirname(__FILE__).'/test2η§γ―γ‚¬γƒ©γ‚Ήγ‚’ι£ŸγΉγ‚‰γ‚Œγ
--EXPECT--
*** Testing exif_imagetype() : basic functionality ***
int(2)
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/exif/tests/exif_imagetype_basic.phpt b/ext/exif/tests/exif_imagetype_basic.phpt
index 1248d39add..d04c1f7c50 100644
--- a/ext/exif/tests/exif_imagetype_basic.phpt
+++ b/ext/exif/tests/exif_imagetype_basic.phpt
@@ -20,4 +20,4 @@ var_dump(exif_imagetype(dirname(__FILE__).'/test2.jpg'));
--EXPECT--
*** Testing exif_imagetype() : basic functionality ***
int(2)
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/exif/tests/exif_imagetype_error.phpt b/ext/exif/tests/exif_imagetype_error.phpt
index 59c9b8d12c..3627ad969d 100644
--- a/ext/exif/tests/exif_imagetype_error.phpt
+++ b/ext/exif/tests/exif_imagetype_error.phpt
@@ -43,4 +43,3 @@ NULL
Warning: exif_imagetype(%s/foo.jpg): failed to open stream: No such file or directory in %s on line %d
bool(false)
===Done===
-
diff --git a/ext/exif/tests/exif_read_data_0.phpt b/ext/exif/tests/exif_read_data_0.phpt
index 3208046b03..79e92f488c 100644
--- a/ext/exif/tests/exif_read_data_0.phpt
+++ b/ext/exif/tests/exif_read_data_0.phpt
@@ -11,4 +11,3 @@ exif_read_data($infile);
--EXPECTF--
Warning: exif_read_data(): Unable to open file in %sexif_read_data_0.php on line %d
===DONE===
-
diff --git a/ext/exif/tests/exif_read_data_streams.phpt b/ext/exif/tests/exif_read_data_streams.phpt
index 59353e7f81..492540b424 100644
--- a/ext/exif/tests/exif_read_data_streams.phpt
+++ b/ext/exif/tests/exif_read_data_streams.phpt
@@ -1631,4 +1631,4 @@ array(31) {
int(1)
["RelatedImageHeight"]=>
int(1)
-} \ No newline at end of file
+}
diff --git a/ext/exif/tests/exif_read_exif_data_basic.phpt b/ext/exif/tests/exif_read_exif_data_basic.phpt
index ddf847de05..b2799909d3 100644
--- a/ext/exif/tests/exif_read_exif_data_basic.phpt
+++ b/ext/exif/tests/exif_read_exif_data_basic.phpt
@@ -61,4 +61,4 @@ Array
)
)
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/exif/tests/exif_tagname_error.phpt b/ext/exif/tests/exif_tagname_error.phpt
index 2408ad5ce8..e4f1a8c0c6 100644
--- a/ext/exif/tests/exif_tagname_error.phpt
+++ b/ext/exif/tests/exif_tagname_error.phpt
@@ -34,4 +34,3 @@ NULL
Warning: exif_tagname() expects exactly 1 parameter, 2 given in %s on line %d
NULL
===Done===
-
diff --git a/ext/exif/tests/exif_tagname_variation1-64bit.phpt b/ext/exif/tests/exif_tagname_variation1-64bit.phpt
index f603aecd86..9a14124362 100644
--- a/ext/exif/tests/exif_tagname_variation1-64bit.phpt
+++ b/ext/exif/tests/exif_tagname_variation1-64bit.phpt
@@ -180,4 +180,3 @@ Done
?>
===Done===
-
diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt
index b63b8a1b01..3ebbdd33fe 100644
--- a/ext/exif/tests/exif_tagname_variation1.phpt
+++ b/ext/exif/tests/exif_tagname_variation1.phpt
@@ -172,4 +172,3 @@ Done
?>
===Done===
-
diff --git a/ext/exif/tests/exif_thumbnail_streams.phpt b/ext/exif/tests/exif_thumbnail_streams.phpt
index 6895a10017..2f3434caff 100644
--- a/ext/exif/tests/exif_thumbnail_streams.phpt
+++ b/ext/exif/tests/exif_thumbnail_streams.phpt
@@ -14,4 +14,4 @@ var_dump(strlen(exif_thumbnail($fp)));
fclose($fp);
?>
--EXPECT--
-int(4150) \ No newline at end of file
+int(4150)
diff --git a/ext/fileinfo/tests/bug67516.phpt b/ext/fileinfo/tests/bug67516.phpt
index 48cd25277e..d4f72877e2 100644
--- a/ext/fileinfo/tests/bug67516.phpt
+++ b/ext/fileinfo/tests/bug67516.phpt
@@ -16,4 +16,3 @@ var_dump($f->file(dirname(__FILE__) . "/bug67516.gif", FILEINFO_MIME));
string(9) "image/gif"
string(25) "image/gif; charset=binary"
===DONE===
-
diff --git a/ext/fileinfo/tests/bug67647-mb.phpt b/ext/fileinfo/tests/bug67647-mb.phpt
index b8c82db793..3887d49cea 100644
--- a/ext/fileinfo/tests/bug67647-mb.phpt
+++ b/ext/fileinfo/tests/bug67647-mb.phpt
@@ -36,4 +36,3 @@ var_dump($fi->file($f));
--EXPECT--
string(15) "video/quicktime"
+++DONE+++
-
diff --git a/ext/fileinfo/tests/bug67647.phpt b/ext/fileinfo/tests/bug67647.phpt
index ff8856ef53..4682415649 100644
--- a/ext/fileinfo/tests/bug67647.phpt
+++ b/ext/fileinfo/tests/bug67647.phpt
@@ -14,4 +14,3 @@ var_dump($fi->file($f));
--EXPECT--
string(15) "video/quicktime"
+++DONE+++
-
diff --git a/ext/fileinfo/tests/bug68398.phpt b/ext/fileinfo/tests/bug68398.phpt
index 504df2b042..a761a755c1 100644
--- a/ext/fileinfo/tests/bug68398.phpt
+++ b/ext/fileinfo/tests/bug68398.phpt
@@ -12,4 +12,3 @@ var_dump($f->file(dirname(__FILE__) . DIRECTORY_SEPARATOR . '68398.zip'));
--EXPECT--
string(31) "application/zip; charset=binary"
+++DONE+++
-
diff --git a/ext/fileinfo/tests/bug69320.phpt b/ext/fileinfo/tests/bug69320.phpt
index 4078649edf..388afc3ff6 100644
--- a/ext/fileinfo/tests/bug69320.phpt
+++ b/ext/fileinfo/tests/bug69320.phpt
@@ -17,4 +17,3 @@ var_dump(finfo_file(finfo_open(FILEINFO_MIME_TYPE), $fname));
?>
--EXPECT--
string(10) "text/plain"
-
diff --git a/ext/fileinfo/tests/cve-2014-3538-mb.phpt b/ext/fileinfo/tests/cve-2014-3538-mb.phpt
index 62d8e43d9b..a29729f1f3 100644
--- a/ext/fileinfo/tests/cve-2014-3538-mb.phpt
+++ b/ext/fileinfo/tests/cve-2014-3538-mb.phpt
@@ -32,4 +32,4 @@ Done
--EXPECTF--
string(%d) "%s"
Ok
-Done \ No newline at end of file
+Done
diff --git a/ext/fileinfo/tests/cve-2014-3538.phpt b/ext/fileinfo/tests/cve-2014-3538.phpt
index d6bc9c68c8..7014629f37 100644
--- a/ext/fileinfo/tests/cve-2014-3538.phpt
+++ b/ext/fileinfo/tests/cve-2014-3538.phpt
@@ -32,4 +32,4 @@ Done
--EXPECTF--
string(%d) "%s"
Ok
-Done \ No newline at end of file
+Done
diff --git a/ext/fileinfo/tests/finfo_extension_flag.phpt b/ext/fileinfo/tests/finfo_extension_flag.phpt
index fdecef31ee..2348558298 100644
--- a/ext/fileinfo/tests/finfo_extension_flag.phpt
+++ b/ext/fileinfo/tests/finfo_extension_flag.phpt
@@ -15,4 +15,3 @@ var_dump($f->file(dirname(__FILE__) . "/resources/test.jpg", FILEINFO_EXTENSION)
--EXPECT--
string(17) "jpeg/jpg/jpe/jfif"
===DONE===
-
diff --git a/ext/fileinfo/tests/finfo_open_002.phpt b/ext/fileinfo/tests/finfo_open_002.phpt
index 3a3891d72c..744773b550 100644
--- a/ext/fileinfo/tests/finfo_open_002.phpt
+++ b/ext/fileinfo/tests/finfo_open_002.phpt
@@ -13,5 +13,3 @@ echo "done!\n";
?>
--EXPECT--
done!
-
-
diff --git a/ext/filter/tests/bug42718-2.phpt b/ext/filter/tests/bug42718-2.phpt
index ed210681d3..82e7757456 100644
--- a/ext/filter/tests/bug42718-2.phpt
+++ b/ext/filter/tests/bug42718-2.phpt
@@ -15,4 +15,3 @@ echo ini_get('filter.default_flags') . "\n";
?>
--EXPECT--
unsafe_raw
-
diff --git a/ext/filter/tests/bug67167.01.phpt b/ext/filter/tests/bug67167.01.phpt
index 91889f1980..a9591d3d56 100644
--- a/ext/filter/tests/bug67167.01.phpt
+++ b/ext/filter/tests/bug67167.01.phpt
@@ -1,9 +1,7 @@
--TEST--
Bug #67167: object with VALIDATE_BOOLEAN and NULL_ON_FAILURE
-
--SKIPIF--
<?php if (!extension_loaded("filter")) die("skip"); ?>
-
--FILE--
<?php
var_dump(filter_var(
@@ -11,6 +9,5 @@ var_dump(filter_var(
FILTER_VALIDATE_BOOLEAN,
FILTER_NULL_ON_FAILURE
));
-
--EXPECT--
NULL
diff --git a/ext/filter/tests/bug67167.02.phpt b/ext/filter/tests/bug67167.02.phpt
index fd634334bb..770d2556ea 100644
--- a/ext/filter/tests/bug67167.02.phpt
+++ b/ext/filter/tests/bug67167.02.phpt
@@ -1,9 +1,7 @@
--TEST--
Bug #67167: filter_var(null,FILTER_VALIDATE_BOOLEAN,FILTER_NULL_ON_FAILURE) returns null
-
--SKIPIF--
<?php if (!extension_loaded("filter")) die("skip"); ?>
-
--FILE--
<?php
var_dump(filter_var(
@@ -11,10 +9,7 @@ var_dump(filter_var(
FILTER_VALIDATE_BOOLEAN,
FILTER_NULL_ON_FAILURE
));
-
--XFAIL--
Requires php_zval_filter to not use convert_to_string for all filters.
-
--EXPECT--
NULL
-
diff --git a/ext/ftp/tests/006.phpt b/ext/ftp/tests/006.phpt
index 6b76a7e0ae..ff0d258917 100644
--- a/ext/ftp/tests/006.phpt
+++ b/ext/ftp/tests/006.phpt
@@ -105,4 +105,4 @@ Warning: ftp_mlsd() expects exactly 2 parameters, 1 given in %s006.php on line 2
NULL
Warning: ftp_append() expects at least 3 parameters, 1 given in %s006.php on line 27
-NULL \ No newline at end of file
+NULL
diff --git a/ext/ftp/tests/007.phpt b/ext/ftp/tests/007.phpt
index 6a6f0da940..eebe8cf1e3 100644
--- a/ext/ftp/tests/007.phpt
+++ b/ext/ftp/tests/007.phpt
@@ -145,4 +145,4 @@ Warning: ftp_set_option(): supplied resource is not a valid FTP Buffer resource
bool(false)
Warning: ftp_get_option(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/ftp/tests/ftp_alloc_basic1.phpt b/ext/ftp/tests/ftp_alloc_basic1.phpt
index b2bdf7440d..c90f6e73fc 100644
--- a/ext/ftp/tests/ftp_alloc_basic1.phpt
+++ b/ext/ftp/tests/ftp_alloc_basic1.phpt
@@ -18,4 +18,4 @@ ftp_login($ftp, 'user', 'pass');
var_dump(ftp_alloc($ftp, 1024));
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/ftp/tests/ftp_alloc_basic2.phpt b/ext/ftp/tests/ftp_alloc_basic2.phpt
index b9e4253fe8..41911e3396 100644
--- a/ext/ftp/tests/ftp_alloc_basic2.phpt
+++ b/ext/ftp/tests/ftp_alloc_basic2.phpt
@@ -20,4 +20,4 @@ var_dump($result);
?>
--EXPECT--
bool(true)
-string(20) "1024 bytes allocated" \ No newline at end of file
+string(20) "1024 bytes allocated"
diff --git a/ext/ftp/tests/ftp_exec_basic.phpt b/ext/ftp/tests/ftp_exec_basic.phpt
index 4a1f63e388..dbf7ce331f 100644
--- a/ext/ftp/tests/ftp_exec_basic.phpt
+++ b/ext/ftp/tests/ftp_exec_basic.phpt
@@ -18,4 +18,4 @@ if (!$ftp) die("Couldn't connect to the server");
var_dump(ftp_exec($ftp, 'ls -al'));
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/ftp/tests/ftp_rawlist_basic2.phpt b/ext/ftp/tests/ftp_rawlist_basic2.phpt
index 1d93643429..9ea9bd2865 100644
--- a/ext/ftp/tests/ftp_rawlist_basic2.phpt
+++ b/ext/ftp/tests/ftp_rawlist_basic2.phpt
@@ -18,4 +18,4 @@ if (!$ftp) die("Couldn't connect to the server");
var_dump(ftp_rawlist($ftp, 'no_exists/'));
?>
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/ftp/tests/ftp_rmdir_basic.phpt b/ext/ftp/tests/ftp_rmdir_basic.phpt
index 6626cb4bed..84063db05f 100644
--- a/ext/ftp/tests/ftp_rmdir_basic.phpt
+++ b/ext/ftp/tests/ftp_rmdir_basic.phpt
@@ -18,4 +18,4 @@ ftp_login($ftp, 'user', 'pass');
var_dump(ftp_rmdir($ftp, 'www/'));
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/ftp/tests/ftp_ssl_connect_error.phpt b/ext/ftp/tests/ftp_ssl_connect_error.phpt
index f139696c7f..85fcf76f79 100644
--- a/ext/ftp/tests/ftp_ssl_connect_error.phpt
+++ b/ext/ftp/tests/ftp_ssl_connect_error.phpt
@@ -24,7 +24,6 @@ echo "\n-- Testing ftp_ssl_connect() function timeout warning for value 0 --\n";
ftp_ssl_connect('totes.invalid', 21, 0);
echo "===DONE===\n";
-
--EXPECTF--
*** Testing ftp_ssl_connect() function : error conditions ***
diff --git a/ext/gd/tests/bug38179.phpt b/ext/gd/tests/bug38179.phpt
index 07becd0703..84eda6c343 100644
--- a/ext/gd/tests/bug38179.phpt
+++ b/ext/gd/tests/bug38179.phpt
@@ -25,4 +25,3 @@ imagedestroy($src); imagedestroy($dst_tc);
?>
--EXPECT--
46FF0000
-
diff --git a/ext/gd/tests/bug38212-mb.phpt b/ext/gd/tests/bug38212-mb.phpt
index 905865f28f..266e470de0 100644
--- a/ext/gd/tests/bug38212-mb.phpt
+++ b/ext/gd/tests/bug38212-mb.phpt
@@ -14,5 +14,4 @@ $im = imagecreatefromgd2part($file, 0,0, -25,10);
unlink($file);
?>
--EXPECTF--
-
Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d
diff --git a/ext/gd/tests/bug38212.phpt b/ext/gd/tests/bug38212.phpt
index 7548008a62..1459bb000d 100644
--- a/ext/gd/tests/bug38212.phpt
+++ b/ext/gd/tests/bug38212.phpt
@@ -14,5 +14,4 @@ $im = imagecreatefromgd2part($file, 0,0, -25,10);
unlink($file);
?>
--EXPECTF--
-
Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d
diff --git a/ext/gd/tests/bug39286-mb.phpt b/ext/gd/tests/bug39286-mb.phpt
index d926fac38e..87390cb489 100644
--- a/ext/gd/tests/bug39286-mb.phpt
+++ b/ext/gd/tests/bug39286-mb.phpt
@@ -9,5 +9,4 @@ Bug #39508 (imagefill crashes with small images 3 pixels or less)
$img =imagecreatefromgd2part("fooη§γ―γ‚¬γƒ©γ‚Ήγ‚’ι£ŸγΉγ‚‰γ‚ŒγΎγ™.png",0, 100, 0, 100);
?>
--EXPECTF--
-
Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d
diff --git a/ext/gd/tests/bug39286.phpt b/ext/gd/tests/bug39286.phpt
index 9171fb7f06..4fe4769a7b 100644
--- a/ext/gd/tests/bug39286.phpt
+++ b/ext/gd/tests/bug39286.phpt
@@ -9,5 +9,4 @@ Bug #39508 (imagefill crashes with small images 3 pixels or less)
$img =imagecreatefromgd2part("foo.png",0, 100, 0, 100);
?>
--EXPECTF--
-
Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d
diff --git a/ext/gd/tests/bug39780.phpt b/ext/gd/tests/bug39780.phpt
index 964cf6953b..7bf9f56cb0 100644
--- a/ext/gd/tests/bug39780.phpt
+++ b/ext/gd/tests/bug39780.phpt
@@ -12,7 +12,6 @@ $im = imagecreatefrompng(dirname(__FILE__) . '/bug39780.png');
var_dump($im);
?>
--EXPECTF--
-
Warning: imagecreatefrompng(): gd-png: fatal libpng error: Read Error: truncated data in %s on line %d
Warning: imagecreatefrompng(): gd-png error: setjmp returns error condition in %s on line %d
diff --git a/ext/gd/tests/bug39780_extern.phpt b/ext/gd/tests/bug39780_extern.phpt
index 79ed4f2cf4..65c3859c6a 100644
--- a/ext/gd/tests/bug39780_extern.phpt
+++ b/ext/gd/tests/bug39780_extern.phpt
@@ -15,4 +15,4 @@ var_dump($im);
gd-png: fatal libpng error: Read Error: truncated data
gd-png error: setjmp returns error condition 2
Warning: imagecreatefrompng(): '%sbug39780.png' is not a valid PNG file in /%s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/gd/tests/bug42434.phpt b/ext/gd/tests/bug42434.phpt
index eb9e8293fd..8f5205d936 100644
--- a/ext/gd/tests/bug42434.phpt
+++ b/ext/gd/tests/bug42434.phpt
@@ -23,4 +23,4 @@ if (imagecolorat($im, 9, 0) == 0x000000) {
imagedestroy($im);
?>
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/gd/tests/bug45799.phpt b/ext/gd/tests/bug45799.phpt
index a28f940b76..34fafa9423 100644
--- a/ext/gd/tests/bug45799.phpt
+++ b/ext/gd/tests/bug45799.phpt
@@ -11,5 +11,4 @@ imagepng($img);
imagedestroy($img);
?>
--EXPECTF--
-
Warning: imagepng(): gd-png error: no colors in palette in %s on line %d
diff --git a/ext/gd/tests/bug49600.phpt b/ext/gd/tests/bug49600.phpt
index 1f767f6f97..1fb84f28bd 100644
--- a/ext/gd/tests/bug49600.phpt
+++ b/ext/gd/tests/bug49600.phpt
@@ -29,4 +29,4 @@ foreach (array("E", "I", "P", "g", "i", "q") as $c)
echo 'OK';
?>
--EXPECT--
-OK \ No newline at end of file
+OK
diff --git a/ext/gd/tests/bug66356.phpt b/ext/gd/tests/bug66356.phpt
index fc4a60439f..7dbfb1b40e 100644
--- a/ext/gd/tests/bug66356.phpt
+++ b/ext/gd/tests/bug66356.phpt
@@ -46,4 +46,4 @@ resource(%d) of type (gd)
Warning: imagecrop(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
in %sbug66356.php on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/gd/tests/bug70976.phpt b/ext/gd/tests/bug70976.phpt
index 2cef56cc32..b4f5c9b78b 100644
--- a/ext/gd/tests/bug70976.phpt
+++ b/ext/gd/tests/bug70976.phpt
@@ -10,4 +10,4 @@ $img = imagerotate(imagecreate(10,10),45,0x7ffffff9);
var_dump($img);
?>
--EXPECT--
-resource(5) of type (gd) \ No newline at end of file
+resource(5) of type (gd)
diff --git a/ext/gd/tests/bug71912-mb.phpt b/ext/gd/tests/bug71912-mb.phpt
index 5714e107ce..d0bf3a89c2 100644
--- a/ext/gd/tests/bug71912-mb.phpt
+++ b/ext/gd/tests/bug71912-mb.phpt
@@ -11,6 +11,5 @@ imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . "invalid_neg_size私はガラ
?>
OK
--EXPECTF--
-
Warning: imagecreatefromgd2(): '%s%einvalid_neg_sizeη§γ―γ‚¬γƒ©γ‚Ήγ‚’ι£ŸγΉγ‚‰γ‚ŒγΎγ™.gd2' is not a valid GD2 file in %s%ebug71912-mb.php on line %d
OK
diff --git a/ext/gd/tests/bug71912.phpt b/ext/gd/tests/bug71912.phpt
index 9cb792126d..ed4665f439 100644
--- a/ext/gd/tests/bug71912.phpt
+++ b/ext/gd/tests/bug71912.phpt
@@ -14,6 +14,5 @@ imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . "invalid_neg_size.gd2");
?>
OK
--EXPECTF--
-
Warning: imagecreatefromgd2(): '%s%einvalid_neg_size.gd2' is not a valid GD2 file in %s%ebug71912.php on line %d
OK
diff --git a/ext/gd/tests/bug71952.phpt b/ext/gd/tests/bug71952.phpt
index 8d574e0559..6aed9e9361 100644
--- a/ext/gd/tests/bug71952.phpt
+++ b/ext/gd/tests/bug71952.phpt
@@ -11,4 +11,4 @@ imageaffinematrixget(4,$vals[0]);
var_dump($vals[0]);
?>
--EXPECT--
-string(200) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" \ No newline at end of file
+string(200) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
diff --git a/ext/gd/tests/bug72227.phpt b/ext/gd/tests/bug72227.phpt
index 6252be7d0e..fb1b5bde94 100644
--- a/ext/gd/tests/bug72227.phpt
+++ b/ext/gd/tests/bug72227.phpt
@@ -12,4 +12,4 @@ imagescale($img, 13, 1, IMG_BICUBIC);
?>
DONE
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/gd/tests/bug72298.phpt b/ext/gd/tests/bug72298.phpt
index 512aa8b4c1..a3aa491cbe 100644
--- a/ext/gd/tests/bug72298.phpt
+++ b/ext/gd/tests/bug72298.phpt
@@ -12,4 +12,4 @@ imagetruecolortopalette($img, false, 4);
?>
DONE
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/gd/tests/bug72512.phpt b/ext/gd/tests/bug72512.phpt
index 3f9e219fc3..e9331ec600 100644
--- a/ext/gd/tests/bug72512.phpt
+++ b/ext/gd/tests/bug72512.phpt
@@ -17,4 +17,3 @@ echo "OK";
?>
--EXPECT--
OK
-
diff --git a/ext/gd/tests/bug72697.phpt b/ext/gd/tests/bug72697.phpt
index d243bd2f14..97bd3bdf88 100644
--- a/ext/gd/tests/bug72697.phpt
+++ b/ext/gd/tests/bug72697.phpt
@@ -14,4 +14,4 @@ imagetruecolortopalette($img, false, PHP_INT_MAX / 8);
DONE
--EXPECTF--
Warning: imagetruecolortopalette(): Number of colors has to be greater than zero and no more than 2147483647 in %sbug72697.php on line %d
-DONE \ No newline at end of file
+DONE
diff --git a/ext/gd/tests/bug72730.phpt b/ext/gd/tests/bug72730.phpt
index a15252ea41..403354d1e2 100644
--- a/ext/gd/tests/bug72730.phpt
+++ b/ext/gd/tests/bug72730.phpt
@@ -12,4 +12,4 @@ imagegammacorrect($img, -1, 1337);
DONE
--EXPECTF--
Warning: imagegammacorrect(): Gamma values should be positive in %sbug72730.php on line %d
-DONE \ No newline at end of file
+DONE
diff --git a/ext/gd/tests/bug73869.phpt b/ext/gd/tests/bug73869.phpt
index 3cc10a4201..16b2edc7a1 100644
--- a/ext/gd/tests/bug73869.phpt
+++ b/ext/gd/tests/bug73869.phpt
@@ -16,4 +16,4 @@ bool(false)
Warning: imagecreatefromgd2(): '%s' is not a valid GD2 file in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/gd/tests/crafted_gd2.phpt b/ext/gd/tests/crafted_gd2.phpt
index 7bcbc4e68b..3fb7c2e004 100644
--- a/ext/gd/tests/crafted_gd2.phpt
+++ b/ext/gd/tests/crafted_gd2.phpt
@@ -11,6 +11,4 @@ Test max colors for a gd image.
imagecreatefromgd(dirname(__FILE__) . '/crafted.gd2');
?>
--EXPECTF--
-
Warning: imagecreatefromgd(): '%scrafted.gd2' is not a valid GD file in %s on line %d
-
diff --git a/ext/gd/tests/imagealphablending_error1.phpt b/ext/gd/tests/imagealphablending_error1.phpt
index 6d49f32b07..4f7607b5dd 100644
--- a/ext/gd/tests/imagealphablending_error1.phpt
+++ b/ext/gd/tests/imagealphablending_error1.phpt
@@ -1,19 +1,15 @@
--TEST--
test imagealphablending without arguments
-
--CREDITS--
Marcelo Diniz <marcelo.leo27 [at] gmail [dot] com
β€ͺ#β€ŽphpspMaisTestFest PHPSP on 2014-07-05
-
--SKIPIF--
<?php
if (!extension_loaded('gd')) die("skip gd extension not available.");
?>
-
--FILE--
<?php
imagealphablending();
?>
-
--EXPECTF--
-Warning: imagealphablending() expects exactly 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: imagealphablending() expects exactly 2 parameters, 0 given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocate_basic.phpt b/ext/gd/tests/imagecolorallocate_basic.phpt
index 426350782e..e0e9adf852 100644
--- a/ext/gd/tests/imagecolorallocate_basic.phpt
+++ b/ext/gd/tests/imagecolorallocate_basic.phpt
@@ -32,4 +32,4 @@ int(16711680)
int(65280)
int(255)
int(16777215)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/gd/tests/imagecolorallocate_error.phpt b/ext/gd/tests/imagecolorallocate_error.phpt
index b584e18634..c2ed9446d6 100644
--- a/ext/gd/tests/imagecolorallocate_error.phpt
+++ b/ext/gd/tests/imagecolorallocate_error.phpt
@@ -46,4 +46,4 @@ NULL
Warning: imagecolorallocate() expects exactly 4 parameters, 3 given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/gd/tests/imagecolorallocate_variation3.phpt b/ext/gd/tests/imagecolorallocate_variation3.phpt
index cc17bafe0d..8552f976c7 100644
--- a/ext/gd/tests/imagecolorallocate_variation3.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation3.phpt
@@ -211,4 +211,4 @@ int(655370)
Warning: imagecolorallocate() 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/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
index 536e2cf842..e7b5807bbc 100644
--- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
@@ -26,4 +26,4 @@ var_dump($corA);
?>
--EXPECT--
The images are equal.
-int(842163455) \ No newline at end of file
+int(842163455)
diff --git a/ext/gd/tests/imagecolorallocatealpha_error1.phpt b/ext/gd/tests/imagecolorallocatealpha_error1.phpt
index bba9262422..793c02d106 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error1.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error1.phpt
@@ -22,4 +22,4 @@ Warning: imagecolorallocatealpha() expects parameter 1 to be resource, %s given
Warning: imagecolorallocatealpha() expects parameter 1 to be resource, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 1 to be resource, null given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocatealpha_error2.phpt b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
index 018f243dc4..fffd0557c6 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error2.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
@@ -19,4 +19,4 @@ Warning: imagecolorallocatealpha() expects parameter 2 to be int, %s given in %s
Warning: imagecolorallocatealpha() expects parameter 2 to be int, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 2 to be int, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 2 to be int, resource given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocatealpha_error3.phpt b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
index b6afa80e8d..11d483db95 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error3.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
@@ -19,4 +19,4 @@ Warning: imagecolorallocatealpha() expects parameter 3 to be int, %s given in %s
Warning: imagecolorallocatealpha() expects parameter 3 to be int, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 3 to be int, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 3 to be int, resource given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocatealpha_error4.phpt b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
index 6003bf18b4..093d9cda55 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error4.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
@@ -19,4 +19,4 @@ Warning: imagecolorallocatealpha() expects parameter 4 to be int, %s given in %s
Warning: imagecolorallocatealpha() expects parameter 4 to be int, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 4 to be int, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 4 to be int, resource given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocatealpha_error5.phpt b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
index 5c36b9757d..2cf5054a0e 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error5.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
@@ -19,4 +19,4 @@ Warning: imagecolorallocatealpha() expects parameter 5 to be int, %s given in %s
Warning: imagecolorallocatealpha() expects parameter 5 to be int, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 5 to be int, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 5 to be int, resource given in %s on line %d
diff --git a/ext/gd/tests/imagecolorresolvealpha_error3.phpt b/ext/gd/tests/imagecolorresolvealpha_error3.phpt
index 735b4c97db..586e1f8461 100644
--- a/ext/gd/tests/imagecolorresolvealpha_error3.phpt
+++ b/ext/gd/tests/imagecolorresolvealpha_error3.phpt
@@ -1,19 +1,15 @@
--TEST--
test imagecolorresolvealpha without arguments
-
--CREDITS--
Marcelo Diniz <marcelo.leo27 [at] gmail [dot] com
β€ͺ#β€ŽphpspMaisTestFest PHPSP on 2014-07-05
-
--SKIPIF--
<?php
if (!extension_loaded('gd')) die("skip gd extension not available.");
?>
-
--FILE--
<?php
imagecolorresolvealpha();
?>
-
--EXPECTF--
-Warning: imagecolorresolvealpha() expects exactly 5 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: imagecolorresolvealpha() expects exactly 5 parameters, 0 given in %s on line %d
diff --git a/ext/gd/tests/imagecolorstotal_basic.phpt b/ext/gd/tests/imagecolorstotal_basic.phpt
index 32c175664f..9ae79d2224 100644
--- a/ext/gd/tests/imagecolorstotal_basic.phpt
+++ b/ext/gd/tests/imagecolorstotal_basic.phpt
@@ -33,4 +33,4 @@ imagedestroy($im);
--EXPECT--
*** Testing imagecolorstotal() : basic functionality ***
Total colors in image: 128
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/gd/tests/imagecreatetruecolor_error3.phpt b/ext/gd/tests/imagecreatetruecolor_error3.phpt
index 3982e8aceb..932cad5ea2 100644
--- a/ext/gd/tests/imagecreatetruecolor_error3.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error3.phpt
@@ -18,4 +18,4 @@ Warning: imagecreatetruecolor() expects exactly 2 parameters, 0 given in %s on l
Warning: imagecreatetruecolor() expects exactly 2 parameters, 1 given in %s on line %d
-Warning: imagecreatetruecolor() expects exactly 2 parameters, 3 given in %s on line %d \ No newline at end of file
+Warning: imagecreatetruecolor() expects exactly 2 parameters, 3 given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error6.phpt b/ext/gd/tests/imagefilltoborder_error6.phpt
index 03ac65be9c..421c5932ee 100644
--- a/ext/gd/tests/imagefilltoborder_error6.phpt
+++ b/ext/gd/tests/imagefilltoborder_error6.phpt
@@ -25,5 +25,3 @@ imagefilltoborder( $image_foo, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), im
?>
--EXPECTF--
Warning: imagefilltoborder(): supplied resource is not a valid Image resource in %s on line %d
-
-
diff --git a/ext/gd/tests/imageflip.phpt b/ext/gd/tests/imageflip.phpt
index 8a439075f2..7f0d2f366a 100644
--- a/ext/gd/tests/imageflip.phpt
+++ b/ext/gd/tests/imageflip.phpt
@@ -27,4 +27,4 @@ var_dump(dechex(imagecolorat($im, 98, 98)));
string(2) "ff"
string(4) "ff00"
string(6) "ff0000"
-string(2) "ff" \ No newline at end of file
+string(2) "ff"
diff --git a/ext/gd/tests/imagegd2_nullbyte_injection.phpt b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
index 278a4a8023..2370d5036e 100644
--- a/ext/gd/tests/imagegd2_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
@@ -26,7 +26,6 @@ imagegd2($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagegd2 TEST
diff --git a/ext/gd/tests/imagegd_nullbyte_injection.phpt b/ext/gd/tests/imagegd_nullbyte_injection.phpt
index 1ef9354919..25e54fe36c 100644
--- a/ext/gd/tests/imagegd_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd_nullbyte_injection.phpt
@@ -26,7 +26,6 @@ imagegd($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagegd TEST
diff --git a/ext/gd/tests/imagegif_nullbyte_injection.phpt b/ext/gd/tests/imagegif_nullbyte_injection.phpt
index 44b1be144f..26cddf3400 100644
--- a/ext/gd/tests/imagegif_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegif_nullbyte_injection.phpt
@@ -30,7 +30,6 @@ imagegif($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagegif TEST
diff --git a/ext/gd/tests/imageistruecolor_basic.phpt b/ext/gd/tests/imageistruecolor_basic.phpt
index d43052db7d..fa323897ba 100644
--- a/ext/gd/tests/imageistruecolor_basic.phpt
+++ b/ext/gd/tests/imageistruecolor_basic.phpt
@@ -14,4 +14,4 @@ $image = imagecreatetruecolor(180, 30);
var_dump(imageistruecolor($image));
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/gd/tests/imageistruecolor_error1.phpt b/ext/gd/tests/imageistruecolor_error1.phpt
index 8b3033c39b..ab0a9fe653 100644
--- a/ext/gd/tests/imageistruecolor_error1.phpt
+++ b/ext/gd/tests/imageistruecolor_error1.phpt
@@ -21,4 +21,4 @@ Warning: imageistruecolor() expects parameter 1 to be resource, string given in
Warning: imageistruecolor(): supplied resource is not a valid Image resource in %s on line %d
-Warning: imageistruecolor() expects parameter 1 to be resource, array given in %s on line %d \ No newline at end of file
+Warning: imageistruecolor() expects parameter 1 to be resource, array given in %s on line %d
diff --git a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
index 4a45fa3c47..3d49584791 100644
--- a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
@@ -30,7 +30,6 @@ imagejpeg($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagejpeg TEST
diff --git a/ext/gd/tests/imagepng_nullbyte_injection.phpt b/ext/gd/tests/imagepng_nullbyte_injection.phpt
index 9a5b7c39ea..56ba6462e4 100644
--- a/ext/gd/tests/imagepng_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagepng_nullbyte_injection.phpt
@@ -30,7 +30,6 @@ imagepng($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagepng TEST
diff --git a/ext/gd/tests/imagerectangle_error2.phpt b/ext/gd/tests/imagerectangle_error2.phpt
index dd84ff414a..4e2e665bda 100644
--- a/ext/gd/tests/imagerectangle_error2.phpt
+++ b/ext/gd/tests/imagerectangle_error2.phpt
@@ -16,4 +16,4 @@ $image = tmpfile();
imagerectangle( $image, 0, 0, 50, 50, 2 );
?>
--EXPECTF--
-Warning: imagerectangle(): supplied resource is not a valid Image resource in %s on line %d \ No newline at end of file
+Warning: imagerectangle(): supplied resource is not a valid Image resource in %s on line %d
diff --git a/ext/gd/tests/imagesavealpha_error2.phpt b/ext/gd/tests/imagesavealpha_error2.phpt
index 1a7083d526..356d647469 100644
--- a/ext/gd/tests/imagesavealpha_error2.phpt
+++ b/ext/gd/tests/imagesavealpha_error2.phpt
@@ -1,19 +1,15 @@
--TEST--
test imagesavealpha without arguments
-
--CREDITS--
Marcelo Diniz <marcelo.leo27 [at] gmail [dot] com
β€ͺ#β€ŽphpspMaisTestFest PHPSP on 2014-07-05
-
--SKIPIF--
<?php
if (!extension_loaded('gd')) die("skip gd extension not available.");
?>
-
--FILE--
<?php
imagesavealpha();
?>
-
--EXPECTF--
-Warning: imagesavealpha() expects exactly 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: imagesavealpha() expects exactly 2 parameters, 0 given in %s on line %d
diff --git a/ext/gd/tests/imagesetthickness_error1.phpt b/ext/gd/tests/imagesetthickness_error1.phpt
index 112f9df863..f54270afbc 100644
--- a/ext/gd/tests/imagesetthickness_error1.phpt
+++ b/ext/gd/tests/imagesetthickness_error1.phpt
@@ -19,4 +19,4 @@ Warning: imagesetthickness() expects parameter 1 to be resource, %s given in %s
Warning: imagesetthickness() expects parameter 1 to be resource, array given in %s on line %d
-Warning: imagesetthickness(): supplied resource is not a valid Image resource in %s on line %d \ No newline at end of file
+Warning: imagesetthickness(): supplied resource is not a valid Image resource in %s on line %d
diff --git a/ext/gd/tests/imagesetthickness_error2.phpt b/ext/gd/tests/imagesetthickness_error2.phpt
index 5052472f7e..7e7d6a7c22 100644
--- a/ext/gd/tests/imagesetthickness_error2.phpt
+++ b/ext/gd/tests/imagesetthickness_error2.phpt
@@ -21,4 +21,4 @@ Warning: imagesetthickness() expects parameter 2 to be int, string given in %s o
Warning: imagesetthickness() expects parameter 2 to be int, array given in %s on line %d
-Warning: imagesetthickness() expects parameter 2 to be int, resource given in %s on line %d \ No newline at end of file
+Warning: imagesetthickness() expects parameter 2 to be int, resource given in %s on line %d
diff --git a/ext/gd/tests/imagetruecolortopalette_error1.phpt b/ext/gd/tests/imagetruecolortopalette_error1.phpt
index 2c3dd0d429..3418449c01 100644
--- a/ext/gd/tests/imagetruecolortopalette_error1.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error1.phpt
@@ -23,4 +23,4 @@ Warning: imagetruecolortopalette() expects parameter 1 to be resource, %s given
Warning: imagetruecolortopalette() expects parameter 1 to be resource, array given in %s on line %d
-Warning: imagetruecolortopalette() expects parameter 1 to be resource, null given in %s on line %d \ No newline at end of file
+Warning: imagetruecolortopalette() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/gd/tests/imagetruecolortopalette_error2.phpt b/ext/gd/tests/imagetruecolortopalette_error2.phpt
index 6486a929f2..f2cddbcb92 100644
--- a/ext/gd/tests/imagetruecolortopalette_error2.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error2.phpt
@@ -19,4 +19,4 @@ imagetruecolortopalette($image, array(), 2);
--EXPECTF--
Warning: imagetruecolortopalette() expects parameter 2 to be bool, resource given in %s on line %d
-Warning: imagetruecolortopalette() expects parameter 2 to be bool, array given in %s on line %d \ No newline at end of file
+Warning: imagetruecolortopalette() expects parameter 2 to be bool, array given in %s on line %d
diff --git a/ext/gd/tests/imagettftext_charmap_order.phpt b/ext/gd/tests/imagettftext_charmap_order.phpt
index 221e6b851a..850ca806b6 100644
--- a/ext/gd/tests/imagettftext_charmap_order.phpt
+++ b/ext/gd/tests/imagettftext_charmap_order.phpt
@@ -63,4 +63,4 @@ if ($black_pixels >= 10) {
imagedestroy($im);
?>
--EXPECTF--
-SUCCESS %d black pixels \ No newline at end of file
+SUCCESS %d black pixels
diff --git a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
index 54a5749605..1d3e460444 100644
--- a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
@@ -30,7 +30,6 @@ imagewbmp($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagewbmp TEST
diff --git a/ext/gd/tests/libgd00086.phpt b/ext/gd/tests/libgd00086.phpt
index 4c909343ca..7756b34d5a 100644
--- a/ext/gd/tests/libgd00086.phpt
+++ b/ext/gd/tests/libgd00086.phpt
@@ -12,7 +12,6 @@ $im = imagecreatefrompng(dirname(__FILE__) . '/libgd00086.png');
var_dump($im);
?>
--EXPECTF--
-
Warning: imagecreatefrompng(): gd-png: fatal libpng error: Read Error: truncated data in %s on line %d
Warning: imagecreatefrompng(): gd-png error: setjmp returns error condition in %s on line %d
diff --git a/ext/gd/tests/libgd00094-mb.phpt b/ext/gd/tests/libgd00094-mb.phpt
index c18b4fd3d1..8a14ceba1e 100644
--- a/ext/gd/tests/libgd00094-mb.phpt
+++ b/ext/gd/tests/libgd00094-mb.phpt
@@ -13,4 +13,3 @@ var_dump($im);
--EXPECTF--
Warning: imagecreatefromxbm(): '%slibgd00094η§γ―γ‚¬γƒ©γ‚Ήγ‚’ι£ŸγΉγ‚‰γ‚ŒγΎγ™.xbm' is not a valid XBM file in %slibgd00094-mb.php on line %d
bool(false)
-
diff --git a/ext/gd/tests/libgd00094.phpt b/ext/gd/tests/libgd00094.phpt
index d06afc4729..f658fc64cf 100644
--- a/ext/gd/tests/libgd00094.phpt
+++ b/ext/gd/tests/libgd00094.phpt
@@ -13,4 +13,3 @@ var_dump($im);
--EXPECTF--
Warning: imagecreatefromxbm(): '%slibgd00094.xbm' is not a valid XBM file in %slibgd00094.php on line %d
bool(false)
-
diff --git a/ext/gd/tests/lines.phpt b/ext/gd/tests/lines.phpt
index 2c999695e9..dda8497222 100644
--- a/ext/gd/tests/lines.phpt
+++ b/ext/gd/tests/lines.phpt
@@ -105,7 +105,6 @@ if ($p3) {
?>
--EXPECTF--
-
Warning: imageline() expects exactly 6 parameters, 5 given in %s on line %d
Horizontal: ok
Vertical: ok
diff --git a/ext/gettext/tests/44938.phpt b/ext/gettext/tests/44938.phpt
index f2d594aa5c..f92f7c1dea 100644
--- a/ext/gettext/tests/44938.phpt
+++ b/ext/gettext/tests/44938.phpt
@@ -37,7 +37,6 @@ var_dump(textdomain($overflown));
?>
==DONE==
--EXPECTF--
-
Warning: bindtextdomain(): domain passed too long in %s on line %d
bool(false)
diff --git a/ext/gettext/tests/bug66267.phpt b/ext/gettext/tests/bug66267.phpt
index de16b65d9e..17d7d58d39 100644
--- a/ext/gettext/tests/bug66267.phpt
+++ b/ext/gettext/tests/bug66267.phpt
@@ -53,4 +53,3 @@ LC_ALL=en_US
hello=hello
==DONE==
-
diff --git a/ext/gettext/tests/gettext_basic-enus.phpt b/ext/gettext/tests/gettext_basic-enus.phpt
index 207739b3f8..12ef33ab05 100644
--- a/ext/gettext/tests/gettext_basic-enus.phpt
+++ b/ext/gettext/tests/gettext_basic-enus.phpt
@@ -25,4 +25,4 @@ A basic test
A basic test
--CREDITS--
Christian Weiske, cweiske@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
index 15107fe0f9..822e412d83 100644
--- a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
+++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
@@ -19,4 +19,4 @@ string(5) "UTF-8"
Done
--CREDITS--
Florian Holzhauer fh-pt@fholzhauer.de
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt
index 0361f45e91..2feb2b2c28 100644
--- a/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt
@@ -20,4 +20,4 @@ Warning: bind_textdomain_codeset() expects exactly 2 parameters, 3 given in %s o
Done
--CREDITS--
Florian Holzhauer fh-pt@fholzhauer.de
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt b/ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt
index 0ebe66e9fd..d8b8794e5a 100644
--- a/ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt
+++ b/ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt
@@ -13,4 +13,4 @@ bindtextdomain('', 'foobar');
Warning: The first parameter of bindtextdomain must not be empty in %s on line %d
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_bindtextdomain-path.phpt b/ext/gettext/tests/gettext_bindtextdomain-path.phpt
index 8bc1854e04..97c9fbb39c 100644
--- a/ext/gettext/tests/gettext_bindtextdomain-path.phpt
+++ b/ext/gettext/tests/gettext_bindtextdomain-path.phpt
@@ -13,4 +13,4 @@ var_dump(bindtextdomain('example.org', 'foobar'));
bool(false)
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt b/ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt
index 97939a469d..1c9fb26194 100644
--- a/ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt
@@ -16,4 +16,4 @@ Warning: bindtextdomain() expects exactly 2 parameters, 1 given in %s on line %d
Warning: bindtextdomain() expects exactly 2 parameters, 0 given in %s on line %d
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_dcgettext-wrongparams.phpt b/ext/gettext/tests/gettext_dcgettext-wrongparams.phpt
index 372a95740d..c5e8f02622 100644
--- a/ext/gettext/tests/gettext_dcgettext-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_dcgettext-wrongparams.phpt
@@ -13,4 +13,4 @@ Warning: dcgettext() expects exactly 3 parameters, 2 given in %s on line %d
NULL
--CREDITS--
Christian Weiske, cweiske@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_dcgettext.phpt b/ext/gettext/tests/gettext_dcgettext.phpt
index c74194db2d..cdf185600d 100644
--- a/ext/gettext/tests/gettext_dcgettext.phpt
+++ b/ext/gettext/tests/gettext_dcgettext.phpt
@@ -22,4 +22,4 @@ string(8) "cProdukt"
string(7) "Produkt"
--CREDITS--
Christian Weiske, cweiske@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_dngettext-plural.phpt b/ext/gettext/tests/gettext_dngettext-plural.phpt
index 0417c0ed52..86548117fd 100644
--- a/ext/gettext/tests/gettext_dngettext-plural.phpt
+++ b/ext/gettext/tests/gettext_dngettext-plural.phpt
@@ -21,4 +21,4 @@ string(7) "Produkt"
string(8) "Produkte"
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_dngettext-wrongparams.phpt b/ext/gettext/tests/gettext_dngettext-wrongparams.phpt
index 4bcf0930b0..787b0b3af3 100644
--- a/ext/gettext/tests/gettext_dngettext-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_dngettext-wrongparams.phpt
@@ -20,4 +20,4 @@ Warning: dngettext() expects exactly 4 parameters, 3 given in %s on line %d
NULL
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_textdomain-retval.phpt b/ext/gettext/tests/gettext_textdomain-retval.phpt
index 35f23b0d53..5795556046 100644
--- a/ext/gettext/tests/gettext_textdomain-retval.phpt
+++ b/ext/gettext/tests/gettext_textdomain-retval.phpt
@@ -20,10 +20,9 @@ echo textdomain(null), "\n";
echo textdomain('foo'), "\n";
?>
--EXPECT--
-
test
test
foo
--CREDITS--
Christian Weiske, cweiske@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_textdomain-wrongparams.phpt b/ext/gettext/tests/gettext_textdomain-wrongparams.phpt
index 9d6c8ec515..e563e7b210 100644
--- a/ext/gettext/tests/gettext_textdomain-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_textdomain-wrongparams.phpt
@@ -22,4 +22,4 @@ textdomain (array());
Warning: textdomain() expects parameter 1 to be string, array given in %s on line 6
--CREDITS--
Christian Weiske, cweiske@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gmp/tests/gmp_export.phpt b/ext/gmp/tests/gmp_export.phpt
index fbc8901cfc..52449ecf0a 100644
--- a/ext/gmp/tests/gmp_export.phpt
+++ b/ext/gmp/tests/gmp_export.phpt
@@ -60,7 +60,6 @@ var_dump(gmp_export(123, 0));
// Invalid options
var_dump(gmp_export(123, 1, GMP_MSW_FIRST | GMP_LSW_FIRST));
var_dump(gmp_export(123, 1, GMP_BIG_ENDIAN | GMP_LITTLE_ENDIAN));
-
--EXPECTF--
bool(true)
diff --git a/ext/gmp/tests/gmp_import.phpt b/ext/gmp/tests/gmp_import.phpt
index b7ae6600ed..a9e9314483 100644
--- a/ext/gmp/tests/gmp_import.phpt
+++ b/ext/gmp/tests/gmp_import.phpt
@@ -62,7 +62,6 @@ var_dump(gmp_import(str_repeat('a', 100), 64));
// Invalid options
var_dump(gmp_import('a', 1, GMP_MSW_FIRST | GMP_LSW_FIRST));
var_dump(gmp_import('a', 1, GMP_BIG_ENDIAN | GMP_LITTLE_ENDIAN));
-
--EXPECTF--
bool(true)
diff --git a/ext/hash/tests/bug64745.phpt b/ext/hash/tests/bug64745.phpt
index 2bed29e6dd..b5706b057e 100644
--- a/ext/hash/tests/bug64745.phpt
+++ b/ext/hash/tests/bug64745.phpt
@@ -12,4 +12,3 @@ var_dump(bin2hex($rawHash));
--EXPECT--
string(40) "0c60c80f961f0e71f3a9b524af6012062fe037a6"
string(40) "0c60c80f961f0e71f3a9b524af6012062fe037a6"
-
diff --git a/ext/hash/tests/hash_hmac_algos.phpt b/ext/hash/tests/hash_hmac_algos.phpt
index 76efff48b3..b4240ac7cb 100644
--- a/ext/hash/tests/hash_hmac_algos.phpt
+++ b/ext/hash/tests/hash_hmac_algos.phpt
@@ -4,7 +4,6 @@ Hash: hash_hmac_algos() function : basic functionality
<?php
print_r(hash_hmac_algos());
-
--EXPECTF--
Array
(
diff --git a/ext/hash/tests/haval.phpt b/ext/hash/tests/haval.phpt
index f8c5c67df1..b01abdb8ef 100644
--- a/ext/hash/tests/haval.phpt
+++ b/ext/hash/tests/haval.phpt
@@ -22,7 +22,6 @@ for($pass=3; $pass<=5; $pass++)
$algo = sprintf('haval%d,%d',$bits,$pass);
echo $algo . ': ' . hash($algo,'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMOPQRSTUVWXYZ0123456789') . "\n";
}
-
--EXPECT--
Empty String
haval128,3: c68f39913f901f3ddf44c707357a7d70
diff --git a/ext/hash/tests/md4.phpt b/ext/hash/tests/md4.phpt
index ee9d60d240..aed4a5ce05 100644
--- a/ext/hash/tests/md4.phpt
+++ b/ext/hash/tests/md4.phpt
@@ -18,5 +18,3 @@ d9130a8164549fe818874806e1c7014b
d79e1c308aa5bbcdeea8ed63df412da9
043f8582f241db351ce627e153e7f0e4
e33b4ddc9c38f2199c3e7b164fcc0536
-
-
diff --git a/ext/hash/tests/md5.phpt b/ext/hash/tests/md5.phpt
index b51273f9c7..1c90662dd6 100644
--- a/ext/hash/tests/md5.phpt
+++ b/ext/hash/tests/md5.phpt
@@ -11,4 +11,3 @@ d41d8cd98f00b204e9800998ecf8427e
0cc175b9c0f1b6a831c399e269772661
1ced811af47ead374872fcca9d73dd71
7707d6ae4e027c70eea2a935c2296f21
-
diff --git a/ext/hash/tests/sha224.phpt b/ext/hash/tests/sha224.phpt
index 468e272fee..a0180baaec 100644
--- a/ext/hash/tests/sha224.phpt
+++ b/ext/hash/tests/sha224.phpt
@@ -17,4 +17,3 @@ ae5c0d27fe120752911c994718296a3bccc77000aac07b8810714932
23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7
75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525
20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67
-
diff --git a/ext/hash/tests/sha256.phpt b/ext/hash/tests/sha256.phpt
index cf3f4069fd..ddc3962eda 100644
--- a/ext/hash/tests/sha256.phpt
+++ b/ext/hash/tests/sha256.phpt
@@ -17,4 +17,3 @@ ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb
ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad
248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1
cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0
-
diff --git a/ext/hash/tests/sha3.phpt b/ext/hash/tests/sha3.phpt
index 0ba6af9c3e..3a5f712c73 100644
--- a/ext/hash/tests/sha3.phpt
+++ b/ext/hash/tests/sha3.phpt
@@ -51,4 +51,3 @@ foreach ($subjects as $subject) {
256: 79f38adec5c20307a98ef76e8324afbfd46cfd81b22e3973c65fa1bd9de31787
384: 1881de2ca7e41ef95dc4732b8f5f002b189cc1e42b74168ed1732649ce1dbcdd76197a31fd55ee989f2d7050dd473e8f
512: e76dfad22084a8b1467fcf2ffa58361bec7628edf5f3fdc0e4805dc48caeeca81b7c13c30adf52a3659584739a2df46be589c51ca1a4a8416df6545a1ce8ba00
-
diff --git a/ext/hash/tests/tiger.phpt b/ext/hash/tests/tiger.phpt
index 609e96f769..cc2306e72c 100644
--- a/ext/hash/tests/tiger.phpt
+++ b/ext/hash/tests/tiger.phpt
@@ -14,4 +14,3 @@ echo hash('tiger192,3', str_repeat('abc', 64)),"\n";
9366604ea109e48ed763caabb2d5633b4946eb295ef5781a
b19abf166d158625808f035edf8be4e6b0bcb31d070ec353
badd965340a9e83e4a16f48a5038c01b856a9158ef59fec1
-
diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt
index 9318c60de2..19cb0f736a 100644
--- a/ext/iconv/tests/eucjp2iso2022jp.phpt
+++ b/ext/iconv/tests/eucjp2iso2022jp.phpt
@@ -24,4 +24,3 @@ echo hexdump(iconv("EUC-JP", "ISO-2022-JP", $str));
?>
--EXPECT--
1b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c1b2842
-
diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt
index a995125815..1323ac1b30 100644
--- a/ext/iconv/tests/eucjp2sjis.phpt
+++ b/ext/iconv/tests/eucjp2sjis.phpt
@@ -55,4 +55,3 @@ echo $str."\n";
?>
--EXPECT--
CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0Cg==
-
diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 38cfdd37b8..d859122ef1 100644
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -55,4 +55,3 @@ echo $str."\n";
?>
--EXPECT--
CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0Cg==
-
diff --git a/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt
index 03b3574d6e..b05bd560d7 100644
--- a/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt
@@ -9,7 +9,6 @@ var_dump(iconv($a, "b", "test"));
var_dump(iconv("x", $a, "test"));
?>
--EXPECTF--
-
Warning: iconv(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
bool(false)
diff --git a/ext/iconv/tests/iconv_basic.phpt b/ext/iconv/tests/iconv_basic.phpt
index 1c57cfbeff..cc0c288d55 100644
--- a/ext/iconv/tests/iconv_basic.phpt
+++ b/ext/iconv/tests/iconv_basic.phpt
@@ -69,4 +69,4 @@ string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323
Converted Strings:
string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_get_encoding_error.phpt b/ext/iconv/tests/iconv_get_encoding_error.phpt
index 0526fce2a5..c146051440 100644
--- a/ext/iconv/tests/iconv_get_encoding_error.phpt
+++ b/ext/iconv/tests/iconv_get_encoding_error.phpt
@@ -174,4 +174,4 @@ bool(false)
Warning: iconv_get_encoding() 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/iconv/tests/iconv_ini_encoding.phpt b/ext/iconv/tests/iconv_ini_encoding.phpt
index 2d02b1c55a..5d2a2090fe 100644
--- a/ext/iconv/tests/iconv_ini_encoding.phpt
+++ b/ext/iconv/tests/iconv_ini_encoding.phpt
@@ -41,7 +41,6 @@ var_dump(ini_get('output_encoding'));
var_dump(ini_get('iconv.internal_encoding'));
var_dump(ini_get('iconv.input_encoding'));
var_dump(ini_get('iconv.output_encoding'));
-
--EXPECT--
Getting INI
string(10) "ISO-8859-1"
diff --git a/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt
index d4ed01d956..d2e7f5713f 100644
--- a/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt
@@ -8,6 +8,5 @@ $a = str_repeat("/", 9000000);
var_dump(iconv_mime_decode("a", null, $a));
?>
--EXPECTF--
-
Warning: iconv_mime_decode(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
bool(false)
diff --git a/ext/iconv/tests/iconv_mime_decode.phpt b/ext/iconv/tests/iconv_mime_decode.phpt
index 24d1794f3f..c5b76f3ce9 100644
--- a/ext/iconv/tests/iconv_mime_decode.phpt
+++ b/ext/iconv/tests/iconv_mime_decode.phpt
@@ -87,4 +87,3 @@ do_regression_test();
(100) "Subject: =?ISO-8859-1?Q?Pr=FCfung?==?ISO-8859-1*de_DE?Q?Pr=FCfung?==?ISO-8859-2?Q?k=F9=D4=F1=D3let?="
(84) "Subject: PrΓΌfung=?ISO-8859-1*de_DE?Q?Pr=FCfung?? =?ISO-8859-2?X?k=F9=D4=F1=D3let?="
(27) "From: γ‚΅γƒ³γƒ—γƒ«ζ–‡ε­—εˆ—γ‚΅γƒ³γƒ—γƒ«ζ–‡ε­—εˆ—ζ—₯本θͺžγƒ†γ‚­γ‚Ήγƒˆ"
-
diff --git a/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt
index 48d664d600..f08d17754b 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt
@@ -8,6 +8,5 @@ $a = str_repeat("/", 9000000);
var_dump(iconv_mime_decode_headers("a", null, $a));
?>
--EXPECTF--
-
Warning: iconv_mime_decode_headers(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
bool(false)
diff --git a/ext/iconv/tests/iconv_mime_decode_headers.phpt b/ext/iconv/tests/iconv_mime_decode_headers.phpt
index 71431f7bce..6a16009ca3 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers.phpt
@@ -86,4 +86,3 @@ array(17) {
["X-UIDL"]=>
string(20) "@eH!!h2:!!EOS!!A_c"!"
}
-
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
index 5973ca0640..ae10b0dc9e 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
@@ -215,4 +215,4 @@ array(0) {
Warning: iconv_mime_decode_headers() expects parameter 1 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_mime_decode_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_variation1.phpt
index f76593bda2..e169b4ead5 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation1.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation1.phpt
@@ -180,4 +180,4 @@ string(0) ""
Warning: iconv_mime_decode() expects parameter 1 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_mime_decode_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_variation3.phpt
index cb20eea7d1..9d62320b03 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation3.phpt
@@ -219,4 +219,4 @@ string(44) "5375626a6563743a20412053616d706c652054657374"
Warning: iconv_mime_decode() expects parameter 3 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt
index e6abca5df1..40c87001e4 100644
--- a/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt
@@ -10,7 +10,6 @@ var_dump(iconv_set_encoding("output_encoding", $a));
var_dump(iconv_set_encoding("internal_encoding", $a));
?>
--EXPECTF--
-
Warning: iconv_set_encoding(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
bool(false)
diff --git a/ext/iconv/tests/iconv_set_encoding_error.phpt b/ext/iconv/tests/iconv_set_encoding_error.phpt
index 4176bf9165..1a3179afea 100644
--- a/ext/iconv/tests/iconv_set_encoding_error.phpt
+++ b/ext/iconv/tests/iconv_set_encoding_error.phpt
@@ -174,4 +174,4 @@ bool(false)
Warning: iconv_set_encoding() 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/iconv/tests/iconv_set_encoding_variation.phpt b/ext/iconv/tests/iconv_set_encoding_variation.phpt
index 906f46bc31..62020063d8 100644
--- a/ext/iconv/tests/iconv_set_encoding_variation.phpt
+++ b/ext/iconv/tests/iconv_set_encoding_variation.phpt
@@ -306,4 +306,4 @@ NULL
string(5) "UTF-8"
string(5) "UTF-8"
string(5) "UTF-8"
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt
index 348cfb1265..23f0b6f2ea 100644
--- a/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt
@@ -8,6 +8,5 @@ $a = str_repeat("/", 9791999);
var_dump(iconv_strlen(1, $a));
?>
--EXPECTF--
-
Warning: iconv_strlen(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
bool(false)
diff --git a/ext/iconv/tests/iconv_strlen_variation2.phpt b/ext/iconv/tests/iconv_strlen_variation2.phpt
index be5afdc93b..c8a736cfc0 100644
--- a/ext/iconv/tests/iconv_strlen_variation2.phpt
+++ b/ext/iconv/tests/iconv_strlen_variation2.phpt
@@ -102,7 +102,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing iconv_strlen() : usage variations ***
@@ -201,4 +200,4 @@ int(12)
Warning: iconv_strlen() expects parameter 2 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt
index 4cb858f0db..0b378cb503 100644
--- a/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt
@@ -8,6 +8,5 @@ $a = str_repeat("/", 9000000);
var_dump(iconv_strpos("a", "b", 0, $a));
?>
--EXPECTF--
-
Warning: iconv_strpos(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
bool(false)
diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt
index 8aa3ce42a5..70f887ee27 100644
--- a/ext/iconv/tests/iconv_strpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strpos_basic.phpt
@@ -56,4 +56,4 @@ int(0)
-- Multibyte string 2 --
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_strpos_variation1.phpt b/ext/iconv/tests/iconv_strpos_variation1.phpt
index 1eb8f7b21b..0d395adcaa 100644
--- a/ext/iconv/tests/iconv_strpos_variation1.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation1.phpt
@@ -179,4 +179,4 @@ bool(false)
Warning: iconv_strpos() expects parameter 1 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_strpos_variation2.phpt b/ext/iconv/tests/iconv_strpos_variation2.phpt
index 798fe7f85c..de7f52d22a 100644
--- a/ext/iconv/tests/iconv_strpos_variation2.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation2.phpt
@@ -179,4 +179,4 @@ bool(false)
Warning: iconv_strpos() expects parameter 2 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_strpos_variation4.phpt b/ext/iconv/tests/iconv_strpos_variation4.phpt
index 5a97c2a5ac..55c3f62889 100644
--- a/ext/iconv/tests/iconv_strpos_variation4.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation4.phpt
@@ -105,7 +105,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing iconv_strpos() : usage variations ***
diff --git a/ext/iconv/tests/iconv_strpos_variation5.phpt b/ext/iconv/tests/iconv_strpos_variation5.phpt
index 7ada6fbb91..1daedd146d 100644
--- a/ext/iconv/tests/iconv_strpos_variation5.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation5.phpt
@@ -44,7 +44,6 @@ for ($i = -30; $i <= 60; $i += 10) {
echo "Done";
?>
-
--EXPECTF--
*** Testing iconv_strpos() : usage variations ***
@@ -111,4 +110,4 @@ bool(false)
bool(false)
--Multibyte String --
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt
index 948cc67c77..f149279800 100644
--- a/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt
@@ -8,6 +8,5 @@ $a = str_repeat("/", 9000000);
var_dump(iconv_strrpos("a", "b", $a));
?>
--EXPECTF--
-
Warning: iconv_strrpos(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
bool(false)
diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt
index bf2a5d9efa..504af12bd7 100644
--- a/ext/iconv/tests/iconv_strrpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strrpos_basic.phpt
@@ -57,4 +57,3 @@ int(20)
-- Multibyte string 2 --
bool(false)
Done
-
diff --git a/ext/iconv/tests/iconv_strrpos_error1.phpt b/ext/iconv/tests/iconv_strrpos_error1.phpt
index b9a1820933..7068f0fffe 100644
--- a/ext/iconv/tests/iconv_strrpos_error1.phpt
+++ b/ext/iconv/tests/iconv_strrpos_error1.phpt
@@ -46,4 +46,4 @@ bool(false)
Warning: iconv_strrpos() expects at least 2 parameters, 1 given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_strrpos_error2.phpt b/ext/iconv/tests/iconv_strrpos_error2.phpt
index 16b7a9def8..1ec096c163 100644
--- a/ext/iconv/tests/iconv_strrpos_error2.phpt
+++ b/ext/iconv/tests/iconv_strrpos_error2.phpt
@@ -32,4 +32,4 @@ echo "Done";
Notice: iconv_strrpos(): Wrong charset, conversion from `unknown-encoding' to `UCS-4LE' is not allowed in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_strrpos_variation1.phpt b/ext/iconv/tests/iconv_strrpos_variation1.phpt
index 573c2ea517..51d99ddca6 100644
--- a/ext/iconv/tests/iconv_strrpos_variation1.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation1.phpt
@@ -100,7 +100,6 @@ foreach($inputs as $input) {
echo "Done";
?>
-
--EXPECTF--
*** Testing iconv_strrpos() : usage variations ***
@@ -177,4 +176,4 @@ bool(false)
Warning: iconv_strrpos() expects parameter 1 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_strrpos_variation2.phpt b/ext/iconv/tests/iconv_strrpos_variation2.phpt
index 297a7589d3..59e26a4a18 100644
--- a/ext/iconv/tests/iconv_strrpos_variation2.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation2.phpt
@@ -102,7 +102,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing iconv_strrpos() : usage variations ***
@@ -179,4 +178,4 @@ bool(false)
Warning: iconv_strrpos() expects parameter 2 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_strrpos_variation3.phpt b/ext/iconv/tests/iconv_strrpos_variation3.phpt
index 35e5056e0f..86af94ae59 100644
--- a/ext/iconv/tests/iconv_strrpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation3.phpt
@@ -103,7 +103,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing iconv_strrpos() : usage variations ***
@@ -202,4 +201,4 @@ int(7)
Warning: iconv_strrpos() expects parameter 3 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt b/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt
index c27e60d1dd..135c636718 100644
--- a/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt
+++ b/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt
@@ -9,6 +9,5 @@ $b = str_repeat('/', 2798349);
var_dump(iconv_substr($a, 0, 1, $b));
?>
--EXPECTF--
-
Warning: iconv_substr(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
bool(false)
diff --git a/ext/iconv/tests/iconv_substr_error1.phpt b/ext/iconv/tests/iconv_substr_error1.phpt
index 61c01dc0d0..e0c277b59c 100644
--- a/ext/iconv/tests/iconv_substr_error1.phpt
+++ b/ext/iconv/tests/iconv_substr_error1.phpt
@@ -47,4 +47,3 @@ bool(false)
Warning: iconv_substr() expects at least 2 parameters, 1 given in %s on line %d
bool(false)
Done
-
diff --git a/ext/iconv/tests/iconv_substr_error2.phpt b/ext/iconv/tests/iconv_substr_error2.phpt
index 0bc0661026..6214aa298a 100644
--- a/ext/iconv/tests/iconv_substr_error2.phpt
+++ b/ext/iconv/tests/iconv_substr_error2.phpt
@@ -33,4 +33,3 @@ echo "Done";
Notice: iconv_substr(): Wrong charset, conversion from `unknown-encoding' to `UCS-4LE' is not allowed in %s on line %d
bool(false)
Done
-
diff --git a/ext/imap/tests/bug31142_2.phpt b/ext/imap/tests/bug31142_2.phpt
index c9eed598b3..004c054963 100644
--- a/ext/imap/tests/bug31142_2.phpt
+++ b/ext/imap/tests/bug31142_2.phpt
@@ -27,4 +27,4 @@ MIME-Version: 1.0
Content-Type: TEXT/plain; CHARSET=iso-8859-2
Content-Transfer-Encoding: QUOTED-PRINTABLE
-asn =C5=99kl \ No newline at end of file
+asn =C5=99kl
diff --git a/ext/imap/tests/bug40854.phpt b/ext/imap/tests/bug40854.phpt
index 0ff231401a..73b1947e0d 100644
--- a/ext/imap/tests/bug40854.phpt
+++ b/ext/imap/tests/bug40854.phpt
@@ -54,4 +54,4 @@ contents.data3
---%s-- \ No newline at end of file
+--%s--
diff --git a/ext/imap/tests/imap_append_basic.phpt b/ext/imap/tests/imap_append_basic.phpt
index e46268533d..06b0c1d4a4 100644
--- a/ext/imap/tests/imap_append_basic.phpt
+++ b/ext/imap/tests/imap_append_basic.phpt
@@ -69,4 +69,3 @@ array(2) {
string(%d) "%w%s 2)%s webmaster@something. Another test (%d chars)"
}
===Done===
-
diff --git a/ext/imap/tests/imap_body.phpt b/ext/imap/tests/imap_body.phpt
index 1c75a94426..77747c8d8a 100644
--- a/ext/imap/tests/imap_body.phpt
+++ b/ext/imap/tests/imap_body.phpt
@@ -45,4 +45,4 @@ Warning: imap_body(): Bad message number in %s on line %d
Warning: imap_body(): invalid value for the options parameter in %s on line %d
Warning: imap_body(): Bad message number in %s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/imap/tests/imap_fetchheader_variation4.phpt b/ext/imap/tests/imap_fetchheader_variation4.phpt
index ad45f4d39d..67c63077f4 100644
--- a/ext/imap/tests/imap_fetchheader_variation4.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation4.phpt
@@ -42,4 +42,4 @@ resource(%d) of type (stream)
Warning: imap_fetchheader(): supplied resource is not a valid imap resource in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/imap/tests/imap_getsubscribed_basic.phpt b/ext/imap/tests/imap_getsubscribed_basic.phpt
index 63617686b1..cfe526844b 100644
--- a/ext/imap/tests/imap_getsubscribed_basic.phpt
+++ b/ext/imap/tests/imap_getsubscribed_basic.phpt
@@ -65,4 +65,4 @@ object(stdClass)#%d (%d) {
int(%d)
[%sdelimiter"]=>
string(%d) "%s"
-} \ No newline at end of file
+}
diff --git a/ext/imap/tests/imap_headerinfo_basic.phpt b/ext/imap/tests/imap_headerinfo_basic.phpt
index afee066f4a..4334b62e8e 100644
--- a/ext/imap/tests/imap_headerinfo_basic.phpt
+++ b/ext/imap/tests/imap_headerinfo_basic.phpt
@@ -126,4 +126,4 @@ Deleted: OK
Draft: OK
string(%d) "%s"
string(%d) "%d"
-int(%d) \ No newline at end of file
+int(%d)
diff --git a/ext/imap/tests/imap_headers.phpt b/ext/imap/tests/imap_headers.phpt
index 4a1136c07b..60c04d406e 100644
--- a/ext/imap/tests/imap_headers.phpt
+++ b/ext/imap/tests/imap_headers.phpt
@@ -25,4 +25,3 @@ Checking with incorrect parameter type
Warning: imap_headers() expects parameter 1 to be resource, string given in %s on line %d
Warning: imap_headers() expects parameter 1 to be resource, bool given in %s on line %d
-
diff --git a/ext/imap/tests/imap_list_basic.phpt b/ext/imap/tests/imap_list_basic.phpt
index 436cd5c3a3..edd899c921 100644
--- a/ext/imap/tests/imap_list_basic.phpt
+++ b/ext/imap/tests/imap_list_basic.phpt
@@ -44,4 +44,4 @@ Warning: imap_list() expects exactly 3 parameters, 1 given in %s on line %d
Warning: imap_list() expects exactly 3 parameters, 2 given in %s on line %d
bool(true)
-string(%s) "{%s}%s" \ No newline at end of file
+string(%s) "{%s}%s"
diff --git a/ext/imap/tests/imap_lsub_basic.phpt b/ext/imap/tests/imap_lsub_basic.phpt
index 7775ec0c3e..0f7149917e 100644
--- a/ext/imap/tests/imap_lsub_basic.phpt
+++ b/ext/imap/tests/imap_lsub_basic.phpt
@@ -58,4 +58,4 @@ Warning: imap_lsub() expects exactly 3 parameters, 2 given in %s on line %d
bool(false)
Checking OK
bool(true)
-string(%s) "{%s}%s" \ No newline at end of file
+string(%s) "{%s}%s"
diff --git a/ext/imap/tests/imap_mail_copy.phpt b/ext/imap/tests/imap_mail_copy.phpt
index fc6d7e56a2..c2aae5b176 100644
--- a/ext/imap/tests/imap_mail_copy.phpt
+++ b/ext/imap/tests/imap_mail_copy.phpt
@@ -51,4 +51,4 @@ NULL
Warning: imap_mail_copy() expects at least 3 parameters, 2 given in %s on line %d
NULL
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/imap/tests/imap_mail_copy_basic.phpt b/ext/imap/tests/imap_mail_copy_basic.phpt
index 05cb128a61..2171403cd1 100644
--- a/ext/imap/tests/imap_mail_copy_basic.phpt
+++ b/ext/imap/tests/imap_mail_copy_basic.phpt
@@ -43,4 +43,4 @@ Create a temporary mailbox and add 1 msgs
.. mailbox '%s' created
Msg Count in new mailbox: 1
bool(true)
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/imap/tests/imap_mail_move.phpt b/ext/imap/tests/imap_mail_move.phpt
index 0456e23c08..7d8e489557 100644
--- a/ext/imap/tests/imap_mail_move.phpt
+++ b/ext/imap/tests/imap_mail_move.phpt
@@ -51,4 +51,4 @@ NULL
Warning: imap_mail_move() expects at least 3 parameters, 2 given in %s on line %d
NULL
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt
index bd04308a44..f33f4963fa 100644
--- a/ext/imap/tests/imap_mail_move_basic.phpt
+++ b/ext/imap/tests/imap_mail_move_basic.phpt
@@ -43,4 +43,4 @@ Create a temporary mailbox and add 1 msgs
.. mailbox '%s' created
Msg Count in new mailbox: 1
bool(true)
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/imap/tests/imap_num_msg_error.phpt b/ext/imap/tests/imap_num_msg_error.phpt
index 2ca498dc9a..69fb23f55b 100644
--- a/ext/imap/tests/imap_num_msg_error.phpt
+++ b/ext/imap/tests/imap_num_msg_error.phpt
@@ -25,4 +25,3 @@ Checking with incorrect parameter type
Warning: imap_num_msg() expects parameter 1 to be resource, string given in %s on line %d
Warning: imap_num_msg() expects parameter 1 to be resource, bool given in %s on line %d
-
diff --git a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
index 07eb69bf68..ee17fb39b9 100644
--- a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
+++ b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
@@ -119,4 +119,4 @@ Deleted: OK
Draft: OK
string(%d) "%s"
string(%d) "%d"
-int(%d) \ No newline at end of file
+int(%d)
diff --git a/ext/imap/tests/imap_savebody_basic.phpt b/ext/imap/tests/imap_savebody_basic.phpt
index 23c3573996..0c03d0033d 100644
--- a/ext/imap/tests/imap_savebody_basic.phpt
+++ b/ext/imap/tests/imap_savebody_basic.phpt
@@ -58,4 +58,3 @@ bool(true)
Size: %d
bool(true)
Size: %d
-
diff --git a/ext/imap/tests/imap_undelete_basic.phpt b/ext/imap/tests/imap_undelete_basic.phpt
index 60e30ae21b..1ec02600d7 100644
--- a/ext/imap/tests/imap_undelete_basic.phpt
+++ b/ext/imap/tests/imap_undelete_basic.phpt
@@ -26,4 +26,4 @@ require_once('clean.inc');
--EXPECTF--
Create a temporary mailbox and add 1 msgs
.. mailbox '{%s}%s' created
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/interbase/tests/005.phpt b/ext/interbase/tests/005.phpt
index b460adceaf..9a9acfd092 100644
--- a/ext/interbase/tests/005.phpt
+++ b/ext/interbase/tests/005.phpt
@@ -287,4 +287,3 @@ four rows again
5
---
end of test
-
diff --git a/ext/interbase/tests/006.phpt b/ext/interbase/tests/006.phpt
index cf360045ed..b3ced2337b 100644
--- a/ext/interbase/tests/006.phpt
+++ b/ext/interbase/tests/006.phpt
@@ -298,4 +298,3 @@ prepare and exec select
10
---
end of test
-
diff --git a/ext/interbase/tests/bug46247.phpt b/ext/interbase/tests/bug46247.phpt
index ffd153b5f1..f682ff66f0 100644
--- a/ext/interbase/tests/bug46247.phpt
+++ b/ext/interbase/tests/bug46247.phpt
@@ -24,7 +24,6 @@ ibase_set_event_handler(NULL, 'foo', 1);
?>
--EXPECTF--
-
Warning: Wrong parameter count for ibase_set_event_handler() in %s on line %d
Warning: ibase_set_event_handler(): supplied argument is not a valid InterBase link resource in %s on line %d
diff --git a/ext/intl/tests/breakiter___construct.phpt b/ext/intl/tests/breakiter___construct.phpt
index 10089e28a6..d957b1182d 100644
--- a/ext/intl/tests/breakiter___construct.phpt
+++ b/ext/intl/tests/breakiter___construct.phpt
@@ -10,7 +10,6 @@ ini_set("intl.error_level", E_WARNING);
new IntlBreakIterator();
--EXPECTF--
-
Fatal error: Uncaught Error: Call to private IntlBreakIterator::__construct() from invalid context in %s:%d
Stack trace:
#0 {main}
diff --git a/ext/intl/tests/breakiter___construct_error.phpt b/ext/intl/tests/breakiter___construct_error.phpt
index 4cba340d84..595c6b283a 100644
--- a/ext/intl/tests/breakiter___construct_error.phpt
+++ b/ext/intl/tests/breakiter___construct_error.phpt
@@ -37,7 +37,6 @@ try {
print_exception($e);
}
--EXPECTF--
-
Exception: IntlRuleBasedBreakIterator::__construct(): rbbi_create_instance: unable to create RuleBasedBreakIterator from rules (parse error on line 1, offset 31) in %s on line %d
Exception: IntlRuleBasedBreakIterator::__construct() expects at least 1 parameter, 0 given in %s on line %d
diff --git a/ext/intl/tests/breakiter_clone_basic.phpt b/ext/intl/tests/breakiter_clone_basic.phpt
index d838f81217..e8b7d34127 100644
--- a/ext/intl/tests/breakiter_clone_basic.phpt
+++ b/ext/intl/tests/breakiter_clone_basic.phpt
@@ -17,7 +17,6 @@ $bi->setText('foobar');
$bi_clone = clone $bi;
var_dump(get_class($bi), get_class($bi_clone));
var_dump($bi == $bi_clone);
-
--EXPECT--
string(26) "IntlRuleBasedBreakIterator"
string(26) "IntlRuleBasedBreakIterator"
diff --git a/ext/intl/tests/breakiter_createCodePointInstance_error.phpt b/ext/intl/tests/breakiter_createCodePointInstance_error.phpt
index 90228e128f..13adc53b03 100644
--- a/ext/intl/tests/breakiter_createCodePointInstance_error.phpt
+++ b/ext/intl/tests/breakiter_createCodePointInstance_error.phpt
@@ -10,9 +10,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(IntlBreakIterator::createCodePointInstance(array()));
--EXPECTF--
-
Warning: IntlBreakIterator::createCodePointInstance() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlBreakIterator::createCodePointInstance(): breakiter_create_code_point_instance: bad arguments in %s on line %d
NULL
-
diff --git a/ext/intl/tests/breakiter_current_basic.phpt b/ext/intl/tests/breakiter_current_basic.phpt
index 2ce6da7697..1f3e679f47 100644
--- a/ext/intl/tests/breakiter_current_basic.phpt
+++ b/ext/intl/tests/breakiter_current_basic.phpt
@@ -25,4 +25,4 @@ int(0)
int(0)
int(3)
int(3)
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/breakiter_factories_basic.phpt b/ext/intl/tests/breakiter_factories_basic.phpt
index 5c902638a3..4d05792c0e 100644
--- a/ext/intl/tests/breakiter_factories_basic.phpt
+++ b/ext/intl/tests/breakiter_factories_basic.phpt
@@ -37,4 +37,3 @@ bool(true)
===== createTitleInstance =====
bool(true)
-
diff --git a/ext/intl/tests/breakiter_factories_error.phpt b/ext/intl/tests/breakiter_factories_error.phpt
index 2fd48f6650..4f3a912a15 100644
--- a/ext/intl/tests/breakiter_factories_error.phpt
+++ b/ext/intl/tests/breakiter_factories_error.phpt
@@ -13,10 +13,7 @@ var_dump(IntlBreakIterator::createSentenceInstance(NULL, 2));
var_dump(IntlBreakIterator::createCharacterInstance(NULL, 2));
var_dump(IntlBreakIterator::createTitleInstance(NULL, 2));
var_dump(IntlBreakIterator::createLineInstance(NULL, 2));
-
-
--EXPECTF--
-
Warning: IntlBreakIterator::createWordInstance() expects parameter 1 to be string, array given in %s on line %d
Warning: IntlBreakIterator::createWordInstance(): breakiter_create_word_instance: bad arguments in %s on line %d
diff --git a/ext/intl/tests/breakiter_first_last_previous_current_error.phpt b/ext/intl/tests/breakiter_first_last_previous_current_error.phpt
index 2ab681228e..da37ffea78 100644
--- a/ext/intl/tests/breakiter_first_last_previous_current_error.phpt
+++ b/ext/intl/tests/breakiter_first_last_previous_current_error.phpt
@@ -15,9 +15,7 @@ var_dump($bi->first(1));
var_dump($bi->last(1));
var_dump($bi->previous(1));
var_dump($bi->current(1));
-
--EXPECTF--
-
Warning: IntlBreakIterator::first() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlBreakIterator::first(): breakiter_first: bad arguments in %s on line %d
diff --git a/ext/intl/tests/breakiter_following_basic.phpt b/ext/intl/tests/breakiter_following_basic.phpt
index 30798d99a3..c139a2c3b4 100644
--- a/ext/intl/tests/breakiter_following_basic.phpt
+++ b/ext/intl/tests/breakiter_following_basic.phpt
@@ -21,4 +21,4 @@ var_dump($bi->following(-1));
int(7)
int(-1)
int(0)
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt b/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
index ee53c068e9..56ed60ffcf 100644
--- a/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
+++ b/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
@@ -17,9 +17,7 @@ var_dump($bi->preceding(1, 2));
var_dump($bi->preceding(array()));
var_dump($bi->isBoundary(1, 2));
var_dump($bi->isBoundary(array()));
-
--EXPECTF--
-
Warning: IntlBreakIterator::following() expects exactly 1 parameter, 2 given in %s on line %d
Warning: IntlBreakIterator::following(): breakiter_following: bad arguments in %s on line %d
diff --git a/ext/intl/tests/breakiter_getLocale_error.phpt b/ext/intl/tests/breakiter_getLocale_error.phpt
index 9e37a31e61..f318743948 100644
--- a/ext/intl/tests/breakiter_getLocale_error.phpt
+++ b/ext/intl/tests/breakiter_getLocale_error.phpt
@@ -14,9 +14,7 @@ $bi->setText("\x80sdfΓ©\x90d888 dfsa9");
var_dump($bi->getLocale(1, 2));
var_dump($bi->getLocale(array()));
var_dump($bi->getLocale());
-
--EXPECTF--
-
Warning: IntlBreakIterator::getLocale() expects exactly 1 parameter, 2 given in %s on line %d
Warning: IntlBreakIterator::getLocale(): breakiter_get_locale: bad arguments in %s on line %d
diff --git a/ext/intl/tests/breakiter_getPartsIterator_error.phpt b/ext/intl/tests/breakiter_getPartsIterator_error.phpt
index 12a55e7e0f..b756540578 100644
--- a/ext/intl/tests/breakiter_getPartsIterator_error.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_error.phpt
@@ -17,7 +17,6 @@ var_dump($it->getPartsIterator(-1));
?>
==DONE==
--EXPECTF--
-
Warning: IntlBreakIterator::getPartsIterator() expects parameter 1 to be int, array given in %s on line %d
Warning: IntlBreakIterator::getPartsIterator(): breakiter_get_parts_iterator: bad arguments in %s on line %d
diff --git a/ext/intl/tests/breakiter_getText_error.phpt b/ext/intl/tests/breakiter_getText_error.phpt
index 91e9919c15..d66b4bb69f 100644
--- a/ext/intl/tests/breakiter_getText_error.phpt
+++ b/ext/intl/tests/breakiter_getText_error.phpt
@@ -10,9 +10,7 @@ ini_set("intl.error_level", E_WARNING);
$bi = new IntlRuleBasedBreakIterator('[\p{Letter}]+;');
var_dump($bi->getText(array()));
-
--EXPECTF--
-
Warning: IntlBreakIterator::getText() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlBreakIterator::getText(): breakiter_get_text: bad arguments in %s on line %d
diff --git a/ext/intl/tests/breakiter_isBoundary_basic.phpt b/ext/intl/tests/breakiter_isBoundary_basic.phpt
index 1f416630a0..f0920dca8c 100644
--- a/ext/intl/tests/breakiter_isBoundary_basic.phpt
+++ b/ext/intl/tests/breakiter_isBoundary_basic.phpt
@@ -25,4 +25,4 @@ bool(true)
bool(false)
bool(false)
bool(false)
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/breakiter_next_error.phpt b/ext/intl/tests/breakiter_next_error.phpt
index 0472ed4a44..eb4664308c 100644
--- a/ext/intl/tests/breakiter_next_error.phpt
+++ b/ext/intl/tests/breakiter_next_error.phpt
@@ -13,9 +13,7 @@ $bi->setText("\x80sdfΓ©\x90d888 dfsa9");
var_dump($bi->next(1, 2));
var_dump($bi->next(array()));
-
--EXPECTF--
-
Warning: IntlBreakIterator::next() expects exactly 1 parameter, 2 given in %s on line %d
Warning: IntlBreakIterator::next(): breakiter_next: bad arguments in %s on line %d
diff --git a/ext/intl/tests/breakiter_previous_basic.phpt b/ext/intl/tests/breakiter_previous_basic.phpt
index c3343af57c..c844ffcb6c 100644
--- a/ext/intl/tests/breakiter_previous_basic.phpt
+++ b/ext/intl/tests/breakiter_previous_basic.phpt
@@ -19,4 +19,4 @@ var_dump($bi->previous());
--EXPECT--
int(13)
int(8)
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/breakiter_setText_error.phpt b/ext/intl/tests/breakiter_setText_error.phpt
index a7a73a08d8..c94a8433f1 100644
--- a/ext/intl/tests/breakiter_setText_error.phpt
+++ b/ext/intl/tests/breakiter_setText_error.phpt
@@ -23,9 +23,7 @@ var_dump($bi->setText(new A));
} catch (Exception $e) {
var_dump($e->getMessage());
}
-
--EXPECTF--
-
Warning: IntlBreakIterator::setText() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlBreakIterator::setText(): breakiter_set_text: bad arguments in %s on line %d
diff --git a/ext/intl/tests/bug59597_32.phpt b/ext/intl/tests/bug59597_32.phpt
index 928a235a83..cd8b679171 100644
--- a/ext/intl/tests/bug59597_32.phpt
+++ b/ext/intl/tests/bug59597_32.phpt
@@ -18,4 +18,3 @@ var_dump($value);
--EXPECT--
int(2147483647)
float(2147483650)
-
diff --git a/ext/intl/tests/bug60192-compare.phpt b/ext/intl/tests/bug60192-compare.phpt
index ce9728023a..096b57558f 100644
--- a/ext/intl/tests/bug60192-compare.phpt
+++ b/ext/intl/tests/bug60192-compare.phpt
@@ -15,7 +15,6 @@ class Collator2 extends Collator{
$c = new Collator2();
$a = $c->compare('h', 'H');
--EXPECTF--
-
Fatal error: Uncaught Error: Object not initialized in %s:%d
Stack trace:
#0 %s(%d): Collator->compare('h', 'H')
diff --git a/ext/intl/tests/bug60192-getlocale.phpt b/ext/intl/tests/bug60192-getlocale.phpt
index c4155e9ab5..ef5ce3fc04 100644
--- a/ext/intl/tests/bug60192-getlocale.phpt
+++ b/ext/intl/tests/bug60192-getlocale.phpt
@@ -16,7 +16,6 @@ class Collator2 extends Collator{
$c = new Collator2();
$c->getLocale(Locale::ACTUAL_LOCALE);
--EXPECTF--
-
Fatal error: Uncaught Error: Object not initialized in %s:%d
Stack trace:
#0 %s(%d): Collator->getLocale(0)
diff --git a/ext/intl/tests/bug60192-getsortkey.phpt b/ext/intl/tests/bug60192-getsortkey.phpt
index 0d0f07e768..21cc279eee 100644
--- a/ext/intl/tests/bug60192-getsortkey.phpt
+++ b/ext/intl/tests/bug60192-getsortkey.phpt
@@ -16,7 +16,6 @@ class Collator2 extends Collator{
$c = new Collator2();
$c->getSortKey('h');
--EXPECTF--
-
Fatal error: Uncaught Error: Object not initialized in %s:%d
Stack trace:
#0 %s(%d): Collator->getSortKey('h')
diff --git a/ext/intl/tests/bug60192-sort.phpt b/ext/intl/tests/bug60192-sort.phpt
index c452d0de6d..530d5eecba 100644
--- a/ext/intl/tests/bug60192-sort.phpt
+++ b/ext/intl/tests/bug60192-sort.phpt
@@ -17,10 +17,8 @@ $c = new Collator2();
$a = array('a', 'b');
$c->sort($a);
--EXPECTF--
-
Fatal error: Uncaught Error: Object not initialized in %s:%d
Stack trace:
#0 %s(%d): Collator->sort(Array)
#1 {main}
thrown in %s on line %d
-
diff --git a/ext/intl/tests/bug60192-sortwithsortkeys.phpt b/ext/intl/tests/bug60192-sortwithsortkeys.phpt
index e7d7c1dc1d..9ee58123c8 100644
--- a/ext/intl/tests/bug60192-sortwithsortkeys.phpt
+++ b/ext/intl/tests/bug60192-sortwithsortkeys.phpt
@@ -17,10 +17,8 @@ $c = new Collator2();
$a = array('a', 'b');
$c->sortWithSortKeys($a);
--EXPECTF--
-
Fatal error: Uncaught Error: Object not initialized in %s:%d
Stack trace:
#0 %s(%d): Collator->sortWithSortKeys(Array)
#1 {main}
thrown in %s on line %d
-
diff --git a/ext/intl/tests/bug62082.phpt b/ext/intl/tests/bug62082.phpt
index dab1252afd..279462e789 100644
--- a/ext/intl/tests/bug62082.phpt
+++ b/ext/intl/tests/bug62082.phpt
@@ -13,4 +13,3 @@ var_dump(locale_get_display_name(str_repeat("a", 600), null));
bool(false)
bool(false)
bool(false)
-
diff --git a/ext/intl/tests/bug67052-win32.phpt b/ext/intl/tests/bug67052-win32.phpt
index 5bc6497bea..2c27624562 100644
--- a/ext/intl/tests/bug67052-win32.phpt
+++ b/ext/intl/tests/bug67052-win32.phpt
@@ -27,4 +27,3 @@ ut_run();
--EXPECT--
1234567,891
de-de
-
diff --git a/ext/intl/tests/bug67052.phpt b/ext/intl/tests/bug67052.phpt
index 7f0c4cba51..6cdfd9f5a9 100644
--- a/ext/intl/tests/bug67052.phpt
+++ b/ext/intl/tests/bug67052.phpt
@@ -32,4 +32,3 @@ ut_run();
--EXPECT--
1234567,891
de_DE.UTF-8
-
diff --git a/ext/intl/tests/bug69374.phpt b/ext/intl/tests/bug69374.phpt
index 6788255289..ee7c49547e 100644
--- a/ext/intl/tests/bug69374.phpt
+++ b/ext/intl/tests/bug69374.phpt
@@ -15,10 +15,7 @@ echo IntlDateFormatter::formatObject($date, $pattern1, 'vi_VN'), "\n";
echo IntlDateFormatter::formatObject ($date, $pattern2, 'ko_KR'), "\n";
?>
==DONE==
-
--EXPECT--
thΓ‘ng 04, 2015
2015λ…„ 4μ›”
==DONE==
-
-
diff --git a/ext/intl/tests/bug69398.phpt b/ext/intl/tests/bug69398.phpt
index 152feedc39..3c95eeeaac 100644
--- a/ext/intl/tests/bug69398.phpt
+++ b/ext/intl/tests/bug69398.phpt
@@ -13,10 +13,7 @@ echo IntlDateFormatter::formatObject($date, array(IntlDateFormatter::SHORT, Intl
echo IntlDateFormatter::formatObject ($date, array(IntlDateFormatter::SHORT, IntlDateFormatter::NONE), 'ko_KR'), "\n";
?>
==DONE==
-
--EXPECT--
04/04/2015
15. 4. 4.
==DONE==
-
-
diff --git a/ext/intl/tests/bug72061.phpt b/ext/intl/tests/bug72061.phpt
index 782c32c11c..6c3d6d5b90 100644
--- a/ext/intl/tests/bug72061.phpt
+++ b/ext/intl/tests/bug72061.phpt
@@ -12,4 +12,4 @@ DONE
--EXPECT--
int(65336)
int(65336)
-DONE \ No newline at end of file
+DONE
diff --git a/ext/intl/tests/bug72533.phpt b/ext/intl/tests/bug72533.phpt
index 1a182afdd9..1faf08c287 100644
--- a/ext/intl/tests/bug72533.phpt
+++ b/ext/intl/tests/bug72533.phpt
@@ -27,4 +27,4 @@ ut_run();
--EXPECT--
false
'locale_accept_from_http: locale string too long: U_ILLEGAL_ARGUMENT_ERROR'
-'en' \ No newline at end of file
+'en'
diff --git a/ext/intl/tests/bug74230.phpt b/ext/intl/tests/bug74230.phpt
index 70ef6ae39a..685b0582bc 100644
--- a/ext/intl/tests/bug74230.phpt
+++ b/ext/intl/tests/bug74230.phpt
@@ -19,4 +19,3 @@ var_dump(
bool(true)
bool(true)
bool(true)
-
diff --git a/ext/intl/tests/bug75317.phpt b/ext/intl/tests/bug75317.phpt
index cbd9605264..62a7c02f0b 100644
--- a/ext/intl/tests/bug75317.phpt
+++ b/ext/intl/tests/bug75317.phpt
@@ -50,4 +50,4 @@ bool(true)
bool(true)
bool(true)
bool(true)
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/intl/tests/calendar_add_error.phpt b/ext/intl/tests/calendar_add_error.phpt
index ad2cbc356e..017551821d 100644
--- a/ext/intl/tests/calendar_add_error.phpt
+++ b/ext/intl/tests/calendar_add_error.phpt
@@ -19,7 +19,6 @@ var_dump($c->add(1));
var_dump(intlcal_add($c, 1, 2, 3));
var_dump(intlcal_add(1, 2, 3));
--EXPECTF--
-
Warning: IntlCalendar::add() expects exactly 2 parameters, 3 given in %s on line %d
Warning: IntlCalendar::add(): intlcal_add: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_createInstance_basic.phpt b/ext/intl/tests/calendar_createInstance_basic.phpt
index 8ef590c974..00a68e620b 100644
--- a/ext/intl/tests/calendar_createInstance_basic.phpt
+++ b/ext/intl/tests/calendar_createInstance_basic.phpt
@@ -25,7 +25,6 @@ var_dump(abs($timeMillis - $time * 1000) < 2000);
?>
==DONE==
-
--EXPECTF--
IntlTimeZone Object
(
diff --git a/ext/intl/tests/calendar_createInstance_error.phpt b/ext/intl/tests/calendar_createInstance_error.phpt
index bf655bee79..5cb9fa1c63 100644
--- a/ext/intl/tests/calendar_createInstance_error.phpt
+++ b/ext/intl/tests/calendar_createInstance_error.phpt
@@ -16,9 +16,7 @@ var_dump(IntlCalendar::createInstance(1, 2, 3));
var_dump(intlcal_create_instance(1, 2, 3));
var_dump(intlcal_create_instance(new X, NULL));
var_dump(intlcal_create_instance(NULL, array()));
-
--EXPECTF--
-
Warning: IntlCalendar::createInstance() expects at most 2 parameters, 3 given in %s on line %d
Warning: IntlCalendar::createInstance(): intlcal_create_calendar: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt
index bdfe8c27cb..4c585a6018 100644
--- a/ext/intl/tests/calendar_equals_error.phpt
+++ b/ext/intl/tests/calendar_equals_error.phpt
@@ -44,7 +44,6 @@ try {
} catch (Error $ex) {
echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
}
-
--EXPECT--
error: 2, IntlCalendar::equals() expects exactly 1 parameter, 0 given
error: 2, IntlCalendar::equals(): intlcal_equals: bad arguments
diff --git a/ext/intl/tests/calendar_fieldDifference_error.phpt b/ext/intl/tests/calendar_fieldDifference_error.phpt
index d09df44452..4f3fc351cb 100644
--- a/ext/intl/tests/calendar_fieldDifference_error.phpt
+++ b/ext/intl/tests/calendar_fieldDifference_error.phpt
@@ -18,9 +18,7 @@ var_dump($c->fieldDifference(1));
var_dump(intlcal_field_difference($c, 0, 1, 2));
var_dump(intlcal_field_difference(1, 0, 1));
-
--EXPECTF--
-
Warning: IntlCalendar::fieldDifference() expects exactly 2 parameters, 3 given in %s on line %d
Warning: IntlCalendar::fieldDifference(): intlcal_field_difference: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_fromDateTime_basic.phpt b/ext/intl/tests/calendar_fromDateTime_basic.phpt
index 1863b7815c..0c7e471454 100644
--- a/ext/intl/tests/calendar_fromDateTime_basic.phpt
+++ b/ext/intl/tests/calendar_fromDateTime_basic.phpt
@@ -35,7 +35,6 @@ var_dump(
strtotime('2012-01-01 00:00:00 +03:40') * 1000.,
$cal->getTimeZone()->getID()
);
-
--EXPECTF--
float(1325372400000)
float(1325372400000)
diff --git a/ext/intl/tests/calendar_fromDateTime_error.phpt b/ext/intl/tests/calendar_fromDateTime_error.phpt
index 2fbf7196f9..1074159687 100644
--- a/ext/intl/tests/calendar_fromDateTime_error.phpt
+++ b/ext/intl/tests/calendar_fromDateTime_error.phpt
@@ -31,9 +31,7 @@ $date = new DateTime('2012-01-01 00:00:00 WEST');
var_dump(IntlCalendar::fromDateTime($date));
var_dump(intlcal_from_date_time());
-
--EXPECTF--
-
Warning: IntlCalendar::fromDateTime() expects at least 1 parameter, 0 given in %s on line %d
Warning: IntlCalendar::fromDateTime(): intlcal_from_date_time: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getAvailableLocales_error.phpt b/ext/intl/tests/calendar_getAvailableLocales_error.phpt
index e9edc468e5..3aee500fea 100644
--- a/ext/intl/tests/calendar_getAvailableLocales_error.phpt
+++ b/ext/intl/tests/calendar_getAvailableLocales_error.phpt
@@ -10,9 +10,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_available_locales(1));
var_dump(IntlCalendar::getAvailableLocales(2));
-
--EXPECTF--
-
Warning: intlcal_get_available_locales() expects exactly 0 parameters, 1 given in %s on line %d
Warning: intlcal_get_available_locales(): intlcal_get_available_locales: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
index 9d83f37809..46fe17d9cd 100644
--- a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
+++ b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
@@ -18,9 +18,7 @@ var_dump($c->getDayOfWeekType());
var_dump(intlcal_get_day_of_week_type($c, "foo"));
var_dump(intlcal_get_day_of_week_type(1, 1));
-
--EXPECTF--
-
Warning: IntlCalendar::getDayOfWeekType() expects exactly 1 parameter, 2 given in %s on line %d
Warning: IntlCalendar::getDayOfWeekType(): intlcal_get_day_of_week_type: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getErrorCode_error.phpt b/ext/intl/tests/calendar_getErrorCode_error.phpt
index 97b7d9c0c1..fd999fbbbf 100644
--- a/ext/intl/tests/calendar_getErrorCode_error.phpt
+++ b/ext/intl/tests/calendar_getErrorCode_error.phpt
@@ -15,9 +15,7 @@ $c = new IntlGregorianCalendar(NULL, 'pt_PT');
var_dump($c->getErrorCode(array()));
var_dump(intlcal_get_error_code(null));
-
--EXPECTF--
-
Warning: IntlCalendar::getErrorCode() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::getErrorCode(): intlcal_get_error_code: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getErrorMessage_error.phpt b/ext/intl/tests/calendar_getErrorMessage_error.phpt
index 5250bc064e..cc52449d94 100644
--- a/ext/intl/tests/calendar_getErrorMessage_error.phpt
+++ b/ext/intl/tests/calendar_getErrorMessage_error.phpt
@@ -15,9 +15,7 @@ $c = new IntlGregorianCalendar(NULL, 'pt_PT');
var_dump($c->getErrorMessage(array()));
var_dump(intlcal_get_error_message(null));
-
--EXPECTF--
-
Warning: IntlCalendar::getErrorMessage() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::getErrorMessage(): intlcal_get_error_message: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
index 4d623f711f..ca2dc4a9f2 100644
--- a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
@@ -16,9 +16,7 @@ var_dump($c->getFirstDayOfWeek(1));
var_dump(intlcal_get_first_day_of_week($c, 1));
var_dump(intlcal_get_first_day_of_week(1));
-
--EXPECTF--
-
Warning: IntlCalendar::getFirstDayOfWeek() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::getFirstDayOfWeek(): intlcal_get_first_day_of_week: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt b/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt
index 4487474217..717c435be7 100644
--- a/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt
+++ b/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt
@@ -10,9 +10,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_keyword_values_for_locale(1, 2));
var_dump(IntlCalendar::getKeywordValuesForLocale(1, 2, array()));
-
--EXPECTF--
-
Warning: intlcal_get_keyword_values_for_locale() expects exactly 3 parameters, 2 given in %s on line %d
Warning: intlcal_get_keyword_values_for_locale(): intlcal_get_keyword_values_for_locale: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getLocale_error.phpt b/ext/intl/tests/calendar_getLocale_error.phpt
index 01ba795bdc..008e1b756e 100644
--- a/ext/intl/tests/calendar_getLocale_error.phpt
+++ b/ext/intl/tests/calendar_getLocale_error.phpt
@@ -18,9 +18,7 @@ var_dump($c->getLocale(2, 3));
var_dump(intlcal_get_locale($c));
var_dump(intlcal_get_locale(1));
-
--EXPECTF--
-
Warning: IntlCalendar::getLocale() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlCalendar::getLocale(): intlcal_get_locale: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
index b2c7e5b46c..a1190e5ce0 100644
--- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
@@ -16,9 +16,7 @@ var_dump($c->getMinimalDaysInFirstWeek(1));
var_dump(intlcal_get_minimal_days_in_first_week($c, 1));
var_dump(intlcal_get_minimal_days_in_first_week(1));
-
--EXPECTF--
-
Warning: IntlCalendar::getMinimalDaysInFirstWeek() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::getMinimalDaysInFirstWeek(): intlcal_get_minimal_days_in_first_week: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getNow_error.phpt b/ext/intl/tests/calendar_getNow_error.phpt
index 31991bb591..712e210851 100644
--- a/ext/intl/tests/calendar_getNow_error.phpt
+++ b/ext/intl/tests/calendar_getNow_error.phpt
@@ -10,9 +10,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(intlcal_get_now(1));
var_dump(IntlCalendar::getNow(2));
-
--EXPECTF--
-
Warning: intlcal_get_now() expects exactly 0 parameters, 1 given in %s on line %d
Warning: intlcal_get_now(): intlcal_get_now: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
index 3ecdc13d2f..06aa679c5a 100644
--- a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
@@ -19,9 +19,7 @@ var_dump(intlcal_get_skipped_wall_time_option($c, 1));
var_dump(intlcal_get_repeated_wall_time_option($c, 1));
var_dump(intlcal_get_skipped_wall_time_option(1));
-
--EXPECTF--
-
Warning: IntlCalendar::getSkippedWallTimeOption() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::getSkippedWallTimeOption(): intlcal_get_skipped_wall_time_option: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getTimeZone_error.phpt b/ext/intl/tests/calendar_getTimeZone_error.phpt
index 5941b9ada0..ea7e85db4c 100644
--- a/ext/intl/tests/calendar_getTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_getTimeZone_error.phpt
@@ -16,9 +16,7 @@ var_dump($c->getTimeZone(1));
var_dump(intlcal_get_time_zone($c, 1));
var_dump(intlcal_get_time_zone(1));
-
--EXPECTF--
-
Warning: IntlCalendar::getTimeZone() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::getTimeZone(): intlcal_get_time_zone: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getTime_error.phpt b/ext/intl/tests/calendar_getTime_error.phpt
index 359b816997..61eaea97dc 100644
--- a/ext/intl/tests/calendar_getTime_error.phpt
+++ b/ext/intl/tests/calendar_getTime_error.phpt
@@ -17,7 +17,6 @@ var_dump($c->getTime(1));
var_dump(intlcal_get_time($c, 1));
var_dump(intlcal_get_time(1));
--EXPECTF--
-
Warning: IntlCalendar::getTime() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::getTime(): intlcal_get_time: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getType_error.phpt b/ext/intl/tests/calendar_getType_error.phpt
index b5f32d5768..c124151893 100644
--- a/ext/intl/tests/calendar_getType_error.phpt
+++ b/ext/intl/tests/calendar_getType_error.phpt
@@ -16,9 +16,7 @@ var_dump($c->getType(1));
var_dump(intlcal_get_type($c, 1));
var_dump(intlcal_get_type(1));
-
--EXPECTF--
-
Warning: IntlCalendar::getType() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::getType(): intlcal_get_type: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_getWeekendTransition_error.phpt b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
index 122a0663fc..d61c9d5a25 100644
--- a/ext/intl/tests/calendar_getWeekendTransition_error.phpt
+++ b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
@@ -18,9 +18,7 @@ var_dump($c->getWeekendTransition(0));
var_dump(intlcal_get_weekend_transition($c));
var_dump(intlcal_get_weekend_transition(1, 1));
-
--EXPECTF--
-
Warning: IntlCalendar::getWeekendTransition() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlCalendar::getWeekendTransition(): intlcal_get_weekend_transition: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
index 999c050b9f..6c6f67f953 100644
--- a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
+++ b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
@@ -52,9 +52,7 @@ try {
} catch (Error $ex) {
echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
}
-
--EXPECTF--
-
Warning: IntlCalendar::getLeastMaximum() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlCalendar::getLeastMaximum(): intlcal_get_least_maximum: bad arguments in %s on line %d
@@ -105,4 +103,3 @@ error: 0, Argument 1 passed to intlcal_get_maximum() must be an instance of Intl
error: 0, Argument 1 passed to intlcal_get_greatest_minimum() must be an instance of IntlCalendar, int given
error: 0, Argument 1 passed to intlcal_get_minimum() must be an instance of IntlCalendar, int given
-
diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
index 989fb8b7cd..d7d20ed6cd 100644
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
@@ -28,7 +28,6 @@ var_dump($c->get(1, 2));
var_dump($c->getActualMaximum(1, 2));
var_dump($c->getActualMinimum(1, 2));
--EXPECTF--
-
Warning: IntlCalendar::get() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlCalendar::get(): intlcal_get: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
index f7026e0719..37e3816fef 100644
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
@@ -110,4 +110,3 @@ error: 0, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar
error: 0, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, int given
error: 0, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, int given
-
diff --git a/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt b/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt
index 2528f362c9..59ad43647c 100644
--- a/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt
+++ b/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt
@@ -5,7 +5,6 @@ IntlCalendar::get/setRepeatedWallTimeOption(): basic test
if (!extension_loaded('intl'))
die('skip intl extension not enabled');
--FILE--
-
<?php
ini_set("intl.error_level", E_WARNING);
ini_set("intl.default_locale", "nl");
@@ -35,7 +34,6 @@ var_dump(
?>
==DONE==
--EXPECT--
-
bool(true)
int(0)
int(1351387800)
@@ -44,4 +42,4 @@ bool(true)
int(1)
int(1351384200)
int(1351384200)
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt b/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt
index f7a004f2a2..94f540abb1 100644
--- a/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt
+++ b/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt
@@ -5,7 +5,6 @@ IntlCalendar::get/setSkippedWallTimeOption(): basic test
if (!extension_loaded('intl'))
die('skip intl extension not enabled');
--FILE--
-
<?php
ini_set("intl.error_level", E_WARNING);
ini_set("intl.default_locale", "nl");
@@ -47,7 +46,6 @@ var_dump(
?>
==DONE==
--EXPECT--
-
int(0)
Should be 3h30
int(3)
@@ -62,4 +60,4 @@ int(2)
Should be 3h00
int(3)
int(0)
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/calendar_inDaylightTime_error.phpt b/ext/intl/tests/calendar_inDaylightTime_error.phpt
index 6ed1f48c3c..6644f477ea 100644
--- a/ext/intl/tests/calendar_inDaylightTime_error.phpt
+++ b/ext/intl/tests/calendar_inDaylightTime_error.phpt
@@ -16,9 +16,7 @@ var_dump($c->inDaylightTime(1));
var_dump(intlcal_in_daylight_time($c, 1));
var_dump(intlcal_in_daylight_time(1));
-
--EXPECTF--
-
Warning: IntlCalendar::inDaylightTime() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::inDaylightTime(): intlcal_in_daylight_time: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
index e7f8765fef..c7e30fd645 100644
--- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt
+++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
@@ -48,7 +48,6 @@ try {
} catch (Error $ex) {
echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
}
-
--EXPECT--
error: 0, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_isLenient_error.phpt b/ext/intl/tests/calendar_isLenient_error.phpt
index 26fb95c173..263d82bb37 100644
--- a/ext/intl/tests/calendar_isLenient_error.phpt
+++ b/ext/intl/tests/calendar_isLenient_error.phpt
@@ -16,9 +16,7 @@ var_dump($c->isLenient(1));
var_dump(intlcal_is_lenient($c, 1));
var_dump(intlcal_is_lenient(1));
-
--EXPECTF--
-
Warning: IntlCalendar::isLenient() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::isLenient(): intlcal_is_lenient: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_isSet_error.phpt b/ext/intl/tests/calendar_isSet_error.phpt
index 53b244879f..7e5b2beaa6 100644
--- a/ext/intl/tests/calendar_isSet_error.phpt
+++ b/ext/intl/tests/calendar_isSet_error.phpt
@@ -18,9 +18,7 @@ var_dump($c->isSet(-1));
var_dump(intlcal_is_set($c));
var_dump(intlcal_is_set(1, 2));
-
--EXPECTF--
-
Warning: IntlCalendar::isSet() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlCalendar::isSet(): intlcal_is_set: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_isWeekend_error.phpt b/ext/intl/tests/calendar_isWeekend_error.phpt
index 71fca1d502..c1f8180fa3 100644
--- a/ext/intl/tests/calendar_isWeekend_error.phpt
+++ b/ext/intl/tests/calendar_isWeekend_error.phpt
@@ -17,7 +17,6 @@ var_dump($c->isWeekend("jhhk"));
var_dump(intlcal_is_weekend($c, "jj"));
var_dump(intlcal_is_weekend(1));
-
--EXPECTF--
Warning: IntlCalendar::isWeekend() expects at most 1 parameter, 2 given in %s on line %d
diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt
index c476bfb62a..27160ee8ca 100644
--- a/ext/intl/tests/calendar_roll_error.phpt
+++ b/ext/intl/tests/calendar_roll_error.phpt
@@ -19,7 +19,6 @@ var_dump($c->roll(1));
var_dump(intlcal_roll($c, 1, 2, 3));
var_dump(intlcal_roll(1, 2, 3));
--EXPECTF--
-
Warning: IntlCalendar::roll(): intlcal_set: too many arguments in %s on line %d
bool(false)
diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
index 82cc3f245d..a22c3b2842 100644
--- a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
@@ -18,9 +18,7 @@ var_dump($c->setFirstDayOfWeek(0));
var_dump(intlcal_set_first_day_of_week($c, 0));
var_dump(intlcal_set_first_day_of_week(1, 2));
-
--EXPECTF--
-
Warning: IntlCalendar::setFirstDayOfWeek() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlCalendar::setFirstDayOfWeek(): intlcal_set_first_day_of_week: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt
index 3091d9a330..b2a6f25d5d 100644
--- a/ext/intl/tests/calendar_setLenient_error.phpt
+++ b/ext/intl/tests/calendar_setLenient_error.phpt
@@ -18,9 +18,7 @@ var_dump($c->setLenient(1, 2));
var_dump(intlcal_set_lenient($c, array()));
var_dump(intlcal_set_lenient(1, false));
-
--EXPECTF--
-
Warning: IntlCalendar::setLenient() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlCalendar::setLenient(): intlcal_set_lenient: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
index bf7584ade1..48d18bf28d 100644
--- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
@@ -18,7 +18,6 @@ var_dump($c->setMinimalDaysInFirstWeek(0));
var_dump(intlcal_set_minimal_days_in_first_week($c, 0));
var_dump(intlcal_set_minimal_days_in_first_week(1, 2));
-
--EXPECTF--
Warning: IntlCalendar::setMinimalDaysInFirstWeek() expects exactly 1 parameter, 0 given in %s on line %d
@@ -41,4 +40,3 @@ Stack trace:
#0 %s(%d): intlcal_set_minimal_days_in_first_week(1, 2)
#1 {main}
thrown in %s on line %d
-
diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
index bc216772cc..776cb8b825 100644
--- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
@@ -28,9 +28,7 @@ var_dump(intlcal_set_skipped_wall_time_option($c));
var_dump(intlcal_set_repeated_wall_time_option($c));
var_dump(intlcal_set_repeated_wall_time_option(1, 1));
-
--EXPECTF--
-
Warning: IntlCalendar::setSkippedWallTimeOption() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlCalendar::setSkippedWallTimeOption(): intlcal_set_skipped_wall_time_option: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt
index 9ed6238d34..dee773d377 100644
--- a/ext/intl/tests/calendar_setTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_error.phpt
@@ -40,7 +40,6 @@ try{
} catch (Error $ex) {
echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
}
-
--EXPECT--
error: 2, IntlCalendar::setTimeZone() expects exactly 1 parameter, 2 given
error: 2, IntlCalendar::setTimeZone(): intlcal_set_time_zone: bad arguments
diff --git a/ext/intl/tests/calendar_setTimeZone_error2.phpt b/ext/intl/tests/calendar_setTimeZone_error2.phpt
index aa1eaba209..767aafa95a 100644
--- a/ext/intl/tests/calendar_setTimeZone_error2.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_error2.phpt
@@ -19,9 +19,7 @@ var_dump($intlcal->getTimeZone()->getID());
$pstdate = new DateTime('2012-01-01 00:00:00 +24:00');
$intlcal->setTimeZone($pstdate->getTimeZone());
var_dump($intlcal->getTimeZone()->getID());
-
--EXPECTF--
-
Warning: IntlCalendar::setTimeZone(): intlcal_set_time_zone: time zone id 'WEST' extracted from ext/date DateTimeZone not recognized in %s on line %d
string(16) "Europe/Amsterdam"
diff --git a/ext/intl/tests/calendar_setTime_error.phpt b/ext/intl/tests/calendar_setTime_error.phpt
index 3d45933ee7..d3fa46c591 100644
--- a/ext/intl/tests/calendar_setTime_error.phpt
+++ b/ext/intl/tests/calendar_setTime_error.phpt
@@ -18,7 +18,6 @@ var_dump($c->setTime("jjj"));
var_dump(intlcal_set_time($c, 1, 2));
var_dump(intlcal_set_time(1));
--EXPECTF--
-
Warning: IntlCalendar::setTime() expects exactly 1 parameter, 2 given in %s on line %d
Warning: IntlCalendar::setTime(): intlcal_set_time: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_set_error.phpt b/ext/intl/tests/calendar_set_error.phpt
index 929f7427aa..5827ad41ec 100644
--- a/ext/intl/tests/calendar_set_error.phpt
+++ b/ext/intl/tests/calendar_set_error.phpt
@@ -20,7 +20,6 @@ var_dump($c->set(-1, 2));
var_dump(intlcal_set($c, -1, 2));
var_dump(intlcal_set(1, 2, 3));
--EXPECTF--
-
Warning: IntlCalendar::set() expects at least 2 parameters, 1 given in %s on line %d
Warning: IntlCalendar::set(): intlcal_set: bad arguments in %s on line %d
diff --git a/ext/intl/tests/calendar_toDateTime_basic.phpt b/ext/intl/tests/calendar_toDateTime_basic.phpt
index d38487dabf..b7ffd31321 100644
--- a/ext/intl/tests/calendar_toDateTime_basic.phpt
+++ b/ext/intl/tests/calendar_toDateTime_basic.phpt
@@ -20,4 +20,4 @@ var_dump($dt->format("c"), $dt->getTimeZone()->getName());
--EXPECT--
string(25) "2012-05-17T17:35:36+01:00"
string(13) "Europe/Lisbon"
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/calendar_toDateTime_error.phpt b/ext/intl/tests/calendar_toDateTime_error.phpt
index 27a74674bd..584bd28f65 100644
--- a/ext/intl/tests/calendar_toDateTime_error.phpt
+++ b/ext/intl/tests/calendar_toDateTime_error.phpt
@@ -22,9 +22,7 @@ var_dump("exception: {$e->getMessage()}");
}
var_dump(intlcal_to_date_time(3));
-
--EXPECTF--
-
Warning: IntlCalendar::toDateTime() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCalendar::toDateTime(): intlcal_to_date_time: bad arguments in %s on line %d
diff --git a/ext/intl/tests/cpbi_getLastCodePoint_error.phpt b/ext/intl/tests/cpbi_getLastCodePoint_error.phpt
index 78bd216629..505a076ca3 100644
--- a/ext/intl/tests/cpbi_getLastCodePoint_error.phpt
+++ b/ext/intl/tests/cpbi_getLastCodePoint_error.phpt
@@ -11,9 +11,7 @@ ini_set("intl.error_level", E_WARNING);
$it = IntlBreakIterator::createCodePointInstance();
var_dump($it->getLastCodePoint(array()));
--EXPECTF--
-
Warning: IntlCodePointBreakIterator::getLastCodePoint() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlCodePointBreakIterator::getLastCodePoint(): cpbi_get_last_code_point: bad arguments in %s on line %d
bool(false)
-
diff --git a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
index d10ad42623..255a1f484d 100644
--- a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
+++ b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
@@ -32,7 +32,6 @@ try {
?>
==DONE==
--EXPECTF--
-
Exception: IntlDateFormatter::__construct(): datefmt_create: no such time zone: 'bad timezone' in %s on line %d
Exception: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s on line %d
diff --git a/ext/intl/tests/dateformat_clone_bad_obj.phpt b/ext/intl/tests/dateformat_clone_bad_obj.phpt
index 5e12b96ae8..f9791004f3 100644
--- a/ext/intl/tests/dateformat_clone_bad_obj.phpt
+++ b/ext/intl/tests/dateformat_clone_bad_obj.phpt
@@ -15,6 +15,5 @@ try {
} catch (Exception $e) {
var_dump($e->getMessage());
}
-
--EXPECTF--
string(%s) "Cannot clone unconstructed IntlDateFormatter"
diff --git a/ext/intl/tests/dateformat_formatObject_calendar.phpt b/ext/intl/tests/dateformat_formatObject_calendar.phpt
index b2b08f362d..11f0fe0137 100644
--- a/ext/intl/tests/dateformat_formatObject_calendar.phpt
+++ b/ext/intl/tests/dateformat_formatObject_calendar.phpt
@@ -27,7 +27,6 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\
?>
==DONE==
-
--EXPECTF--
01/01/2012 00:00:00
Domingo, 1 de Janeiro de 2012 0:00:00 Hora %Sda Europa Ocidental
@@ -38,4 +37,3 @@ Domingo, 1 de Janeiro de 2012 5:00:00 GMT+03:00
06/02/1433 00:00:00
Sunday, Safar 6, 1433 12:00:00 AM Western European %STime
==DONE==
-
diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt
index 688ccc31bf..7d308df6b0 100644
--- a/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt
+++ b/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt
@@ -27,7 +27,6 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\
?>
==DONE==
-
--EXPECTF--
01/01/2012, 00:00:00
Domingo, 1 de Janeiro de 2012 Γ s 00:00:00 Hora %Sda Europa Ocidental
diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt
index 0312524148..33d2c8bfbf 100644
--- a/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt
+++ b/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt
@@ -28,7 +28,6 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\
?>
==DONE==
-
--EXPECTF--
01/01/2012, 00:00:00
domingo, 1 de Janeiro de 2012 Γ s 00:00:00 Hora PadrΓ£o %Sda Europa Ocidental
diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt
index 70a8adc913..141ea9c806 100644
--- a/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt
+++ b/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt
@@ -28,7 +28,6 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\
?>
==DONE==
-
--EXPECTF--
01/01/2012, 00:00:00
domingo, 1 de janeiro de 2012 Γ s 00:00:00 Hora PadrΓ£o %Sda Europa Ocidental
diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt
index d68b1f5fcb..c8fd0535d8 100644
--- a/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt
+++ b/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt
@@ -27,7 +27,6 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\
?>
==DONE==
-
--EXPECTF--
01/01/2012, 00:00:00
domingo, 1 de janeiro de 2012 Γ s 00:00:00 Hora padrΓ£o %Sda Europa Ocidental
diff --git a/ext/intl/tests/dateformat_formatObject_datetime.phpt b/ext/intl/tests/dateformat_formatObject_datetime.phpt
index a2cba4c76b..279a132478 100644
--- a/ext/intl/tests/dateformat_formatObject_datetime.phpt
+++ b/ext/intl/tests/dateformat_formatObject_datetime.phpt
@@ -22,7 +22,6 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n";
?>
==DONE==
-
--EXPECTF--
01/01/2012 00:00:00
Domingo, 1 de Janeiro de 2012 0:00:00 Hora %Sda Europa Ocidental
@@ -31,4 +30,3 @@ Jan 1, 2012 12:00:00 AM
Sun 2012-01-1 00,00,00.000 Portugal Time (Lisbon)
Domingo, 1 de Janeiro de 2012 5:00:00 GMT+03:00
==DONE==
-
diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt
index 567a7eb849..67aee94947 100644
--- a/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt
+++ b/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt
@@ -22,7 +22,6 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n";
?>
==DONE==
-
--EXPECTF--
01/01/2012, 00:00:00
Domingo, 1 de Janeiro de 2012 Γ s 00:00:00 Hora %Sda Europa Ocidental
diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt
index 5ee72446f1..7ddacfa25a 100644
--- a/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt
+++ b/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt
@@ -23,7 +23,6 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n";
?>
==DONE==
-
--EXPECTF--
01/01/2012, 00:00:00
domingo, 1 de Janeiro de 2012 Γ s 00:00:00 Hora PadrΓ£o %Sda Europa Ocidental
diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt
index 6ae6dfedd3..3c233eeb95 100644
--- a/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt
+++ b/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt
@@ -23,7 +23,6 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n";
?>
==DONE==
-
--EXPECTF--
01/01/2012, 00:00:00
domingo, 1 de janeiro de 2012 Γ s 00:00:00 Hora PadrΓ£o %Sda Europa Ocidental
diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt
index 22b0f6adbe..d3b671f324 100644
--- a/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt
+++ b/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt
@@ -22,7 +22,6 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n";
?>
==DONE==
-
--EXPECTF--
01/01/2012, 00:00:00
domingo, 1 de janeiro de 2012 Γ s 00:00:00 Hora padrΓ£o %Sda Europa Ocidental
diff --git a/ext/intl/tests/dateformat_formatObject_error.phpt b/ext/intl/tests/dateformat_formatObject_error.phpt
index 24e21b50d8..bfcc951b73 100644
--- a/ext/intl/tests/dateformat_formatObject_error.phpt
+++ b/ext/intl/tests/dateformat_formatObject_error.phpt
@@ -30,9 +30,7 @@ var_dump(IntlDateFormatter::formatObject($cal, "YYYY", array()));
?>
==DONE==
-
--EXPECTF--
-
Warning: IntlDateFormatter::formatObject() expects at least 1 parameter, 0 given in %s on line %d
bool(false)
@@ -71,4 +69,3 @@ bool(false)
Warning: IntlDateFormatter::formatObject() expects parameter 3 to be string, array given in %s on line %d
bool(false)
==DONE==
-
diff --git a/ext/intl/tests/dateformat_getCalendarObject_error.phpt b/ext/intl/tests/dateformat_getCalendarObject_error.phpt
index d2ad66c829..d5a7833ded 100644
--- a/ext/intl/tests/dateformat_getCalendarObject_error.phpt
+++ b/ext/intl/tests/dateformat_getCalendarObject_error.phpt
@@ -20,7 +20,6 @@ var_dump(datefmt_get_calendar_object(new stdclass));
?>
==DONE==
--EXPECTF--
-
Warning: IntlDateFormatter::getCalendarObject() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlDateFormatter::getCalendarObject(): datefmt_get_calendar_object: unable to parse input params in %s on line %d
diff --git a/ext/intl/tests/dateformat_getTimeZone_error.phpt b/ext/intl/tests/dateformat_getTimeZone_error.phpt
index 4ac5555d88..d2ab92d86a 100644
--- a/ext/intl/tests/dateformat_getTimeZone_error.phpt
+++ b/ext/intl/tests/dateformat_getTimeZone_error.phpt
@@ -20,7 +20,6 @@ var_dump(datefmt_get_timezone(new stdclass));
?>
==DONE==
--EXPECTF--
-
Warning: IntlDateFormatter::getTimeZone() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlDateFormatter::getTimeZone(): datefmt_get_timezone: unable to parse input params in %s on line %d
diff --git a/ext/intl/tests/dateformat_get_set_pattern2.phpt b/ext/intl/tests/dateformat_get_set_pattern2.phpt
index 1db8828ab3..b741906ad6 100644
--- a/ext/intl/tests/dateformat_get_set_pattern2.phpt
+++ b/ext/intl/tests/dateformat_get_set_pattern2.phpt
@@ -3,7 +3,6 @@ datefmt_get_pattern_code and datefmt_set_pattern_code() icu >= 4.8
--SKIPIF--
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
--FILE--
-
<?php
/*
diff --git a/ext/intl/tests/dateformat_is_set_lenient.phpt b/ext/intl/tests/dateformat_is_set_lenient.phpt
index 8492a2e2a8..b78396b77f 100644
--- a/ext/intl/tests/dateformat_is_set_lenient.phpt
+++ b/ext/intl/tests/dateformat_is_set_lenient.phpt
@@ -3,7 +3,6 @@ datefmt_set_lenient and datefmt_set_lenient()
--SKIPIF--
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
--FILE--
-
<?php
/*
diff --git a/ext/intl/tests/dateformat_setTimeZone_error.phpt b/ext/intl/tests/dateformat_setTimeZone_error.phpt
index bd37031325..b58d159088 100644
--- a/ext/intl/tests/dateformat_setTimeZone_error.phpt
+++ b/ext/intl/tests/dateformat_setTimeZone_error.phpt
@@ -22,7 +22,6 @@ var_dump(datefmt_set_timezone(new stdclass, 'UTC'));
?>
==DONE==
--EXPECTF--
-
Warning: IntlDateFormatter::setTimeZone() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: unable to parse input params in %s on line %d
diff --git a/ext/intl/tests/dateformat_set_timezone_id2.phpt b/ext/intl/tests/dateformat_set_timezone_id2.phpt
index f4524cea43..3d22f7d03d 100644
--- a/ext/intl/tests/dateformat_set_timezone_id2.phpt
+++ b/ext/intl/tests/dateformat_set_timezone_id2.phpt
@@ -58,7 +58,6 @@ include_once( 'ut_common.inc' );
ut_run();
?>
--EXPECTF--
-
Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'CN' in %s on line %d
Warning: datefmt_set_timezone(): datefmt_set_timezone: no such time zone: 'CN' in %s on line %d
diff --git a/ext/intl/tests/dateformat_timezone_arg_variations.phpt b/ext/intl/tests/dateformat_timezone_arg_variations.phpt
index 77d7caae3a..5379ab2d5b 100644
--- a/ext/intl/tests/dateformat_timezone_arg_variations.phpt
+++ b/ext/intl/tests/dateformat_timezone_arg_variations.phpt
@@ -34,7 +34,6 @@ echo $df->format($ts), "\n";
$df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0);
echo $df->format($ts), "\n";
-
--EXPECTF--
sΓ‘bado%S 31 de diciembre de 2011 23:00:00 Hora%S de las Azores
domingo%S 1 de enero de 2012 01:00:00 Hora estΓ‘ndar de Europa Central
diff --git a/ext/intl/tests/dateformat_timezone_arg_variations2.phpt b/ext/intl/tests/dateformat_timezone_arg_variations2.phpt
index 53ee820540..c50a6a8108 100644
--- a/ext/intl/tests/dateformat_timezone_arg_variations2.phpt
+++ b/ext/intl/tests/dateformat_timezone_arg_variations2.phpt
@@ -34,7 +34,6 @@ echo $df->format($ts), "\n";
$df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0);
echo $df->format($ts), "\n";
-
--EXPECTF--
sΓ‘bado%S, 31 de diciembre de 2011 23:00:00 Hora estΓ‘ndar de las Azores
domingo%S, 1 de enero de 2012 01:00:00 Hora estΓ‘ndar de Europa central
diff --git a/ext/intl/tests/dateformat_timezone_arg_variations3.phpt b/ext/intl/tests/dateformat_timezone_arg_variations3.phpt
index f8aaf2bd4a..fe8841200a 100644
--- a/ext/intl/tests/dateformat_timezone_arg_variations3.phpt
+++ b/ext/intl/tests/dateformat_timezone_arg_variations3.phpt
@@ -35,7 +35,6 @@ echo $df->format($ts), "\n";
$df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0);
echo $df->format($ts), "\n";
-
--EXPECTF--
sΓ‘bado%S 31 de diciembre de 2011, 23:00:00 (Hora estΓ‘ndar de las Azores)
domingo%S 1 de enero de 2012, 1:00:00 (Hora estΓ‘ndar de Europa central)
diff --git a/ext/intl/tests/dateformat_timezone_arg_variations4.phpt b/ext/intl/tests/dateformat_timezone_arg_variations4.phpt
index be6b1221ce..967c33e232 100644
--- a/ext/intl/tests/dateformat_timezone_arg_variations4.phpt
+++ b/ext/intl/tests/dateformat_timezone_arg_variations4.phpt
@@ -34,7 +34,6 @@ echo $df->format($ts), "\n";
$df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0);
echo $df->format($ts), "\n";
-
--EXPECT--
sΓ‘bado, 31 de diciembre de 2011, 23:00:00 (hora estΓ‘ndar de las Azores)
domingo, 1 de enero de 2012, 1:00:00 (hora estΓ‘ndar de Europa central)
@@ -43,4 +42,3 @@ sΓ‘bado, 31 de diciembre de 2011, 19:00:00 (hora estΓ‘ndar oriental)
domingo, 1 de enero de 2012, 1:00:00 (hora estΓ‘ndar de Europa central)
domingo, 1 de enero de 2012, 0:00:00 (hora estΓ‘ndar de Europa occidental)
domingo, 1 de enero de 2012, 1:00:00 (hora estΓ‘ndar de Europa central)
-
diff --git a/ext/intl/tests/formatter_clone_bad_obj.phpt b/ext/intl/tests/formatter_clone_bad_obj.phpt
index f90aae011f..53a715e6a7 100644
--- a/ext/intl/tests/formatter_clone_bad_obj.phpt
+++ b/ext/intl/tests/formatter_clone_bad_obj.phpt
@@ -15,6 +15,5 @@ try {
} catch (Exception $e) {
var_dump($e->getMessage());
}
-
--EXPECT--
string(42) "Cannot clone unconstructed NumberFormatter"
diff --git a/ext/intl/tests/formatter_get_set_symbol2.phpt b/ext/intl/tests/formatter_get_set_symbol2.phpt
index 95e0648c33..201a4f6872 100644
--- a/ext/intl/tests/formatter_get_set_symbol2.phpt
+++ b/ext/intl/tests/formatter_get_set_symbol2.phpt
@@ -187,4 +187,3 @@ Symbol 'MONETARY_GROUPING_SEPARATOR_SYMBOL-3'
Default symbol: [,]
New symbol: [blahblahblahblahblahblahblahblahblahblah]
A number formatted with the new symbol: $12blahblahblahblahblahblahblahblahblahblah345.12
-
diff --git a/ext/intl/tests/formatter_get_set_text_attribute.phpt b/ext/intl/tests/formatter_get_set_text_attribute.phpt
index 0535da477b..dea3c2d36f 100644
--- a/ext/intl/tests/formatter_get_set_text_attribute.phpt
+++ b/ext/intl/tests/formatter_get_set_text_attribute.phpt
@@ -118,5 +118,3 @@ New value: [blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah
Formatting number with new value: blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah12,345.123
Currency ISO-code for locale 'uk_UA' is: UAH
-
-
diff --git a/ext/intl/tests/formatter_get_set_text_attribute_var2.phpt b/ext/intl/tests/formatter_get_set_text_attribute_var2.phpt
index f1306094c4..260e33a350 100644
--- a/ext/intl/tests/formatter_get_set_text_attribute_var2.phpt
+++ b/ext/intl/tests/formatter_get_set_text_attribute_var2.phpt
@@ -118,5 +118,3 @@ New value: [blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah
Formatting number with new value: blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah12,345.123
Currency ISO-code for locale 'uk_UA' is: UAH
-
-
diff --git a/ext/intl/tests/grapheme.phpt b/ext/intl/tests/grapheme.phpt
index 6b476edaab..6c5896daa4 100644
--- a/ext/intl/tests/grapheme.phpt
+++ b/ext/intl/tests/grapheme.phpt
@@ -781,7 +781,6 @@ function check_result($result, $expected) {
?>
--EXPECT--
-
function grapheme_strlen($string) {}
"hindi" in devanagari strlen 3
@@ -1213,4 +1212,3 @@ extract from "o%CC%88abca%CC%8Axyz" "8" graphemes - grapheme_extract GRAPHEME_EX
extract from "o%CC%88abca%CC%8Axyz" "8" graphemes - grapheme_extract GRAPHEME_EXTR_MAXCHARS starting at byte position 4 = bca%CC%8Axyz == bca%CC%8Axyz
extract from "o%CC%88abca%CC%8Axyz" "8" graphemes - grapheme_extract GRAPHEME_EXTR_MAXCHARS starting at byte position 5 = ca%CC%8Axyz == ca%CC%8Axyz
extract from "o%CC%88abca%CC%8Axyz" "8" graphemes - grapheme_extract GRAPHEME_EXTR_MAXCHARS starting at byte position 6 = a%CC%8Axyz == a%CC%8Axyz
-
diff --git a/ext/intl/tests/gregoriancalendar___construct_error.phpt b/ext/intl/tests/gregoriancalendar___construct_error.phpt
index 30dedbb345..bef69db877 100644
--- a/ext/intl/tests/gregoriancalendar___construct_error.phpt
+++ b/ext/intl/tests/gregoriancalendar___construct_error.phpt
@@ -26,7 +26,6 @@ try {
print_exception($e);
}
--EXPECTF--
-
Warning: intlgregcal_create_instance(): intlgregcal_create_instance: too many arguments in %s on line %d
NULL
diff --git a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
index 76c5cbc652..a1cfb593d7 100644
--- a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
@@ -16,7 +16,6 @@ var_dump($c->getGregorianChange(1));
var_dump(intlgregcal_get_gregorian_change($c, 1));
var_dump(intlgregcal_get_gregorian_change(1));
--EXPECTF--
-
Warning: IntlGregorianCalendar::getGregorianChange() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlGregorianCalendar::getGregorianChange(): intlgregcal_get_gregorian_change: bad arguments in %s on line %d
diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
index 125dc15cc1..9da5aaf418 100644
--- a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
@@ -19,7 +19,6 @@ var_dump(intlgregcal_is_leap_year($c, 1, 2));
var_dump(intlgregcal_is_leap_year($c));
var_dump(intlgregcal_is_leap_year(1, 2));
--EXPECTF--
-
Warning: IntlGregorianCalendar::isLeapYear() expects exactly 1 parameter, 2 given in %s on line %d
Warning: IntlGregorianCalendar::isLeapYear(): intlgregcal_is_leap_year: bad arguments in %s on line %d
diff --git a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
index 74833eb14a..0dd27802b5 100644
--- a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
@@ -18,7 +18,6 @@ var_dump($c->setGregorianChange("sdfds"));
var_dump(intlgregcal_set_gregorian_change($c));
var_dump(intlgregcal_set_gregorian_change(1, 4.));
--EXPECTF--
-
Warning: IntlGregorianCalendar::setGregorianChange() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlGregorianCalendar::setGregorianChange(): intlgregcal_set_gregorian_change: bad arguments in %s on line %d
diff --git a/ext/intl/tests/locale_get_script.phpt b/ext/intl/tests/locale_get_script.phpt
index 6a794fdb12..1ddbade97b 100644
--- a/ext/intl/tests/locale_get_script.phpt
+++ b/ext/intl/tests/locale_get_script.phpt
@@ -119,4 +119,3 @@ en-a-myExt-b-another: script=''
de-419-DE: script=''
a-DE: script=''
ar-a-aaa-b-bbb-a-ccc: script=''
-
diff --git a/ext/intl/tests/msgfmt_clone_bad_obj.phpt b/ext/intl/tests/msgfmt_clone_bad_obj.phpt
index 48321094d1..69105a6b04 100644
--- a/ext/intl/tests/msgfmt_clone_bad_obj.phpt
+++ b/ext/intl/tests/msgfmt_clone_bad_obj.phpt
@@ -15,6 +15,5 @@ try {
} catch (Exception $e) {
var_dump($e->getMessage());
}
-
--EXPECTF--
string(%d) "Cannot clone unconstructed MessageFormatter"
diff --git a/ext/intl/tests/msgfmt_format_error1.phpt b/ext/intl/tests/msgfmt_format_error1.phpt
index da4880a97b..1b460b65e1 100644
--- a/ext/intl/tests/msgfmt_format_error1.phpt
+++ b/ext/intl/tests/msgfmt_format_error1.phpt
@@ -14,6 +14,5 @@ EOD;
$mf = new MessageFormatter('en_US', $fmt);
var_dump($mf->format(array(7)));
-
--EXPECT--
string(5) "7 {1}"
diff --git a/ext/intl/tests/msgfmt_format_error2.phpt b/ext/intl/tests/msgfmt_format_error2.phpt
index 00b8542ed1..69ab9f37ca 100644
--- a/ext/intl/tests/msgfmt_format_error2.phpt
+++ b/ext/intl/tests/msgfmt_format_error2.phpt
@@ -14,8 +14,6 @@ EOD;
$mf = new MessageFormatter('en_US', $fmt);
var_dump($mf->format(array(7)));
-
--EXPECTF--
-
Warning: MessageFormatter::format(): Inconsistent types declared for an argument in %s on line %d
bool(false)
diff --git a/ext/intl/tests/msgfmt_format_error3.phpt b/ext/intl/tests/msgfmt_format_error3.phpt
index 98eebd7e64..5cbe9a121b 100644
--- a/ext/intl/tests/msgfmt_format_error3.phpt
+++ b/ext/intl/tests/msgfmt_format_error3.phpt
@@ -14,8 +14,6 @@ EOD;
$mf = new MessageFormatter('en_US', $fmt);
var_dump($mf->format(array("foo" => 7, -1 => "bar")));
-
--EXPECTF--
-
Warning: MessageFormatter::format(): Found negative or too large array key in %s on line %d
bool(false)
diff --git a/ext/intl/tests/msgfmt_format_error4.phpt b/ext/intl/tests/msgfmt_format_error4.phpt
index 5f4d006178..96b1f39b0b 100644
--- a/ext/intl/tests/msgfmt_format_error4.phpt
+++ b/ext/intl/tests/msgfmt_format_error4.phpt
@@ -16,9 +16,7 @@ $mf = new MessageFormatter('en_US', $fmt);
var_dump($mf->format(array("foo" => 7, "\x80" => "bar")));
var_dump($mf->format(array("foo" => "\x80")));
-
--EXPECTF--
-
Warning: MessageFormatter::format(): Invalid UTF-8 data in argument key: '€' in %s on line %d
bool(false)
diff --git a/ext/intl/tests/msgfmt_format_error5.phpt b/ext/intl/tests/msgfmt_format_error5.phpt
index 9e14fbc577..c828b43abb 100644
--- a/ext/intl/tests/msgfmt_format_error5.phpt
+++ b/ext/intl/tests/msgfmt_format_error5.phpt
@@ -16,7 +16,6 @@ EOD;
$mf = new MessageFormatter('en_US', $fmt);
var_dump($mf->format(array("foo" => new stdclass())));
-
--EXPECTF--
Warning: MessageFormatter::format(): msgfmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted) in %s on line %d
diff --git a/ext/intl/tests/msgfmt_format_error6.phpt b/ext/intl/tests/msgfmt_format_error6.phpt
index aefed90e97..8a6998a35b 100644
--- a/ext/intl/tests/msgfmt_format_error6.phpt
+++ b/ext/intl/tests/msgfmt_format_error6.phpt
@@ -14,8 +14,6 @@ EOD;
$mf = new MessageFormatter('en_US', $fmt);
var_dump($mf->format(array("foo" => 'bar', 7 => fopen('php://memory', 'r+'))));
-
--EXPECTF--
-
Warning: MessageFormatter::format(): No strategy to convert the value given for the argument with key '7' is available in %s on line %d
bool(false)
diff --git a/ext/intl/tests/msgfmt_format_mixed_params.phpt b/ext/intl/tests/msgfmt_format_mixed_params.phpt
index 3a94e095e2..36ccf0b147 100644
--- a/ext/intl/tests/msgfmt_format_mixed_params.phpt
+++ b/ext/intl/tests/msgfmt_format_mixed_params.phpt
@@ -20,4 +20,4 @@ var_dump($mf->format(array("foo" => 1.3, 0 => 2.3)));
--EXPECT--
string(10) "2.3 -- 1st"
string(10) "2.3 -- 1st"
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/msgfmt_setPattern_cache.phpt b/ext/intl/tests/msgfmt_setPattern_cache.phpt
index 995eee6f2e..90d057c50d 100644
--- a/ext/intl/tests/msgfmt_setPattern_cache.phpt
+++ b/ext/intl/tests/msgfmt_setPattern_cache.phpt
@@ -23,4 +23,4 @@ var_dump($mf->format(array(1.3, 1.3)));
string(10) "1.3 -- 1st"
string(10) "1.3 -- 1st"
string(10) "1st -- 1.3"
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/normalizer_get_raw_decomposition.phpt b/ext/intl/tests/normalizer_get_raw_decomposition.phpt
index 6e393cdd08..63caa7d472 100644
--- a/ext/intl/tests/normalizer_get_raw_decomposition.phpt
+++ b/ext/intl/tests/normalizer_get_raw_decomposition.phpt
@@ -65,4 +65,3 @@ error info: 'Input string must be exactly one UTF-8 encoded code point long.: U_
---------------------
'f5' has no decomposition mapping
error info: 'Code point out of range: U_ILLEGAL_ARGUMENT_ERROR' (1)
-
diff --git a/ext/intl/tests/normalizer_normalize.phpt b/ext/intl/tests/normalizer_normalize.phpt
index 70a2bce912..5f8c25ec2f 100644
--- a/ext/intl/tests/normalizer_normalize.phpt
+++ b/ext/intl/tests/normalizer_normalize.phpt
@@ -162,4 +162,3 @@ ut_run();
is in form 'UNORM_NONE'? = no error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1)
'%E1%BA%9B' normalized to form 'UNORM_NONE' is '%E1%BA%9B' error info: 'U_ZERO_ERROR' (0)
is in form 'UNORM_NONE'? = no error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1)
-
diff --git a/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt b/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
index 80eedbfba5..a9c4d32ee4 100644
--- a/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
+++ b/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
@@ -43,4 +43,4 @@ pos : 17
rule status: 0
pos : 19
rule status: 42
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/timezone_IDforWindowsID_basic.phpt b/ext/intl/tests/timezone_IDforWindowsID_basic.phpt
index f8e3d33325..e2cb329196 100644
--- a/ext/intl/tests/timezone_IDforWindowsID_basic.phpt
+++ b/ext/intl/tests/timezone_IDforWindowsID_basic.phpt
@@ -25,7 +25,6 @@ foreach ($tzs as $tz => $regions) {
}
}
}
-
--EXPECT--
** Gnomeregan
bool(false)
diff --git a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
index d7d865c7a7..800fc9a021 100644
--- a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
+++ b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
@@ -24,7 +24,6 @@ foreach ($tzs as $tz => $regions) {
}
}
}
-
--EXPECT--
** Gnomeregan
bool(false)
diff --git a/ext/intl/tests/timezone_countEquivalentIDs_error.phpt b/ext/intl/tests/timezone_countEquivalentIDs_error.phpt
index 4d8f4bc3e3..3087f49cbe 100644
--- a/ext/intl/tests/timezone_countEquivalentIDs_error.phpt
+++ b/ext/intl/tests/timezone_countEquivalentIDs_error.phpt
@@ -12,10 +12,7 @@ var_dump(IntlTimeZone::countEquivalentIDs());
var_dump(IntlTimeZone::countEquivalentIDs(array()));
var_dump(IntlTimeZone::countEquivalentIDs("foo\x80"));
var_dump(IntlTimeZone::countEquivalentIDs("foo bar", 7));
-
-
--EXPECTF--
-
Warning: IntlTimeZone::countEquivalentIDs() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlTimeZone::countEquivalentIDs(): intltz_count_equivalent_ids: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_createDefault_error.phpt b/ext/intl/tests/timezone_createDefault_error.phpt
index 0724898219..f2f2e021b9 100644
--- a/ext/intl/tests/timezone_createDefault_error.phpt
+++ b/ext/intl/tests/timezone_createDefault_error.phpt
@@ -9,10 +9,7 @@ if (!extension_loaded('intl'))
ini_set("intl.error_level", E_WARNING);
var_dump(IntlTimeZone::createDefault(4));
-
-
--EXPECTF--
-
Warning: IntlTimeZone::createDefault() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::createDefault(): intltz_create_default: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_createEnumeration_error.phpt b/ext/intl/tests/timezone_createEnumeration_error.phpt
index e1e7cb9333..ea92e28d95 100644
--- a/ext/intl/tests/timezone_createEnumeration_error.phpt
+++ b/ext/intl/tests/timezone_createEnumeration_error.phpt
@@ -10,10 +10,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(IntlTimeZone::createEnumeration(array()));
var_dump(IntlTimeZone::createEnumeration(1, 2));
-
-
--EXPECTF--
-
Warning: IntlTimeZone::createEnumeration(): intltz_create_enumeration: invalid argument type in %s on line %d
bool(false)
diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
index d428b53052..5edfaeaf6b 100644
--- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
+++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
@@ -13,9 +13,7 @@ var_dump(IntlTimeZone::createTimeZoneIDEnumeration(array()));
var_dump(IntlTimeZone::createTimeZoneIDEnumeration(-1));
var_dump(IntlTimeZone::createTimeZoneIDEnumeration(IntlTimeZone::TYPE_ANY, array()));
var_dump(IntlTimeZone::createTimeZoneIDEnumeration(IntlTimeZone::TYPE_ANY, "PT", "a80"));
-
--EXPECTF--
-
Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects at least 1 parameter, 0 given in %s on line %d
Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_createTimeZone_error.phpt b/ext/intl/tests/timezone_createTimeZone_error.phpt
index 2be821a67e..553223ee4c 100644
--- a/ext/intl/tests/timezone_createTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_createTimeZone_error.phpt
@@ -12,9 +12,7 @@ var_dump(IntlTimeZone::createTimeZone());
var_dump(IntlTimeZone::createTimeZone(new stdClass));
var_dump(IntlTimeZone::createTimeZone("foo bar", 4));
var_dump(IntlTimeZone::createTimeZone("foo\x80"));
-
--EXPECTF--
-
Warning: IntlTimeZone::createTimeZone() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlTimeZone::createTimeZone(): intltz_create_time_zone: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt b/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt
index 10e2621ae4..c846b0b20e 100644
--- a/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt
+++ b/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt
@@ -29,7 +29,6 @@ $dtz = $dt->getTimeZone();
var_dump($dtz->getName());
$tz = IntlTimeZone::fromDateTimeZone($dtz);
var_dump($tz->getID(), $tz->getRawOffset() /* (3*60+40)*60000 */);
-
--EXPECTF--
string(16) "Europe/Amsterdam"
int(3600000)
diff --git a/ext/intl/tests/timezone_fromDateTimeZone_error.phpt b/ext/intl/tests/timezone_fromDateTimeZone_error.phpt
index 031882277e..f50e59f97c 100644
--- a/ext/intl/tests/timezone_fromDateTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_fromDateTimeZone_error.phpt
@@ -18,9 +18,7 @@ $dt = new DateTime('2012-08-01 00:00:00 WEST');
var_dump(IntlTimeZone::fromDateTimeZone($dt->getTimeZone()));
var_dump(intltz_from_date_time_zone());
-
--EXPECTF--
-
Warning: IntlTimeZone::fromDateTimeZone() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlTimeZone::fromDateTimeZone(): intltz_from_date_time_zone: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getCanonicalID_error.phpt b/ext/intl/tests/timezone_getCanonicalID_error.phpt
index b29ca67701..684d946b1e 100644
--- a/ext/intl/tests/timezone_getCanonicalID_error.phpt
+++ b/ext/intl/tests/timezone_getCanonicalID_error.phpt
@@ -11,10 +11,7 @@ ini_set("intl.error_level", E_WARNING);
var_dump(IntlTimeZone::getCanonicalID());
var_dump(IntlTimeZone::getCanonicalID(array()));
var_dump(IntlTimeZone::getCanonicalID("foo\x81"));
-
-
--EXPECTF--
-
Warning: IntlTimeZone::getCanonicalID() expects at least 1 parameter, 0 given in %s on line %d
Warning: IntlTimeZone::getCanonicalID(): intltz_get_canonical_id: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getDSTSavings_error.phpt b/ext/intl/tests/timezone_getDSTSavings_error.phpt
index 26526dc72e..9df04f08c1 100644
--- a/ext/intl/tests/timezone_getDSTSavings_error.phpt
+++ b/ext/intl/tests/timezone_getDSTSavings_error.phpt
@@ -12,9 +12,7 @@ $tz = IntlTimeZone::createTimeZone('Europe/Lisbon');
var_dump($tz->getDSTSavings(array()));
var_dump(intltz_get_dst_savings(null));
-
--EXPECTF--
-
Warning: IntlTimeZone::getDSTSavings() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::getDSTSavings(): intltz_get_dst_savings: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt
index 61143ca490..8d30f8840f 100644
--- a/ext/intl/tests/timezone_getDisplayName_error.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_error.phpt
@@ -16,9 +16,7 @@ var_dump($tz->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT, array()));
var_dump($tz->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT, NULL, NULL));
var_dump(intltz_get_display_name(null, IntlTimeZone::DISPLAY_SHORT, false, 'pt_PT'));
-
--EXPECTF--
-
Warning: IntlTimeZone::getDisplayName() expects parameter 1 to be bool, array given in %s on line %d
Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getEquivalentID_error.phpt b/ext/intl/tests/timezone_getEquivalentID_error.phpt
index f22ca4eefd..facb8fe8cf 100644
--- a/ext/intl/tests/timezone_getEquivalentID_error.phpt
+++ b/ext/intl/tests/timezone_getEquivalentID_error.phpt
@@ -12,9 +12,7 @@ var_dump(IntlTimeZone::getEquivalentID('foo'));
var_dump(IntlTimeZone::getEquivalentID('foo', 'bar'));
var_dump(IntlTimeZone::getEquivalentID('Europe/Lisbon', 0, 1));
var_dump(IntlTimeZone::getEquivalentID("foo\x80", 0));
-
--EXPECTF--
-
Warning: IntlTimeZone::getEquivalentID() expects exactly 2 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::getEquivalentID(): intltz_get_equivalent_id: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getErrorCode_error.phpt b/ext/intl/tests/timezone_getErrorCode_error.phpt
index a6d704c035..f5b06b0757 100644
--- a/ext/intl/tests/timezone_getErrorCode_error.phpt
+++ b/ext/intl/tests/timezone_getErrorCode_error.phpt
@@ -12,9 +12,7 @@ $tz = IntlTimeZone::createTimeZone('Europe/Lisbon');
var_dump($tz->getErrorCode(array()));
var_dump(intltz_get_error_code(null));
-
--EXPECTF--
-
Warning: IntlTimeZone::getErrorCode() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::getErrorCode(): intltz_get_error_code: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getErrorMessage_error.phpt b/ext/intl/tests/timezone_getErrorMessage_error.phpt
index 2f7cfcfe2a..6b8ce7d5c8 100644
--- a/ext/intl/tests/timezone_getErrorMessage_error.phpt
+++ b/ext/intl/tests/timezone_getErrorMessage_error.phpt
@@ -12,9 +12,7 @@ $tz = IntlTimeZone::createTimeZone('Europe/Lisbon');
var_dump($tz->getErrorMessage(array()));
var_dump(intltz_get_error_message(null));
-
--EXPECTF--
-
Warning: IntlTimeZone::getErrorMessage() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::getErrorMessage(): intltz_get_error_message: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getGMT_error.phpt b/ext/intl/tests/timezone_getGMT_error.phpt
index 15afb765e4..ca478a10d1 100644
--- a/ext/intl/tests/timezone_getGMT_error.phpt
+++ b/ext/intl/tests/timezone_getGMT_error.phpt
@@ -9,10 +9,7 @@ if (!extension_loaded('intl'))
ini_set("intl.error_level", E_WARNING);
var_dump(IntlTimeZone::getGMT(4));
-
-
--EXPECTF--
-
Warning: IntlTimeZone::getGMT() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::getGMT(): intltz_get_gmt: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getID_error.phpt b/ext/intl/tests/timezone_getID_error.phpt
index a08c506cee..4d0ffeb96f 100644
--- a/ext/intl/tests/timezone_getID_error.phpt
+++ b/ext/intl/tests/timezone_getID_error.phpt
@@ -11,10 +11,7 @@ ini_set("intl.error_level", E_WARNING);
$tz = IntlTimeZone::createTimeZone('Europe/Lisbon');
var_dump($tz->getID('foo'));
intltz_get_id(null);
-
-
--EXPECTF--
-
Warning: IntlTimeZone::getID() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::getID(): intltz_get_id: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getOffset_error.phpt b/ext/intl/tests/timezone_getOffset_error.phpt
index 632fa5e85a..d66716e552 100644
--- a/ext/intl/tests/timezone_getOffset_error.phpt
+++ b/ext/intl/tests/timezone_getOffset_error.phpt
@@ -14,9 +14,7 @@ var_dump($tz->getOffset(time()*1000, true, $a));
var_dump($tz->getOffset(time()*1000, true, $a, $a, $a));
intltz_get_offset(null, time()*1000, false, $a, $a);
-
--EXPECTF--
-
Warning: IntlTimeZone::getOffset(): intltz_get_offset: error obtaining offset in %s on line %d
bool(false)
diff --git a/ext/intl/tests/timezone_getRawOffset_error.phpt b/ext/intl/tests/timezone_getRawOffset_error.phpt
index 1015ef4ddc..dc7df51cca 100644
--- a/ext/intl/tests/timezone_getRawOffset_error.phpt
+++ b/ext/intl/tests/timezone_getRawOffset_error.phpt
@@ -12,9 +12,7 @@ $tz = IntlTimeZone::createTimeZone('Europe/Lisbon');
var_dump($tz->getRawOffset('foo'));
intltz_get_raw_offset(null);
-
--EXPECTF--
-
Warning: IntlTimeZone::getRawOffset() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::getRawOffset(): intltz_get_raw_offset: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getRegion_error.phpt b/ext/intl/tests/timezone_getRegion_error.phpt
index 9d08bbbde0..7a9e1e1ca7 100644
--- a/ext/intl/tests/timezone_getRegion_error.phpt
+++ b/ext/intl/tests/timezone_getRegion_error.phpt
@@ -13,11 +13,7 @@ var_dump(IntlTimeZone::getRegion(array()));
var_dump(IntlTimeZone::getRegion('Europe/Lisbon', 4));
var_dump(IntlTimeZone::getRegion("foo\x81"));
var_dump(IntlTimeZone::getRegion("foo"));
-
-
-
--EXPECTF--
-
Warning: IntlTimeZone::getRegion() expects exactly 1 parameter, 0 given in %s on line %d
Warning: IntlTimeZone::getRegion(): intltz_get_region: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getTZDataVersion_error.phpt b/ext/intl/tests/timezone_getTZDataVersion_error.phpt
index 258b8807b7..eab4573a36 100644
--- a/ext/intl/tests/timezone_getTZDataVersion_error.phpt
+++ b/ext/intl/tests/timezone_getTZDataVersion_error.phpt
@@ -9,9 +9,7 @@ if (!extension_loaded('intl'))
ini_set("intl.error_level", E_WARNING);
var_dump(IntlTimeZone::getTZDataVersion('foo'));
-
--EXPECTF--
-
Warning: IntlTimeZone::getTZDataVersion() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::getTZDataVersion(): intltz_get_tz_data_version: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_getUnknown_basic.phpt b/ext/intl/tests/timezone_getUnknown_basic.phpt
index 041255be9f..7d5f50206a 100644
--- a/ext/intl/tests/timezone_getUnknown_basic.phpt
+++ b/ext/intl/tests/timezone_getUnknown_basic.phpt
@@ -30,4 +30,4 @@ IntlTimeZone Object
[rawOffset] => 0
[currentOffset] => 0
)
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/intl/tests/timezone_getUnknown_error.phpt b/ext/intl/tests/timezone_getUnknown_error.phpt
index d96bd488ee..57773c256b 100644
--- a/ext/intl/tests/timezone_getUnknown_error.phpt
+++ b/ext/intl/tests/timezone_getUnknown_error.phpt
@@ -15,9 +15,7 @@ $c = new IntlGregorianCalendar(NULL, 'pt_PT');
IntlTimeZone::getUnknown(1);
intltz_get_unknown(1);
-
--EXPECTF--
-
Warning: IntlTimeZone::getUnknown() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::getUnknown(): intltz_get_unknown: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_hasSameRules_error.phpt b/ext/intl/tests/timezone_hasSameRules_error.phpt
index 0e9b4a8bd6..4ec73a96a6 100644
--- a/ext/intl/tests/timezone_hasSameRules_error.phpt
+++ b/ext/intl/tests/timezone_hasSameRules_error.phpt
@@ -29,11 +29,9 @@ try {
var_dump($ex->getCode(), $ex->getMessage());
echo "\n";
}
-
--EXPECT--
int(0)
string(99) "Argument 1 passed to IntlTimeZone::hasSameRules() must be an instance of IntlTimeZone, string given"
int(0)
string(92) "Argument 1 passed to intltz_has_same_rules() must be an instance of IntlTimeZone, null given"
-
diff --git a/ext/intl/tests/timezone_toDateTimeZone_basic.phpt b/ext/intl/tests/timezone_toDateTimeZone_basic.phpt
index 76981a4a91..831bc3df1a 100644
--- a/ext/intl/tests/timezone_toDateTimeZone_basic.phpt
+++ b/ext/intl/tests/timezone_toDateTimeZone_basic.phpt
@@ -22,7 +22,6 @@ function do_test(IntlTimeZone $tz, $proc = false) {
do_test(IntlTimeZone::createTimeZone('CET'));
do_test(IntlTimeZone::createTimeZone('Europe/Amsterdam'));
do_test(IntlTimeZone::createTimeZone('GMT+0405'), true);
-
--EXPECTF--
string(3) "CET"
int(3600000)
diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
index f36e28494a..d00e78fd3a 100644
--- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
@@ -19,9 +19,7 @@ try {
var_dump(intltz_to_date_time_zone());
var_dump(intltz_to_date_time_zone(1));
-
--EXPECTF--
-
Warning: IntlTimeZone::toDateTimeZone() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::toDateTimeZone(): intltz_to_date_time_zone: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_useDaylightTime_error.phpt b/ext/intl/tests/timezone_useDaylightTime_error.phpt
index d3f9471671..c6ab2eefe5 100644
--- a/ext/intl/tests/timezone_useDaylightTime_error.phpt
+++ b/ext/intl/tests/timezone_useDaylightTime_error.phpt
@@ -11,9 +11,7 @@ ini_set("intl.error_level", E_WARNING);
$tz = IntlTimeZone::createTimeZone('Europe/Lisbon');
var_dump($tz->useDaylightTime('foo'));
intltz_use_daylight_time(null);
-
--EXPECTF--
-
Warning: IntlTimeZone::useDaylightTime() expects exactly 0 parameters, 1 given in %s on line %d
Warning: IntlTimeZone::useDaylightTime(): intltz_use_daylight_time: bad arguments in %s on line %d
diff --git a/ext/intl/tests/timezone_windowsID_basic.phpt b/ext/intl/tests/timezone_windowsID_basic.phpt
index 370dc45b6c..e91d5f5ba9 100644
--- a/ext/intl/tests/timezone_windowsID_basic.phpt
+++ b/ext/intl/tests/timezone_windowsID_basic.phpt
@@ -28,7 +28,6 @@ foreach ($tzs as $tz) {
echo "Error: ", intl_get_error_message(), "\n";
}
}
-
--EXPECT--
string(24) "SA Pacific Standard Time"
string(21) "Eastern Standard Time"
diff --git a/ext/intl/tests/timezone_windowsID_basic2.phpt b/ext/intl/tests/timezone_windowsID_basic2.phpt
index 528eaad7db..94a1ac198c 100644
--- a/ext/intl/tests/timezone_windowsID_basic2.phpt
+++ b/ext/intl/tests/timezone_windowsID_basic2.phpt
@@ -27,7 +27,6 @@ foreach ($tzs as $tz) {
echo "Error: ", intl_get_error_message(), "\n";
}
}
-
--EXPECT--
string(24) "SA Pacific Standard Time"
string(18) "Cuba Standard Time"
diff --git a/ext/intl/tests/transliterator_clone.phpt b/ext/intl/tests/transliterator_clone.phpt
index 23d569b898..3253b0f793 100644
--- a/ext/intl/tests/transliterator_clone.phpt
+++ b/ext/intl/tests/transliterator_clone.phpt
@@ -14,7 +14,6 @@ $u = clone $t;
echo $u->id, ": ", $u->transliterate($str), "\n";
echo "Done.\n";
-
--EXPECT--
hex-any: a δΈ‡
hex-any: a δΈ‡
diff --git a/ext/intl/tests/transliterator_create_basic.phpt b/ext/intl/tests/transliterator_create_basic.phpt
index 4de032dbd6..171687aae8 100644
--- a/ext/intl/tests/transliterator_create_basic.phpt
+++ b/ext/intl/tests/transliterator_create_basic.phpt
@@ -12,9 +12,7 @@ $t = transliterator_create("any-latin");
echo $t->id,"\n";
echo "Done.\n";
-
--EXPECT--
any-latin
any-latin
Done.
-
diff --git a/ext/intl/tests/transliterator_create_from_rule_error.phpt b/ext/intl/tests/transliterator_create_from_rule_error.phpt
index 7ec6cd0a5a..d1549ec1b6 100644
--- a/ext/intl/tests/transliterator_create_from_rule_error.phpt
+++ b/ext/intl/tests/transliterator_create_from_rule_error.phpt
@@ -30,7 +30,6 @@ RULES;
$t = Transliterator::createFromRules($rules);
echo intl_get_error_message(),"\n";
echo "Done.\n";
-
--EXPECTF--
Warning: Transliterator::createFromRules() expects at least 1 parameter, 0 given in %s on line %d
diff --git a/ext/intl/tests/transliterator_create_inverse_error.phpt b/ext/intl/tests/transliterator_create_inverse_error.phpt
index ca3de096da..1a1e80ba68 100644
--- a/ext/intl/tests/transliterator_create_inverse_error.phpt
+++ b/ext/intl/tests/transliterator_create_inverse_error.phpt
@@ -12,7 +12,6 @@ $tr->createInverse(array());
$tr = Transliterator::create("Katakana-Latin");
transliterator_create_inverse("jj");
-
--EXPECTF--
Warning: Transliterator::createInverse() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/intl/tests/transliterator_get_error_code_error.phpt b/ext/intl/tests/transliterator_get_error_code_error.phpt
index d65fea9904..e700d2b172 100644
--- a/ext/intl/tests/transliterator_get_error_code_error.phpt
+++ b/ext/intl/tests/transliterator_get_error_code_error.phpt
@@ -9,7 +9,6 @@ $t = Transliterator::create("[\p{Bidi_Mirrored}] Hex");
echo transliterator_get_error_code(), "\n";
echo $t->getErrorCode(null), "\n";
echo transliterator_get_error_code(array()), "\n";
-
--EXPECTF--
Warning: transliterator_get_error_code() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/intl/tests/transliterator_get_error_message_error.phpt b/ext/intl/tests/transliterator_get_error_message_error.phpt
index a6129ea271..ec8282447a 100644
--- a/ext/intl/tests/transliterator_get_error_message_error.phpt
+++ b/ext/intl/tests/transliterator_get_error_message_error.phpt
@@ -9,7 +9,6 @@ $t = Transliterator::create("[\p{Bidi_Mirrored}] Hex");
echo transliterator_get_error_message(), "\n";
echo $t->getErrorMessage(null), "\n";
echo transliterator_get_error_message(array()), "\n";
-
--EXPECTF--
Warning: transliterator_get_error_message() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/intl/tests/transliterator_list_ids_error.phpt b/ext/intl/tests/transliterator_list_ids_error.phpt
index d1066a8920..fa651387f1 100644
--- a/ext/intl/tests/transliterator_list_ids_error.phpt
+++ b/ext/intl/tests/transliterator_list_ids_error.phpt
@@ -9,7 +9,6 @@ ini_set("intl.error_level", E_WARNING);
var_dump(transliterator_list_ids(array()));
echo "Done.\n";
-
--EXPECTF--
Warning: transliterator_list_ids() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/intl/tests/uconverter_enum.phpt b/ext/intl/tests/uconverter_enum.phpt
index 67e02c9d75..09b6c23194 100644
--- a/ext/intl/tests/uconverter_enum.phpt
+++ b/ext/intl/tests/uconverter_enum.phpt
@@ -12,7 +12,6 @@ var_dump(in_array('ISO-8859-1', $avail));
$latin1 = UConverter::getAliases('latin1');
var_dump(in_array('ISO-8859-1', $latin1));
-
--EXPECT--
bool(true)
bool(true)
diff --git a/ext/intl/tests/uconverter_func_subst.phpt b/ext/intl/tests/uconverter_func_subst.phpt
index 12168f3cca..09121ff49b 100644
--- a/ext/intl/tests/uconverter_func_subst.phpt
+++ b/ext/intl/tests/uconverter_func_subst.phpt
@@ -21,7 +21,6 @@ foreach(array('?','','??') as $subst) {
var_dump($ret);
}
}
-
--EXPECT--
string(23) "This is an ascii string"
string(12) "Snowman: (?)"
diff --git a/ext/intl/tests/uconverter_oop_subst.phpt b/ext/intl/tests/uconverter_oop_subst.phpt
index d21d95f8d0..3cfc0078df 100644
--- a/ext/intl/tests/uconverter_oop_subst.phpt
+++ b/ext/intl/tests/uconverter_oop_subst.phpt
@@ -16,7 +16,6 @@ foreach(array('?','','<unknown>') as $subst) {
var_dump($c->convert("This is an ascii string"));
var_dump($c->convert("Snowman: (\xE2\x98\x83)"));
}
-
--EXPECT--
string(23) "This is an ascii string"
string(12) "Snowman: (?)"
diff --git a/ext/json/tests/bug72787.phpt b/ext/json/tests/bug72787.phpt
index c9820faa9f..2b0a49121a 100644
--- a/ext/json/tests/bug72787.phpt
+++ b/ext/json/tests/bug72787.phpt
@@ -10,6 +10,5 @@ var_dump(json_decode('[]', false, 0x100000000));
?>
--EXPECTF--
-
Warning: json_decode(): Depth must be lower than %d in %s on line %d
NULL
diff --git a/ext/json/tests/fail001.phpt b/ext/json/tests/fail001.phpt
index 47c2e65487..21dd42f8c3 100644
--- a/ext/json/tests/fail001.phpt
+++ b/ext/json/tests/fail001.phpt
@@ -164,4 +164,3 @@ AS OBJECT
NULL
AS ARRAY
NULL
-
diff --git a/ext/json/tests/json_last_error_error.phpt b/ext/json/tests/json_last_error_error.phpt
index 9b520ed9a7..e733b32854 100644
--- a/ext/json/tests/json_last_error_error.phpt
+++ b/ext/json/tests/json_last_error_error.phpt
@@ -18,4 +18,3 @@ NULL
Warning: json_last_error() expects exactly 0 parameters, 4 given in %s on line %d
NULL
-
diff --git a/ext/json/tests/json_last_error_msg_error.phpt b/ext/json/tests/json_last_error_msg_error.phpt
index 1a5f9d1bda..719e9fc50c 100644
--- a/ext/json/tests/json_last_error_msg_error.phpt
+++ b/ext/json/tests/json_last_error_msg_error.phpt
@@ -18,4 +18,3 @@ NULL
Warning: json_last_error_msg() expects exactly 0 parameters, 4 given in %s on line %d
NULL
-
diff --git a/ext/json/tests/serialize.phpt b/ext/json/tests/serialize.phpt
index 159c9f214f..1aa90750da 100644
--- a/ext/json/tests/serialize.phpt
+++ b/ext/json/tests/serialize.phpt
@@ -78,5 +78,3 @@ foreach(array('NonSerializingTest','SerializingTest','ValueSerializingTest','Sel
{"data":{"str":"foo","int":1,"float":2.3,"bool":false,"nil":null,"arr":[1,2,3],"obj":{}}}
{"data":["foo",1,2.3,false,null,[1,2,3],{}]}
{"data":{"str":"foo","int":1,"float":2.3,"bool":false,"nil":null,"arr":[1,2,3],"obj":{}}}
-
-
diff --git a/ext/ldap/tests/bug76248.phpt b/ext/ldap/tests/bug76248.phpt
index 21bb4fa31d..3a0b2a456b 100644
--- a/ext/ldap/tests/bug76248.phpt
+++ b/ext/ldap/tests/bug76248.phpt
@@ -37,4 +37,4 @@ array(2) {
["dn"]=>
NULL
}
-} \ No newline at end of file
+}
diff --git a/ext/ldap/tests/ldap_escape_all.phpt b/ext/ldap/tests/ldap_escape_all.phpt
index a79be004ff..d5f4950c60 100644
--- a/ext/ldap/tests/ldap_escape_all.phpt
+++ b/ext/ldap/tests/ldap_escape_all.phpt
@@ -11,4 +11,4 @@ var_dump(ldap_escape($subject));
?>
--EXPECT--
-string(39) "\66\6f\6f\3d\62\61\72\28\62\61\7a\29\2a" \ No newline at end of file
+string(39) "\66\6f\6f\3d\62\61\72\28\62\61\7a\29\2a"
diff --git a/ext/ldap/tests/ldap_escape_both.phpt b/ext/ldap/tests/ldap_escape_both.phpt
index 2169c0ad2e..424a4575af 100644
--- a/ext/ldap/tests/ldap_escape_both.phpt
+++ b/ext/ldap/tests/ldap_escape_both.phpt
@@ -11,4 +11,4 @@ var_dump(ldap_escape($subject, null, LDAP_ESCAPE_DN | LDAP_ESCAPE_FILTER));
?>
--EXPECT--
-string(21) "foo\3dbar\28baz\29\2a" \ No newline at end of file
+string(21) "foo\3dbar\28baz\29\2a"
diff --git a/ext/ldap/tests/ldap_escape_dn.phpt b/ext/ldap/tests/ldap_escape_dn.phpt
index fbcb0545ae..d80e02dee7 100644
--- a/ext/ldap/tests/ldap_escape_dn.phpt
+++ b/ext/ldap/tests/ldap_escape_dn.phpt
@@ -11,4 +11,4 @@ var_dump(ldap_escape($subject, null, LDAP_ESCAPE_DN));
?>
--EXPECT--
-string(15) "foo\3dbar(baz)*" \ No newline at end of file
+string(15) "foo\3dbar(baz)*"
diff --git a/ext/ldap/tests/ldap_escape_filter.phpt b/ext/ldap/tests/ldap_escape_filter.phpt
index e4540a452d..d156f56c87 100644
--- a/ext/ldap/tests/ldap_escape_filter.phpt
+++ b/ext/ldap/tests/ldap_escape_filter.phpt
@@ -11,4 +11,4 @@ var_dump(ldap_escape($subject, null, LDAP_ESCAPE_FILTER));
?>
--EXPECT--
-string(19) "foo=bar\28baz\29\2a" \ No newline at end of file
+string(19) "foo=bar\28baz\29\2a"
diff --git a/ext/ldap/tests/ldap_escape_ignore.phpt b/ext/ldap/tests/ldap_escape_ignore.phpt
index ab56aa2d0e..73260690d0 100644
--- a/ext/ldap/tests/ldap_escape_ignore.phpt
+++ b/ext/ldap/tests/ldap_escape_ignore.phpt
@@ -12,4 +12,4 @@ var_dump(ldap_escape($subject, $ignore));
?>
--EXPECT--
-string(31) "\66oo\3d\62a\72\28\62a\7a\29\2a" \ No newline at end of file
+string(31) "\66oo\3d\62a\72\28\62a\7a\29\2a"
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
index 7f1adde613..40b31ea85d 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
@@ -24,7 +24,6 @@ try {
}
echo "Done.\n";
-
--EXPECTF--
Warning: libxml_set_external_entity_loader() expects parameter 1 to be a valid callback, array must have exactly two members in %s on line %d
NULL
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
index 9581927043..d65f77e9f8 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
@@ -43,7 +43,6 @@ $r = $dd->loadXML($xml);
var_dump($dd->validate());
echo "Done.\n";
-
--EXPECTF--
string(10) "-//FOO/BAR"
string(25) "http://example.com/foobar"
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
index b6251bea6d..e51869cf47 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
@@ -34,7 +34,6 @@ file_put_contents(__DIR__ . "/foobar.dtd", $dtd);
var_dump($dd->validate());
echo "Done.\n";
-
--EXPECTF--
string(10) "-//FOO/BAR"
string(%d) "%sfoobar.dtd"
diff --git a/ext/mbstring/tests/bug20087.phpt b/ext/mbstring/tests/bug20087.phpt
index 842c1092b8..fc5e589bd2 100644
--- a/ext/mbstring/tests/bug20087.phpt
+++ b/ext/mbstring/tests/bug20087.phpt
@@ -19,4 +19,3 @@ string(0) ""
ERR: Deprecated
bool(true)
string(3) "moo"
-
diff --git a/ext/mbstring/tests/bug43841.phpt b/ext/mbstring/tests/bug43841.phpt
index 753842cac4..01ae2a7525 100644
--- a/ext/mbstring/tests/bug43841.phpt
+++ b/ext/mbstring/tests/bug43841.phpt
@@ -33,9 +33,7 @@ foreach ($offsets as $i) {
var_dump(strrpos('This is na English ta', 'a', $i));
}
?>
-
--EXPECTF--
-
-- Offset is -25 --
Multibyte String:
diff --git a/ext/mbstring/tests/bug43994.phpt b/ext/mbstring/tests/bug43994.phpt
index e9a11d054e..5825a4901a 100644
--- a/ext/mbstring/tests/bug43994.phpt
+++ b/ext/mbstring/tests/bug43994.phpt
@@ -37,9 +37,7 @@ foreach($inputs as $input) {
$iterator++;
};
?>
-
--EXPECTF--
-
-- Iteration 1 --
Without $regs arg:
diff --git a/ext/mbstring/tests/bug43998.phpt b/ext/mbstring/tests/bug43998.phpt
index da5e599da0..72ea62a7fc 100644
--- a/ext/mbstring/tests/bug43998.phpt
+++ b/ext/mbstring/tests/bug43998.phpt
@@ -29,7 +29,6 @@ foreach($inputs as $input) {
};
?>
--EXPECTF--
-
-- Iteration 1 --
Warning: mb_strtolower(): Unknown encoding "12345" in %s on line %d
diff --git a/ext/mbstring/tests/bug45923.phpt b/ext/mbstring/tests/bug45923.phpt
index 41ffd70924..aad4b0de4f 100644
--- a/ext/mbstring/tests/bug45923.phpt
+++ b/ext/mbstring/tests/bug45923.phpt
@@ -243,4 +243,4 @@ int(4)
> Offset: -20
Warning: mb_strripos(): Offset is greater than the length of haystack string in %s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/mbstring/tests/bug54494.phpt b/ext/mbstring/tests/bug54494.phpt
index 3d7206c3ee..d2bdc9cbd2 100644
--- a/ext/mbstring/tests/bug54494.phpt
+++ b/ext/mbstring/tests/bug54494.phpt
@@ -49,4 +49,3 @@ Length: 12
UCS-2LE:
Length: 12
6800e4006c006c00f60020007700f60072006c0064000a00
-
diff --git a/ext/mbstring/tests/bug65045.phpt b/ext/mbstring/tests/bug65045.phpt
index 002c5ed174..8535a95d95 100644
--- a/ext/mbstring/tests/bug65045.phpt
+++ b/ext/mbstring/tests/bug65045.phpt
@@ -21,9 +21,8 @@ var_dump(
$expected === mb_convert_encoding($str, 'UTF-8', 'UTF-8'),
$expected2 === mb_convert_encoding($str2, 'UTF-8', 'UTF-8')
);
-
--EXPECT--
bool(true)
bool(true)
bool(true)
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/mbstring/tests/bug68846.phpt b/ext/mbstring/tests/bug68846.phpt
index 1b43e3d11b..c0a7c267fd 100644
--- a/ext/mbstring/tests/bug68846.phpt
+++ b/ext/mbstring/tests/bug68846.phpt
@@ -9,4 +9,4 @@ var_dump(
);
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/mbstring/tests/bug72402.phpt b/ext/mbstring/tests/bug72402.phpt
index fc9eb077b9..b3fd8464b8 100644
--- a/ext/mbstring/tests/bug72402.phpt
+++ b/ext/mbstring/tests/bug72402.phpt
@@ -17,4 +17,4 @@ try {
?>
DONE
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/mbstring/tests/bug75944.phpt b/ext/mbstring/tests/bug75944.phpt
index cb66d4e230..dc11ea244d 100644
--- a/ext/mbstring/tests/bug75944.phpt
+++ b/ext/mbstring/tests/bug75944.phpt
@@ -10,4 +10,3 @@ var_dump(mb_detect_encoding(chr(0xff), array('CP-1251'))); // letter '?'
--EXPECT--
string(12) "Windows-1251"
string(12) "Windows-1251"
-
diff --git a/ext/mbstring/tests/bug76532.phpt b/ext/mbstring/tests/bug76532.phpt
index e61e403dbf..321af91947 100644
--- a/ext/mbstring/tests/bug76532.phpt
+++ b/ext/mbstring/tests/bug76532.phpt
@@ -9,4 +9,4 @@ $width = 2147483647;
var_dump(mb_strimwidth($string_to_trim, 0, $width));
?>
--EXPECT--
-string(81) "εΎ—εΎˆεΉΈη¦γ€‚ζœ‰δΈ€ε€©οΌŒδΈ€δΈͺι•ΏεΎ—εΎˆδΈ‘ηš„θ€δΊΊεΈ¦η€δΈ€εͺ木马ζ₯εˆ°ηŽ‹" \ No newline at end of file
+string(81) "εΎ—εΎˆεΉΈη¦γ€‚ζœ‰δΈ€ε€©οΌŒδΈ€δΈͺι•ΏεΎ—εΎˆδΈ‘ηš„θ€δΊΊεΈ¦η€δΈ€εͺ木马ζ₯εˆ°ηŽ‹"
diff --git a/ext/mbstring/tests/casefold.phpt b/ext/mbstring/tests/casefold.phpt
index 002269b680..2138aff255 100644
--- a/ext/mbstring/tests/casefold.phpt
+++ b/ext/mbstring/tests/casefold.phpt
@@ -16,7 +16,6 @@ output_handler=
print mb_strtoupper( "δλο\n" );
print mb_convert_case( "δλο\n", MB_CASE_TITLE );
?>
-
--EXPECT--
abcdefghijklmnopqrstuvwxyz
ABCDEFGHIJKLMNOPQRSTUVWXYZ
diff --git a/ext/mbstring/tests/ini_encoding.phpt b/ext/mbstring/tests/ini_encoding.phpt
index b9809b2bfe..4d65c3c5d9 100644
--- a/ext/mbstring/tests/ini_encoding.phpt
+++ b/ext/mbstring/tests/ini_encoding.phpt
@@ -43,8 +43,6 @@ var_dump(ini_get('mbstring.internal_encoding'));
var_dump(mb_internal_encoding());
var_dump(ini_get('mbstring.http_input'));
var_dump(ini_get('mbstring.http_output'));
-
-
--EXPECT--
Getting INI
string(9) "Shift_JIS"
diff --git a/ext/mbstring/tests/ini_encoding2.phpt b/ext/mbstring/tests/ini_encoding2.phpt
index f0f62dab07..f3728486ae 100644
--- a/ext/mbstring/tests/ini_encoding2.phpt
+++ b/ext/mbstring/tests/ini_encoding2.phpt
@@ -43,8 +43,6 @@ var_dump(ini_get('mbstring.internal_encoding'));
var_dump(mb_internal_encoding());
var_dump(ini_get('mbstring.http_input'));
var_dump(ini_get('mbstring.http_output'));
-
-
--EXPECT--
Getting INI
string(0) ""
diff --git a/ext/mbstring/tests/mb_chr_ord.phpt b/ext/mbstring/tests/mb_chr_ord.phpt
index f2d42fa682..72a4220e8b 100644
--- a/ext/mbstring/tests/mb_chr_ord.phpt
+++ b/ext/mbstring/tests/mb_chr_ord.phpt
@@ -2066,4 +2066,3 @@ ERROR(57341)
ERROR(57342)
ERROR(57343)
OK
-
diff --git a/ext/mbstring/tests/mb_convert_encoding.phpt b/ext/mbstring/tests/mb_convert_encoding.phpt
index 13faa9d12d..06f10c291e 100644
--- a/ext/mbstring/tests/mb_convert_encoding.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding.phpt
@@ -108,7 +108,6 @@ print("MP: $s\n"); // Missing parameter
?>
-
--EXPECT--
== BASIC TEST ==
EUC-JP: ΖόΛάΈμ₯Ζ₯­₯Ή₯Θ€Η€Ή‘£01234£΅£Ά£·£Έ£Ή‘£
@@ -134,5 +133,3 @@ ERR: Warning
BAD:
ERR: Warning
MP:
-
-
diff --git a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt
index 50e7076a13..e29b9c063e 100644
--- a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt
@@ -204,4 +204,3 @@ string(24) "68656c6c6f2c20776f726c64"
Warning: mb_convert_encoding() expects parameter 2 to be string, resource given in %s on line %d
string(0) ""
Done
-
diff --git a/ext/mbstring/tests/mb_convert_kana.phpt b/ext/mbstring/tests/mb_convert_kana.phpt
index b3bffb61d8..b83923756d 100644
--- a/ext/mbstring/tests/mb_convert_kana.phpt
+++ b/ext/mbstring/tests/mb_convert_kana.phpt
@@ -53,7 +53,6 @@ echo $hanKakuD . ' => ' . mb_convert_kana($hanKakuD, 'AZKH', 'utf-8');
ーアイウエ。「キクケコサシスセソ => ーをむウエγ‚ͺγ‚«γ‚­γ‚―γ‚±γ‚³γ‚΅γ‚·γ‚Ήγ‚»γ‚½
οΎ€οΎοΎ‚οΎƒοΎ„οΎ…οΎ†οΎ‡οΎˆοΎ‰οΎŠοΎ‹οΎŒοΎοΎŽοΎ => γ‚Ώγƒγƒ„γƒ†γƒˆγƒŠγƒ‹γƒŒγƒγƒŽγƒγƒ’γƒ•γƒ˜γƒ›γƒž
οΎοΎ‘οΎ’οΎ“οΎ”οΎ•οΎ–οΎ—οΎ˜οΎ™οΎšοΎ›οΎœοΎοΎžοΎŸ => γƒŸγƒ γƒ‘γƒ’γƒ€γƒ¦γƒ¨γƒ©γƒͺγƒ«γƒ¬γƒ­γƒ―γƒ³γ‚›γ‚œ
-
--CREDITS--
Jason Easter <easter@phpug-wuerzburg.de>
PHPUG WΓΌrzburg <phpug-wuerzburg.de>
diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt
index bc1c320c3d..e4d02a2269 100644
--- a/ext/mbstring/tests/mb_convert_variables.phpt
+++ b/ext/mbstring/tests/mb_convert_variables.phpt
@@ -133,7 +133,6 @@ print("{$oo->s1}{$oo->s2}{$oo->s3}\n"); // Converted to EUC-JP
?>
-
--EXPECT--
== SCALER TEST ==
SJIS
@@ -161,4 +160,3 @@ EUC-JP
ΖόΛάΈμ₯Ζ₯­₯Ή₯Θ€Η€Ή‘£01234£΅£Ά£·£Έ£Ή‘£ΖόΛάΈμ₯Ζ₯­₯Ή₯Θ€Η€Ή‘£01234£΅£Ά£·£Έ£Ή‘£ΖόΛάΈμ₯Ζ₯­₯Ή₯Θ€Η€Ή‘£01234£΅£Ά£·£Έ£Ή‘£
ΖόΛάΈμ₯Ζ₯­₯Ή₯Θ€Η€Ή‘£01234£΅£Ά£·£Έ£Ή‘£ΖόΛάΈμ₯Ζ₯­₯Ή₯Θ€Η€Ή‘£01234£΅£Ά£·£Έ£Ή‘£ΖόΛάΈμ₯Ζ₯­₯Ή₯Θ€Η€Ή‘£01234£΅£Ά£·£Έ£Ή‘£
ΖόΛάΈμ₯Ζ₯­₯Ή₯Θ€Η€Ή‘£01234£΅£Ά£·£Έ£Ή‘£ΖόΛάΈμ₯Ζ₯­₯Ή₯Θ€Η€Ή‘£01234£΅£Ά£·£Έ£Ή‘£ΖόΛάΈμ₯Ζ₯­₯Ή₯Θ€Η€Ή‘£01234£΅£Ά£·£Έ£Ή‘£
-
diff --git a/ext/mbstring/tests/mb_detect_encoding.phpt b/ext/mbstring/tests/mb_detect_encoding.phpt
index d50330849c..4972e9c3e0 100644
--- a/ext/mbstring/tests/mb_detect_encoding.phpt
+++ b/ext/mbstring/tests/mb_detect_encoding.phpt
@@ -96,7 +96,6 @@ print("MP: $s\n"); // Missing parameter
?>
-
--EXPECT--
== BASIC TEST ==
SJIS: SJIS
@@ -118,4 +117,3 @@ ERR: Warning
BAD: EUC-JP
ERR: Warning
MP:
-
diff --git a/ext/mbstring/tests/mb_detect_order.phpt b/ext/mbstring/tests/mb_detect_order.phpt
index 8c6ee3eb5e..664ffd7bda 100644
--- a/ext/mbstring/tests/mb_detect_order.phpt
+++ b/ext/mbstring/tests/mb_detect_order.phpt
@@ -45,7 +45,6 @@ $r = mb_detect_order($a);
print implode(', ', mb_detect_order()) . "\n";
?>
-
--EXPECT--
OK_AUTO
ASCII, JIS, UTF-8, EUC-JP, SJIS
@@ -58,4 +57,3 @@ OK_BAD_STR
ASCII, JIS, EUC-JP, UTF-8
OK_BAD_ARRAY
ASCII, JIS, EUC-JP, UTF-8
-
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
index 3c98cba81f..1352088ccd 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
@@ -5,7 +5,6 @@ Test mb_encode_mimeheader() function : basic functionality
extension_loaded('mbstring') or die('skip');
function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
?>
-
--FILE--
<?php
/* Prototype : string mb_encode_mimeheader
@@ -71,4 +70,4 @@ string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9
=?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
=?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
=?UTF-8?Q?=39=2E?="
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
index c765785db9..151d4a610f 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
@@ -5,7 +5,6 @@ Test mb_encode_mimeheader() function : basic functionality
extension_loaded('mbstring') or die('skip');
function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
?>
-
--FILE--
<?php
/* Prototype : string mb_encode_mimeheader(string $str [, string $charset
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
index ba8f612e4e..d56a996892 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
@@ -5,7 +5,6 @@ Test mb_encode_mimeheader() function : basic functionality
extension_loaded('mbstring') or die('skip');
function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
?>
-
--FILE--
<?php
/* Prototype : string mb_encode_mimeheader(string $str [, string $charset
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
index 00b471a747..fb548d88cb 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
@@ -5,7 +5,6 @@ Test mb_encode_mimeheader() function : basic functionality, indent
extension_loaded('mbstring') or die('skip');
function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
?>
-
--FILE--
<?php
/* Prototype : string mb_encode_mimeheader
@@ -898,4 +897,3 @@ string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9
=?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
=?UTF-8?Q?=39=2E?="
Done
-
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
index 8f8cf3e3dc..be01edbadd 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
@@ -181,4 +181,4 @@ string(0) ""
Warning: mb_encode_mimeheader() 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/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
index 3499efab80..edf602d550 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
@@ -36,7 +36,6 @@ foreach ($linefeeds as $linefeed) {
echo "Done";
?>
-
--EXPECT--
*** Testing mb_encode_mimeheader() : usage variations ***
diff --git a/ext/mbstring/tests/mb_ereg.phpt b/ext/mbstring/tests/mb_ereg.phpt
index faf6ea65e4..ff507adc07 100644
--- a/ext/mbstring/tests/mb_ereg.phpt
+++ b/ext/mbstring/tests/mb_ereg.phpt
@@ -30,7 +30,6 @@ output_handler=
do_tests( $enc );
}
?>
-
--EXPECT--
(15)6162632064656620676869206a6b6c2064656620676869206a6b6c
(27)a3e1a3e2a3e320a4a2a4aaa4a420a4aba4b3a4ca20a4efa4f1a4f320a3e1a3e2a3e320a4a2a4aaa4a420a4ab20a4b3a4ca20a4efa4f1a4f3
@@ -43,4 +42,4 @@ output_handler=
(27)a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab20a4ada4ab20a4f2a4f020a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab2020a4ada4ab20a4f2a4f0
(15)6162632064656620676869206a6b6c2064656620676869206a6b6c
(39)a3e1a3e2a3e320a4a2a4aaa4a420a4aba4b3a4ca20a4efa4f1a4f320a3e1a3e2a3e320a4a2a4aaa4a420a4ab20a4b3a4ca20a4efa4f1a4f3
-(39)a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab20a4ada4ab20a4f2a4f020a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab2020a4ada4ab20a4f2a4f0 \ No newline at end of file
+(39)a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab20a4ada4ab20a4f2a4f020a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab2020a4ada4ab20a4f2a4f0
diff --git a/ext/mbstring/tests/mb_ereg_basic.phpt b/ext/mbstring/tests/mb_ereg_basic.phpt
index 021200dfde..b13f012b7b 100644
--- a/ext/mbstring/tests/mb_ereg_basic.phpt
+++ b/ext/mbstring/tests/mb_ereg_basic.phpt
@@ -75,7 +75,6 @@ function base64_encode_var_dump($regs) {
}
}
?>
-
--EXPECT--
*** Testing mb_ereg() : basic functionality ***
Regex encoding set to utf-8
diff --git a/ext/mbstring/tests/mb_ereg_match_basic.phpt b/ext/mbstring/tests/mb_ereg_match_basic.phpt
index a67acc3c59..59ff022dc2 100644
--- a/ext/mbstring/tests/mb_ereg_match_basic.phpt
+++ b/ext/mbstring/tests/mb_ereg_match_basic.phpt
@@ -42,7 +42,6 @@ var_dump(mb_ereg_match($regex2, $string_mb));
echo "Done";
?>
--EXPECT--
-
*** Testing mb_ereg_match() : basic functionality ***
-- ASCII string 1 --
diff --git a/ext/mbstring/tests/mb_ereg_match_error1.phpt b/ext/mbstring/tests/mb_ereg_match_error1.phpt
index d483b6609d..35fdc6339b 100644
--- a/ext/mbstring/tests/mb_ereg_match_error1.phpt
+++ b/ext/mbstring/tests/mb_ereg_match_error1.phpt
@@ -55,4 +55,4 @@ bool(false)
Warning: mb_ereg_match() expects at least 2 parameters, 0 given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_replace.phpt b/ext/mbstring/tests/mb_ereg_replace.phpt
index 9413da82b9..26838341fe 100644
--- a/ext/mbstring/tests/mb_ereg_replace.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace.phpt
@@ -11,8 +11,6 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab
print mb_ereg_replace( ' ', '-', 'a b c d e' )."\n";
print mb_ereg_replace( '([a-z]+)','[\\1]', 'abc def ghi' );
?>
-
--EXPECT--
a-b-c-d-e
[abc] [def] [ghi]
-
diff --git a/ext/mbstring/tests/mb_ereg_replace_basic.phpt b/ext/mbstring/tests/mb_ereg_replace_basic.phpt
index ac30149099..3627468371 100644
--- a/ext/mbstring/tests/mb_ereg_replace_basic.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_basic.phpt
@@ -59,4 +59,4 @@ string(72) "e697a5e69cace8aa9e5f5f5f5f5f31323334efbc95efbc96efbc97efbc98efbc99e3
-- Multibyte string 2 --
string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_replace_callback.phpt b/ext/mbstring/tests/mb_ereg_replace_callback.phpt
index 1e15dcc433..7c152e7b46 100644
--- a/ext/mbstring/tests/mb_ereg_replace_callback.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_callback.phpt
@@ -20,4 +20,3 @@ echo mb_ereg_replace_callback('(?<word>\w+) (?<digit>\d+).*', function ($m) {
--EXPECT--
abc(3) 123(3) #",;(4) $foo(4)
123-abc
-
diff --git a/ext/mbstring/tests/mb_ereg_replace_named_subpatterns.phpt b/ext/mbstring/tests/mb_ereg_replace_named_subpatterns.phpt
index 1bf8a2714c..66eece7260 100644
--- a/ext/mbstring/tests/mb_ereg_replace_named_subpatterns.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_named_subpatterns.phpt
@@ -25,7 +25,6 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab
// An unclosed backref is ignored
echo mb_ereg_replace('(?<a>\w+)', '-\k<a', 'AA'), PHP_EOL;
?>
-
--EXPECT--
_a_ _b_ _c_ _d_ _e_
<abc> <def> <ghi>
diff --git a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt
index e69e147e48..39bdf51020 100644
--- a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt
@@ -175,4 +175,4 @@ string(1) "_"
Warning: mb_ereg_replace() expects parameter 2 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt
index c85f68aa06..deb8b2eb41 100644
--- a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt
@@ -176,4 +176,4 @@ string(10) "str1n1_v1l"
Warning: mb_ereg_replace() expects parameter 4 to be string, resource given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_search_pos.phpt b/ext/mbstring/tests/mb_ereg_search_pos.phpt
index ae59c3e3d2..e9c8aaafc7 100644
--- a/ext/mbstring/tests/mb_ereg_search_pos.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_pos.phpt
@@ -28,5 +28,3 @@ array(2) {
[1]=>
int(6)
}
-
-
diff --git a/ext/mbstring/tests/mb_ereg_search_setpos.phpt b/ext/mbstring/tests/mb_ereg_search_setpos.phpt
index 2304529f56..5b76ad0d28 100644
--- a/ext/mbstring/tests/mb_ereg_search_setpos.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_setpos.phpt
@@ -67,5 +67,3 @@ Warning: mb_ereg_search_setpos(): Position is out of range in %s on line %d
bool(false)
int(0)
==DONE==
-
-
diff --git a/ext/mbstring/tests/mb_ereg_search_xxx.phpt b/ext/mbstring/tests/mb_ereg_search_xxx.phpt
index 49182248f8..a2049df144 100644
--- a/ext/mbstring/tests/mb_ereg_search_xxx.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_xxx.phpt
@@ -34,7 +34,6 @@ output_handler=
do_tests( $enc, 'x' );
}
?>
-
--EXPECT--
(EUC-JP) (10) ‘¦’Ο
(EUC-JP) (5) abcde
diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt
index b879de750e..60baf8743e 100644
--- a/ext/mbstring/tests/mb_ereg_variation1.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation1.phpt
@@ -89,7 +89,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECT--
*** Testing mb_ereg() : usage variations ***
diff --git a/ext/mbstring/tests/mb_ereg_variation2.phpt b/ext/mbstring/tests/mb_ereg_variation2.phpt
index f6a93ebc83..ef528a7173 100644
--- a/ext/mbstring/tests/mb_ereg_variation2.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation2.phpt
@@ -106,7 +106,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_ereg() : usage variations ***
diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt
index 756e876126..5264ad4fa6 100644
--- a/ext/mbstring/tests/mb_ereg_variation3.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation3.phpt
@@ -69,7 +69,6 @@ function base64_encode_var_dump($regs) {
echo "Done";
?>
-
--EXPECT--
*** Testing mb_ereg() : variation ***
diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt
index fa32c2091f..54efbfb3f8 100644
--- a/ext/mbstring/tests/mb_ereg_variation4.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation4.phpt
@@ -146,4 +146,4 @@ array(1) {
[0]=>
string(8) "MDEyMzQ="
}
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_variation5.phpt b/ext/mbstring/tests/mb_ereg_variation5.phpt
index 0a7eb53d77..24b12f25a7 100644
--- a/ext/mbstring/tests/mb_ereg_variation5.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation5.phpt
@@ -79,4 +79,4 @@ array(1) {
[0]=>
string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
}
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt
index 5a2e746dd6..97e5e58906 100644
--- a/ext/mbstring/tests/mb_ereg_variation6.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation6.phpt
@@ -189,4 +189,4 @@ array(1) {
[0]=>
bool(false)
}
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_ereg_variation7.phpt b/ext/mbstring/tests/mb_ereg_variation7.phpt
index e35b9ef5cf..e43d051d2a 100644
--- a/ext/mbstring/tests/mb_ereg_variation7.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation7.phpt
@@ -91,4 +91,4 @@ array(5) {
[4]=>
string(4) "ODk="
}
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_http_input.phpt b/ext/mbstring/tests/mb_http_input.phpt
index 3a4916d751..5ac57d3e42 100644
--- a/ext/mbstring/tests/mb_http_input.phpt
+++ b/ext/mbstring/tests/mb_http_input.phpt
@@ -43,9 +43,7 @@ else {
}
?>
-
--EXPECT--
ΖόΛάΈμ0123456789ΖόΛάΈμ₯«₯Ώ₯«₯Κ€€ι€¬€Κ
ΖόΛάΈμ0123456789ΖόΛάΈμ₯«₯Ώ₯«₯Κ€€ι€¬€Κ
OK
-
diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt
index cb2ea21f77..da2c6407ce 100644
--- a/ext/mbstring/tests/mb_http_output.phpt
+++ b/ext/mbstring/tests/mb_http_output.phpt
@@ -59,7 +59,6 @@ $enc = mb_http_output();
print "$enc\n";
?>
-
--EXPECT--
OK_ASCII_SET
ASCII
@@ -81,4 +80,3 @@ EUC-JP
ERR: Warning
OK_BAD_OBJ_SET
EUC-JP
-
diff --git a/ext/mbstring/tests/mb_internal_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding.phpt
index 6ef4be23d9..d4bc8de048 100644
--- a/ext/mbstring/tests/mb_internal_encoding.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding.phpt
@@ -47,7 +47,6 @@ $enc = mb_internal_encoding();
print "$enc\n";
?>
-
--EXPECT--
OK_EUC-JP_SET
EUC-JP
@@ -65,4 +64,3 @@ ASCII
ERR: Warning
OK_BAD_OBJ_SET
ASCII
-
diff --git a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
index 954f7aecc2..c031569399 100644
--- a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
@@ -100,7 +100,6 @@ fclose($fp);
echo "Done";
?>
--EXPECTF--
-
*** Testing mb_internal_encoding() : usage variations ***
-- Iteration 1 --
diff --git a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
index 216c789c54..ba53c48401 100644
--- a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
@@ -89,7 +89,6 @@ foreach($encoding as $enc) {
echo "Done";
?>
--EXPECTF--
-
*** Testing mb_internal_encoding() : usage variations ***
-- Iteration 1 --
diff --git a/ext/mbstring/tests/mb_output_handler_euc_jp.phpt b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
index dff5c97743..1e99229dff 100644
--- a/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
+++ b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
@@ -16,6 +16,5 @@ $output = ob_get_clean();
var_dump( $output );
?>
-
--EXPECT--
string(73) "₯Ζ₯Ή₯ΘΝΡΖόΛάΈμΚΈ»ϊΞσ‘£€³€Ξ₯β₯Έ₯ε‘Ό₯λ€ΟPHP€Λ₯ή₯λ₯Α₯Π₯€₯Θ΄ΨΏτ€ςΔσΆ‘€·€ή€Ή‘£"
diff --git a/ext/mbstring/tests/mb_output_handler_shift_jis.phpt b/ext/mbstring/tests/mb_output_handler_shift_jis.phpt
index d4612d9775..01742d101e 100644
--- a/ext/mbstring/tests/mb_output_handler_shift_jis.phpt
+++ b/ext/mbstring/tests/mb_output_handler_shift_jis.phpt
@@ -11,6 +11,5 @@ mbstring.http_output=EUC-JP
// Shift_JIS
var_dump("ƒeƒXƒg—p“ϊ–{Œκ•ΆŽš—ρB‚±‚Μƒ‚ƒWƒ…[ƒ‹‚ΝPHP‚Ιƒ}ƒ‹ƒ`ƒoƒCƒgŠΦ”‚π’ρ‹Ÿ‚΅‚ά‚·B");
?>
-
--EXPECT--
string(73) "₯Ζ₯Ή₯ΘΝΡΖόΛάΈμΚΈ»ϊΞσ‘£€³€Ξ₯β₯Έ₯ε‘Ό₯λ€ΟPHP€Λ₯ή₯λ₯Α₯Π₯€₯Θ΄ΨΏτ€ςΔσΆ‘€·€ή€Ή‘£"
diff --git a/ext/mbstring/tests/mb_preferred_mime_name.phpt b/ext/mbstring/tests/mb_preferred_mime_name.phpt
index 071c2b1ef2..1fa73421f6 100644
--- a/ext/mbstring/tests/mb_preferred_mime_name.phpt
+++ b/ext/mbstring/tests/mb_preferred_mime_name.phpt
@@ -40,7 +40,6 @@ var_dump(mb_preferred_mime_name('BAD_NAME'));
// No preferred name
var_dump(mb_preferred_mime_name('auto'));
?>
-
--EXPECTF--
Shift_JIS
Shift_JIS
diff --git a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt
index baaab535d4..0ef9eb4384 100644
--- a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt
@@ -417,4 +417,4 @@ string(6) "EUC-KR"
string(6) "EUC-KR"
bool(true)
string(5) "KOI8R"
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_regex_set_options.phpt b/ext/mbstring/tests/mb_regex_set_options.phpt
index 26c8a998f8..301df8f118 100644
--- a/ext/mbstring/tests/mb_regex_set_options.phpt
+++ b/ext/mbstring/tests/mb_regex_set_options.phpt
@@ -13,6 +13,5 @@ function_exists('mb_regex_set_options') or die("skip\n");
mb_regex_set_options( '' );
print mb_ereg_replace(' -', '+', '- - - - -' );
?>
-
--EXPECT--
+ + + + +-++++
diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt
index f25ab1615c..216beec1cc 100644
--- a/ext/mbstring/tests/mb_split.phpt
+++ b/ext/mbstring/tests/mb_split.phpt
@@ -35,7 +35,6 @@ mbstring.func_overload=0
verify_split( "\xa1\xa1+", "\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1", $i );
}
?>
-
--EXPECT--
bool(true)
ok
@@ -46,4 +45,3 @@ ok
2-2
3-3
4-4
-
diff --git a/ext/mbstring/tests/mb_strcut.phpt b/ext/mbstring/tests/mb_strcut.phpt
index 7c78ffe02f..e6845db025 100644
--- a/ext/mbstring/tests/mb_strcut.phpt
+++ b/ext/mbstring/tests/mb_strcut.phpt
@@ -24,11 +24,8 @@ $str = mb_strcut($euc_jp, -100, 10,'EUC-JP');
?>
-
--EXPECT--
€ΞΚΈ
0123€³€ΞΚΈ»ϊΞσ€ΟΖόΛάΈμ€Η€Ή‘£EUC-JP€ς»Θ€Γ€Ζ€€€ή€Ή‘£ΖόΛάΈμ€ΟΜΜΕέ½­€€‘£
OK
OK: 0123€³€ΞΚΈ
-
-
diff --git a/ext/mbstring/tests/mb_strimwidth.phpt b/ext/mbstring/tests/mb_strimwidth.phpt
index f257604c6b..8d23276f2f 100644
--- a/ext/mbstring/tests/mb_strimwidth.phpt
+++ b/ext/mbstring/tests/mb_strimwidth.phpt
@@ -37,7 +37,6 @@ $str = mb_strimwidth($euc_jp, -10, -12,'...','EUC-JP');
($str === FALSE) ? print "13 OK\n" : print "NG: $str\n";
?>
-
--EXPECT--
String width: 68
1: 0123€³€ΞΚΈ»ϊ...
diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt
index 3038bb3450..23a8b6c5a2 100644
--- a/ext/mbstring/tests/mb_stripos_basic2.phpt
+++ b/ext/mbstring/tests/mb_stripos_basic2.phpt
@@ -126,4 +126,3 @@ int(11)
int(2)
int(11)
Done
-
diff --git a/ext/mbstring/tests/mb_stripos_variation2.phpt b/ext/mbstring/tests/mb_stripos_variation2.phpt
index b92aceecdb..bb49022e0f 100644
--- a/ext/mbstring/tests/mb_stripos_variation2.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation2.phpt
@@ -197,4 +197,3 @@ bool(false)
Warning: mb_stripos() expects parameter 2 to be string, resource given in %s on line %d
NULL
Done
-
diff --git a/ext/mbstring/tests/mb_stripos_variation4.phpt b/ext/mbstring/tests/mb_stripos_variation4.phpt
index e762bb4e71..b2109ee8e0 100644
--- a/ext/mbstring/tests/mb_stripos_variation4.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation4.phpt
@@ -105,7 +105,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_stripos() : usage variations ***
diff --git a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
index 436ac90811..cc05393a55 100644
--- a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
@@ -43,7 +43,6 @@ for ($i = -30; $i <= 60; $i += 10) {
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_stripos() : usage variations ***
diff --git a/ext/mbstring/tests/mb_stristr_variation1.phpt b/ext/mbstring/tests/mb_stristr_variation1.phpt
index 8f01425221..15b4c864c8 100644
--- a/ext/mbstring/tests/mb_stristr_variation1.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation1.phpt
@@ -205,4 +205,3 @@ bool(false)
Error: 2 - mb_stristr() expects parameter 1 to be string, resource given, %s(%d)
NULL
===DONE===
-
diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt
index 5842a8c6fd..2352e82beb 100644
--- a/ext/mbstring/tests/mb_stristr_variation2.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation2.phpt
@@ -213,4 +213,3 @@ bool(false)
Error: 2 - mb_stristr() expects parameter 2 to be string, resource given, %s(%d)
NULL
===DONE===
-
diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt
index 512d76de04..0ab540b959 100644
--- a/ext/mbstring/tests/mb_strlen.phpt
+++ b/ext/mbstring/tests/mb_strlen.phpt
@@ -73,7 +73,6 @@ echo $r."\n";
?>
-
--EXPECT--
== ASCII ==
40
@@ -96,6 +95,3 @@ ERR: Warning
ERR: Warning
ERR: Warning
-
-
-
diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt
index 421c4d984b..2da54e6fe9 100644
--- a/ext/mbstring/tests/mb_strlen_basic.phpt
+++ b/ext/mbstring/tests/mb_strlen_basic.phpt
@@ -30,7 +30,6 @@ var_dump(mb_strlen($string_mb, 'UTF-8'));
echo "\nDone";
?>
-
--EXPECT--
*** Testing mb_strlen() : basic functionality***
diff --git a/ext/mbstring/tests/mb_strlen_variation2.phpt b/ext/mbstring/tests/mb_strlen_variation2.phpt
index 9311127131..17c1e0c6e6 100644
--- a/ext/mbstring/tests/mb_strlen_variation2.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation2.phpt
@@ -102,7 +102,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strlen() : usage variations ***
diff --git a/ext/mbstring/tests/mb_strpos_basic.phpt b/ext/mbstring/tests/mb_strpos_basic.phpt
index f55ec59f6e..9965120e23 100644
--- a/ext/mbstring/tests/mb_strpos_basic.phpt
+++ b/ext/mbstring/tests/mb_strpos_basic.phpt
@@ -54,4 +54,4 @@ int(0)
-- Multibyte string 2 --
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strpos_variation4.phpt b/ext/mbstring/tests/mb_strpos_variation4.phpt
index f9b8d9bcfd..a9b168c573 100644
--- a/ext/mbstring/tests/mb_strpos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation4.phpt
@@ -104,7 +104,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strpos() : usage variations ***
diff --git a/ext/mbstring/tests/mb_strpos_variation5.phpt b/ext/mbstring/tests/mb_strpos_variation5.phpt
index 404af22c45..097c8dccb4 100644
--- a/ext/mbstring/tests/mb_strpos_variation5.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation5.phpt
@@ -43,7 +43,6 @@ for ($i = -30; $i <= 60; $i += 10) {
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strpos() : usage variations ***
diff --git a/ext/mbstring/tests/mb_strrchr_basic.phpt b/ext/mbstring/tests/mb_strrchr_basic.phpt
index 2d8b8009c0..f13780cf3b 100644
--- a/ext/mbstring/tests/mb_strrchr_basic.phpt
+++ b/ext/mbstring/tests/mb_strrchr_basic.phpt
@@ -61,4 +61,4 @@ string(0) ""
-- Multibyte string: needle doesn't exist --
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/mbstring/tests/mb_strrchr_variation6.phpt b/ext/mbstring/tests/mb_strrchr_variation6.phpt
index 053a1cf726..8b3108bf69 100644
--- a/ext/mbstring/tests/mb_strrchr_variation6.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation6.phpt
@@ -62,4 +62,4 @@ bool(false)
string(52) "cebccebdcebecebfcf80cf81cf83cf84cf85cf86cf87cf88cf89"
bool(false)
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/mbstring/tests/mb_strrichr_variation5.phpt b/ext/mbstring/tests/mb_strrichr_variation5.phpt
index be28a5955c..a6846cd124 100644
--- a/ext/mbstring/tests/mb_strrichr_variation5.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation5.phpt
@@ -66,4 +66,4 @@ string(20) "ce9cce9dcebecebfcea0"
string(42) "cebacebbcebccebdcebece9fcea0cea120cebacebb"
string(20) "ce9cce9dcebecebfcea0"
string(42) "cebacebbcebccebdcebece9fcea0cea120cebacebb"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
index d542b54b3d..ed0707e6bb 100644
--- a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
@@ -204,4 +204,3 @@ int(8)
Warning: mb_strripos() expects parameter 3 to be int, resource given in %s on line %d
NULL
Done
-
diff --git a/ext/mbstring/tests/mb_strripos_variation4.phpt b/ext/mbstring/tests/mb_strripos_variation4.phpt
index 195060be07..72ce6865a8 100644
--- a/ext/mbstring/tests/mb_strripos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation4.phpt
@@ -105,7 +105,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strripos() : usage variations ***
diff --git a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
index 11d289f52d..fd8f6ae226 100644
--- a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
@@ -44,7 +44,6 @@ for ($i = -10; $i <= 60; $i += 10) {
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strripos() : usage variations ***
@@ -112,4 +111,3 @@ bool(false)
Warning: mb_strripos(): Offset is greater than the length of haystack string in %s on line %d
bool(false)
Done
-
diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt
index bf035a412d..d9df624bea 100644
--- a/ext/mbstring/tests/mb_strrpos_basic.phpt
+++ b/ext/mbstring/tests/mb_strrpos_basic.phpt
@@ -55,4 +55,3 @@ int(20)
-- Multibyte string 2 --
bool(false)
Done
-
diff --git a/ext/mbstring/tests/mb_strrpos_variation1.phpt b/ext/mbstring/tests/mb_strrpos_variation1.phpt
index cd6c111206..9376443cf4 100644
--- a/ext/mbstring/tests/mb_strrpos_variation1.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation1.phpt
@@ -101,7 +101,6 @@ foreach($inputs as $input) {
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strrpos() : usage variations ***
diff --git a/ext/mbstring/tests/mb_strrpos_variation2.phpt b/ext/mbstring/tests/mb_strrpos_variation2.phpt
index 8a23321c02..85c951eb83 100644
--- a/ext/mbstring/tests/mb_strrpos_variation2.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation2.phpt
@@ -103,7 +103,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strrpos() : usage variations ***
diff --git a/ext/mbstring/tests/mb_strrpos_variation4.phpt b/ext/mbstring/tests/mb_strrpos_variation4.phpt
index a7011dd278..3e1f6c9703 100644
--- a/ext/mbstring/tests/mb_strrpos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation4.phpt
@@ -104,7 +104,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strrpos() : usage variations ***
diff --git a/ext/mbstring/tests/mb_strstr_basic.phpt b/ext/mbstring/tests/mb_strstr_basic.phpt
index 5a9068e606..b7632020c5 100644
--- a/ext/mbstring/tests/mb_strstr_basic.phpt
+++ b/ext/mbstring/tests/mb_strstr_basic.phpt
@@ -61,4 +61,4 @@ string(0) ""
-- Multibyte string: needle doesn't exist --
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/mbstring/tests/mb_strtolower_variation1.phpt b/ext/mbstring/tests/mb_strtolower_variation1.phpt
index 057fc299ce..004660ff1f 100644
--- a/ext/mbstring/tests/mb_strtolower_variation1.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation1.phpt
@@ -175,4 +175,4 @@ string(0) ""
Warning: mb_strtolower() 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/mbstring/tests/mb_strtolower_variation3.phpt b/ext/mbstring/tests/mb_strtolower_variation3.phpt
index bf918df182..bd0bd58c44 100644
--- a/ext/mbstring/tests/mb_strtolower_variation3.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation3.phpt
@@ -43,7 +43,6 @@ if ($b == $string_all_mb) { // Japanese characters only - should not be any conv
echo "Done";
?>
-
--EXPECT--
*** Testing mb_strtolower() : usage variations ***
diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt
index 05091b4752..17bd8c7fe2 100644
--- a/ext/mbstring/tests/mb_strtolower_variation4.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt
@@ -38,7 +38,6 @@ foreach ($uppers as $lang => $sourcestring) {
echo "Done";
?>
-
--EXPECT--
*** Testing mb_strtolower() : usage variations ***
@@ -53,4 +52,4 @@ Correctly Converted
-- Russian --
string(24) "0LDQsdCy0LPQtNC10LbQtw=="
Correctly Converted
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtoupper_basic.phpt b/ext/mbstring/tests/mb_strtoupper_basic.phpt
index e8f48345fe..72601442fd 100644
--- a/ext/mbstring/tests/mb_strtoupper_basic.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_basic.phpt
@@ -46,7 +46,6 @@ if ($mb == $greek_upper) {
echo "Done";
?>
-
--EXPECT--
*** Testing mb_strtoupper() : basic functionality ***
@@ -57,4 +56,4 @@ Correctly converted
-- Multibyte String --
string(64) "zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p"
Correctly converted
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strtoupper_error1.phpt b/ext/mbstring/tests/mb_strtoupper_error1.phpt
index c14d2f1b5c..e475a7d2e6 100644
--- a/ext/mbstring/tests/mb_strtoupper_error1.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_error1.phpt
@@ -31,7 +31,6 @@ var_dump( mb_strtoupper() );
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strtoupper() : error conditions ***
diff --git a/ext/mbstring/tests/mb_strtoupper_error2.phpt b/ext/mbstring/tests/mb_strtoupper_error2.phpt
index cf42926577..07c6763550 100644
--- a/ext/mbstring/tests/mb_strtoupper_error2.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_error2.phpt
@@ -25,7 +25,6 @@ var_dump( mb_strtoupper($sourcestring, $encoding) );
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strtoupper() : error conditions ***
diff --git a/ext/mbstring/tests/mb_strtoupper_variation1.phpt b/ext/mbstring/tests/mb_strtoupper_variation1.phpt
index 6331db27ba..3bf6e18103 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation1.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation1.phpt
@@ -101,7 +101,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strtoupper() : usage variations ***
@@ -178,4 +177,4 @@ string(0) ""
Warning: mb_strtoupper() 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/mbstring/tests/mb_strtoupper_variation2.phpt b/ext/mbstring/tests/mb_strtoupper_variation2.phpt
index d92b773ba4..498f94fba4 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt
@@ -108,7 +108,6 @@ fclose($fp);
echo "Done";
?>
-
--EXPECTF--
*** Testing mb_strtoupper() : usage variations ***
diff --git a/ext/mbstring/tests/mb_strtoupper_variation3.phpt b/ext/mbstring/tests/mb_strtoupper_variation3.phpt
index de77f39225..3a40cb9bf3 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation3.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation3.phpt
@@ -44,7 +44,6 @@ if ($b == $string_all_mb) { // Japanese characters only - should not be any conv
echo "Done";
?>
-
--EXPECT--
*** Testing mb_strtoupper() : usage variations ***
diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt
index 0c4caf6fd1..7b126e671b 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt
@@ -39,7 +39,6 @@ foreach ($lowers as $lang => $sourcestring) {
echo "Done";
?>
-
--EXPECT--
*** Testing mb_strtoupper() : usage variations ***
@@ -54,4 +53,4 @@ Correctly Converted
-- Russian --
string(24) "0JDQkdCS0JPQlNCV0JbQlw=="
Correctly Converted
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_strwidth.phpt b/ext/mbstring/tests/mb_strwidth.phpt
index da439b4a20..25210078b8 100644
--- a/ext/mbstring/tests/mb_strwidth.phpt
+++ b/ext/mbstring/tests/mb_strwidth.phpt
@@ -27,6 +27,5 @@ $str = mb_strwidth($euc_jp, -100, 10,'...','EUC-JP');
($str !== "") ? print "6 OK: $str\n" : print "NG: $str\n";
*/
?>
-
--EXPECT--
1: 68
diff --git a/ext/mbstring/tests/mb_substitute_character_error.phpt b/ext/mbstring/tests/mb_substitute_character_error.phpt
index 4fe13683ea..29b93b638d 100644
--- a/ext/mbstring/tests/mb_substitute_character_error.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_error.phpt
@@ -32,4 +32,3 @@ var_dump( mb_substitute_character($substchar, $extra_arg) );
Warning: mb_substitute_character() expects at most 1 parameter, 2 given in %s on line %d
NULL
===DONE===
-
diff --git a/ext/mbstring/tests/mb_substitute_character_variation1.phpt b/ext/mbstring/tests/mb_substitute_character_variation1.phpt
index 10df85ea27..f738876469 100644
--- a/ext/mbstring/tests/mb_substitute_character_variation1.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt
@@ -228,4 +228,3 @@ bool(false)
Error: 2 - mb_substitute_character(): Unknown character, %s(%d)
bool(false)
===DONE===
-
diff --git a/ext/mbstring/tests/mb_substr.phpt b/ext/mbstring/tests/mb_substr.phpt
index 94a0d8e368..28b35ea910 100644
--- a/ext/mbstring/tests/mb_substr.phpt
+++ b/ext/mbstring/tests/mb_substr.phpt
@@ -25,11 +25,8 @@ $str = mb_substr($euc_jp, -100, 10,'EUC-JP');
($str !== "") ? print "4 OK: ".bin2hex($str)."\n" : print "NG: ".bin2hex($str)."\n";
?>
-
--EXPECT--
1: c6fccbdcb8eca4c7a4b9a1a34555432d
2: 30313233a4b3a4cecab8bbfacef3a4cfc6fccbdcb8eca4c7a4b9a1a34555432d4a50a4f2bbc8a4c3a4c6a4a4a4dea4b9a1a3c6fccbdcb8eca4cfccccc5ddbdada4a4a1a3
3 OK
4 OK: 30313233a4b3a4cecab8bbfacef3a4cf
-
-
diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt
index 3b1e442724..2324ed0939 100644
--- a/ext/mbstring/tests/mb_substr_count_variation3.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt
@@ -217,4 +217,4 @@ bool(false)
Warning: mb_substr_count() 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/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt
index c38e3adca4..29d1d6e22e 100644
--- a/ext/mbstring/tests/mb_substr_count_variation4.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt
@@ -41,4 +41,4 @@ int(1)
-- Multibyte String --
int(1)
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_variation1.phpt b/ext/mbstring/tests/mb_substr_variation1.phpt
index 6e5ec9ef2b..5fa4f25975 100644
--- a/ext/mbstring/tests/mb_substr_variation1.phpt
+++ b/ext/mbstring/tests/mb_substr_variation1.phpt
@@ -178,4 +178,3 @@ string(0) ""
Warning: mb_substr() expects parameter 1 to be string, resource given in %s on line %d
NULL
Done
-
diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt
index 5a72406b6b..d65774ab60 100644
--- a/ext/mbstring/tests/mb_substr_variation2.phpt
+++ b/ext/mbstring/tests/mb_substr_variation2.phpt
@@ -224,4 +224,3 @@ bool(false)
Warning: mb_substr() expects parameter 4 to be string, resource given in %s on line %d
string(0) ""
Done
-
diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt
index f4a4643421..c31af9b9ef 100644
--- a/ext/mbstring/tests/mb_substr_variation4.phpt
+++ b/ext/mbstring/tests/mb_substr_variation4.phpt
@@ -129,4 +129,4 @@ string(0) ""
string(0) ""
--Multibyte String --
string(0) ""
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt
index a9be0686fa..94231a4624 100644
--- a/ext/mbstring/tests/mb_substr_variation5.phpt
+++ b/ext/mbstring/tests/mb_substr_variation5.phpt
@@ -130,4 +130,4 @@ string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=
string(28) "SXMgYW4gRW5nbGlzaCBzdHJpbmc="
--Multibyte String --
string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_variation6.phpt b/ext/mbstring/tests/mb_substr_variation6.phpt
index b1783c839f..172ab962b0 100644
--- a/ext/mbstring/tests/mb_substr_variation6.phpt
+++ b/ext/mbstring/tests/mb_substr_variation6.phpt
@@ -134,4 +134,4 @@ string(0) ""
string(0) ""
--Multibyte String --
string(0) ""
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/mb_substr_variation7.phpt b/ext/mbstring/tests/mb_substr_variation7.phpt
index da00d4b80a..909393177e 100644
--- a/ext/mbstring/tests/mb_substr_variation7.phpt
+++ b/ext/mbstring/tests/mb_substr_variation7.phpt
@@ -135,4 +135,4 @@ string(100) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efb
string(40) "497320616e20456e676c69736820737472696e67"
--Multibyte String --
string(100) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
-Done \ No newline at end of file
+Done
diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt
index 59e82ae07f..3b8cb79cd1 100644
--- a/ext/mbstring/tests/php_gr_jp_10830.phpt
+++ b/ext/mbstring/tests/php_gr_jp_10830.phpt
@@ -12,7 +12,6 @@ $a="aaa\n<>";
var_dump( mb_ereg("^[^><]+$",$a) );
var_dump( !!preg_match("/^[^><]+$/",$a) );
?>
-
--EXPECT--
bool(false)
bool(false)
diff --git a/ext/mbstring/tests/simpletest.phpt b/ext/mbstring/tests/simpletest.phpt
index b07b6f52bc..18a223e70c 100644
--- a/ext/mbstring/tests/simpletest.phpt
+++ b/ext/mbstring/tests/simpletest.phpt
@@ -31,4 +31,3 @@ print: ₯ή₯λ₯Α₯Π₯€₯Θ΄ΨΏτ€¬»Θ€¨€ή€Ή‘£€³€ΞΚΈ»ϊ€¬Ο’·λ€΅€μ€Ζ€€€λ€Ο€Ί‘£
printf: ₯ή₯λ₯Α₯Π₯€₯Θ΄ΨΏτ€¬»Θ€¨€ή€Ή‘£€³€ΞΚΈ»ϊ€¬Ο’·λ€΅€μ€Ζ€€€λ€Ο€Ί‘£
sprintf: ₯ή₯λ₯Α₯Π₯€₯Θ΄ΨΏτ€¬»Θ€¨€ή€Ή‘£€³€ΞΚΈ»ϊ€¬Ο’·λ€΅€μ€Ζ€€€λ€Ο€Ί‘£
echo: ₯ή₯λ₯Α₯Π₯€₯Θ΄ΨΏτ€¬»Θ€¨€ή€Ή‘£€³€ΞΚΈ»ϊ€¬Ο’·λ€΅€μ€Ζ€€€λ€Ο€Ί‘£
-
diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt
index ed09b2eecb..f7a72aea05 100644
--- a/ext/mysqli/tests/001.phpt
+++ b/ext/mysqli/tests/001.phpt
@@ -60,4 +60,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECTF--
%s(4) "1111"
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt
index 5a8dcae0c1..1c98577454 100644
--- a/ext/mysqli/tests/002.phpt
+++ b/ext/mysqli/tests/002.phpt
@@ -82,4 +82,4 @@ array(11) {
[10]=>
string(4) "1000"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt
index 2e2089d4b2..c526dfbdff 100644
--- a/ext/mysqli/tests/003.phpt
+++ b/ext/mysqli/tests/003.phpt
@@ -100,4 +100,4 @@ array(7) {
[6]=>
string(19) "1999-12-29 00:00:00"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt
index 349788eb92..e19d4c3119 100644
--- a/ext/mysqli/tests/004.phpt
+++ b/ext/mysqli/tests/004.phpt
@@ -86,4 +86,4 @@ array(2) {
[1]=>
string(15) "this is a test3"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt
index cbb1cccf96..e1f5be989f 100644
--- a/ext/mysqli/tests/005.phpt
+++ b/ext/mysqli/tests/005.phpt
@@ -58,4 +58,4 @@ array(2) {
[1]=>
string(13) "32K String ok"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt
index 2043cc5d07..d60c52fbde 100644
--- a/ext/mysqli/tests/006.phpt
+++ b/ext/mysqli/tests/006.phpt
@@ -73,4 +73,4 @@ array(7) {
[6]=>
int(0)
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt
index 26b5763bb4..86c7fc2e57 100644
--- a/ext/mysqli/tests/007.phpt
+++ b/ext/mysqli/tests/007.phpt
@@ -73,4 +73,4 @@ array(7) {
[6]=>
int(0)
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt
index 0ae09df842..f36e524d11 100644
--- a/ext/mysqli/tests/008.phpt
+++ b/ext/mysqli/tests/008.phpt
@@ -73,4 +73,4 @@ array(7) {
[6]=>
int(0)
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt
index 7807929348..906c0f027b 100644
--- a/ext/mysqli/tests/009.phpt
+++ b/ext/mysqli/tests/009.phpt
@@ -113,4 +113,4 @@ array(8) {
}
20123456
3123456789
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt
index 421899d10a..21fd278489 100644
--- a/ext/mysqli/tests/013.phpt
+++ b/ext/mysqli/tests/013.phpt
@@ -69,4 +69,4 @@ mysqli_close($link);
?>
--EXPECT--
ok
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt
index de950b00f7..bad4105623 100644
--- a/ext/mysqli/tests/015.phpt
+++ b/ext/mysqli/tests/015.phpt
@@ -91,4 +91,4 @@ array(2) {
[1]=>
string(4) "egon"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt
index 60170a727e..b534f7d455 100644
--- a/ext/mysqli/tests/016.phpt
+++ b/ext/mysqli/tests/016.phpt
@@ -30,4 +30,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECT--
string(6) "foobar"
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt
index ee2713672d..7196ad48c6 100644
--- a/ext/mysqli/tests/017.phpt
+++ b/ext/mysqli/tests/017.phpt
@@ -40,4 +40,4 @@ array(3) {
[2]=>
string(3) "foo"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/018.phpt b/ext/mysqli/tests/018.phpt
index d5466e2241..8b3c960924 100644
--- a/ext/mysqli/tests/018.phpt
+++ b/ext/mysqli/tests/018.phpt
@@ -30,4 +30,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECT--
int(0)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt
index 06f03c0cf1..4688ff9f8a 100644
--- a/ext/mysqli/tests/019.phpt
+++ b/ext/mysqli/tests/019.phpt
@@ -91,4 +91,4 @@ array(11) {
[10]=>
string(6) "foobar"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt
index 6512cd8b9c..57016de4b8 100644
--- a/ext/mysqli/tests/020.phpt
+++ b/ext/mysqli/tests/020.phpt
@@ -95,4 +95,4 @@ array(7) {
[6]=>
%s(19) "1999-12-29 00:00:00"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt
index 2011ae630d..d9cf52eddc 100644
--- a/ext/mysqli/tests/021.phpt
+++ b/ext/mysqli/tests/021.phpt
@@ -56,4 +56,4 @@ array(2) {
[1]=>
string(14) "this is a test"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt
index 81450d2845..fd8036fd1a 100644
--- a/ext/mysqli/tests/022.phpt
+++ b/ext/mysqli/tests/022.phpt
@@ -61,4 +61,4 @@ array(2) {
[1]=>
%s(13) "32K String ok"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt
index 2528519ebd..17a8abce77 100644
--- a/ext/mysqli/tests/023.phpt
+++ b/ext/mysqli/tests/023.phpt
@@ -80,4 +80,4 @@ array(7) {
[6]=>
int(0)
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt
index 893ca0dce3..5294a24883 100644
--- a/ext/mysqli/tests/024.phpt
+++ b/ext/mysqli/tests/024.phpt
@@ -80,4 +80,4 @@ array(7) {
[6]=>
int(0)
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt
index 937d624165..3b472f9513 100644
--- a/ext/mysqli/tests/025.phpt
+++ b/ext/mysqli/tests/025.phpt
@@ -85,4 +85,4 @@ array(7) {
[6]=>
int(0)
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt
index 14b8dcbdba..51b2b774bb 100644
--- a/ext/mysqli/tests/026.phpt
+++ b/ext/mysqli/tests/026.phpt
@@ -62,4 +62,4 @@ array(2) {
[1]=>
string(99) "This is the first sentence. And this is the second sentence. And finally this is the last sentence."
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/027.phpt b/ext/mysqli/tests/027.phpt
index 69233d683e..f4d985a744 100644
--- a/ext/mysqli/tests/027.phpt
+++ b/ext/mysqli/tests/027.phpt
@@ -21,4 +21,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECT--
bool(true)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt
index 67e54d632c..e8d3835374 100644
--- a/ext/mysqli/tests/028.phpt
+++ b/ext/mysqli/tests/028.phpt
@@ -21,4 +21,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECTF--
string(%d) "%s"
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt
index 936420649d..cf59999eaf 100644
--- a/ext/mysqli/tests/029.phpt
+++ b/ext/mysqli/tests/029.phpt
@@ -39,4 +39,4 @@ mysqli_close($link);
?>
--EXPECT--
int(3)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/030.phpt b/ext/mysqli/tests/030.phpt
index c4b1710439..e51aec3734 100644
--- a/ext/mysqli/tests/030.phpt
+++ b/ext/mysqli/tests/030.phpt
@@ -27,4 +27,4 @@ require_once('skipifconnectfailure.inc');
--EXPECT--
int(0)
int(1146)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt
index 9360b4f3d4..8518b45a3e 100644
--- a/ext/mysqli/tests/031.phpt
+++ b/ext/mysqli/tests/031.phpt
@@ -27,4 +27,4 @@ require_once('skipifconnectfailure.inc');
--EXPECTF--
string(0) ""
string(%d) "%s"
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt
index d6427e7815..27d8fb3fa5 100644
--- a/ext/mysqli/tests/032.phpt
+++ b/ext/mysqli/tests/032.phpt
@@ -39,4 +39,4 @@ mysqli_close($link);
?>
--EXPECT--
string(38) "Records: 3 Duplicates: 0 Warnings: 0"
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt
index 7ed9ba7523..2ac4896432 100644
--- a/ext/mysqli/tests/033.phpt
+++ b/ext/mysqli/tests/033.phpt
@@ -22,4 +22,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECTF--
string(%d) "%s via %s"
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/034.phpt b/ext/mysqli/tests/034.phpt
index 3fda560080..1eae37e1a5 100644
--- a/ext/mysqli/tests/034.phpt
+++ b/ext/mysqli/tests/034.phpt
@@ -22,4 +22,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECT--
int(10)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/035.phpt b/ext/mysqli/tests/035.phpt
index 7b18e027b8..8e755b9846 100644
--- a/ext/mysqli/tests/035.phpt
+++ b/ext/mysqli/tests/035.phpt
@@ -21,4 +21,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECT--
int(1)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt
index b0d259c3f4..919625c8cd 100644
--- a/ext/mysqli/tests/036.phpt
+++ b/ext/mysqli/tests/036.phpt
@@ -60,4 +60,4 @@ array(2) {
[1]=>
bool(true)
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt
index 03d5d5562c..5826a9834e 100644
--- a/ext/mysqli/tests/037.phpt
+++ b/ext/mysqli/tests/037.phpt
@@ -50,4 +50,4 @@ array(2) {
[1]=>
int(2)
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/039.phpt b/ext/mysqli/tests/039.phpt
index ae881e1d2d..bde6460d97 100644
--- a/ext/mysqli/tests/039.phpt
+++ b/ext/mysqli/tests/039.phpt
@@ -27,4 +27,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECT--
int(2)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt
index 3e28883550..a860f30d81 100644
--- a/ext/mysqli/tests/040.phpt
+++ b/ext/mysqli/tests/040.phpt
@@ -44,4 +44,4 @@ mysqli_close($link);
?>
--EXPECT--
int(1)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/041.phpt b/ext/mysqli/tests/041.phpt
index ec67e476ca..86ddd67069 100644
--- a/ext/mysqli/tests/041.phpt
+++ b/ext/mysqli/tests/041.phpt
@@ -35,4 +35,4 @@ mysqli_close($link);
?>
--EXPECT--
int(1)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt
index 2a324f7e40..e84dfc2a10 100644
--- a/ext/mysqli/tests/042.phpt
+++ b/ext/mysqli/tests/042.phpt
@@ -76,4 +76,4 @@ object(stdClass)#%d (7) {
["c7"]=>
string(1) "0"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt
index 964e38330e..daf79ebbe4 100644
--- a/ext/mysqli/tests/043.phpt
+++ b/ext/mysqli/tests/043.phpt
@@ -56,4 +56,4 @@ array(1) {
[0]=>
string(15) "Rasmus is No. 1"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/044.phpt b/ext/mysqli/tests/044.phpt
index 3ddae3e420..7dbbbb20a2 100644
--- a/ext/mysqli/tests/044.phpt
+++ b/ext/mysqli/tests/044.phpt
@@ -23,4 +23,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECT--
int(1)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt
index 1abc5e7bb6..8e4b8c3b2c 100644
--- a/ext/mysqli/tests/046.phpt
+++ b/ext/mysqli/tests/046.phpt
@@ -47,4 +47,4 @@ mysqli_close($link);
?>
--EXPECT--
bool(true)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt
index 064bb42bb3..a89488fa58 100644
--- a/ext/mysqli/tests/047.phpt
+++ b/ext/mysqli/tests/047.phpt
@@ -234,4 +234,4 @@ object(stdClass)#5 (13) {
["decimals"]=>
int(0)
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt
index 6f55d03716..9328e0e282 100644
--- a/ext/mysqli/tests/048.phpt
+++ b/ext/mysqli/tests/048.phpt
@@ -76,4 +76,4 @@ array(11) {
[10]=>
string(4) "1000"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt
index e91d8c26ef..7128de8d38 100644
--- a/ext/mysqli/tests/049.phpt
+++ b/ext/mysqli/tests/049.phpt
@@ -30,4 +30,4 @@ array(1) {
[0]=>
string(%d) "%s"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt
index 00bb90724c..dab3dfa78d 100644
--- a/ext/mysqli/tests/057.phpt
+++ b/ext/mysqli/tests/057.phpt
@@ -110,4 +110,4 @@ array(1) {
[0]=>
string(1) "1"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt
index 0c75488dd6..e839e7e64e 100644
--- a/ext/mysqli/tests/058.phpt
+++ b/ext/mysqli/tests/058.phpt
@@ -70,4 +70,4 @@ array(4) {
[3]=>
string(3) "bar"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt
index a05acb825b..0632553143 100644
--- a/ext/mysqli/tests/059.phpt
+++ b/ext/mysqli/tests/059.phpt
@@ -54,4 +54,4 @@ mysqli_close($link);
?>
--EXPECT--
string(6) "foobar"
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt
index 04d6c8a015..9043dd7def 100644
--- a/ext/mysqli/tests/060.phpt
+++ b/ext/mysqli/tests/060.phpt
@@ -71,4 +71,4 @@ object(test_class)#%d (7) {
["c7"]=>
string(1) "0"
}
-Done \ No newline at end of file
+Done
diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt
index fa02853a19..b10485d5a2 100644
--- a/ext/mysqli/tests/062.phpt
+++ b/ext/mysqli/tests/062.phpt
@@ -27,4 +27,4 @@ array(1) {
[0]=>
string(3) "foo"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt
index c4852ac91d..b1d5314278 100644
--- a/ext/mysqli/tests/063.phpt
+++ b/ext/mysqli/tests/063.phpt
@@ -21,4 +21,4 @@ require_once('skipifconnectfailure.inc');
var_dump($foo);
?>
--EXPECT--
-string(3) "foo" \ No newline at end of file
+string(3) "foo"
diff --git a/ext/mysqli/tests/067.phpt b/ext/mysqli/tests/067.phpt
index d5795bdee8..e36993bb6b 100644
--- a/ext/mysqli/tests/067.phpt
+++ b/ext/mysqli/tests/067.phpt
@@ -78,4 +78,4 @@ for ($i =0; $i < 3; $i++) {
mysqli_close($link);
?>
--EXPECT--
-int(63) \ No newline at end of file
+int(63)
diff --git a/ext/mysqli/tests/068.phpt b/ext/mysqli/tests/068.phpt
index 0d7899d177..17160f78f1 100644
--- a/ext/mysqli/tests/068.phpt
+++ b/ext/mysqli/tests/068.phpt
@@ -8,4 +8,4 @@ mysqli get_client_info
echo gettype($s);
?>
--EXPECT--
-string \ No newline at end of file
+string
diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt
index c195173188..29ed2fd94a 100644
--- a/ext/mysqli/tests/069.phpt
+++ b/ext/mysqli/tests/069.phpt
@@ -35,4 +35,4 @@ array(1) {
[2]=>
string(1) "2"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/070.phpt b/ext/mysqli/tests/070.phpt
index b71d9b2e49..6452d6ab78 100644
--- a/ext/mysqli/tests/070.phpt
+++ b/ext/mysqli/tests/070.phpt
@@ -16,4 +16,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECT--
bool(true)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt
index 6f45777978..48b719c629 100644
--- a/ext/mysqli/tests/071.phpt
+++ b/ext/mysqli/tests/071.phpt
@@ -71,4 +71,4 @@ bool(true)
bool(false)
bool(true)
bool(false)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt
index 3aaef33c67..997469d39c 100644
--- a/ext/mysqli/tests/072.phpt
+++ b/ext/mysqli/tests/072.phpt
@@ -29,4 +29,4 @@ int(1)
int(1051)
string(%d) "Unknown table %snot_exists%s"
string(5) "HY000"
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/073.phpt b/ext/mysqli/tests/073.phpt
index 90fae8b7c6..86e54ffc93 100644
--- a/ext/mysqli/tests/073.phpt
+++ b/ext/mysqli/tests/073.phpt
@@ -21,4 +21,4 @@ string(%d) "%s"
int(%d)
bool(%s)
int(%d)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt
index b790f62839..a10f11136b 100644
--- a/ext/mysqli/tests/074.phpt
+++ b/ext/mysqli/tests/074.phpt
@@ -31,4 +31,4 @@ bool(true)
array(1) {
[0]=>
string(1) "1"
-} \ No newline at end of file
+}
diff --git a/ext/mysqli/tests/bug32490.phpt b/ext/mysqli/tests/bug32490.phpt
index 3d877c0d9c..4f9ef6f80d 100644
--- a/ext/mysqli/tests/bug32490.phpt
+++ b/ext/mysqli/tests/bug32490.phpt
@@ -10,4 +10,3 @@ var_dump(method_exists("mysqli", "__construct"));
--EXPECT--
bool(false)
bool(true)
-
diff --git a/ext/mysqli/tests/bug33263.phpt b/ext/mysqli/tests/bug33263.phpt
index 33c5dbbc56..e9ca36fe49 100644
--- a/ext/mysqli/tests/bug33263.phpt
+++ b/ext/mysqli/tests/bug33263.phpt
@@ -34,4 +34,4 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/bug35759.phpt b/ext/mysqli/tests/bug35759.phpt
index 99c1380d95..d6d7a7582b 100644
--- a/ext/mysqli/tests/bug35759.phpt
+++ b/ext/mysqli/tests/bug35759.phpt
@@ -55,4 +55,4 @@ require_once('skipifconnectfailure.inc');
--CLEAN--
<?php require("clean_table.inc"); ?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/bug38710.phpt b/ext/mysqli/tests/bug38710.phpt
index b5baf19442..7a47003632 100644
--- a/ext/mysqli/tests/bug38710.phpt
+++ b/ext/mysqli/tests/bug38710.phpt
@@ -21,4 +21,4 @@ if ($text !== str_repeat('a', ($IS_MYSQLND || mysqli_get_server_version($db) > 5
echo "Done";
?>
--EXPECT--
-Done \ No newline at end of file
+Done
diff --git a/ext/mysqli/tests/bug42548.phpt b/ext/mysqli/tests/bug42548.phpt
index ef0c831e4d..8624250eb1 100644
--- a/ext/mysqli/tests/bug42548.phpt
+++ b/ext/mysqli/tests/bug42548.phpt
@@ -72,4 +72,4 @@ Array
)
----- next result -----------
no results found
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/bug44897.phpt b/ext/mysqli/tests/bug44897.phpt
index 89853a3acf..948e4aaee7 100644
--- a/ext/mysqli/tests/bug44897.phpt
+++ b/ext/mysqli/tests/bug44897.phpt
@@ -84,6 +84,5 @@ mysqli_query($link, "DROP PROCEDURE IF EXISTS p");
mysqli_close($link);
?>
-
--EXPECT--
done!
diff --git a/ext/mysqli/tests/bug48909.phpt b/ext/mysqli/tests/bug48909.phpt
index 94bf4236dc..ef46c97c6a 100644
--- a/ext/mysqli/tests/bug48909.phpt
+++ b/ext/mysqli/tests/bug48909.phpt
@@ -43,4 +43,4 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECT--
-done \ No newline at end of file
+done
diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt
index f20cbb1b11..d9093f0347 100644
--- a/ext/mysqli/tests/bug49442.phpt
+++ b/ext/mysqli/tests/bug49442.phpt
@@ -127,4 +127,4 @@ array(2) {
["label"]=>
string(1) "z"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/bug50772.phpt b/ext/mysqli/tests/bug50772.phpt
index 6d0ee6c24c..9f26135c60 100644
--- a/ext/mysqli/tests/bug50772.phpt
+++ b/ext/mysqli/tests/bug50772.phpt
@@ -33,4 +33,4 @@ require_once('skipifconnectfailure.inc');
--EXPECT--
ok 1
ok 2
-done \ No newline at end of file
+done
diff --git a/ext/mysqli/tests/bug52082.phpt b/ext/mysqli/tests/bug52082.phpt
index 815f79013a..11157195ab 100644
--- a/ext/mysqli/tests/bug52082.phpt
+++ b/ext/mysqli/tests/bug52082.phpt
@@ -47,4 +47,4 @@ array(2) {
[1]=>
string(6) "latin2"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/bug52891.phpt b/ext/mysqli/tests/bug52891.phpt
index 7e4758887f..22fcb735e3 100644
--- a/ext/mysqli/tests/bug52891.phpt
+++ b/ext/mysqli/tests/bug52891.phpt
@@ -157,4 +157,4 @@ array(1) {
["a"]=>
string(10) "4294967297"
}
-done \ No newline at end of file
+done
diff --git a/ext/mysqli/tests/bug53503.phpt b/ext/mysqli/tests/bug53503.phpt
index a34b7a3416..bb8d00109f 100644
--- a/ext/mysqli/tests/bug53503.phpt
+++ b/ext/mysqli/tests/bug53503.phpt
@@ -63,4 +63,4 @@ $link->close();
unlink('bug53503.data');
?>
--EXPECT--
-done \ No newline at end of file
+done
diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt
index 6ea62065b9..e7b16fdd13 100644
--- a/ext/mysqli/tests/bug55283.phpt
+++ b/ext/mysqli/tests/bug55283.phpt
@@ -72,4 +72,4 @@ array(2) {
[1]=>
string(7) "RC4-MD5"
}
-done \ No newline at end of file
+done
diff --git a/ext/mysqli/tests/bug55653.phpt b/ext/mysqli/tests/bug55653.phpt
index 1caff1a27a..80e654771c 100644
--- a/ext/mysqli/tests/bug55653.phpt
+++ b/ext/mysqli/tests/bug55653.phpt
@@ -33,4 +33,4 @@ require_once('skipifconnectfailure.inc');
echo "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/bug62046.phpt b/ext/mysqli/tests/bug62046.phpt
index 3ad913d951..e996de361d 100644
--- a/ext/mysqli/tests/bug62046.phpt
+++ b/ext/mysqli/tests/bug62046.phpt
@@ -37,4 +37,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECT--
int(42)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/bug66124.phpt b/ext/mysqli/tests/bug66124.phpt
index 9cb5f45726..d5dec314cf 100644
--- a/ext/mysqli/tests/bug66124.phpt
+++ b/ext/mysqli/tests/bug66124.phpt
@@ -98,4 +98,4 @@ fetch id:1311200011005001566
Using 's':
insert id:1311200011005001566
fetch id:1311200011005001566
-done \ No newline at end of file
+done
diff --git a/ext/mysqli/tests/bug66762.phpt b/ext/mysqli/tests/bug66762.phpt
index cf1309e5a2..f5240bc926 100644
--- a/ext/mysqli/tests/bug66762.phpt
+++ b/ext/mysqli/tests/bug66762.phpt
@@ -24,4 +24,4 @@ done!
--EXPECT--
bool(true)
bool(true)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/bug70384.phpt b/ext/mysqli/tests/bug70384.phpt
index 4e9ef3181e..0f062f0035 100644
--- a/ext/mysqli/tests/bug70384.phpt
+++ b/ext/mysqli/tests/bug70384.phpt
@@ -59,4 +59,4 @@ mysqli_float_handling - ensure 4 byte float is handled correctly
require_once("clean_table.inc");
?>
--EXPECT--
-OK \ No newline at end of file
+OK
diff --git a/ext/mysqli/tests/bug74737.phpt b/ext/mysqli/tests/bug74737.phpt
index 3651ac23cd..e3aca90ea7 100644
--- a/ext/mysqli/tests/bug74737.phpt
+++ b/ext/mysqli/tests/bug74737.phpt
@@ -12,7 +12,6 @@ echo $rf->getNumberOfParameters();
echo PHP_EOL;
echo $rf->getNumberOfRequiredParameters();
?>
-
--EXPECT--
0
0
diff --git a/ext/mysqli/tests/bug_mysql_49406.phpt b/ext/mysqli/tests/bug_mysql_49406.phpt
index 7ed7b447bf..74ea471702 100644
--- a/ext/mysqli/tests/bug_mysql_49406.phpt
+++ b/ext/mysqli/tests/bug_mysql_49406.phpt
@@ -104,4 +104,4 @@ Charsetnr : %d
Flags : %d
Type : %d (%s)
Decimals : %d
-done \ No newline at end of file
+done
diff --git a/ext/mysqli/tests/mysqli_auth_pam.phpt b/ext/mysqli/tests/mysqli_auth_pam.phpt
index b5dfad77cd..86c5c4809a 100644
--- a/ext/mysqli/tests/mysqli_auth_pam.phpt
+++ b/ext/mysqli/tests/mysqli_auth_pam.phpt
@@ -88,7 +88,6 @@ max_execution_time=240
mysqli_query($link, 'DROP USER pamtest@localhost');
?>
--EXPECTF--
-
Warning: mysqli_real_connect(): (28000/1045): Access denied for user %s
[001] Cannot connect to the server using host=%s
done!
diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt b/ext/mysqli/tests/mysqli_begin_transaction.phpt
index 57f0595238..b316ca9fe3 100644
--- a/ext/mysqli/tests/mysqli_begin_transaction.phpt
+++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt
@@ -123,4 +123,4 @@ NULL
Warning: mysqli_begin_transaction(): Invalid value for parameter flags (-1) in %s on line %d
[019] [%d]%A
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt
index 00fa9f0af6..d25e09b2f5 100644
--- a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt
@@ -62,4 +62,4 @@ if (!$IS_MYSQLND) {
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt
index 577673f0b5..1f3eaceceb 100644
--- a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt
@@ -30,4 +30,4 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_change_user_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt
index 12370b18cc..36adab22b0 100644
--- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt
@@ -67,4 +67,4 @@ if (!have_innodb($link))
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
index 68dd834116..7367a5cd7c 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
@@ -190,4 +190,4 @@ Constructor:
Warning: mysqli_result::__construct() expects parameter 2 to be int, string given in %s on line %d
Warning: mysqli_result::__construct() expects parameter 1 to be mysqli, string given in %s on line %d
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
index fd14154322..8fc4583a4c 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
@@ -195,4 +195,4 @@ stmt->unknown = '13'
Prepare using the constructor:
Warning: mysqli_stmt::__construct() expects parameter 2 to be string, object given in %s on line %d
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt
index 62f01cac6a..4d3c883e45 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt
@@ -129,4 +129,4 @@ warning->errno = ''
Access to undefined properties:
warning->unknown = ''
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt
index 3ae0050017..66cd94bd54 100644
--- a/ext/mysqli/tests/mysqli_connect.phpt
+++ b/ext/mysqli/tests/mysqli_connect.phpt
@@ -172,4 +172,4 @@ array(1) {
[0]=>
string(19) "mysqli.default_host"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_connect_errno.phpt b/ext/mysqli/tests/mysqli_connect_errno.phpt
index c2d22ee8ea..e596a1891a 100644
--- a/ext/mysqli/tests/mysqli_connect_errno.phpt
+++ b/ext/mysqli/tests/mysqli_connect_errno.phpt
@@ -37,4 +37,4 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_connect_error.phpt b/ext/mysqli/tests/mysqli_connect_error.phpt
index dca311ea93..d0c79d6c71 100644
--- a/ext/mysqli/tests/mysqli_connect_error.phpt
+++ b/ext/mysqli/tests/mysqli_connect_error.phpt
@@ -36,4 +36,4 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
index a43b8da460..cdc8049719 100644
--- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
@@ -177,4 +177,4 @@ array(1) {
["all_defaults"]=>
string(13) "have been set"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
index 5ede44591e..e5a1b0fc99 100644
--- a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
@@ -54,4 +54,4 @@ Warning: mysqli_connect(): (HY000/200%d): %s
4) be quiet
%s(%d) "%s"
int(200%d)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt
index 97ca40c61c..c5ba7493c1 100644
--- a/ext/mysqli/tests/mysqli_connect_twice.phpt
+++ b/ext/mysqli/tests/mysqli_connect_twice.phpt
@@ -81,4 +81,4 @@ array(1) {
["syntax"]=>
string(18) "works also with oo"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_constants_categories.phpt b/ext/mysqli/tests/mysqli_constants_categories.phpt
index 28aaa582ad..6a90e3d3f0 100644
--- a/ext/mysqli/tests/mysqli_constants_categories.phpt
+++ b/ext/mysqli/tests/mysqli_constants_categories.phpt
@@ -21,4 +21,4 @@ require_once('skipifemb.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt
index d644bf9204..de02d0ebd7 100644
--- a/ext/mysqli/tests/mysqli_debug_ini.phpt
+++ b/ext/mysqli/tests/mysqli_debug_ini.phpt
@@ -50,4 +50,4 @@ mysqlnd.debug="t:O,/tmp/mysqli_debug_phpt.trace"
?>
--EXPECT--
string(32) "t:O,/tmp/mysqli_debug_phpt.trace"
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt
index 9814c6e255..268bd619cb 100644
--- a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt
+++ b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt
@@ -44,4 +44,4 @@ if (!function_exists('mysqli_disable_reads_from_master')) {
?>
--EXPECTF--
Warning: mysqli_disable_reads_from_master(): Couldn't fetch mysqli in %s on line %d
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_driver.phpt b/ext/mysqli/tests/mysqli_driver.phpt
index 02223809ee..9f70cb4899 100644
--- a/ext/mysqli/tests/mysqli_driver.phpt
+++ b/ext/mysqli/tests/mysqli_driver.phpt
@@ -111,4 +111,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECTF--
Warning: mysqli_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'NO_SQL' at line 1 in %s on line %d
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_driver_unclonable.phpt b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
index e761d06532..2b82f91d65 100644
--- a/ext/mysqli/tests/mysqli_driver_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
@@ -13,4 +13,4 @@ Trying to clone mysqli_driver object
Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli_driver in %s:%d
Stack trace:
#0 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_embedded_connect.phpt b/ext/mysqli/tests/mysqli_embedded_connect.phpt
index 37891f55e6..d1a8730a06 100644
--- a/ext/mysqli/tests/mysqli_embedded_connect.phpt
+++ b/ext/mysqli/tests/mysqli_embedded_connect.phpt
@@ -29,4 +29,4 @@ require_once('skipifconnectfailure.inc');
?>
--EXPECTF--
Warning: mysqli_embedded_connect() expects parameter 1 to be mysqli, null given in %s on line %d
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
index e23ddd1671..17b4b37529 100644
--- a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
+++ b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
@@ -40,4 +40,4 @@ if (!function_exists('mysqli_enable_reads_from_master')) {
?>
--EXPECTF--
Warning: mysqli_enable_reads_from_master(): Couldn't fetch mysqli in %s on line %d
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_expire_password.phpt b/ext/mysqli/tests/mysqli_expire_password.phpt
index 272be79f8c..853daf0cdf 100644
--- a/ext/mysqli/tests/mysqli_expire_password.phpt
+++ b/ext/mysqli/tests/mysqli_expire_password.phpt
@@ -122,7 +122,6 @@ if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO expiretest@'%
mysqli_query($link, 'DROP USER expiretest@localhost');
?>
--EXPECTF--
-
Warning: mysqli%sconnect(): (HY000/1862): %s in %s on line %d
[001] Cannot connect [1862] %s
diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
index 171a1a4010..4701926d6c 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
@@ -46,4 +46,4 @@ array(2) {
["label"]=>
string(1) "a"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
index ccd94043a1..d372ef5574 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
@@ -112,4 +112,4 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
index e09e8b2cc3..f86502704a 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
@@ -139,4 +139,4 @@ array(2) {
[2]=>
string(1) "2"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
index 22aee90c49..fdbf222df8 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
@@ -161,4 +161,4 @@ array(3) {
["фамилия"]=>
string(14) "Π₯ристов"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt
index 09ff9d193d..551877e800 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt
@@ -75,4 +75,4 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
index f55a32b951..45b009051b 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
@@ -241,4 +241,4 @@ mysqli_close($link);
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt
index 70464ffb51..31661bdda2 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt
@@ -123,4 +123,4 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt
index 5057d47fba..24cfae7a9a 100644
--- a/ext/mysqli/tests/mysqli_fork.phpt
+++ b/ext/mysqli/tests/mysqli_fork.phpt
@@ -249,4 +249,4 @@ array(1) {
child array
parent conti
child stop
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_get_client_info.phpt b/ext/mysqli/tests/mysqli_get_client_info.phpt
index ffb9e954cc..0e8642d35d 100644
--- a/ext/mysqli/tests/mysqli_get_client_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_info.phpt
@@ -15,4 +15,4 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
index 880ee321f0..9c889caf8f 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
@@ -43,4 +43,4 @@ mysqlnd.collect_memory_statistics=1
--EXPECTF--
BEGINNING: implicit_free_result = %d
END: implicit_free_result = %d
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
index 0b3d772d5c..5d9b2aad94 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
@@ -45,4 +45,4 @@ mysqlnd.collect_memory_statistics=0
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
index d12957b113..ea1055f806 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
@@ -103,4 +103,4 @@ BUFFERED: rows_fetched_from_client_ps_cursor = 0
UNBUFFERED: rows_fetched_from_client_ps_unbuffered = %d
UNBUFFERED: rows_fetched_from_client_ps_buffered = %d
UNBUFFERED: rows_fetched_from_client_ps_cursor = 0
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_get_client_version.phpt b/ext/mysqli/tests/mysqli_get_client_version.phpt
index 3cf7ac2cc2..dbf5e3004a 100644
--- a/ext/mysqli/tests/mysqli_get_client_version.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_version.phpt
@@ -11,4 +11,4 @@ mysqli_get_client_version()
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
index 549d9c8a72..a91d84413c 100644
--- a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
+++ b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
@@ -50,4 +50,4 @@ if (!function_exists('mysqli_get_connection_stats')) {
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt
index 81b5ac1b4d..ada57f7d9f 100644
--- a/ext/mysqli/tests/mysqli_get_host_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_host_info.phpt
@@ -32,4 +32,4 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_get_proto_info.phpt b/ext/mysqli/tests/mysqli_get_proto_info.phpt
index 28313670ad..b24ab11fbd 100644
--- a/ext/mysqli/tests/mysqli_get_proto_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_proto_info.phpt
@@ -26,4 +26,4 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_get_server_info.phpt b/ext/mysqli/tests/mysqli_get_server_info.phpt
index d1eb116cb0..3ea1b4a70d 100644
--- a/ext/mysqli/tests/mysqli_get_server_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_server_info.phpt
@@ -30,4 +30,4 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_get_server_version.phpt b/ext/mysqli/tests/mysqli_get_server_version.phpt
index 30b95748b3..ddbf4e73bb 100644
--- a/ext/mysqli/tests/mysqli_get_server_version.phpt
+++ b/ext/mysqli/tests/mysqli_get_server_version.phpt
@@ -25,4 +25,4 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_init.phpt b/ext/mysqli/tests/mysqli_init.phpt
index 47550dcc6e..01e53d5fe8 100644
--- a/ext/mysqli/tests/mysqli_init.phpt
+++ b/ext/mysqli/tests/mysqli_init.phpt
@@ -22,4 +22,4 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt
index 12c858fbe4..16797aa94b 100644
--- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt
+++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt
@@ -100,4 +100,4 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_insert_id_var"))
mysqli_close($link);
?>
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt
index 2833f3fb18..496e5e48fe 100644
--- a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt
+++ b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt
@@ -113,4 +113,4 @@ memory_limit=256M
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt
index 1059c3554f..85eb90e65a 100644
--- a/ext/mysqli/tests/mysqli_kill.phpt
+++ b/ext/mysqli/tests/mysqli_kill.phpt
@@ -142,4 +142,4 @@ array(1) {
}
Warning: mysqli_kill(): processid should have positive value in %s on line %d
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_last_insert_id.phpt b/ext/mysqli/tests/mysqli_last_insert_id.phpt
index 996c401f74..d966eca05e 100644
--- a/ext/mysqli/tests/mysqli_last_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_last_insert_id.phpt
@@ -191,4 +191,4 @@ id = %d, label = 'c'
id = %d, label = 'a%d'
id = %d, label = 'c%d'
id = 101, label = 'b%d'
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt
index 7e4a797158..28898b1dcb 100644
--- a/ext/mysqli/tests/mysqli_multi_query.phpt
+++ b/ext/mysqli/tests/mysqli_multi_query.phpt
@@ -120,7 +120,6 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECTF--
-
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
[006] 3
[008] 0
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
index 67a5ab6d5b..7dbdc134eb 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
@@ -33,4 +33,4 @@ Warning: mysqli_query(): MySQL server has gone away in %s on line %d
Warning: mysqli_query(): Error reading result set's header in %s on line %d
[002] [%d] %s
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
index 85a36981b5..7b69aff617 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
@@ -45,4 +45,4 @@ array(1) {
["SLEEP(6)"]=>
string(1) "0"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
index a00ab15948..df273c4f14 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
@@ -44,4 +44,4 @@ array(1) {
["SLEEP(2)"]=>
string(1) "0"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_no_reconnect.phpt b/ext/mysqli/tests/mysqli_no_reconnect.phpt
index 465f9fee97..481f49eedf 100644
--- a/ext/mysqli/tests/mysqli_no_reconnect.phpt
+++ b/ext/mysqli/tests/mysqli_no_reconnect.phpt
@@ -124,4 +124,4 @@ mysqli.reconnect=0
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_open_bug74432.phpt b/ext/mysqli/tests/mysqli_open_bug74432.phpt
index c1ed86d88d..08139081c4 100644
--- a/ext/mysqli/tests/mysqli_open_bug74432.phpt
+++ b/ext/mysqli/tests/mysqli_open_bug74432.phpt
@@ -26,4 +26,3 @@ require_once('skipifconnectfailure.inc');
object(mysqli)#%d (%d) {
%A
}
-
diff --git a/ext/mysqli/tests/mysqli_options_init_command.phpt b/ext/mysqli/tests/mysqli_options_init_command.phpt
index a78dfca20f..734adcf5c8 100644
--- a/ext/mysqli/tests/mysqli_options_init_command.phpt
+++ b/ext/mysqli/tests/mysqli_options_init_command.phpt
@@ -75,4 +75,4 @@ require_once('skipifconnectfailure.inc');
--EXPECTF--
Warning: mysqli_real_connect(): (%s/%d): %s in %s on line %d
[010] Cannot connect to the server using %s
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
index f0c0bdbc7a..94acab84bb 100644
--- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
+++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
@@ -106,4 +106,4 @@ if (!$IS_MYSQLND)
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pam_sha256.phpt b/ext/mysqli/tests/mysqli_pam_sha256.phpt
index 760da471dd..b263939837 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256.phpt
@@ -110,4 +110,4 @@ $link->close();
$link->query('DROP USER shatest@localhost');
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt
index 70835739cf..cd96c55ad5 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt
@@ -123,7 +123,6 @@ mysqlnd.sha256_server_public_key="test_sha256_ini"
@unlink($file);
?>
--EXPECTF--
-
Warning: mysqli::__construct(): (HY000/1045): %s in %s on line %d
[001] [1045] %s
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt
index 1461933015..190158316b 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt
@@ -129,4 +129,4 @@ $link->close();
@unlink($file);
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
index e2626240d8..73b2ebe95c 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
@@ -185,4 +185,4 @@ Warning: mysqli::real_connect(%sest_sha256_wrong_%d): failed to open stream: No
Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d
[400 + 002] [1045] %s
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
index 9af480e003..f1adcf49f5 100644
--- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
@@ -158,4 +158,4 @@ array(1) {
["syntax"]=>
string(18) "works also with oo"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pconn_disabled.phpt b/ext/mysqli/tests/mysqli_pconn_disabled.phpt
index 7222212db0..e8c592f9ff 100644
--- a/ext/mysqli/tests/mysqli_pconn_disabled.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_disabled.phpt
@@ -59,4 +59,4 @@ Warning: my_mysqli_connect(): Persistent connections are disabled. Downgrading t
Warning: my_mysqli_connect(): Persistent connections are disabled. Downgrading to normal in %s on line %d
Connecction 1 - SELECT @pcondisabled -> 'Connection 1'
Connecction 2 - SELECT @pcondisabled -> ''
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pconn_kill.phpt b/ext/mysqli/tests/mysqli_pconn_kill.phpt
index b60bb3662b..f4be4c7c7b 100644
--- a/ext/mysqli/tests/mysqli_pconn_kill.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_kill.phpt
@@ -92,4 +92,4 @@ mysqli.max_persistent=2
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pconn_limits.phpt b/ext/mysqli/tests/mysqli_pconn_limits.phpt
index 960c4a2635..311d8ed21e 100644
--- a/ext/mysqli/tests/mysqli_pconn_limits.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_limits.phpt
@@ -95,4 +95,4 @@ Regular connection 2 - 'works...'
Persistent connection 1 - 'works...'
Persistent connection 2 - 'works...'
Persistent connection 3 - 'works...'
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
index 99e51e7c5e..4b610c3a9a 100644
--- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
@@ -269,4 +269,4 @@ array(3) {
["cached_plinks"]=>
int(0)
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pconn_reuse.phpt b/ext/mysqli/tests/mysqli_pconn_reuse.phpt
index 6e210bd4c5..926f6b797c 100644
--- a/ext/mysqli/tests/mysqli_pconn_reuse.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_reuse.phpt
@@ -88,4 +88,4 @@ Connection 2 (no reuse) - Thread ID -> '%d'
Connection 2 - SELECT @pcondisabled -> 'Connection 2'
Connection 2 (reuse) - SELECT @pcondisabled -> 'Connection 2'
Connection 2 (reuse) - Thread ID -> '%d'
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pconn_twice.phpt b/ext/mysqli/tests/mysqli_pconn_twice.phpt
index c821177eeb..ca2acd1369 100644
--- a/ext/mysqli/tests/mysqli_pconn_twice.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_twice.phpt
@@ -74,4 +74,4 @@ array(1) {
["syntax"]=>
string(18) "works also with oo"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_pconnect.phpt b/ext/mysqli/tests/mysqli_pconnect.phpt
index ac17c22b84..3fb14d25d9 100644
--- a/ext/mysqli/tests/mysqli_pconnect.phpt
+++ b/ext/mysqli/tests/mysqli_pconnect.phpt
@@ -69,4 +69,4 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_phpinfo.phpt b/ext/mysqli/tests/mysqli_phpinfo.phpt
index 2ecd838592..02913daa69 100644
--- a/ext/mysqli/tests/mysqli_phpinfo.phpt
+++ b/ext/mysqli/tests/mysqli_phpinfo.phpt
@@ -69,4 +69,4 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_poll.phpt b/ext/mysqli/tests/mysqli_poll.phpt
index 8a49ba3f82..b9c66381f9 100644
--- a/ext/mysqli/tests/mysqli_poll.phpt
+++ b/ext/mysqli/tests/mysqli_poll.phpt
@@ -134,7 +134,6 @@ if (!$IS_MYSQLND)
print "done!";
?>
--EXPECTF--
-
Warning: mysqli_poll(): Negative values passed for sec and/or usec in %s on line %d
Warning: mysqli_poll(): Negative values passed for sec and/or usec in %s on line %d
@@ -145,4 +144,4 @@ Warning: mysqli_poll(): Negative values passed for sec and/or usec in %s on line
[015 + 6] Rejecting thread %d: 0/
[015 + 6] Rejecting thread %d: 0/
[016 + 6] Rejecting thread %d: 0/
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_poll_kill.phpt b/ext/mysqli/tests/mysqli_poll_kill.phpt
index 84cd0f68b9..7c10d13df1 100644
--- a/ext/mysqli/tests/mysqli_poll_kill.phpt
+++ b/ext/mysqli/tests/mysqli_poll_kill.phpt
@@ -207,4 +207,4 @@ Warning: mysqli_reap_async_query(): %s
Warning: mysqli_reap_async_query(): Error reading result set's header in %s on line %d
[018] Error: %d/%s
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
index 9d9ef64d91..bfe780a9cd 100644
--- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
+++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
@@ -173,7 +173,6 @@ mysqli_query($link, "DROP PROCEDURE IF EXISTS p");
mysqli_close($link);
?>
-
--EXPECTF--
[003] 'SELECT' caused 1064
[003] 'UPDATE test SET id = 101 WHERE id > 3' caused 1062
diff --git a/ext/mysqli/tests/mysqli_prepare_no_object.phpt b/ext/mysqli/tests/mysqli_prepare_no_object.phpt
index b10706aa04..0a1d22d756 100644
--- a/ext/mysqli/tests/mysqli_prepare_no_object.phpt
+++ b/ext/mysqli/tests/mysqli_prepare_no_object.phpt
@@ -43,4 +43,4 @@ a) [1065] Query was empty
b) [1065] Query was empty
c) [1065] Query was empty
c) [1065] Query was empty
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_query_iterators.phpt b/ext/mysqli/tests/mysqli_query_iterators.phpt
index 2577aa76ee..81ca8c0fae 100644
--- a/ext/mysqli/tests/mysqli_query_iterators.phpt
+++ b/ext/mysqli/tests/mysqli_query_iterators.phpt
@@ -198,4 +198,4 @@ array(1) {
["id"]=>
string(1) "6"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt
index 1df5cc8760..aad39cd94d 100644
--- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt
@@ -192,4 +192,4 @@ array(1) {
["id"]=>
string(1) "1"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt
index 47535f937e..d4e43243fa 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt
@@ -62,4 +62,4 @@ array(1) {
["label"]=>
string(1) "\"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_release_savepoint.phpt b/ext/mysqli/tests/mysqli_release_savepoint.phpt
index ba4c564385..bb9a77a0af 100644
--- a/ext/mysqli/tests/mysqli_release_savepoint.phpt
+++ b/ext/mysqli/tests/mysqli_release_savepoint.phpt
@@ -81,4 +81,4 @@ array(1) {
["id"]=>
string(1) "1"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_report.phpt b/ext/mysqli/tests/mysqli_report.phpt
index 3dcf4981b8..889fda5fbd 100644
--- a/ext/mysqli/tests/mysqli_report.phpt
+++ b/ext/mysqli/tests/mysqli_report.phpt
@@ -299,4 +299,4 @@ Warning: mysqli_kill(): processid should have positive value in %s on line %d
Warning: mysqli_stmt_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
[013] Access denied for user '%s'@'%s' (using password: YES)
[016] Access denied for user '%s'@'%s' (using password: YES)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_report_new.phpt b/ext/mysqli/tests/mysqli_report_new.phpt
index 5cf5ca8e3b..0717aaf73b 100644
--- a/ext/mysqli/tests/mysqli_report_new.phpt
+++ b/ext/mysqli/tests/mysqli_report_new.phpt
@@ -45,6 +45,5 @@ if (mysqli_get_server_version($link) < 50600)
require_once("clean_table.inc");
?>
--EXPECTF--
-
Warning: mysqli_change_user(): (%d/%d): Access denied for user '%s'@'%s' (using password: %s) in %s on line %d
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_report_wo_ps.phpt b/ext/mysqli/tests/mysqli_report_wo_ps.phpt
index 2665793407..d08ffa5e7d 100644
--- a/ext/mysqli/tests/mysqli_report_wo_ps.phpt
+++ b/ext/mysqli/tests/mysqli_report_wo_ps.phpt
@@ -117,4 +117,4 @@ Warning: mysqli_real_query(): (%d/%d): You have an error in your SQL syntax; che
Warning: mysqli_kill(): processid should have positive value in %s on line %d
[011] Access denied for user '%s'@'%s' (using password: YES)
[014] Access denied for user '%s'@'%s' (using password: YES)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt
index 6164197a6c..6eff412a1d 100644
--- a/ext/mysqli/tests/mysqli_result_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt
@@ -24,4 +24,4 @@ require_once('skipifconnectfailure.inc');
Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli_result in %s:%d
Stack trace:
#0 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_savepoint.phpt b/ext/mysqli/tests/mysqli_savepoint.phpt
index 5775b0eaec..cb0d1169c8 100644
--- a/ext/mysqli/tests/mysqli_savepoint.phpt
+++ b/ext/mysqli/tests/mysqli_savepoint.phpt
@@ -67,6 +67,5 @@ if (!have_innodb($link))
require_once("clean_table.inc");
?>
--EXPECTF--
-
Warning: mysqli_savepoint(): Savepoint name cannot be empty in %s on line %d
done!
diff --git a/ext/mysqli/tests/mysqli_send_query.phpt b/ext/mysqli/tests/mysqli_send_query.phpt
index 7de2bfc21c..d07985c2b7 100644
--- a/ext/mysqli/tests/mysqli_send_query.phpt
+++ b/ext/mysqli/tests/mysqli_send_query.phpt
@@ -47,4 +47,4 @@ if (!$TEST_EXPERIMENTAL)
?>
--EXPECTF--
Warning: mysqli_send_query(): Couldn't fetch mysqli in %s on line %d
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
index e05843e5b7..b48df9d410 100644
--- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
@@ -26,4 +26,4 @@ die("SKIP: prefetch isn't supported at the moment");
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt
index 0daab8b11a..0b1d41a176 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt
@@ -126,4 +126,4 @@ Testing 273 columns with 240 rows...
... statement with 65520 parameters prepared
Statement done
bool(true)
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
index bc189dea3f..b8f209ef79 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
@@ -107,4 +107,4 @@ object(foo)#%d (1) {
}
0 - Ρ„ΡƒΠ±Π°Ρ€
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
index 2e3df083b7..72adfb04e7 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
@@ -124,4 +124,4 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
index 3818b6ccfd..734d691c28 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
@@ -156,4 +156,4 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt
index 6d096531e8..11755b4aef 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt
@@ -94,4 +94,4 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
index 957044cd67..3a1c004c2e 100644
--- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
@@ -65,7 +65,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change"))
mysqli_close($link);
?>
-
--EXPECT--
bool(true)
bool(true)
@@ -91,4 +90,4 @@ int(2)
---- Row 3
bool(false)
----
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
index f9ab267502..6537b8d88b 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
@@ -195,4 +195,4 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
mysqli_close($link);
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
index 293761bb84..aed04962f2 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
@@ -128,4 +128,4 @@ Unsupported and undefined, under development
--EXPECT--
[010] More results: yes
[011] Next result: yes
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
index 8c7c799def..6ab270b8f4 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
@@ -78,4 +78,4 @@ Unsupported and undefined, under development
--EXPECTF--
[008] More results: %s
[009] Next results: %s
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt
index 49ca6f6bff..495fcdce7d 100644
--- a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt
@@ -73,4 +73,4 @@ Fetching BIT column values using the PS API
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt
index 00bde68284..22eb7c9074 100644
--- a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt
@@ -138,4 +138,4 @@ mysqli_stmt_fetch - geometry / spatial types
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
index 87dd01223f..c7109063e7 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
@@ -130,4 +130,4 @@ Fetching BIT column values using the PS API
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
index a717bee50d..8508150f98 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
@@ -47,4 +47,4 @@ mysqli_stmt_get_result() - meta data, field_count()
?>
--EXPECT--
2 2
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
index 9bfd7d6958..a2965b7362 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
@@ -140,4 +140,4 @@ mysqli_stmt_get_result - geometry / spatial types
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_multires.phpt b/ext/mysqli/tests/mysqli_stmt_multires.phpt
index 8564383bc9..23a8ad27a8 100644
--- a/ext/mysqli/tests/mysqli_stmt_multires.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_multires.phpt
@@ -117,4 +117,4 @@ string(5) "a---a"
string(18) "[013] next_result:"
bool(true)
[014] No result, as expected
-done \ No newline at end of file
+done
diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
index c53101a096..8f4e13ef39 100644
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
@@ -98,7 +98,6 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECTF--
-
Warning: mysqli_stmt_result_metadata(): invalid object or resource mysqli_stmt
in %s on line %d
object(stdClass)#5 (13) {
diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
index 44c1f1bdcc..7f858e0216 100644
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
@@ -229,4 +229,4 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
index eeb74d9093..38048894af 100644
--- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
@@ -95,4 +95,4 @@ if (stristr(mysqli_get_client_info(), 'mysqlnd'))
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
index 07acb041b5..fa26a3a45e 100644
--- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
@@ -100,4 +100,4 @@ Warning: mysqli_stmt_send_long_data(): There was an error while sending long dat
require_once("clean_table.inc");
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
index 6576c15d90..18dddc90c7 100644
--- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
@@ -25,4 +25,4 @@ require_once('skipifconnectfailure.inc');
Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli_stmt in %s:%d
Stack trace:
#0 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_store_result_copy.phpt b/ext/mysqli/tests/mysqli_store_result_copy.phpt
index cdbccee198..3f82b8a892 100644
--- a/ext/mysqli/tests/mysqli_store_result_copy.phpt
+++ b/ext/mysqli/tests/mysqli_store_result_copy.phpt
@@ -282,4 +282,4 @@ array(2) {
string(1) "b"
}
}
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_thread_safe.phpt b/ext/mysqli/tests/mysqli_thread_safe.phpt
index 2f6a87ba42..15b93dd209 100644
--- a/ext/mysqli/tests/mysqli_thread_safe.phpt
+++ b/ext/mysqli/tests/mysqli_thread_safe.phpt
@@ -13,4 +13,4 @@ require_once('skipifemb.inc');
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt
index f4471bf831..a6bb1946c7 100644
--- a/ext/mysqli/tests/mysqli_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_unclonable.phpt
@@ -23,4 +23,4 @@ require_once('skipifconnectfailure.inc');
Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli in %s:%d
Stack trace:
#0 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_warning_unclonable.phpt b/ext/mysqli/tests/mysqli_warning_unclonable.phpt
index d3ae47d0b4..1079ac374b 100644
--- a/ext/mysqli/tests/mysqli_warning_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_warning_unclonable.phpt
@@ -38,4 +38,4 @@ if (!$TEST_EXPERIMENTAL)
require_once("clean_table.inc");
?>
--EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class mysqli_warning in %s on line %d \ No newline at end of file
+Fatal error: Trying to clone an uncloneable object of class mysqli_warning in %s on line %d
diff --git a/ext/oci8/tests/bind_number.phpt b/ext/oci8/tests/bind_number.phpt
index 4ae085b4d1..0fc5fedfa4 100644
--- a/ext/oci8/tests/bind_number.phpt
+++ b/ext/oci8/tests/bind_number.phpt
@@ -213,5 +213,3 @@ array(1) {
}
}
===DONE===
-
-
diff --git a/ext/oci8/tests/bug70700.phpt b/ext/oci8/tests/bug70700.phpt
index 5431a90f6a..5633673406 100644
--- a/ext/oci8/tests/bug70700.phpt
+++ b/ext/oci8/tests/bug70700.phpt
@@ -154,9 +154,7 @@ echo 'size of string4 is ', strlen($string4), ' bytes, ', mb_strlen($string4), '
echo 'size of stream4a is ', strlen($stream4a), ' bytes, ', mb_strlen($stream4a), ' chars.', PHP_EOL;
echo 'beg of stream4a is ', $start4a, PHP_EOL;
echo 'end of stream4a is ', $ending4a, PHP_EOL;
-
--EXPECT--
-
Test 1: j
size of string1 is 1000006 bytes, 1000006 chars.
size of stream1a is 1000006 bytes, 1000006 chars.
@@ -180,4 +178,3 @@ size of string4 is 8193 bytes, 2735 chars.
size of stream4a is 8193 bytes, 2735 chars.
beg of stream4a is abcγγγγγγγ
end of stream4a is γγγγγγγxyz
-
diff --git a/ext/oci8/tests/bug72524.phpt b/ext/oci8/tests/bug72524.phpt
index 45ce8c7d5b..b48ec513ed 100644
--- a/ext/oci8/tests/bug72524.phpt
+++ b/ext/oci8/tests/bug72524.phpt
@@ -6,7 +6,6 @@ $target_dbs = array('oracledb' => true, 'timesten' => true); // test runs on th
require(dirname(__FILE__).'/skipif.inc');
?>
--FILE--
-
<?php
require(dirname(__FILE__).'/connect.inc');
diff --git a/ext/oci8/tests/conn_attr_2.phpt b/ext/oci8/tests/conn_attr_2.phpt
index b0df3ccbbe..4ba1a65c2b 100644
--- a/ext/oci8/tests/conn_attr_2.phpt
+++ b/ext/oci8/tests/conn_attr_2.phpt
@@ -16,7 +16,6 @@ if (!(isset($matches[0]) && $matches[1] >= 10)) {
--INI--
oci8.privileged_connect = On
--FILE--
-
<?php
$testuser = 'testuser_attr_2'; // Used in conn_attr.inc
diff --git a/ext/oci8/tests/db_op_1.phpt b/ext/oci8/tests/db_op_1.phpt
index 27de28db03..b3dc1ef087 100644
--- a/ext/oci8/tests/db_op_1.phpt
+++ b/ext/oci8/tests/db_op_1.phpt
@@ -58,4 +58,3 @@ array(1) {
string(7) "db_op_1"
}
===DONE===
-
diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt
index 1878347123..a35e20fcc3 100644
--- a/ext/oci8/tests/db_op_2.phpt
+++ b/ext/oci8/tests/db_op_2.phpt
@@ -66,4 +66,3 @@ array(2) {
string(7) "db_op_2a"
}
===DONE===
-
diff --git a/ext/oci8/tests/define3.phpt b/ext/oci8/tests/define3.phpt
index 701c89db54..690924b73a 100644
--- a/ext/oci8/tests/define3.phpt
+++ b/ext/oci8/tests/define3.phpt
@@ -112,4 +112,3 @@ bool(true)
file md5:614fcbba1effb7caa27ef0ef25c27fcf
file md5:06d4f219d946c74d748d43932cd9dcb2
Done
-
diff --git a/ext/oci8/tests/define4.phpt b/ext/oci8/tests/define4.phpt
index 6aae1d99b2..c01790bab0 100644
--- a/ext/oci8/tests/define4.phpt
+++ b/ext/oci8/tests/define4.phpt
@@ -71,4 +71,3 @@ string(4) "some"
Warning: oci_result(): supplied resource is not a valid oci8 statement resource in %s on line %d
bool(false)
Done
-
diff --git a/ext/oci8/tests/define5.phpt b/ext/oci8/tests/define5.phpt
index 774bac2344..f3aeb776a9 100644
--- a/ext/oci8/tests/define5.phpt
+++ b/ext/oci8/tests/define5.phpt
@@ -69,4 +69,3 @@ Test 3 - no new define done
string(4) "some"
string(5) "thing"
Done
-
diff --git a/ext/oci8/tests/drcp_connect1.phpt b/ext/oci8/tests/drcp_connect1.phpt
index 7e8dfb7910..fc6fbc7d81 100644
--- a/ext/oci8/tests/drcp_connect1.phpt
+++ b/ext/oci8/tests/drcp_connect1.phpt
@@ -97,4 +97,3 @@ resource(%d) of type (oci8 persistent connection)
Select with persistent connection 2
The value of the package variable is 1000
Done
-
diff --git a/ext/oci8/tests/drcp_newconnect.phpt b/ext/oci8/tests/drcp_newconnect.phpt
index 79718f4ee2..c2b6f51a25 100644
--- a/ext/oci8/tests/drcp_newconnect.phpt
+++ b/ext/oci8/tests/drcp_newconnect.phpt
@@ -40,4 +40,3 @@ resource(%d) of type (oci8 connection)
resource(%d) of type (oci8 connection)
First and second connections are different OK
Done
-
diff --git a/ext/oci8/tests/drcp_privileged.phpt b/ext/oci8/tests/drcp_privileged.phpt
index c57216672f..54efc8726c 100644
--- a/ext/oci8/tests/drcp_privileged.phpt
+++ b/ext/oci8/tests/drcp_privileged.phpt
@@ -66,4 +66,3 @@ bool(false)
Warning: oci_pconnect(): ORA-01031: %s in %s on line %d
bool(false)
Done
-
diff --git a/ext/oci8/tests/drcp_scope3.phpt b/ext/oci8/tests/drcp_scope3.phpt
index b448a518ad..e77dc9fd7e 100644
--- a/ext/oci8/tests/drcp_scope3.phpt
+++ b/ext/oci8/tests/drcp_scope3.phpt
@@ -58,4 +58,4 @@ resource(%d) of type (oci8 persistent connection)
The value of DEPT for id 105 is NEWDEPT
Warning: oci_execute(): ORA-00054: %s
-Done \ No newline at end of file
+Done
diff --git a/ext/oci8/tests/drcp_scope5.phpt b/ext/oci8/tests/drcp_scope5.phpt
index 832e6aa8cb..46163efe2d 100644
--- a/ext/oci8/tests/drcp_scope5.phpt
+++ b/ext/oci8/tests/drcp_scope5.phpt
@@ -60,4 +60,4 @@ resource(%d) of type (oci8 persistent connection)
Update done-- DEPT value has been set to NEWDEPT
resource(%d) of type (oci8 persistent connection)
The value of DEPT for id 105 is NEWDEPT
-Done \ No newline at end of file
+Done
diff --git a/ext/oci8/tests/edition_2.phpt b/ext/oci8/tests/edition_2.phpt
index 9ec5f4b96d..763f59577d 100644
--- a/ext/oci8/tests/edition_2.phpt
+++ b/ext/oci8/tests/edition_2.phpt
@@ -244,4 +244,3 @@ The value of current EDITION is MYEDITION
The value of edition has been successfully set
The value of current EDITION is MYEDITION1
Done
-
diff --git a/ext/oci8/tests/fetch_array.phpt b/ext/oci8/tests/fetch_array.phpt
index 9b67f27e8f..c4a45c6be2 100644
--- a/ext/oci8/tests/fetch_array.phpt
+++ b/ext/oci8/tests/fetch_array.phpt
@@ -373,4 +373,3 @@ array(5) {
NULL
}
Done
-
diff --git a/ext/oci8/tests/imp_res_get_cancel.phpt b/ext/oci8/tests/imp_res_get_cancel.phpt
index 1ea6beaf60..e09ddf906a 100644
--- a/ext/oci8/tests/imp_res_get_cancel.phpt
+++ b/ext/oci8/tests/imp_res_get_cancel.phpt
@@ -53,4 +53,3 @@ Test 1
1
3
===DONE===
-
diff --git a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt
index 32732163d8..08c9d2f36b 100644
--- a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt
+++ b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt
@@ -153,4 +153,3 @@ array(3) {
string(6) "Line 3"
}
===DONE===
-
diff --git a/ext/oci8/tests/lob_038.phpt b/ext/oci8/tests/lob_038.phpt
index 74388f180b..effb466214 100644
--- a/ext/oci8/tests/lob_038.phpt
+++ b/ext/oci8/tests/lob_038.phpt
@@ -189,4 +189,4 @@ array(1) {
}
}
string(11) "blob test 3"
-Done \ No newline at end of file
+Done
diff --git a/ext/oci8/tests/lob_041.phpt b/ext/oci8/tests/lob_041.phpt
index 944952982f..2243b978a0 100644
--- a/ext/oci8/tests/lob_041.phpt
+++ b/ext/oci8/tests/lob_041.phpt
@@ -63,7 +63,6 @@ $stmtarray = array(
oci8_test_sql_execute($c, $stmtarray);
?>
-
--EXPECTF--
Test 1 - explicit statement close
test data
diff --git a/ext/opcache/tests/log_verbosity_bug.phpt b/ext/opcache/tests/log_verbosity_bug.phpt
index c965e5c4b7..fc4c3d8d93 100644
--- a/ext/opcache/tests/log_verbosity_bug.phpt
+++ b/ext/opcache/tests/log_verbosity_bug.phpt
@@ -17,4 +17,3 @@ opcache.log_verbosity_level=-1
var_dump("Script should fail");
?>
--EXPECT--
-
diff --git a/ext/opcache/tests/optimize_func_calls.phpt b/ext/opcache/tests/optimize_func_calls.phpt
index eee21b557c..eb1a6b38b4 100644
--- a/ext/opcache/tests/optimize_func_calls.phpt
+++ b/ext/opcache/tests/optimize_func_calls.phpt
@@ -131,4 +131,3 @@ Fatal error: Uncaught Error: Cannot pass parameter 1 by reference in %soptimize_
Stack trace:
#0 {main}
thrown in %soptimize_func_calls.php on line %d
-
diff --git a/ext/opcache/tests/ssa_bug_007.phpt b/ext/opcache/tests/ssa_bug_007.phpt
index 84d9e34b31..9eab31cf89 100644
--- a/ext/opcache/tests/ssa_bug_007.phpt
+++ b/ext/opcache/tests/ssa_bug_007.phpt
@@ -20,4 +20,3 @@ function render($properties) {
OK
--EXPECT--
OK
-
diff --git a/ext/opcache/tests/ssa_bug_008.phpt b/ext/opcache/tests/ssa_bug_008.phpt
index f65dd3032b..e12e0922b1 100644
--- a/ext/opcache/tests/ssa_bug_008.phpt
+++ b/ext/opcache/tests/ssa_bug_008.phpt
@@ -7,4 +7,3 @@ if (!is_int($info = gc_collect_cycles()) || ($info < 100)) {
}
--EXPECT--
integer
-
diff --git a/ext/opcache/tests/wrong_inlining_001.phpt b/ext/opcache/tests/wrong_inlining_001.phpt
index 5cc515c4af..f8cebc152e 100644
--- a/ext/opcache/tests/wrong_inlining_001.phpt
+++ b/ext/opcache/tests/wrong_inlining_001.phpt
@@ -25,4 +25,4 @@ test();
OK
--EXPECTF--
Notice: Only variables should be passed by reference in %swrong_inlining_001.php on line 7
-OK \ No newline at end of file
+OK
diff --git a/ext/opcache/tests/zzz_basic_logging.phpt b/ext/opcache/tests/zzz_basic_logging.phpt
index e8d84a9304..8605cb1988 100644
--- a/ext/opcache/tests/zzz_basic_logging.phpt
+++ b/ext/opcache/tests/zzz_basic_logging.phpt
@@ -3,7 +3,6 @@ Test basic logging for the Opcache
--DESCRIPTION--
This test runs a simple PHP script and ensures the Opcache
outputs the correct logging at the highest log_verbosity_level
-
--INI--
opcache.enable=1
opcache.enable_cli=1
diff --git a/ext/openssl/tests/001.phpt b/ext/openssl/tests/001.phpt
index 77b0f32183..6e74ba7f46 100644
--- a/ext/openssl/tests/001.phpt
+++ b/ext/openssl/tests/001.phpt
@@ -74,4 +74,4 @@ OK!
<?php
$key_file_name = __DIR__ . DIRECTORY_SEPARATOR . '001-tmp.key';
@unlink($key_file_name);
-?> \ No newline at end of file
+?>
diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt
index c07bbf8cba..94ebf12aea 100644
--- a/ext/openssl/tests/bug54992.phpt
+++ b/ext/openssl/tests/bug54992.phpt
@@ -45,5 +45,3 @@ Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
bool(false)
-
-
diff --git a/ext/openssl/tests/bug61124.phpt b/ext/openssl/tests/bug61124.phpt
index 9c7d0ac483..e10334fabf 100644
--- a/ext/openssl/tests/bug61124.phpt
+++ b/ext/openssl/tests/bug61124.phpt
@@ -6,7 +6,6 @@ if (!extension_loaded("openssl")) die("skip");
--FILE--
<?php
var_dump(openssl_decrypt('kzo w2RMExUTYQXW2Xzxmg==', 'aes-128-cbc', 'pass', false, 'pass'));
-
--EXPECTF--
Warning: openssl_decrypt(): IV passed is only 4 bytes long, cipher expects an IV of precisely 16 bytes, padding with \0 in %s on line %d
bool(false)
diff --git a/ext/openssl/tests/bug61930.phpt b/ext/openssl/tests/bug61930.phpt
index 6d8742b80d..c79f51eeef 100644
--- a/ext/openssl/tests/bug61930.phpt
+++ b/ext/openssl/tests/bug61930.phpt
@@ -23,4 +23,3 @@ var_dump(openssl_verify($data, base64_decode($sig), $key));
--EXPECTF--
resource(%d) of type (OpenSSL key)
int(1)
-
diff --git a/ext/openssl/tests/bug68265.phpt b/ext/openssl/tests/bug68265.phpt
index f2c867670a..736ff290a2 100644
--- a/ext/openssl/tests/bug68265.phpt
+++ b/ext/openssl/tests/bug68265.phpt
@@ -40,4 +40,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--EXPECTF--
resource(%d) of type (stream)
-
diff --git a/ext/openssl/tests/bug68879.phpt b/ext/openssl/tests/bug68879.phpt
index 8cf9044c93..1f135ee50a 100644
--- a/ext/openssl/tests/bug68879.phpt
+++ b/ext/openssl/tests/bug68879.phpt
@@ -40,4 +40,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--EXPECTF--
resource(%d) of type (stream)
-
diff --git a/ext/openssl/tests/bug69215.phpt b/ext/openssl/tests/bug69215.phpt
index ab9eec6770..7cd1df12db 100644
--- a/ext/openssl/tests/bug69215.phpt
+++ b/ext/openssl/tests/bug69215.phpt
@@ -47,4 +47,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--EXPECTF--
resource(%d) of type (stream)
-
diff --git a/ext/openssl/tests/bug71475.phpt b/ext/openssl/tests/bug71475.phpt
index 659544297b..5df8ac27c6 100644
--- a/ext/openssl/tests/bug71475.phpt
+++ b/ext/openssl/tests/bug71475.phpt
@@ -11,6 +11,5 @@ openssl_seal($_, $_, $_, array_fill(0,64,0));
?>
DONE
--EXPECTF--
-
Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s%ebug71475.php on line %d
DONE
diff --git a/ext/openssl/tests/bug72333.phpt b/ext/openssl/tests/bug72333.phpt
index e478e3b925..7fc79846a1 100644
--- a/ext/openssl/tests/bug72333.phpt
+++ b/ext/openssl/tests/bug72333.phpt
@@ -65,4 +65,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--EXPECT--
done
-
diff --git a/ext/openssl/tests/bug74651.phpt b/ext/openssl/tests/bug74651.phpt
index f86394bdd5..b4e50a0421 100644
--- a/ext/openssl/tests/bug74651.phpt
+++ b/ext/openssl/tests/bug74651.phpt
@@ -14,4 +14,4 @@ var_dump(openssl_seal($inputstr, $sealed, $ekeys, array($pub_key_id, $pub_key_id
?>
--EXPECTF--
resource(%d) of type (OpenSSL key)
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/openssl/tests/bug74720_0.phpt b/ext/openssl/tests/bug74720_0.phpt
index b6b4b35d62..f85d83860c 100644
--- a/ext/openssl/tests/bug74720_0.phpt
+++ b/ext/openssl/tests/bug74720_0.phpt
@@ -90,4 +90,3 @@ int(39)
int(39)
int(39)
==DONE==
-
diff --git a/ext/openssl/tests/bug74720_1.phpt b/ext/openssl/tests/bug74720_1.phpt
index eb0d1f5c56..231a083b76 100644
--- a/ext/openssl/tests/bug74720_1.phpt
+++ b/ext/openssl/tests/bug74720_1.phpt
@@ -83,4 +83,3 @@ unlink($outPath);
--EXPECT--
bool(true)
==DONE==
-
diff --git a/ext/openssl/tests/bug74903.phpt b/ext/openssl/tests/bug74903.phpt
index 7a20b8693d..41f0416fee 100644
--- a/ext/openssl/tests/bug74903.phpt
+++ b/ext/openssl/tests/bug74903.phpt
@@ -80,4 +80,3 @@ unlink($tmpFileOut);
bool(true)
bool(true)
==DONE==
-
diff --git a/ext/openssl/tests/bug76296.phpt b/ext/openssl/tests/bug76296.phpt
index 59a73b7d7b..41e3b9984e 100644
--- a/ext/openssl/tests/bug76296.phpt
+++ b/ext/openssl/tests/bug76296.phpt
@@ -15,7 +15,6 @@ ini_set('open_basedir', $dir);
var_dump(openssl_pkey_get_public($pem));
?>
--EXPECTF--
-
Warning: openssl_pkey_get_public(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s) in %s on line %d
bool(false)
--CLEAN--
diff --git a/ext/openssl/tests/openssl_csr_sign_basic.phpt b/ext/openssl/tests/openssl_csr_sign_basic.phpt
index 4a8e9dd67f..57c9e75c0e 100644
--- a/ext/openssl/tests/openssl_csr_sign_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_sign_basic.phpt
@@ -79,4 +79,3 @@ bool(false)
Warning: openssl_csr_sign() expects parameter 4 to be int, array given in %s on line %d
NULL
resource(%d) of type (OpenSSL X.509)
-
diff --git a/ext/openssl/tests/openssl_decrypt_error.phpt b/ext/openssl/tests/openssl_decrypt_error.phpt
index eab67f403c..be40f8080f 100644
--- a/ext/openssl/tests/openssl_decrypt_error.phpt
+++ b/ext/openssl/tests/openssl_decrypt_error.phpt
@@ -27,7 +27,6 @@ var_dump(openssl_decrypt($encrypted, $method, array()));
var_dump(openssl_encrypt($data, $method, $password, 0, $iv, $wrong));
?>
--EXPECTF--
-
Warning: openssl_encrypt(): Using an empty Initialization Vector (iv) is potentially insecure and not recommended in %s on line %d
string(44) "yof6cPPH4mLee6TOc0YQSrh4dvywMqxGUyjp0lV6+aM="
string(44) "yof6cPPH4mLee6TOc0YQSrh4dvywMqxGUyjp0lV6+aM="
diff --git a/ext/openssl/tests/openssl_encrypt_crash.phpt b/ext/openssl/tests/openssl_encrypt_crash.phpt
index b88782b0b2..cf2d7f823a 100644
--- a/ext/openssl/tests/openssl_encrypt_crash.phpt
+++ b/ext/openssl/tests/openssl_encrypt_crash.phpt
@@ -8,6 +8,5 @@ openssl_encrypt('', 'AES-128-CBC', 'foo');
var_dump("done");
?>
--EXPECTF--
-
Warning: openssl_encrypt(): Using an empty Initialization Vector (iv) is potentially insecure and not recommended in %s on line %d
-string(4) "done" \ No newline at end of file
+string(4) "done"
diff --git a/ext/openssl/tests/openssl_pkcs7_read_basic.phpt b/ext/openssl/tests/openssl_pkcs7_read_basic.phpt
index 052779dc0a..64c7c2c130 100644
--- a/ext/openssl/tests/openssl_pkcs7_read_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs7_read_basic.phpt
@@ -16,7 +16,6 @@ var_dump(openssl_pkcs7_read($infile, $result));
var_dump($result);
?>
--EXPECTF--
-
Warning: openssl_pkcs7_read() expects exactly 2 parameters, 0 given in %s on line %d
NULL
diff --git a/ext/openssl/tests/openssl_pkey_new_error.phpt b/ext/openssl/tests/openssl_pkey_new_error.phpt
index 0316c5d7a1..c7dc193d53 100644
--- a/ext/openssl/tests/openssl_pkey_new_error.phpt
+++ b/ext/openssl/tests/openssl_pkey_new_error.phpt
@@ -16,10 +16,8 @@ openssl_pkey_get_details(openssl_pkey_new($dsa));
openssl_pkey_get_details(openssl_pkey_new($dh));
?>
--EXPECTF--
-
Warning: openssl_pkey_get_details() expects parameter 1 to be resource, bool given in %s on line %d
Warning: openssl_pkey_get_details() expects parameter 1 to be resource, bool given in %s on line %d
Warning: openssl_pkey_get_details() expects parameter 1 to be resource, bool given in %s on line %d
-
diff --git a/ext/openssl/tests/openssl_public_encrypt_basic.phpt b/ext/openssl/tests/openssl_public_encrypt_basic.phpt
index e9d47c26b0..69650a65d9 100644
--- a/ext/openssl/tests/openssl_public_encrypt_basic.phpt
+++ b/ext/openssl/tests/openssl_public_encrypt_basic.phpt
@@ -37,4 +37,3 @@ Warning: openssl_public_encrypt(): key parameter is not a valid public key in %s
bool(false)
bool(true)
string(4) "test"
-
diff --git a/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt b/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt
index 68c11dde2c..5727de90a2 100644
--- a/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt
+++ b/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt
@@ -19,4 +19,4 @@ string(10) "%s"
string(12) "%s"
string(14) "%s"
string(16) "%s"
-string(18) "%s" \ No newline at end of file
+string(18) "%s"
diff --git a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt
index f47255ac1b..ceaafc2234 100644
--- a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt
@@ -49,4 +49,3 @@ bool(false)
Warning: openssl_x509_fingerprint(): Unknown signature algorithm in %s on line %d
bool(false)
-
diff --git a/ext/openssl/tests/openssl_x509_read_basic.phpt b/ext/openssl/tests/openssl_x509_read_basic.phpt
index 72a62f7079..062c6bf1cb 100644
--- a/ext/openssl/tests/openssl_x509_read_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_read_basic.phpt
@@ -34,4 +34,3 @@ bool(false)
Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d
bool(false)
-
diff --git a/ext/openssl/tests/stream_crypto_flags_002.phpt b/ext/openssl/tests/stream_crypto_flags_002.phpt
index 379736dd81..5992612018 100644
--- a/ext/openssl/tests/stream_crypto_flags_002.phpt
+++ b/ext/openssl/tests/stream_crypto_flags_002.phpt
@@ -55,4 +55,3 @@ resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
-
diff --git a/ext/openssl/tests/stream_crypto_flags_003.phpt b/ext/openssl/tests/stream_crypto_flags_003.phpt
index fd6746daa0..51a8dec123 100644
--- a/ext/openssl/tests/stream_crypto_flags_003.phpt
+++ b/ext/openssl/tests/stream_crypto_flags_003.phpt
@@ -53,4 +53,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
-
diff --git a/ext/pcre/tests/002.phpt b/ext/pcre/tests/002.phpt
index 42b63c7d1b..d4780447bc 100644
--- a/ext/pcre/tests/002.phpt
+++ b/ext/pcre/tests/002.phpt
@@ -16,7 +16,6 @@ var_dump(preg_replace('/(.)/e', 'for ($', 'abc'));
?>
--EXPECTF--
-
Warning: preg_match() expects at least 2 parameters, 0 given in %s002.php on line 3
bool(false)
diff --git a/ext/pcre/tests/bug27103.phpt b/ext/pcre/tests/bug27103.phpt
index 163dc9f1ea..0264228aee 100644
--- a/ext/pcre/tests/bug27103.phpt
+++ b/ext/pcre/tests/bug27103.phpt
@@ -40,4 +40,3 @@ h: 1
e: 1
r: 1
e: 1
-
diff --git a/ext/pcre/tests/bug52732.phpt b/ext/pcre/tests/bug52732.phpt
index 8cfa20420f..2ca969d3bf 100644
--- a/ext/pcre/tests/bug52732.phpt
+++ b/ext/pcre/tests/bug52732.phpt
@@ -10,4 +10,4 @@ var_dump($ret);
?>
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/pcre/tests/bug73392.phpt b/ext/pcre/tests/bug73392.phpt
index 2b432543b8..90606c9e05 100644
--- a/ext/pcre/tests/bug73392.phpt
+++ b/ext/pcre/tests/bug73392.phpt
@@ -20,7 +20,6 @@ var_dump(preg_replace_callback_array(
"/a/" => 'b', "/b/" => function () { return "c"; }, "/c/" => new Rep, "reporting" => array("Foo", "rep"), "a1" => array("Foo", "rep"),
), 'a'));
?>
-
--EXPECTF--
Warning: preg_replace_callback_array(): Delimiter must not be alphanumeric or backslash in %sbug73392.php on line %d
diff --git a/ext/pcre/tests/bug74183.phpt b/ext/pcre/tests/bug74183.phpt
index 9085763d80..53c209a64e 100644
--- a/ext/pcre/tests/bug74183.phpt
+++ b/ext/pcre/tests/bug74183.phpt
@@ -12,4 +12,4 @@ var_dump(preg_last_error() === \PREG_INTERNAL_ERROR);
--EXPECTF--
Warning: preg_match(): Compilation failed: regular expression is too large at offset %s in %s on line %d
bool(false)
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/pcre/tests/bug74873.phpt b/ext/pcre/tests/bug74873.phpt
index 9b64dae926..ebcf0b3418 100644
--- a/ext/pcre/tests/bug74873.phpt
+++ b/ext/pcre/tests/bug74873.phpt
@@ -5,4 +5,4 @@ Bug #74873 (Minor BC break: PCRE_JIT changes output of preg_match())
var_dump(preg_match('/\S+/', 'foo bar', $matches, 0, 99999));
?>
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/pcre/tests/bug76850.phpt b/ext/pcre/tests/bug76850.phpt
index 89a64f9f78..3e07ab7aa8 100644
--- a/ext/pcre/tests/bug76850.phpt
+++ b/ext/pcre/tests/bug76850.phpt
@@ -25,4 +25,3 @@ var_dump(preg_match('/./', "a"));
--EXPECT--
int(1)
==DONE==
-
diff --git a/ext/pcre/tests/bug76909.phpt b/ext/pcre/tests/bug76909.phpt
index 3e8435588d..5109bed3a7 100644
--- a/ext/pcre/tests/bug76909.phpt
+++ b/ext/pcre/tests/bug76909.phpt
@@ -24,4 +24,3 @@ int(0)
int(0)
int(0)
int(0)
-
diff --git a/ext/pcre/tests/match_flags3.phpt b/ext/pcre/tests/match_flags3.phpt
index 84deb0b80c..695f0c1e81 100644
--- a/ext/pcre/tests/match_flags3.phpt
+++ b/ext/pcre/tests/match_flags3.phpt
@@ -18,7 +18,6 @@ var_dump(preg_match('/(?P<3>)/', ''));
?>
--EXPECTF--
-
Warning: preg_match(): Empty regular expression in %smatch_flags3.php on line 3
bool(false)
int(1)
diff --git a/ext/pcre/tests/pcre.constants.phpt b/ext/pcre/tests/pcre.constants.phpt
index ad012e7e69..5abc6c72c2 100644
--- a/ext/pcre/tests/pcre.constants.phpt
+++ b/ext/pcre/tests/pcre.constants.phpt
@@ -32,4 +32,4 @@ PREG_INTERNAL_ERROR= 1
PREG_BACKTRACK_LIMIT_ERROR= 2
PREG_RECURSION_LIMIT_ERROR= 3
PREG_BAD_UTF8_ERROR= 4
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/pcre/tests/preg_grep_error.phpt b/ext/pcre/tests/preg_grep_error.phpt
index f2afdb9d26..8cc3ffe669 100644
--- a/ext/pcre/tests/preg_grep_error.phpt
+++ b/ext/pcre/tests/preg_grep_error.phpt
@@ -40,4 +40,4 @@ NULL
Warning: preg_grep() expects at least 2 parameters, 1 given in %spreg_grep_error.php on line %d
NULL
-Done \ No newline at end of file
+Done
diff --git a/ext/pcre/tests/preg_grep_error1.phpt b/ext/pcre/tests/preg_grep_error1.phpt
index ae2eb128ba..fcc36e7d91 100644
--- a/ext/pcre/tests/preg_grep_error1.phpt
+++ b/ext/pcre/tests/preg_grep_error1.phpt
@@ -27,7 +27,6 @@ var_dump(preg_grep($value, $array));
echo "Done"
?>
--EXPECTF--
-
*** Testing preg_grep() : error conditions ***
Arg value is abcdef
@@ -65,4 +64,4 @@ array(2) {
Warning: preg_grep() expects parameter 1 to be string, object given in %spreg_grep_error1.php on line %d
NULL
-Done \ No newline at end of file
+Done
diff --git a/ext/pcre/tests/preg_grep_error2.phpt b/ext/pcre/tests/preg_grep_error2.phpt
index aa4dae98a0..720940800f 100644
--- a/ext/pcre/tests/preg_grep_error2.phpt
+++ b/ext/pcre/tests/preg_grep_error2.phpt
@@ -39,4 +39,4 @@ array(2) {
Warning: preg_grep() expects parameter 2 to be array, object given in %spreg_grep_error2.php on line %d
NULL
-Done \ No newline at end of file
+Done
diff --git a/ext/pcre/tests/preg_last_error_error.phpt b/ext/pcre/tests/preg_last_error_error.phpt
index c75e2f86c1..105d5ab1c2 100644
--- a/ext/pcre/tests/preg_last_error_error.phpt
+++ b/ext/pcre/tests/preg_last_error_error.phpt
@@ -27,4 +27,4 @@ var_dump( preg_last_error($extra_arg) );
Warning: preg_last_error() expects exactly 0 parameters, 1 given in %s on line %d
NULL
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/pcre/tests/preg_match_all_error3.phpt b/ext/pcre/tests/preg_match_all_error3.phpt
index 6c1422b61a..6559b22d2e 100644
--- a/ext/pcre/tests/preg_match_all_error3.phpt
+++ b/ext/pcre/tests/preg_match_all_error3.phpt
@@ -16,5 +16,4 @@ var_dump(preg_match_all($regex, $subject, 'test'));
echo "Done";
?>
--EXPECTF--
-
Fatal error: Only variables can be passed by reference in %spreg_match_all_error3.php on line %d
diff --git a/ext/pcre/tests/preg_match_basic.phpt b/ext/pcre/tests/preg_match_basic.phpt
index 939773f62e..a0015f129e 100644
--- a/ext/pcre/tests/preg_match_basic.phpt
+++ b/ext/pcre/tests/preg_match_basic.phpt
@@ -18,9 +18,7 @@ var_dump($match4);
var_dump(preg_match('/hello world/', $string, $match5)); //tries to find "hello world" (should be Hello, world)
var_dump($match5);
?>
-
--EXPECT--
-
int(1)
array(1) {
[0]=>
@@ -49,4 +47,3 @@ array(1) {
int(0)
array(0) {
}
-
diff --git a/ext/pcre/tests/preg_match_basic_002.phpt b/ext/pcre/tests/preg_match_basic_002.phpt
index 19c85c0cce..bca8f3e3c5 100644
--- a/ext/pcre/tests/preg_match_basic_002.phpt
+++ b/ext/pcre/tests/preg_match_basic_002.phpt
@@ -20,4 +20,4 @@ array(2) {
[1]=>
string(1) "y"
}
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/pcre/tests/preg_match_basic_edit.phpt b/ext/pcre/tests/preg_match_basic_edit.phpt
index d4339a8955..e06bb4005c 100644
--- a/ext/pcre/tests/preg_match_basic_edit.phpt
+++ b/ext/pcre/tests/preg_match_basic_edit.phpt
@@ -26,9 +26,7 @@ var_dump($match4);
var_dump(preg_match('/hello world/', $string, $match5)); //tries to find "hello world" (should be Hello, world)
var_dump($match5);
?>
-
--EXPECT--
-
int(1)
array(1) {
[0]=>
@@ -57,4 +55,3 @@ array(1) {
int(0)
array(0) {
}
-
diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt
index ba0aea4912..42bb5abd27 100644
--- a/ext/pcre/tests/preg_match_error1.phpt
+++ b/ext/pcre/tests/preg_match_error1.phpt
@@ -26,7 +26,6 @@ $regex_value = new stdclass(); //Object
var_dump(preg_match($regex_value, $subject));
?>
--EXPECTF--
-
*** Testing preg_match() : error conditions ***
Arg value is abcdef
diff --git a/ext/pcre/tests/preg_match_error2.phpt b/ext/pcre/tests/preg_match_error2.phpt
index f44b1d0f72..cb0917a228 100644
--- a/ext/pcre/tests/preg_match_error2.phpt
+++ b/ext/pcre/tests/preg_match_error2.phpt
@@ -22,7 +22,6 @@ var_dump(preg_match($regex, $value));
echo "Done";
?>
--EXPECTF--
-
*** Testing preg_match() : error conditions ***
Arg value is: this is a string
@@ -35,4 +34,4 @@ bool(false)
Warning: preg_match() expects parameter 2 to be string, object given in %spreg_match_error2.php on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/pcre/tests/preg_quote_basic.phpt b/ext/pcre/tests/preg_quote_basic.phpt
index 2697a80155..bdcd933428 100644
--- a/ext/pcre/tests/preg_quote_basic.phpt
+++ b/ext/pcre/tests/preg_quote_basic.phpt
@@ -15,11 +15,10 @@ var_dump(preg_match('/^[tT]\w{6} - ' . preg_quote($string_before, '/') . ' [a-z]
var_dump($matches1);
?>
--EXPECT--
-
$string_before looks like: /this *-has \ metacharacters^ in $
$string_after looks like: \/this \*\-has \\ metacharacters\^ in \$, with metacharacters and / (set as delimiter) escaped
int(1)
array(1) {
[0]=>
string(58) "testing - /this *-has \ metacharacters^ in $ should work"
-} \ No newline at end of file
+}
diff --git a/ext/pcre/tests/preg_quote_error1.phpt b/ext/pcre/tests/preg_quote_error1.phpt
index a02c836707..6f885f0509 100644
--- a/ext/pcre/tests/preg_quote_error1.phpt
+++ b/ext/pcre/tests/preg_quote_error1.phpt
@@ -33,4 +33,4 @@ NULL
Warning: preg_quote() expects parameter 1 to be string, object given in %spreg_quote_error1.php on line %d
NULL
-Done \ No newline at end of file
+Done
diff --git a/ext/pcre/tests/preg_replace_basic.phpt b/ext/pcre/tests/preg_replace_basic.phpt
index 9c2eba47d8..266bd0eebd 100644
--- a/ext/pcre/tests/preg_replace_basic.phpt
+++ b/ext/pcre/tests/preg_replace_basic.phpt
@@ -16,7 +16,6 @@ var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', '\\1 at \\2 do
?>
--EXPECT--
-
string(54) "123456789 - Hello, world - This is a string."
string(54) "123456789 - Hello, world - This is a string."
string(54) "444444444 - Hello, world - This is a string."
diff --git a/ext/pcre/tests/preg_replace_callback_error1.phpt b/ext/pcre/tests/preg_replace_callback_error1.phpt
index add24fbc82..313064eab8 100644
--- a/ext/pcre/tests/preg_replace_callback_error1.phpt
+++ b/ext/pcre/tests/preg_replace_callback_error1.phpt
@@ -56,4 +56,4 @@ string(9) "number 1."
Arg value is /[a-zA-Z]/
string(3) " 1."
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/pcre/tests/preg_replace_error1.phpt b/ext/pcre/tests/preg_replace_error1.phpt
index 04eef25e3d..8e20108b88 100644
--- a/ext/pcre/tests/preg_replace_error1.phpt
+++ b/ext/pcre/tests/preg_replace_error1.phpt
@@ -56,4 +56,3 @@ Arg value is /[a-zA-Z]/
string(1) "1"
Recoverable fatal error: Object of class stdClass could not be converted to string in %spreg_replace_error1.php on line %d
-
diff --git a/ext/pcre/tests/preg_replace_error2.phpt b/ext/pcre/tests/preg_replace_error2.phpt
index 79f4c60d69..8c826587ea 100644
--- a/ext/pcre/tests/preg_replace_error2.phpt
+++ b/ext/pcre/tests/preg_replace_error2.phpt
@@ -34,4 +34,3 @@ Warning: preg_replace(): Parameter mismatch, pattern is a string while replaceme
bool(false)
Recoverable fatal error: Object of class stdClass could not be converted to string in %spreg_replace_error2.php on line %d
-
diff --git a/ext/pcre/tests/preg_split_error.phpt b/ext/pcre/tests/preg_split_error.phpt
index 960b286c91..45fe6459e6 100644
--- a/ext/pcre/tests/preg_split_error.phpt
+++ b/ext/pcre/tests/preg_split_error.phpt
@@ -41,4 +41,4 @@ bool(false)
Warning: preg_split() expects at least 2 parameters, 1 given in %spreg_split_error.php on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/pcre/tests/preg_split_error2.phpt b/ext/pcre/tests/preg_split_error2.phpt
index e08182177f..030f757d0a 100644
--- a/ext/pcre/tests/preg_split_error2.phpt
+++ b/ext/pcre/tests/preg_split_error2.phpt
@@ -31,4 +31,4 @@ bool(false)
Warning: preg_split() expects parameter 2 to be string, object given in %spreg_split_error2.php on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/pdo/tests/bug_39656.phpt b/ext/pdo/tests/bug_39656.phpt
index 9ee54916bb..eacb693918 100644
--- a/ext/pdo/tests/bug_39656.phpt
+++ b/ext/pdo/tests/bug_39656.phpt
@@ -48,4 +48,3 @@ array(4) {
}
bool(false)
Done
-
diff --git a/ext/pdo/tests/bug_44173.phpt b/ext/pdo/tests/bug_44173.phpt
index f13abaa5d5..ecb76127d6 100644
--- a/ext/pdo/tests/bug_44173.phpt
+++ b/ext/pdo/tests/bug_44173.phpt
@@ -75,4 +75,3 @@ bool(false)
Warning: PDO::query(): SQLSTATE[HY000]: General error: fetch mode requires the classname argument in %s
bool(false)
-
diff --git a/ext/pdo/tests/bug_52098.phpt b/ext/pdo/tests/bug_52098.phpt
index d30a8e462f..00fd94ec76 100644
--- a/ext/pdo/tests/bug_52098.phpt
+++ b/ext/pdo/tests/bug_52098.phpt
@@ -56,4 +56,4 @@ $db->exec("DROP TABLE test");
Calling object method 'foo'
Calling object method 'bar'
Calling object method 'lucky'
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/pdo/tests/bug_64172.phpt b/ext/pdo/tests/bug_64172.phpt
index e8949fe597..266ff6a33b 100644
--- a/ext/pdo/tests/bug_64172.phpt
+++ b/ext/pdo/tests/bug_64172.phpt
@@ -81,4 +81,4 @@ array(3) {
[2]=>
NULL
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/pdo/tests/pecl_bug_5772.phpt b/ext/pdo/tests/pecl_bug_5772.phpt
index e38c8947e2..1b5dbb3bd2 100644
--- a/ext/pdo/tests/pecl_bug_5772.phpt
+++ b/ext/pdo/tests/pecl_bug_5772.phpt
@@ -24,6 +24,5 @@ function heLLO($row) {
foreach ($db->query("SELECT * FROM test")->fetchAll(PDO::FETCH_FUNC, 'heLLO') as $row) {
var_dump($row);
}
-
--EXPECT--
string(1) "1"
diff --git a/ext/pdo/tests/pecl_bug_5809.phpt b/ext/pdo/tests/pecl_bug_5809.phpt
index bb412812e5..f9d3f75ea7 100644
--- a/ext/pdo/tests/pecl_bug_5809.phpt
+++ b/ext/pdo/tests/pecl_bug_5809.phpt
@@ -22,7 +22,6 @@ var_dump($values);
$stmt = $db->prepare('SELECT * FROM test WHERE id = ?');
$stmt->execute($values);
var_dump($values);
-
--EXPECT--
array(1) {
[0]=>
diff --git a/ext/pdo_dblib/tests/bug_68957.phpt b/ext/pdo_dblib/tests/bug_68957.phpt
index 47ff461bb3..d500fd498b 100644
--- a/ext/pdo_dblib/tests/bug_68957.phpt
+++ b/ext/pdo_dblib/tests/bug_68957.phpt
@@ -26,4 +26,3 @@ Array
)
)
-
diff --git a/ext/pdo_firebird/tests/bug_62024.phpt b/ext/pdo_firebird/tests/bug_62024.phpt
index e046879c22..3676a2f3e5 100644
--- a/ext/pdo_firebird/tests/bug_62024.phpt
+++ b/ext/pdo_firebird/tests/bug_62024.phpt
@@ -48,4 +48,3 @@ unset($dbh);
--EXPECT--
bool(true)
bool(true)
-
diff --git a/ext/pdo_firebird/tests/bug_64037.phpt b/ext/pdo_firebird/tests/bug_64037.phpt
index f7b53e57a3..ae57199d4d 100644
--- a/ext/pdo_firebird/tests/bug_64037.phpt
+++ b/ext/pdo_firebird/tests/bug_64037.phpt
@@ -42,4 +42,4 @@ unset($dbh);
--EXPECT--
string(5) "-1.00"
string(5) "-0.99"
-string(5) "-1.01" \ No newline at end of file
+string(5) "-1.01"
diff --git a/ext/pdo_firebird/tests/bug_73087.phpt b/ext/pdo_firebird/tests/bug_73087.phpt
index 3ed18db0f1..97dee2b556 100644
--- a/ext/pdo_firebird/tests/bug_73087.phpt
+++ b/ext/pdo_firebird/tests/bug_73087.phpt
@@ -23,4 +23,4 @@ unset($C);
echo 'OK';
?>
--EXPECT--
-OK \ No newline at end of file
+OK
diff --git a/ext/pdo_firebird/tests/bug_74462.phpt b/ext/pdo_firebird/tests/bug_74462.phpt
index 52033decca..8c1290c05c 100644
--- a/ext/pdo_firebird/tests/bug_74462.phpt
+++ b/ext/pdo_firebird/tests/bug_74462.phpt
@@ -26,4 +26,4 @@ array(3) {
bool(false)
[2]=>
NULL
-} \ No newline at end of file
+}
diff --git a/ext/pdo_firebird/tests/bug_76488.phpt b/ext/pdo_firebird/tests/bug_76488.phpt
index 028d3cb805..d4f885dbd8 100644
--- a/ext/pdo_firebird/tests/bug_76488.phpt
+++ b/ext/pdo_firebird/tests/bug_76488.phpt
@@ -29,4 +29,4 @@ from r
echo "OK";
?>
--EXPECT--
-OK \ No newline at end of file
+OK
diff --git a/ext/pdo_firebird/tests/bug_aaa.phpt b/ext/pdo_firebird/tests/bug_aaa.phpt
index 821d59afd2..a4a504f5d9 100644
--- a/ext/pdo_firebird/tests/bug_aaa.phpt
+++ b/ext/pdo_firebird/tests/bug_aaa.phpt
@@ -16,4 +16,4 @@ unset($C);
echo 'OK';
?>
--EXPECT--
-OK \ No newline at end of file
+OK
diff --git a/ext/pdo_mysql/tests/bug66141.phpt b/ext/pdo_mysql/tests/bug66141.phpt
index 5c382dfe0e..bddf08e9f2 100644
--- a/ext/pdo_mysql/tests/bug66141.phpt
+++ b/ext/pdo_mysql/tests/bug66141.phpt
@@ -35,4 +35,4 @@ Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: 1064 Y
string(50) "'Something\', 1 as one, 2 as two FROM dual; -- f'"
string(50) "'Something'', 1 as one, 2 as two FROM dual; -- f'"
string(50) "'Something'', 1 as one, 2 as two FROM dual; -- f'"
-done \ No newline at end of file
+done
diff --git a/ext/pdo_mysql/tests/bug68371.phpt b/ext/pdo_mysql/tests/bug68371.phpt
index cac93c9668..77ddc3183e 100644
--- a/ext/pdo_mysql/tests/bug68371.phpt
+++ b/ext/pdo_mysql/tests/bug68371.phpt
@@ -98,4 +98,3 @@ string(5) "mysql"
ERR
ERR
int(4)
-
diff --git a/ext/pdo_mysql/tests/bug_39483.phpt b/ext/pdo_mysql/tests/bug_39483.phpt
index c493b8c03f..559cad65ba 100644
--- a/ext/pdo_mysql/tests/bug_39483.phpt
+++ b/ext/pdo_mysql/tests/bug_39483.phpt
Binary files differ
diff --git a/ext/pdo_mysql/tests/bug_41698.phpt b/ext/pdo_mysql/tests/bug_41698.phpt
index b2dee60d74..637a0910b1 100644
--- a/ext/pdo_mysql/tests/bug_41698.phpt
+++ b/ext/pdo_mysql/tests/bug_41698.phpt
@@ -34,4 +34,4 @@ array(2) {
["floatval"]=>
string(8) "4.560000"
}
-} \ No newline at end of file
+}
diff --git a/ext/pdo_mysql/tests/bug_51670.phpt b/ext/pdo_mysql/tests/bug_51670.phpt
index ddfd139d94..b2a1219991 100644
--- a/ext/pdo_mysql/tests/bug_51670.phpt
+++ b/ext/pdo_mysql/tests/bug_51670.phpt
@@ -21,4 +21,3 @@ echo 'done!';
?>
--EXPECT--
done!
-
diff --git a/ext/pdo_mysql/tests/bug_pecl_12925.phpt b/ext/pdo_mysql/tests/bug_pecl_12925.phpt
index 1d9558bf66..a893fb81b7 100644
--- a/ext/pdo_mysql/tests/bug_pecl_12925.phpt
+++ b/ext/pdo_mysql/tests/bug_pecl_12925.phpt
@@ -59,4 +59,4 @@ array(1) {
string(1) "c"
}
}
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt
index 8c8922f20b..e24f66c09d 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt
@@ -53,4 +53,4 @@ pdo.dsn.mysql="mysql:dbname=phptest;socket=/tmp/mysql.sock"
?>
--EXPECT--
pdo.dsn.mysql cannot be accessed through ini_get_all()/ini_get()
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt
index 925290e734..95e6ff9875 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt
@@ -95,4 +95,4 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc';
MySQLPDOTest::dropTestTable();
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt
index a39fff5c81..6c39467b12 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt
@@ -221,4 +221,4 @@ array(1) {
string(1) "1"
}
}
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt
index 464d2b422d..19831da979 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt
@@ -34,4 +34,4 @@ $db = MySQLPDOTest::factory();
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt
index d852af01fd..708e3a2efc 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt
@@ -28,4 +28,4 @@ $db = MySQLPDOTest::factory();
?>
--EXPECT--
string(5) "mysql"
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_errmode.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_errmode.phpt
index ce6a1ecd26..4db50f074f 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_errmode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_errmode.phpt
@@ -163,4 +163,4 @@ error_reporting=E_ALL
Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: %d You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near '%s' at line %d in %s on line %d
-end of execution \ No newline at end of file
+end of execution
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt
index 115103df75..c9aa5aaac4 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt
@@ -74,4 +74,4 @@ $db->exec('DROP TABLE IF EXISTS test');
[002] id = 1, val = 0123456789... (length: 1000)
[003] id = 1, val = 0123456789... (length: %d)
[004] id = 1, val = 0123456789... (length: 2000)
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt
index b812bf7bb5..b10e82afcb 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt
@@ -92,4 +92,3 @@ array(1) {
}
}
done!
-
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt
index cc8dab5a14..3a937c7dee 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt
@@ -118,4 +118,4 @@ array(1) {
string(3) "%se"
}
}
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_prefetch.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_prefetch.phpt
index 456a796131..41dcf06f40 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_prefetch.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_prefetch.phpt
@@ -18,4 +18,4 @@ $db = MySQLPDOTest::factory();
Warning: PDO::getAttribute(): SQLSTATE[IM001]: Driver does not support this function: driver does not support that attribute in %s on line %d
bool(false)
bool(false)
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt
index f7c6d0b2d0..9c3087384b 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt
@@ -45,4 +45,4 @@ $db = MySQLPDOTest::factory();
print "done!";
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt
index 1d65e4486c..0a50c8d46a 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt
@@ -62,4 +62,4 @@ $db = MySQLPDOTest::factory();
print "done!";
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
index 6955e0a173..e280ded294 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
@@ -156,4 +156,4 @@ Fatal error: Uncaught Error: Cannot instantiate abstract class mystatement6 in %
Stack trace:
#0 %s(%d): PDO->query('SELECT id, labe...')
#1 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_bit.phpt b/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
index 4cb5c64259..f27e3d8c78 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
@@ -61,4 +61,4 @@ array(2) {
string(1) "1"
}
int(1)
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_commit.phpt b/ext/pdo_mysql/tests/pdo_mysql_commit.phpt
index f3cd530f2f..2219ae8ed4 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_commit.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_commit.phpt
@@ -87,4 +87,4 @@ $db->exec('DROP TABLE IF EXISTS test_commit');
MySQLPDOTest::dropTestTable($db);
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt b/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt
index db38c6904f..a974f29df9 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt
@@ -83,4 +83,4 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc';
MySQLPDOTest::dropTestTable();
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt
index 2dc00e012b..8afd07bef0 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt
@@ -89,4 +89,4 @@ MySQLPDOTest::dropTestTable($db);
@$db->exec('DROP DATABASE IF EXISTS pdo_exec_ddl2');
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt
index d0e0ffcba7..f8900a0ef3 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt
@@ -62,4 +62,4 @@ $db = MySQLPDOTest::factory();
--EXPECTF--
Warning: PDO::exec(): SQLSTATE[HY000]: General error: 2014 Cannot execute queries while other unbuffered queries are active. Consider using PDOStatement::fetchAll(). Alternatively, if your code is only ever going to run against mysql, you may enable query buffering by setting the PDO::MYSQL_ATTR_USE_BUFFERED_QUERY attribute. in %s on line %d
[006] Expecting '1'/integer got ''/boolean when running 'INSERT INTO test(id, col1) VALUES (2, 'b')', [HY000] HY000 2014 Cannot execute queries while other unbuffered queries are active. Consider using PDOStatement::fetchAll(). Alternatively, if your code is only ever going to run against mysql, you may enable query buffering by setting the PDO::MYSQL_ATTR_USE_BUFFERED_QUERY attribute.
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt b/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt
index 6a7de2c22a..9303a3119d 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt
@@ -85,4 +85,4 @@ array(2) {
[2]=>
string(1) "1"
}
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_column.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_column.phpt
index 57a4529ac2..8a942d0d32 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_column.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_column.phpt
@@ -46,4 +46,4 @@ array(1) {
Warning: PDOStatement::execute(): SQLSTATE[HY093]: Invalid parameter number: parameter was not defined in %s on line %d
array(0) {
}
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt
index 0187858f8b..442e710e74 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt
@@ -87,4 +87,4 @@ array(1) {
string(4) "row1"
}
}
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt b/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt
index 79a036ca8f..108975bcf8 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt
@@ -93,4 +93,4 @@ int(1)
int(0)
int(1)
int(0)
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt
index 95d7754ca5..c23ef4b2fd 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt
@@ -170,4 +170,4 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc';
MySQLPDOTest::dropTestTable();
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
index 9b02489251..2dedf35958 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
@@ -145,4 +145,4 @@ $db->exec('DROP TABLE IF EXISTS test');
--EXPECT--
Emulated PS...
Native PS...
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt
index 3e25f85b7a..bec8b70caf 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt
@@ -95,4 +95,4 @@ $db = MySQLPDOTest::factory();
$db->exec('DROP TABLE IF EXISTS test');
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt
index dd9c47bc37..69e0d35e17 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt
@@ -66,4 +66,4 @@ int(2)
Testing native PS...
int(4)
int(2)
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt
index d996dbc3b6..255cd383a6 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt
@@ -188,4 +188,4 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc';
MySQLPDOTest::dropTestTable();
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
index 9eb31f524c..d2a2316272 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
@@ -103,4 +103,4 @@ Fatal error: Uncaught Error: Call to a member function errorInfo() on bool in %s
Stack trace:
#0 %s(%d): mysql_stmt_multiquery_wrong_usage(Object(PDO))
#1 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt
index e93bf78a13..1e89c8900c 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt
@@ -33,4 +33,4 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc';
MySQLPDOTest::dropTestTable();
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
index 4c4148d5bb..1dc203fa9e 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
@@ -181,4 +181,4 @@ array(1) {
string(1) "a"
}
}
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt b/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt
index 50d5864d8f..1d8c529378 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt
@@ -125,4 +125,4 @@ $db = MySQLPDOTest::factory();
$db->exec('DROP TABLE IF EXISTS test');
?>
--EXPECT--
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pecl_bug_5802.phpt b/ext/pdo_mysql/tests/pecl_bug_5802.phpt
index 397d2e7b9f..b7cbf78ee7 100644
--- a/ext/pdo_mysql/tests/pecl_bug_5802.phpt
+++ b/ext/pdo_mysql/tests/pecl_bug_5802.phpt
@@ -58,4 +58,4 @@ array(3) {
string(3) "qaz"
}
}
-done! \ No newline at end of file
+done!
diff --git a/ext/pdo_oci/tests/bug60994.phpt b/ext/pdo_oci/tests/bug60994.phpt
index a238f4a4d3..890ecb47c7 100644
--- a/ext/pdo_oci/tests/bug60994.phpt
+++ b/ext/pdo_oci/tests/bug60994.phpt
@@ -92,11 +92,9 @@ echo 'size of string4 is ', strlen($string4), ' bytes, ', mb_strlen($string4), '
echo 'size of stream4 is ', strlen($stream4), ' bytes, ', mb_strlen($stream4), ' chars.', PHP_EOL;
echo 'beg of stream4 is ', $start4, PHP_EOL;
echo 'end of stream4 is ', $ending4, PHP_EOL;
-
--XFAIL--
Fails due to Bug 60994
--EXPECT--
-
Test 1: j
size of string1 is 1000006 bytes, 1000006 chars.
size of stream1 is 1000006 bytes, 1000006 chars.
@@ -120,4 +118,3 @@ size of string4 is 24567 bytes, 8193 chars.
size of stream4 is 24567 bytes, 8193 chars.
beg of stream4 is abcγγγγγγγ
end of stream4 is γγγγγγγxyz
-
diff --git a/ext/pdo_oci/tests/bug_33707.phpt b/ext/pdo_oci/tests/bug_33707.phpt
index 1ac9fa45cb..0692a08bdf 100644
--- a/ext/pdo_oci/tests/bug_33707.phpt
+++ b/ext/pdo_oci/tests/bug_33707.phpt
@@ -15,7 +15,6 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
$rs = $db->query('select blah from a_table_that_doesnt_exist');
var_dump($rs);
var_dump($db->errorInfo());
-
--EXPECTF--
bool(false)
array(3) {
diff --git a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt
index 298d59ed0d..0c02a01e53 100644
--- a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt
@@ -61,4 +61,4 @@ Change setting back to true - PDO::ATTR_AUTOCOMMIT: bool(true)
Insert data
Second connection should be able to see committed data
Data is: some data
-Done \ No newline at end of file
+Done
diff --git a/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt b/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt
index b9c4612b8f..7c104b20ba 100644
--- a/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt
@@ -58,4 +58,4 @@ NULL
PDO::ATTR_ORACLE_NULLS: PDO::NULL_TO_STRING: int(2)
string(0) ""
string(0) ""
-Done \ No newline at end of file
+Done
diff --git a/ext/pdo_oci/tests/pdo_oci_stream_1.phpt b/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
index 9f17e9f61b..68bec157eb 100644
--- a/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
@@ -110,4 +110,4 @@ Read jjjxyz
Read 0
Read 0
Read 0
-Read jjjxyz \ No newline at end of file
+Read jjjxyz
diff --git a/ext/pdo_oci/tests/pdo_oci_templob_1.phpt b/ext/pdo_oci/tests/pdo_oci_templob_1.phpt
index d79b6b72ce..0dddd4f7e5 100644
--- a/ext/pdo_oci/tests/pdo_oci_templob_1.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_templob_1.phpt
@@ -82,4 +82,3 @@ else
?>
--EXPECT--
Success! All the temporary LOB in previously closed statements are properly cleaned.
-
diff --git a/ext/pdo_oci/tests/pecl_bug_11345.phpt b/ext/pdo_oci/tests/pecl_bug_11345.phpt
index 8a633f547c..31f691d7ef 100644
--- a/ext/pdo_oci/tests/pecl_bug_11345.phpt
+++ b/ext/pdo_oci/tests/pecl_bug_11345.phpt
@@ -24,6 +24,5 @@ catch (PDOException $e) {
echo "Done\n";
?>
-
--EXPECTF--
-Connection failed: SQLSTATE[HY000]: OCINlsCharSetNameToId: unknown character set name (%s) \ No newline at end of file
+Connection failed: SQLSTATE[HY000]: OCINlsCharSetNameToId: unknown character set name (%s)
diff --git a/ext/pdo_oci/tests/pecl_bug_6364.phpt b/ext/pdo_oci/tests/pecl_bug_6364.phpt
index 925665e42b..e8ed6ee62d 100644
--- a/ext/pdo_oci/tests/pecl_bug_6364.phpt
+++ b/ext/pdo_oci/tests/pecl_bug_6364.phpt
@@ -42,7 +42,6 @@ $dbh->exec ("drop procedure bug_6364_sp");
$dbh->exec ("drop table bug_6364_t");
?>
-
--EXPECT--
string(4) "val4"
string(4) "val5"
diff --git a/ext/pdo_odbc/tests/long_columns.phpt b/ext/pdo_odbc/tests/long_columns.phpt
index fda63c47cb..3f72b354c1 100644
--- a/ext/pdo_odbc/tests/long_columns.phpt
+++ b/ext/pdo_odbc/tests/long_columns.phpt
@@ -90,7 +90,6 @@ foreach ($db->query('SELECT id, data from TEST ORDER BY LEN(data) ASC') as $row)
}
echo "Finished\n";
-
--EXPECT--
Passed on size 32
Passed on size 53
diff --git a/ext/pdo_odbc/tests/max_columns.phpt b/ext/pdo_odbc/tests/max_columns.phpt
index 301fa764ca..6fb8984005 100644
--- a/ext/pdo_odbc/tests/max_columns.phpt
+++ b/ext/pdo_odbc/tests/max_columns.phpt
@@ -41,6 +41,5 @@ foreach ($db->query('SELECT id, data from TEST') as $row) {
}
echo "Finished\n";
-
--EXPECT--
Finished
diff --git a/ext/pdo_pgsql/tests/bug36727.phpt b/ext/pdo_pgsql/tests/bug36727.phpt
index 34d14db6cc..d5f8e49f96 100644
--- a/ext/pdo_pgsql/tests/bug36727.phpt
+++ b/ext/pdo_pgsql/tests/bug36727.phpt
@@ -21,4 +21,4 @@ echo "Done\n";
--EXPECTF--
Warning: PDOStatement::bindValue(): SQLSTATE[HY093]: Invalid parameter number: :test in %sbug36727.php on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/pdo_pgsql/tests/bug48764.phpt b/ext/pdo_pgsql/tests/bug48764.phpt
index a40e453d8d..cfe29cd7c3 100644
--- a/ext/pdo_pgsql/tests/bug48764.phpt
+++ b/ext/pdo_pgsql/tests/bug48764.phpt
@@ -59,7 +59,6 @@ function bug($db, $options = array()) {
echo $e->getCode()."\n";
}
}
-
--EXPECT--
Test 1
42P18
diff --git a/ext/pdo_pgsql/tests/bug62479.phpt b/ext/pdo_pgsql/tests/bug62479.phpt
index efe4ece4e6..389240f8e1 100644
--- a/ext/pdo_pgsql/tests/bug62479.phpt
+++ b/ext/pdo_pgsql/tests/bug62479.phpt
@@ -73,4 +73,3 @@ $pdo->query($dropUser);
--EXPECT--
int(1)
int(1)
-
diff --git a/ext/pdo_pgsql/tests/bug68371.phpt b/ext/pdo_pgsql/tests/bug68371.phpt
index 636b22f52e..350708b97d 100644
--- a/ext/pdo_pgsql/tests/bug68371.phpt
+++ b/ext/pdo_pgsql/tests/bug68371.phpt
@@ -96,4 +96,3 @@ string(5) "pgsql"
ERR
ERR
int(4)
-
diff --git a/ext/pdo_pgsql/tests/bug69344.phpt b/ext/pdo_pgsql/tests/bug69344.phpt
index d274e0608c..d8e5d25b0a 100644
--- a/ext/pdo_pgsql/tests/bug69344.phpt
+++ b/ext/pdo_pgsql/tests/bug69344.phpt
@@ -41,4 +41,3 @@ $test();
--EXPECT--
SQLSTATE[HY093]: Invalid parameter number: parameter was not defined
SQLSTATE[HY093]: Invalid parameter number: parameter was not defined
-
diff --git a/ext/pdo_pgsql/tests/bug69362.phpt b/ext/pdo_pgsql/tests/bug69362.phpt
index e986af8578..3db58d5fcc 100644
--- a/ext/pdo_pgsql/tests/bug69362.phpt
+++ b/ext/pdo_pgsql/tests/bug69362.phpt
@@ -61,4 +61,3 @@ $pdo->query($dropUser);
?>
--EXPECT--
int(1)
-
diff --git a/ext/pdo_pgsql/tests/bug72294.phpt b/ext/pdo_pgsql/tests/bug72294.phpt
index 484a6f5765..46c462417b 100644
--- a/ext/pdo_pgsql/tests/bug72294.phpt
+++ b/ext/pdo_pgsql/tests/bug72294.phpt
@@ -146,4 +146,3 @@ $test->run( $result );
==NOCRASH==
--EXPECT--
==NOCRASH==
-
diff --git a/ext/pdo_pgsql/tests/bug75402.phpt b/ext/pdo_pgsql/tests/bug75402.phpt
index 8fc5bbf947..065bf80984 100644
--- a/ext/pdo_pgsql/tests/bug75402.phpt
+++ b/ext/pdo_pgsql/tests/bug75402.phpt
@@ -81,7 +81,6 @@ if ($db) {
}
var_dump($resp);
-
--EXPECT--
object(stdClass)#2 (1) {
["entries"]=>
diff --git a/ext/pdo_pgsql/tests/bug_33876.phpt b/ext/pdo_pgsql/tests/bug_33876.phpt
index 15c4275d80..31a76c9a63 100644
--- a/ext/pdo_pgsql/tests/bug_33876.phpt
+++ b/ext/pdo_pgsql/tests/bug_33876.phpt
@@ -88,9 +88,6 @@ if (!$res->execute(array(false))) {
} else {
print_r($res->fetchAll(PDO::FETCH_ASSOC));
}
-
-
-
--EXPECT--
Array
(
diff --git a/ext/pdo_pgsql/tests/bug_49985.phpt b/ext/pdo_pgsql/tests/bug_49985.phpt
index e1d7df82a0..be5a4297bd 100644
--- a/ext/pdo_pgsql/tests/bug_49985.phpt
+++ b/ext/pdo_pgsql/tests/bug_49985.phpt
@@ -32,4 +32,3 @@ for ($i = 0; $i < 3; $i++) {
bool(true)
SQLSTATE[23505]: %stest_pkey%s
SQLSTATE[23505]: %stest_pkey%s
-
diff --git a/ext/pdo_pgsql/tests/copy_from.phpt b/ext/pdo_pgsql/tests/copy_from.phpt
index 552038069c..15eea01229 100644
--- a/ext/pdo_pgsql/tests/copy_from.phpt
+++ b/ext/pdo_pgsql/tests/copy_from.phpt
@@ -396,4 +396,3 @@ Testing pgsqlCopyFromFile() with error
Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %s "test_error" %s
Testing pgsqlCopyFromFile() with non existing file
Exception: SQLSTATE[HY000]: General error: 7 Unable to open the file
-
diff --git a/ext/pdo_pgsql/tests/copy_to.phpt b/ext/pdo_pgsql/tests/copy_to.phpt
index 93aab16679..4ddce526bd 100644
--- a/ext/pdo_pgsql/tests/copy_to.phpt
+++ b/ext/pdo_pgsql/tests/copy_to.phpt
@@ -136,4 +136,3 @@ Testing pgsqlCopyToFile() with error
Exception: SQLSTATE[42P01]: Undefined table: 7 %s: %s "test_error" %s
Testing pgsqlCopyToFile() to unwritable file
Exception: SQLSTATE[HY000]: General error: 7 Unable to open the file for writing
-
diff --git a/ext/pdo_sqlite/tests/bug33841.phpt b/ext/pdo_sqlite/tests/bug33841.phpt
index d472af770e..97a28ec5d3 100644
--- a/ext/pdo_sqlite/tests/bug33841.phpt
+++ b/ext/pdo_sqlite/tests/bug33841.phpt
@@ -20,7 +20,6 @@ $stmt = $db->prepare("UPDATE test SET text = :text ");
$stmt->bindParam(':text', $name);
$name = 'test2';
var_dump($stmt->execute(), $stmt->rowCount());
-
--EXPECT--
bool(true)
int(1)
diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_statement_getattribute.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_statement_getattribute.phpt
index 6b7e36560e..ba1d6f949a 100644
--- a/ext/pdo_sqlite/tests/pdo_sqlite_statement_getattribute.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_statement_getattribute.phpt
@@ -17,4 +17,4 @@ var_dump($st->getAttribute(PDO::SQLITE_ATTR_READONLY_STATEMENT));
?>
--EXPECT--
bool(true)
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/pgsql/tests/10pg_convert.phpt b/ext/pgsql/tests/10pg_convert.phpt
index adc2756e25..f00cab7664 100644
--- a/ext/pgsql/tests/10pg_convert.phpt
+++ b/ext/pgsql/tests/10pg_convert.phpt
@@ -26,4 +26,4 @@ array(3) {
string(6) "E'AAA'"
[""bin""]=>
string(6) "E'BBB'"
-} \ No newline at end of file
+}
diff --git a/ext/pgsql/tests/10pg_convert_9.phpt b/ext/pgsql/tests/10pg_convert_9.phpt
index 827c96250d..a8395315c6 100644
--- a/ext/pgsql/tests/10pg_convert_9.phpt
+++ b/ext/pgsql/tests/10pg_convert_9.phpt
@@ -27,4 +27,4 @@ array(3) {
string(6) "E'AAA'"
[""bin""]=>
string(12) "E'\\x424242'"
-} \ No newline at end of file
+}
diff --git a/ext/pgsql/tests/12pg_insert.phpt b/ext/pgsql/tests/12pg_insert.phpt
index 9fd0dd1e3b..c03060a87e 100644
--- a/ext/pgsql/tests/12pg_insert.phpt
+++ b/ext/pgsql/tests/12pg_insert.phpt
@@ -21,4 +21,4 @@ echo "Ok\n";
?>
--EXPECT--
INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES (1234,E'AAA',E'BBB');
-Ok \ No newline at end of file
+Ok
diff --git a/ext/pgsql/tests/12pg_insert_9.phpt b/ext/pgsql/tests/12pg_insert_9.phpt
index b84e25b8d3..275afc55e1 100644
--- a/ext/pgsql/tests/12pg_insert_9.phpt
+++ b/ext/pgsql/tests/12pg_insert_9.phpt
@@ -27,4 +27,4 @@ echo "Ok\n";
INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES (1234,E'AAA',E'\\x424242');
INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES ('1234','AAA','BBB');
resource(%d) of type (pgsql result)
-Ok \ No newline at end of file
+Ok
diff --git a/ext/pgsql/tests/13pg_select_9.phpt b/ext/pgsql/tests/13pg_select_9.phpt
index 3b3ccb7462..d5e661e5e0 100644
--- a/ext/pgsql/tests/13pg_select_9.phpt
+++ b/ext/pgsql/tests/13pg_select_9.phpt
@@ -47,4 +47,4 @@ array(2) {
}
SELECT * FROM "php_pgsql_test" WHERE "num"=1234;
SELECT * FROM "php_pgsql_test" WHERE "num"='1234';
-Ok \ No newline at end of file
+Ok
diff --git a/ext/pgsql/tests/14pg_update_9.phpt b/ext/pgsql/tests/14pg_update_9.phpt
index 9f1b516b9d..e3e802b7a2 100644
--- a/ext/pgsql/tests/14pg_update_9.phpt
+++ b/ext/pgsql/tests/14pg_update_9.phpt
@@ -26,4 +26,4 @@ echo "Ok\n";
--EXPECT--
UPDATE "php_pgsql_test" SET "num"=1234,"str"=E'ABC',"bin"=E'\\x58595a' WHERE "num"=1234;
UPDATE "php_pgsql_test" SET "num"='1234',"str"='ABC',"bin"='XYZ' WHERE "num"='1234';
-Ok \ No newline at end of file
+Ok
diff --git a/ext/pgsql/tests/31nb_async_query_prepared.phpt b/ext/pgsql/tests/31nb_async_query_prepared.phpt
index d82ae798e8..f485e596f9 100644
--- a/ext/pgsql/tests/31nb_async_query_prepared.phpt
+++ b/ext/pgsql/tests/31nb_async_query_prepared.phpt
@@ -109,4 +109,3 @@ echo "OK";
?>
--EXPECT--
OK
-
diff --git a/ext/pgsql/tests/32nb_async_query.phpt b/ext/pgsql/tests/32nb_async_query.phpt
index 7858a60eea..8ef1591db5 100644
--- a/ext/pgsql/tests/32nb_async_query.phpt
+++ b/ext/pgsql/tests/32nb_async_query.phpt
@@ -81,4 +81,3 @@ echo "OK";
?>
--EXPECT--
OK
-
diff --git a/ext/pgsql/tests/bug47199.phpt b/ext/pgsql/tests/bug47199.phpt
index 622630c057..1fcc4b0d59 100644
--- a/ext/pgsql/tests/bug47199.phpt
+++ b/ext/pgsql/tests/bug47199.phpt
@@ -64,4 +64,4 @@ array(1) {
}
}
-Done \ No newline at end of file
+Done
diff --git a/ext/pgsql/tests/bug64609.phpt b/ext/pgsql/tests/bug64609.phpt
index 72fac7648e..e31ec8e019 100644
--- a/ext/pgsql/tests/bug64609.phpt
+++ b/ext/pgsql/tests/bug64609.phpt
@@ -27,4 +27,4 @@ var_dump($converted);
array(1) {
[""a""]=>
string(5) "E'ok'"
-} \ No newline at end of file
+}
diff --git a/ext/pgsql/tests/bug72197.phpt b/ext/pgsql/tests/bug72197.phpt
index 6b6cc3ec67..bf9c16978b 100644
--- a/ext/pgsql/tests/bug72197.phpt
+++ b/ext/pgsql/tests/bug72197.phpt
@@ -32,4 +32,3 @@ Warning: pg_lo_create(): supplied resource is not a valid PostgreSQL link resour
int(%d)
int(%d)
==DONE==
-
diff --git a/ext/pgsql/tests/pg_insert_001.phpt b/ext/pgsql/tests/pg_insert_001.phpt
index 626d4d0f82..ecb13c4ee9 100644
--- a/ext/pgsql/tests/pg_insert_001.phpt
+++ b/ext/pgsql/tests/pg_insert_001.phpt
@@ -26,7 +26,6 @@ pg_query('DROP SCHEMA phptests');
?>
--EXPECTF--
-
Warning: pg_insert(): Table 'foo' doesn't exists in %s on line %d
string(55) "INSERT INTO "phptests"."foo" ("id","id2") VALUES (1,2);"
array(1) {
diff --git a/ext/pgsql/tests/pg_insert_002.phpt b/ext/pgsql/tests/pg_insert_002.phpt
index 329f525b27..0dcee55b8f 100644
--- a/ext/pgsql/tests/pg_insert_002.phpt
+++ b/ext/pgsql/tests/pg_insert_002.phpt
@@ -15,7 +15,6 @@ foreach (array('', '.', '..') as $table) {
?>
Done
--EXPECTF--
-
Warning: pg_insert(): The table name must be specified in %s on line %d
bool(false)
@@ -24,4 +23,4 @@ bool(false)
Warning: pg_insert(): The table name must be specified in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/phar/tests/002.phpt b/ext/phar/tests/002.phpt
index a7cf0cb2d2..41cb9be716 100644
--- a/ext/phar/tests/002.phpt
+++ b/ext/phar/tests/002.phpt
@@ -14,4 +14,4 @@ Phar::mapPhar();
__HALT_COMPILER(); ?>
--EXPECTF--
Warning: Phar::mapPhar() expects at most 2 parameters, 3 given in %s002.php on line %d
-internal corruption of phar "%s002.php" (truncated manifest at manifest length) \ No newline at end of file
+internal corruption of phar "%s002.php" (truncated manifest at manifest length)
diff --git a/ext/phar/tests/020.phpt b/ext/phar/tests/020.phpt
index 289fc39c95..1c2b4b1abe 100644
--- a/ext/phar/tests/020.phpt
+++ b/ext/phar/tests/020.phpt
@@ -133,4 +133,4 @@ array(26) {
int(-1)
[%sblocks"]=>
int(-1)
-} \ No newline at end of file
+}
diff --git a/ext/phar/tests/021.phpt b/ext/phar/tests/021.phpt
index 3e3278b9f8..010136f779 100644
--- a/ext/phar/tests/021.phpt
+++ b/ext/phar/tests/021.phpt
@@ -82,4 +82,4 @@ array(26) {
int(-1)
[%sblocks"]=>
int(-1)
-} \ No newline at end of file
+}
diff --git a/ext/phar/tests/032.phpt b/ext/phar/tests/032.phpt
index 5e5d759c62..0878482d0a 100644
--- a/ext/phar/tests/032.phpt
+++ b/ext/phar/tests/032.phpt
@@ -25,5 +25,4 @@ unlink(dirname(__FILE__) . '/files/032.phar.php');
__halt_compiler();
?>
--EXPECTF--
-
-phar "%s032.phar.php" does not have a signature===DONE=== \ No newline at end of file
+phar "%s032.phar.php" does not have a signature===DONE===
diff --git a/ext/phar/tests/addfuncs.phpt b/ext/phar/tests/addfuncs.phpt
index 4312bff1a0..ab10736a8a 100644
--- a/ext/phar/tests/addfuncs.phpt
+++ b/ext/phar/tests/addfuncs.phpt
@@ -50,4 +50,4 @@ Entry a does not exist and cannot be created: phar error: file "a" in phar "%sad
phar error: unable to open file "%s/does/not/exist" to add to phar archive
Cannot create any files in magic ".phar" directory
Cannot create any files in magic ".phar" directory
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug13786.phpt b/ext/phar/tests/bug13786.phpt
index 572d1eb9aa..8ed0697bff 100644
--- a/ext/phar/tests/bug13786.phpt
+++ b/ext/phar/tests/bug13786.phpt
@@ -29,4 +29,4 @@ echo $e->getMessage() . "\n";
--EXPECTF--
string(26) "file 0 in DataArchive.phar"
unable to seek to start of file "0" while creating new phar "%sDataArchive.phar"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug46178.phpt b/ext/phar/tests/bug46178.phpt
index 9dab621485..1496ae1c33 100644
--- a/ext/phar/tests/bug46178.phpt
+++ b/ext/phar/tests/bug46178.phpt
@@ -17,4 +17,4 @@ $phar->addEmptyDir('long/path');
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');?>
--EXPECT--
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug47085.phpt b/ext/phar/tests/bug47085.phpt
index 9aaaed0670..5c2504f675 100644
--- a/ext/phar/tests/bug47085.phpt
+++ b/ext/phar/tests/bug47085.phpt
@@ -21,4 +21,4 @@ var_dump(rename("phar://a.phar/x", "phar://a.phar/y"));
--EXPECTF--
Warning: rename(): phar error: cannot rename "phar://a.phar/x" to "phar://a.phar/y" from extracted phar archive, source does not exist in %sbug47085.php on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug48377.phpt b/ext/phar/tests/bug48377.phpt
index 6282a1565e..f466ea4532 100644
--- a/ext/phar/tests/bug48377.phpt
+++ b/ext/phar/tests/bug48377.phpt
@@ -26,4 +26,4 @@ try {
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip');?>
--EXPECTF--
phar "%sbug48377.zip" exists and must be unlinked prior to conversion
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug53872.phpt b/ext/phar/tests/bug53872.phpt
index a3745a20cb..ada60055f9 100644
--- a/ext/phar/tests/bug53872.phpt
+++ b/ext/phar/tests/bug53872.phpt
@@ -25,4 +25,3 @@ unlink("bug53872-phar.phar");
--EXPECT--
content of first.txt
content of third.txt
-
diff --git a/ext/phar/tests/bug60164.phpt b/ext/phar/tests/bug60164.phpt
index 8fd5de5146..83883b6ee5 100644
--- a/ext/phar/tests/bug60164.phpt
+++ b/ext/phar/tests/bug60164.phpt
@@ -18,4 +18,4 @@ foreach (new RecursiveIteratorIterator(new Phar($phar, null, 'stuboflength1041.p
--EXPECT--
string(5) "a.php"
string(5) "b.php"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug65028.phpt b/ext/phar/tests/bug65028.phpt
index d62f3c2b72..7d24ead69d 100644
--- a/ext/phar/tests/bug65028.phpt
+++ b/ext/phar/tests/bug65028.phpt
@@ -153,4 +153,3 @@ catch(UnexpectedValueException $ex)
?>
--EXPECT--
No exception thrown.
-
diff --git a/ext/phar/tests/bug69324.phpt b/ext/phar/tests/bug69324.phpt
index 70e3f972e7..7768ffbd66 100644
--- a/ext/phar/tests/bug69324.phpt
+++ b/ext/phar/tests/bug69324.phpt
@@ -14,4 +14,4 @@ var_dump($meta);
echo $e->getMessage();
}
--EXPECTF--
-internal corruption of phar "%s" (truncated manifest entry) \ No newline at end of file
+internal corruption of phar "%s" (truncated manifest entry)
diff --git a/ext/phar/tests/bug69720.phpt b/ext/phar/tests/bug69720.phpt
index 286d3cbdbe..c0f76c7a0e 100644
--- a/ext/phar/tests/bug69720.phpt
+++ b/ext/phar/tests/bug69720.phpt
@@ -22,7 +22,6 @@ try {
}
?>
--EXPECTF--
-
MY_METADATA_NULL
Warning: file_get_contents(phar://%s): failed to open stream: phar error: "test.php" is not a file in phar "%s.phar" in %s.php on line %d
diff --git a/ext/phar/tests/bug71354.phpt b/ext/phar/tests/bug71354.phpt
index 43230f1520..91cc9b0111 100644
--- a/ext/phar/tests/bug71354.phpt
+++ b/ext/phar/tests/bug71354.phpt
@@ -10,4 +10,4 @@ var_dump($p['aaaa']->getContent());
DONE
--EXPECT--
string(0) ""
-DONE \ No newline at end of file
+DONE
diff --git a/ext/phar/tests/bug71391.phpt b/ext/phar/tests/bug71391.phpt
index 6965aaaa30..f442116191 100644
--- a/ext/phar/tests/bug71391.phpt
+++ b/ext/phar/tests/bug71391.phpt
@@ -15,4 +15,4 @@ DONE
unlink(__DIR__."/bug71391.test.tar");
?>
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/phar/tests/bug71488.phpt b/ext/phar/tests/bug71488.phpt
index 22d2bf098f..53f1304343 100644
--- a/ext/phar/tests/bug71488.phpt
+++ b/ext/phar/tests/bug71488.phpt
@@ -14,4 +14,4 @@ DONE
@unlink(__DIR__."/bug71488.test");
?>
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/phar/tests/bug72928.phpt b/ext/phar/tests/bug72928.phpt
index 8e6a95418c..1277e88711 100644
--- a/ext/phar/tests/bug72928.phpt
+++ b/ext/phar/tests/bug72928.phpt
@@ -15,4 +15,4 @@ var_dump($phar);
DONE
--EXPECTF--
phar error: signature cannot be read in zip-based phar "%sbug72928.zip"
-DONE \ No newline at end of file
+DONE
diff --git a/ext/phar/tests/bug73035.phpt b/ext/phar/tests/bug73035.phpt
index 5928428abc..ffdd36c52e 100644
--- a/ext/phar/tests/bug73035.phpt
+++ b/ext/phar/tests/bug73035.phpt
@@ -15,4 +15,4 @@ var_dump($phar);
DONE
--EXPECTF--
phar error: tar-based phar "%sbug73035.tar" signature cannot be read
-DONE \ No newline at end of file
+DONE
diff --git a/ext/phar/tests/bug73764.phpt b/ext/phar/tests/bug73764.phpt
index cab314a731..baff083265 100644
--- a/ext/phar/tests/bug73764.phpt
+++ b/ext/phar/tests/bug73764.phpt
@@ -13,4 +13,4 @@ echo "OK\n";
}
?>
--EXPECTF--
-internal corruption of phar "%sbug73764.phar" (truncated manifest entry) \ No newline at end of file
+internal corruption of phar "%sbug73764.phar" (truncated manifest entry)
diff --git a/ext/phar/tests/bug74383.phpt b/ext/phar/tests/bug74383.phpt
index abe50831fc..92ea892b88 100644
--- a/ext/phar/tests/bug74383.phpt
+++ b/ext/phar/tests/bug74383.phpt
@@ -13,7 +13,6 @@ echo PHP_EOL;
echo (int) $rm->getParameters()[0]->isOptional();
?>
-
--EXPECT--
1
0
diff --git a/ext/phar/tests/cache_list/copyonwrite1.phar.phpt b/ext/phar/tests/cache_list/copyonwrite1.phar.phpt
index 90b0a8fe46..dd6b45f9a2 100644
--- a/ext/phar/tests/cache_list/copyonwrite1.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite1.phar.phpt
@@ -11,4 +11,4 @@ files/write.phar
--EXPECT--
hi
changed
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt
index 660776af05..7502988ed2 100644
--- a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt
@@ -21,4 +21,4 @@ __HALT_COMPILER(); ?>
"
<?php __HALT_COMPILER(); ?>
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt
index eae6a8e26e..e75473d463 100644
--- a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt
@@ -19,4 +19,4 @@ echo "ok\n";
__HALT_COMPILER(); ?>
"
6643
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite12.phar.phpt b/ext/phar/tests/cache_list/copyonwrite12.phar.phpt
index 40b544191d..b197f6501b 100644
--- a/ext/phar/tests/cache_list/copyonwrite12.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite12.phar.phpt
@@ -21,4 +21,4 @@ array(2) {
["hash_type"]=>
string(3) "MD5"
}
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt
index bbb3ab5aa9..84f7cfefca 100644
--- a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt
@@ -12,4 +12,4 @@ files/write13.phar
--EXPECT--
bool(false)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt
index 9e10b31591..a4ad2bcb29 100644
--- a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt
@@ -12,4 +12,4 @@ files/write14.phar
--EXPECT--
bool(true)
bool(false)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt
index a74439ddeb..6ab97b50cf 100644
--- a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt
@@ -11,4 +11,4 @@ files/write15.phar
--EXPECT--
bool(false)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt
index 5e8744e9f3..670d510e5c 100644
--- a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt
@@ -11,4 +11,4 @@ files/write16.phar
--EXPECT--
bool(true)
bool(false)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
index 57412401b6..7e2719ae7b 100644
--- a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
@@ -11,4 +11,4 @@ files/write17.phar
--EXPECT--
NULL
string(2) "hi"
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt
index 751194b330..6269466b9c 100644
--- a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt
@@ -11,4 +11,4 @@ files/write18.phar
--EXPECT--
100666
100444
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
index e70b0dfa76..b67f5d7324 100644
--- a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
@@ -11,4 +11,4 @@ files/write19.phar
--EXPECT--
string(2) "hi"
string(3) "hi2"
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite2.phar.phpt b/ext/phar/tests/cache_list/copyonwrite2.phar.phpt
index 8d21c813a4..f28871f158 100644
--- a/ext/phar/tests/cache_list/copyonwrite2.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite2.phar.phpt
@@ -14,4 +14,4 @@ bool(true)
string(2) "hi"
bool(true)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt
index aa0c9653ee..843ed51709 100644
--- a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt
@@ -11,4 +11,4 @@ files/write20.phar
--EXPECT--
string(2) "hi"
NULL
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt
index 6b32520f2d..978847cf06 100644
--- a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt
@@ -12,4 +12,4 @@ files/write21.phar
--EXPECT--
bool(false)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt
index 141f9c9ad7..45cc8bd4a8 100644
--- a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt
@@ -12,4 +12,4 @@ files/write22.phar
--EXPECT--
bool(true)
bool(false)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt
index c6025fd125..4cc10803f9 100644
--- a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt
@@ -14,4 +14,4 @@ bool(true)
bool(false)
bool(false)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt
index 3bf0e11c3d..0dd8f632d5 100644
--- a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt
@@ -12,4 +12,4 @@ files/write24.phar
--EXPECT--
bool(false)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt
index 13cae01e85..41b6382f05 100644
--- a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt
@@ -13,4 +13,4 @@ files/write25.phar
bool(false)
bool(true)
<?php __HALT_COMPILER();
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite3.phar.phpt b/ext/phar/tests/cache_list/copyonwrite3.phar.phpt
index 7e2c94c5b2..887ef82231 100644
--- a/ext/phar/tests/cache_list/copyonwrite3.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite3.phar.phpt
@@ -13,4 +13,4 @@ bool(true)
bool(true)
bool(false)
bool(false)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite4.phar.phpt b/ext/phar/tests/cache_list/copyonwrite4.phar.phpt
index 20ff78e282..dd14582055 100644
--- a/ext/phar/tests/cache_list/copyonwrite4.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite4.phar.phpt
@@ -12,4 +12,4 @@ files/write4.phar
bool(false)
bool(true)
string(2) "hi"
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite4a.phpt b/ext/phar/tests/cache_list/copyonwrite4a.phpt
index 1945e31f16..039113288b 100644
--- a/ext/phar/tests/cache_list/copyonwrite4a.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite4a.phpt
@@ -17,4 +17,4 @@ var_dump(file_exists('phar://' . dirname(__FILE__) . '/files/write4.phar/testit.
bool(false)
bool(true)
string(2) "hi"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/cache_list/copyonwrite5.phar.phpt b/ext/phar/tests/cache_list/copyonwrite5.phar.phpt
index 89990a7af1..3ca835ae5f 100644
--- a/ext/phar/tests/cache_list/copyonwrite5.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite5.phar.phpt
@@ -24,4 +24,4 @@ array(2) {
phar://%scopyonwrite5.phar.php%cfile1 file1
phar://%scopyonwrite5.phar.php%cfile2 file2
phar://%scopyonwrite5.phar.php%chi hi
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite7.phar.phpt b/ext/phar/tests/cache_list/copyonwrite7.phar.phpt
index d6faded9cc..520368d3b6 100644
--- a/ext/phar/tests/cache_list/copyonwrite7.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite7.phar.phpt
@@ -11,4 +11,4 @@ files/write7.phar
--EXPECT--
bool(true)
bool(false)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite8.phar.phpt b/ext/phar/tests/cache_list/copyonwrite8.phar.phpt
index 7217d336e2..99f12ca8ca 100644
--- a/ext/phar/tests/cache_list/copyonwrite8.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite8.phar.phpt
@@ -11,4 +11,4 @@ files/write8.phar
--EXPECTF--
string(%s) "%scopyonwrite8.phar.php"
hi
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt
index ee0eb34937..63aa2b168e 100644
--- a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt
@@ -20,4 +20,4 @@ __HALT_COMPILER(); ?>
"
<?php __HALT_COMPILER(); ?>
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/frontcontroller11.phpt b/ext/phar/tests/cache_list/frontcontroller11.phpt
index 255f16abfa..87a29196a8 100644
--- a/ext/phar/tests/cache_list/frontcontroller11.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller11.phpt
@@ -14,4 +14,4 @@ files/frontcontroller5.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECT--
-hio \ No newline at end of file
+hio
diff --git a/ext/phar/tests/cache_list/frontcontroller12.phpt b/ext/phar/tests/cache_list/frontcontroller12.phpt
index 6d798f9f8a..8b78e62c9c 100644
--- a/ext/phar/tests/cache_list/frontcontroller12.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller12.phpt
@@ -18,4 +18,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar
Stack trace:
#0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller12.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller12.php on line 2
diff --git a/ext/phar/tests/cache_list/frontcontroller13.phpt b/ext/phar/tests/cache_list/frontcontroller13.phpt
index c81d0cfbd9..9d2f9105da 100644
--- a/ext/phar/tests/cache_list/frontcontroller13.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller13.phpt
@@ -18,4 +18,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used (not a str
Stack trace:
#0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller13.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller13.php on line 2
diff --git a/ext/phar/tests/cache_list/frontcontroller15.phpt b/ext/phar/tests/cache_list/frontcontroller15.phpt
index d142a5d742..fc639c316f 100644
--- a/ext/phar/tests/cache_list/frontcontroller15.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller15.phpt
@@ -18,4 +18,3 @@ Content-type: text/html; charset=UTF-8
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
</code>
-
diff --git a/ext/phar/tests/cache_list/frontcontroller16.phpt b/ext/phar/tests/cache_list/frontcontroller16.phpt
index 10bebdccef..0664c039d5 100644
--- a/ext/phar/tests/cache_list/frontcontroller16.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller16.phpt
@@ -15,4 +15,3 @@ files/frontcontroller8.phar
Content-type: text/html; charset=UTF-8
--EXPECT--
hio1
-
diff --git a/ext/phar/tests/cache_list/frontcontroller17.phpt b/ext/phar/tests/cache_list/frontcontroller17.phpt
index 35d3ae4e9c..05ad328167 100644
--- a/ext/phar/tests/cache_list/frontcontroller17.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller17.phpt
@@ -15,4 +15,3 @@ Content-type: application/octet-stream
Content-length: 4
--EXPECT--
hio3
-
diff --git a/ext/phar/tests/cache_list/frontcontroller22.phpt b/ext/phar/tests/cache_list/frontcontroller22.phpt
index 82a8389ad5..f0d659b4c3 100644
--- a/ext/phar/tests/cache_list/frontcontroller22.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller22.phpt
@@ -19,4 +19,4 @@ string(12) "oof/test.php"
Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d
-Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d \ No newline at end of file
+Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d
diff --git a/ext/phar/tests/cache_list/frontcontroller23.phpt b/ext/phar/tests/cache_list/frontcontroller23.phpt
index 3da9631dfb..4de4d7dd1c 100644
--- a/ext/phar/tests/cache_list/frontcontroller23.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller23.phpt
@@ -15,4 +15,4 @@ files/frontcontroller14.phar
Content-type: text/html; charset=UTF-8
--EXPECTF--
string(9) "/hi/there"
-string(%d) "phar://%sfrontcontroller23.php/html/index.php" \ No newline at end of file
+string(%d) "phar://%sfrontcontroller23.php/html/index.php"
diff --git a/ext/phar/tests/cache_list/frontcontroller24.phpt b/ext/phar/tests/cache_list/frontcontroller24.phpt
index cd7c990c29..23ecdc904b 100644
--- a/ext/phar/tests/cache_list/frontcontroller24.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller24.phpt
@@ -14,4 +14,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECT--
-My 404 is rawesome \ No newline at end of file
+My 404 is rawesome
diff --git a/ext/phar/tests/cache_list/frontcontroller25.phpt b/ext/phar/tests/cache_list/frontcontroller25.phpt
index 3ec1d52d54..6fe6aee714 100644
--- a/ext/phar/tests/cache_list/frontcontroller25.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller25.phpt
@@ -15,4 +15,4 @@ files/frontcontroller8.phar
Content-type: text/html; charset=UTF-8
--EXPECT--
string(42) "/frontcontroller25.php/a1.phps/extra/stuff"
-string(12) "/extra/stuff" \ No newline at end of file
+string(12) "/extra/stuff"
diff --git a/ext/phar/tests/cache_list/frontcontroller26.phpt b/ext/phar/tests/cache_list/frontcontroller26.phpt
index b7d1270107..bf1b96494e 100644
--- a/ext/phar/tests/cache_list/frontcontroller26.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller26.phpt
@@ -13,4 +13,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: application/octet-stream
--EXPECT--
-<?php var_dump("hi"); \ No newline at end of file
+<?php var_dump("hi");
diff --git a/ext/phar/tests/cache_list/frontcontroller27.phpt b/ext/phar/tests/cache_list/frontcontroller27.phpt
index 1e0898dffc..00867b53c1 100644
--- a/ext/phar/tests/cache_list/frontcontroller27.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller27.phpt
@@ -14,4 +14,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/plain;charset=UTF-8
--EXPECT--
-hi \ No newline at end of file
+hi
diff --git a/ext/phar/tests/cache_list/frontcontroller29.phpt b/ext/phar/tests/cache_list/frontcontroller29.phpt
index c86cdfe4ac..caaf34538e 100644
--- a/ext/phar/tests/cache_list/frontcontroller29.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller29.phpt
@@ -19,4 +19,4 @@ Stack trace:
#0 [internal function]: unknown()
#1 %s(%d): Phar::webPhar('whatever', 'index.php', '404.php', Array)
#2 {main}
- thrown in phar://%sfatalerror.phps on line 1 \ No newline at end of file
+ thrown in phar://%sfatalerror.phps on line 1
diff --git a/ext/phar/tests/cache_list/frontcontroller30.phpt b/ext/phar/tests/cache_list/frontcontroller30.phpt
index 5a63da874c..e30f170e07 100644
--- a/ext/phar/tests/cache_list/frontcontroller30.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller30.phpt
@@ -11,4 +11,4 @@ REQUEST_URI=/huh?
files/frontcontroller8.phar
--EXPECTF--
oops did not run
-%a \ No newline at end of file
+%a
diff --git a/ext/phar/tests/cache_list/frontcontroller31.phpt b/ext/phar/tests/cache_list/frontcontroller31.phpt
index 9ef1221a28..54128759f0 100644
--- a/ext/phar/tests/cache_list/frontcontroller31.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller31.phpt
@@ -13,4 +13,4 @@ Content-type: text/html; charset=UTF-8
--FILE_EXTERNAL--
files/frontcontroller16.phar
--EXPECT--
-phar error: invalid rewrite callback \ No newline at end of file
+phar error: invalid rewrite callback
diff --git a/ext/phar/tests/cache_list/frontcontroller33.phpt b/ext/phar/tests/cache_list/frontcontroller33.phpt
index 65e0733670..8cf0a16056 100644
--- a/ext/phar/tests/cache_list/frontcontroller33.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller33.phpt
@@ -13,4 +13,4 @@ Content-type: text/html; charset=UTF-8
--FILE_EXTERNAL--
files/frontcontroller18.phar
--EXPECT--
-phar error: rewrite callback must return a string or false \ No newline at end of file
+phar error: rewrite callback must return a string or false
diff --git a/ext/phar/tests/cache_list/frontcontroller6.phpt b/ext/phar/tests/cache_list/frontcontroller6.phpt
index a79c958517..4781c66310 100644
--- a/ext/phar/tests/cache_list/frontcontroller6.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller6.phpt
@@ -20,4 +20,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/cache_list/frontcontroller8.phpt b/ext/phar/tests/cache_list/frontcontroller8.phpt
index e04f9e5a3a..fc85ef8fa5 100644
--- a/ext/phar/tests/cache_list/frontcontroller8.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller8.phpt
@@ -20,4 +20,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/cache_list/frontcontroller9.phpt b/ext/phar/tests/cache_list/frontcontroller9.phpt
index 1a8b9168cc..631bb30ef0 100644
--- a/ext/phar/tests/cache_list/frontcontroller9.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller9.phpt
@@ -17,4 +17,4 @@ Content-type: text/html; charset=UTF-8
<code><span style="color: #000000">
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
-</code> \ No newline at end of file
+</code>
diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt
index 39fc31e27b..91e22270c6 100644
--- a/ext/phar/tests/create_new_phar_b.phpt
+++ b/ext/phar/tests/create_new_phar_b.phpt
@@ -17,7 +17,6 @@ include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.pha
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-
Warning: file_put_contents(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d
Warning: include(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d
diff --git a/ext/phar/tests/delete.phpt b/ext/phar/tests/delete.phpt
index 1d98509064..46a4e23817 100644
--- a/ext/phar/tests/delete.phpt
+++ b/ext/phar/tests/delete.phpt
@@ -28,4 +28,4 @@ echo file_get_contents($pname . '/a') . "\n";
--EXPECTF--
a
-Warning: file_get_contents(phar://%sdelete.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16 \ No newline at end of file
+Warning: file_get_contents(phar://%sdelete.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16
diff --git a/ext/phar/tests/delete_in_phar.phpt b/ext/phar/tests/delete_in_phar.phpt
index d28f136f77..c7f8e82403 100644
--- a/ext/phar/tests/delete_in_phar.phpt
+++ b/ext/phar/tests/delete_in_phar.phpt
@@ -54,4 +54,4 @@ Warning: include(%sdelete_in_phar.phar.php/b/c.php): failed to open stream: phar
Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d
===DONE===
- \ No newline at end of file
+
diff --git a/ext/phar/tests/dir.phpt b/ext/phar/tests/dir.phpt
index a8f9d3f889..5740d60f87 100644
--- a/ext/phar/tests/dir.phpt
+++ b/ext/phar/tests/dir.phpt
@@ -89,4 +89,4 @@ Warning: rmdir(): phar error: cannot remove directory "" in phar "%sdir.phar.php
Warning: rmdir(): phar error: cannot remove directory "" in phar "%sdir.phar.php", directory does not exist in %sdir.php on line %d
Warning: mkdir(): phar error: cannot create directory "" in phar "%sdir.phar.php", phar error: invalid path "" must not be empty in %sdir.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/file_get_contents.phpt b/ext/phar/tests/file_get_contents.phpt
index fcc9d64655..24d6e48723 100644
--- a/ext/phar/tests/file_get_contents.phpt
+++ b/ext/phar/tests/file_get_contents.phpt
@@ -27,4 +27,4 @@ include $fname;
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECT--
-hihi===DONE=== \ No newline at end of file
+hihi===DONE===
diff --git a/ext/phar/tests/fopen_edgecases.phpt b/ext/phar/tests/fopen_edgecases.phpt
index 4c28ff31a1..7af8451f8f 100644
--- a/ext/phar/tests/fopen_edgecases.phpt
+++ b/ext/phar/tests/fopen_edgecases.phpt
@@ -121,4 +121,4 @@ Warning: rename(): phar error: cannot rename "phar://%sfopen_edgecases.phar.php/
Warning: fopen(./notfound.php): failed to open stream: No such file or directory in phar://%sfopen_edgecases.phar.php/test.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/frontcontroller12.phpt b/ext/phar/tests/frontcontroller12.phpt
index bad71d0ac5..a7b1a892d6 100644
--- a/ext/phar/tests/frontcontroller12.phpt
+++ b/ext/phar/tests/frontcontroller12.phpt
@@ -17,4 +17,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar
Stack trace:
#0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller12.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller12.php on line 2
diff --git a/ext/phar/tests/frontcontroller13.phpt b/ext/phar/tests/frontcontroller13.phpt
index 7d018a141a..99b769d406 100644
--- a/ext/phar/tests/frontcontroller13.phpt
+++ b/ext/phar/tests/frontcontroller13.phpt
@@ -17,4 +17,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used (not a str
Stack trace:
#0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller13.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller13.php on line 2
diff --git a/ext/phar/tests/frontcontroller15.phpt b/ext/phar/tests/frontcontroller15.phpt
index 370098014d..16b64c0e9e 100644
--- a/ext/phar/tests/frontcontroller15.phpt
+++ b/ext/phar/tests/frontcontroller15.phpt
@@ -17,4 +17,3 @@ Content-type: text/html; charset=UTF-8
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
</code>
-
diff --git a/ext/phar/tests/frontcontroller16.phpt b/ext/phar/tests/frontcontroller16.phpt
index 712af40bf3..1355d0042a 100644
--- a/ext/phar/tests/frontcontroller16.phpt
+++ b/ext/phar/tests/frontcontroller16.phpt
@@ -14,4 +14,3 @@ files/frontcontroller8.phar
Content-type: text/html; charset=UTF-8
--EXPECT--
hio1
-
diff --git a/ext/phar/tests/frontcontroller17.phpt b/ext/phar/tests/frontcontroller17.phpt
index 233e2e2a49..a735eb42cf 100644
--- a/ext/phar/tests/frontcontroller17.phpt
+++ b/ext/phar/tests/frontcontroller17.phpt
@@ -13,4 +13,3 @@ Content-type: application/octet-stream
Content-length: 4
--EXPECT--
hio3
-
diff --git a/ext/phar/tests/frontcontroller22.phpt b/ext/phar/tests/frontcontroller22.phpt
index 827c5688c7..b482164396 100644
--- a/ext/phar/tests/frontcontroller22.phpt
+++ b/ext/phar/tests/frontcontroller22.phpt
@@ -18,4 +18,4 @@ string(12) "oof/test.php"
Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d
-Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d \ No newline at end of file
+Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d
diff --git a/ext/phar/tests/frontcontroller23.phpt b/ext/phar/tests/frontcontroller23.phpt
index 24464c9beb..441eb701c2 100644
--- a/ext/phar/tests/frontcontroller23.phpt
+++ b/ext/phar/tests/frontcontroller23.phpt
@@ -14,4 +14,4 @@ files/frontcontroller14.phar
Content-type: text/html; charset=UTF-8
--EXPECTF--
string(9) "/hi/there"
-string(%d) "phar://%sfrontcontroller23.php/html/index.php" \ No newline at end of file
+string(%d) "phar://%sfrontcontroller23.php/html/index.php"
diff --git a/ext/phar/tests/frontcontroller24.phpt b/ext/phar/tests/frontcontroller24.phpt
index 69cd9f92b6..e7d5dce909 100644
--- a/ext/phar/tests/frontcontroller24.phpt
+++ b/ext/phar/tests/frontcontroller24.phpt
@@ -13,4 +13,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECT--
-My 404 is rawesome \ No newline at end of file
+My 404 is rawesome
diff --git a/ext/phar/tests/frontcontroller25.phpt b/ext/phar/tests/frontcontroller25.phpt
index 1ef9117550..c2995ed437 100644
--- a/ext/phar/tests/frontcontroller25.phpt
+++ b/ext/phar/tests/frontcontroller25.phpt
@@ -14,4 +14,4 @@ files/frontcontroller8.phar
Content-type: text/html; charset=UTF-8
--EXPECT--
string(42) "/frontcontroller25.php/a1.phps/extra/stuff"
-string(12) "/extra/stuff" \ No newline at end of file
+string(12) "/extra/stuff"
diff --git a/ext/phar/tests/frontcontroller26.phpt b/ext/phar/tests/frontcontroller26.phpt
index e66dd2036b..20a7d88351 100644
--- a/ext/phar/tests/frontcontroller26.phpt
+++ b/ext/phar/tests/frontcontroller26.phpt
@@ -11,4 +11,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: application/octet-stream
--EXPECT--
-<?php var_dump("hi"); \ No newline at end of file
+<?php var_dump("hi");
diff --git a/ext/phar/tests/frontcontroller27.phpt b/ext/phar/tests/frontcontroller27.phpt
index 9aa82f1349..720a2ec9e6 100644
--- a/ext/phar/tests/frontcontroller27.phpt
+++ b/ext/phar/tests/frontcontroller27.phpt
@@ -13,4 +13,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/plain;charset=UTF-8
--EXPECT--
-hi \ No newline at end of file
+hi
diff --git a/ext/phar/tests/frontcontroller29.phpt b/ext/phar/tests/frontcontroller29.phpt
index 710a58f91b..5e18357b6b 100644
--- a/ext/phar/tests/frontcontroller29.phpt
+++ b/ext/phar/tests/frontcontroller29.phpt
@@ -18,4 +18,4 @@ Stack trace:
#0 [internal function]: unknown()
#1 %s(%d): Phar::webPhar('whatever', 'index.php', '404.php', Array)
#2 {main}
- thrown in phar://%sfatalerror.phps on line 1 \ No newline at end of file
+ thrown in phar://%sfatalerror.phps on line 1
diff --git a/ext/phar/tests/frontcontroller30.phpt b/ext/phar/tests/frontcontroller30.phpt
index de6960c244..fd6088d05a 100644
--- a/ext/phar/tests/frontcontroller30.phpt
+++ b/ext/phar/tests/frontcontroller30.phpt
@@ -9,4 +9,4 @@ REQUEST_URI=/huh?
files/frontcontroller8.phar
--EXPECTF--
oops did not run
-%a \ No newline at end of file
+%a
diff --git a/ext/phar/tests/frontcontroller31.phpt b/ext/phar/tests/frontcontroller31.phpt
index 13c305d2f3..a02c937b58 100644
--- a/ext/phar/tests/frontcontroller31.phpt
+++ b/ext/phar/tests/frontcontroller31.phpt
@@ -12,4 +12,4 @@ Content-type: text/html; charset=UTF-8
--FILE_EXTERNAL--
files/frontcontroller16.phar
--EXPECT--
-phar error: invalid rewrite callback \ No newline at end of file
+phar error: invalid rewrite callback
diff --git a/ext/phar/tests/frontcontroller33.phpt b/ext/phar/tests/frontcontroller33.phpt
index 6247a4ebfc..d80f44fffa 100644
--- a/ext/phar/tests/frontcontroller33.phpt
+++ b/ext/phar/tests/frontcontroller33.phpt
@@ -12,4 +12,4 @@ Content-type: text/html; charset=UTF-8
--FILE_EXTERNAL--
files/frontcontroller18.phar
--EXPECT--
-phar error: rewrite callback must return a string or false \ No newline at end of file
+phar error: rewrite callback must return a string or false
diff --git a/ext/phar/tests/frontcontroller6.phpt b/ext/phar/tests/frontcontroller6.phpt
index c5dd382b10..de298c7b0e 100644
--- a/ext/phar/tests/frontcontroller6.phpt
+++ b/ext/phar/tests/frontcontroller6.phpt
@@ -18,4 +18,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/frontcontroller8.phpt b/ext/phar/tests/frontcontroller8.phpt
index 77d33dac38..b22f14a03a 100644
--- a/ext/phar/tests/frontcontroller8.phpt
+++ b/ext/phar/tests/frontcontroller8.phpt
@@ -18,4 +18,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/frontcontroller9.phpt b/ext/phar/tests/frontcontroller9.phpt
index d47a2898e6..c591879172 100644
--- a/ext/phar/tests/frontcontroller9.phpt
+++ b/ext/phar/tests/frontcontroller9.phpt
@@ -16,4 +16,4 @@ Content-type: text/html; charset=UTF-8
<code><span style="color: #000000">
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
-</code> \ No newline at end of file
+</code>
diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt
index 5f9462c260..4041ae2c20 100644
--- a/ext/phar/tests/include_path.phpt
+++ b/ext/phar/tests/include_path.phpt
@@ -31,4 +31,4 @@ test/file1.php
Warning: include(file2.php): failed to open stream: No such file or directory in %sinclude_path.php on line %d
Warning: include(): Failed opening 'file2.php' for inclusion (include_path='%sphar://%stempmanifest1.phar.php/test') in %sinclude_path.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/include_path_advanced.phpt b/ext/phar/tests/include_path_advanced.phpt
index 6feee422b4..c4603ba28b 100644
--- a/ext/phar/tests/include_path_advanced.phpt
+++ b/ext/phar/tests/include_path_advanced.phpt
@@ -9,4 +9,4 @@ files/include_path.phar
--EXPECT--
file1.php
test/file1.php
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/invalid_alias.phpt b/ext/phar/tests/invalid_alias.phpt
index dc0c71ed11..97ebe0fe1a 100644
--- a/ext/phar/tests/invalid_alias.phpt
+++ b/ext/phar/tests/invalid_alias.phpt
@@ -42,4 +42,4 @@ Invalid alias "hi/" specified for phar "%sinvalid_alias.phar"
Invalid alias "hi\l" specified for phar "%sinvalid_alias.phar"
Invalid alias "hil;" specified for phar "%sinvalid_alias.phar"
Invalid alias ":hil" specified for phar "%sinvalid_alias.phar"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/invalid_setstubalias.phpt b/ext/phar/tests/invalid_setstubalias.phpt
index 04cb779ddb..86fa6e7f78 100644
--- a/ext/phar/tests/invalid_setstubalias.phpt
+++ b/ext/phar/tests/invalid_setstubalias.phpt
@@ -44,4 +44,4 @@ Cannot set stub ".phar/stub.php" directly in phar "%sinvalid_setstubalias.phar.t
Cannot set alias ".phar/alias.txt" directly in phar "%sinvalid_setstubalias.phar.tar", use setAlias
Cannot set stub ".phar/stub.php" directly in phar "%sinvalid_setstubalias.phar.zip", use setStub
Cannot set alias ".phar/alias.txt" directly in phar "%sinvalid_setstubalias.phar.zip", use setAlias
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/mkdir.phpt b/ext/phar/tests/mkdir.phpt
index 527d77547c..ca8de30860 100644
--- a/ext/phar/tests/mkdir.phpt
+++ b/ext/phar/tests/mkdir.phpt
@@ -44,4 +44,4 @@ Warning: rmdir(): phar error: cannot remove directory "" in phar "foo.phar", dir
Warning: rmdir(): phar error: cannot remove directory "a" in phar "%smkdir.phar.php", phar error: path "a" exists and is a not a directory in %smkdir.php on line %d
Cannot create a directory in magic ".phar" directory
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt
index e253f12493..d91318533e 100644
--- a/ext/phar/tests/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/open_for_write_existing_b.phpt
@@ -34,7 +34,6 @@ include $pname . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d
diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt
index be56d9952a..eb0c27bf64 100644
--- a/ext/phar/tests/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/open_for_write_existing_c.phpt
@@ -28,7 +28,6 @@ include $pname . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d
diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt
index 28c9dda906..2918d49dad 100644
--- a/ext/phar/tests/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/open_for_write_newfile_b.phpt
@@ -36,7 +36,6 @@ include $pname . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d
diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt
index efa0da877f..8275c02baa 100644
--- a/ext/phar/tests/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/open_for_write_newfile_c.phpt
@@ -30,7 +30,6 @@ include $pname . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d
diff --git a/ext/phar/tests/opendir.phpt b/ext/phar/tests/opendir.phpt
index ca6e391b06..0bde7dbff7 100644
--- a/ext/phar/tests/opendir.phpt
+++ b/ext/phar/tests/opendir.phpt
@@ -41,4 +41,4 @@ phar url "phar://" is unknown in %sopendir.php on line %d
Warning: opendir(phar://hi.phar): failed to open dir: phar error: invalid url or non-existent phar "phar://hi.phar"
phar url "phar://hi.phar" is unknown in %sopendir.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt
index 86578754d9..8d7068f19a 100644
--- a/ext/phar/tests/phar_commitwrite.phpt
+++ b/ext/phar/tests/phar_commitwrite.phpt
@@ -39,4 +39,4 @@ Phar::mapPhar('brandnewphar.phar');
include 'phar://brandnewphar.phar/startup.php';
__HALT_COMPILER(); ?>
"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt
index 78dd1b39e7..0e0903d1dd 100644
--- a/ext/phar/tests/phar_create_in_cwd.phpt
+++ b/ext/phar/tests/phar_create_in_cwd.phpt
@@ -42,4 +42,4 @@ Phar::mapPhar('brandnewphar.phar');
include 'phar://brandnewphar.phar/startup.php';
__HALT_COMPILER(); ?>
"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_ctx_001.phpt b/ext/phar/tests/phar_ctx_001.phpt
index 197c7628d8..f8f349a380 100644
--- a/ext/phar/tests/phar_ctx_001.phpt
+++ b/ext/phar/tests/phar_ctx_001.phpt
@@ -97,4 +97,4 @@ array(1) {
[0]=>
int(4)
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_gobyebye.phpt b/ext/phar/tests/phar_gobyebye.phpt
index 608e950768..93e153bdf2 100644
--- a/ext/phar/tests/phar_gobyebye.phpt
+++ b/ext/phar/tests/phar_gobyebye.phpt
@@ -44,4 +44,4 @@ bool(false)
bool(false)
Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_isvalidpharfilename.phpt b/ext/phar/tests/phar_isvalidpharfilename.phpt
index da07bec287..a59f498b95 100644
--- a/ext/phar/tests/phar_isvalidpharfilename.phpt
+++ b/ext/phar/tests/phar_isvalidpharfilename.phpt
@@ -137,4 +137,3 @@ bool(true)
bool(true)
bool(false)
===DONE===
-
diff --git a/ext/phar/tests/phar_mount.phpt b/ext/phar/tests/phar_mount.phpt
index 80f8cda389..73bd489a2d 100644
--- a/ext/phar/tests/phar_mount.phpt
+++ b/ext/phar/tests/phar_mount.phpt
@@ -60,4 +60,4 @@ Mounting of testit to %sphar_mount.php within phar %sphar_mount.phar.tar failed
Mounting of /oops to /home/oops/../../etc/passwd: within phar %sphar_mount.phar.php failed
<?php
$fname = dirname(__FILE__) . '/' . basename(
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt
index 9544a1a5e0..23ce5c914a 100644
--- a/ext/phar/tests/pharfileinfo_chmod.phpt
+++ b/ext/phar/tests/pharfileinfo_chmod.phpt
@@ -30,4 +30,4 @@ $b->chmod(0666);
Phar entry "a" is a temporary directory (not an actual entry in the archive), cannot chmod
Warning: PharFileInfo::chmod() expects parameter 1 to be int, array given in %spharfileinfo_chmod.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/pharfileinfo_compression.phpt b/ext/phar/tests/pharfileinfo_compression.phpt
index 551776194e..9f5480be4f 100644
--- a/ext/phar/tests/pharfileinfo_compression.phpt
+++ b/ext/phar/tests/pharfileinfo_compression.phpt
@@ -91,4 +91,4 @@ Phar is readonly, cannot decompress
Phar entry is a directory, cannot set compression
bool(true)
bool(true)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/pharfileinfo_destruct.phpt b/ext/phar/tests/pharfileinfo_destruct.phpt
index 23e7042fa4..dc3917d2df 100644
--- a/ext/phar/tests/pharfileinfo_destruct.phpt
+++ b/ext/phar/tests/pharfileinfo_destruct.phpt
@@ -22,4 +22,4 @@ unset($b);
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>
--EXPECT--
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/readfile.phpt b/ext/phar/tests/readfile.phpt
index 60fdad1792..63e80eb0e3 100644
--- a/ext/phar/tests/readfile.phpt
+++ b/ext/phar/tests/readfile.phpt
@@ -27,4 +27,4 @@ include $fname;
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECT--
-hihi===DONE=== \ No newline at end of file
+hihi===DONE===
diff --git a/ext/phar/tests/rename.phpt b/ext/phar/tests/rename.phpt
index c73c98ec81..cfcedc7000 100644
--- a/ext/phar/tests/rename.phpt
+++ b/ext/phar/tests/rename.phpt
@@ -29,4 +29,4 @@ echo file_get_contents($pname . '/a') . "\n";
a
a
-Warning: file_get_contents(phar://%srename.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d \ No newline at end of file
+Warning: file_get_contents(phar://%srename.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d
diff --git a/ext/phar/tests/security.phpt b/ext/phar/tests/security.phpt
index f2944da413..6d26da0b25 100644
--- a/ext/phar/tests/security.phpt
+++ b/ext/phar/tests/security.phpt
@@ -33,4 +33,4 @@ include $fname2;
--EXPECT--
bool(false)
Write operations disabled by the php.ini setting phar.readonly
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/stat.phpt b/ext/phar/tests/stat.phpt
index 184aa6d2ec..c397b3e4a0 100644
--- a/ext/phar/tests/stat.phpt
+++ b/ext/phar/tests/stat.phpt
@@ -222,4 +222,4 @@ not found 2
Warning: fileperms(): stat failed for not/found in phar://%sstat.phar.php/my/index.php on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt
index 371e47d93b..48738a4313 100644
--- a/ext/phar/tests/tar/create_new_phar_b.phpt
+++ b/ext/phar/tests/tar/create_new_phar_b.phpt
@@ -17,7 +17,6 @@ include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.pha
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
--EXPECTF--
-
Warning: file_put_contents(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d
Warning: include(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d
diff --git a/ext/phar/tests/tar/delete.phpt b/ext/phar/tests/tar/delete.phpt
index 32b2b1e28b..3395fa54d1 100644
--- a/ext/phar/tests/tar/delete.phpt
+++ b/ext/phar/tests/tar/delete.phpt
@@ -29,4 +29,4 @@ echo file_get_contents($alias . '/a') . "\n";
--EXPECTF--
a
-Warning: file_get_contents(phar://%sdelete.phar.tar/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.tar" in %sdelete.php on line %d \ No newline at end of file
+Warning: file_get_contents(phar://%sdelete.phar.tar/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.tar" in %sdelete.php on line %d
diff --git a/ext/phar/tests/tar/frontcontroller10.phar.phpt b/ext/phar/tests/tar/frontcontroller10.phar.phpt
index 23ce6f37e2..211b02c51c 100644
--- a/ext/phar/tests/tar/frontcontroller10.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller10.phar.phpt
@@ -21,4 +21,4 @@ Status: 403 Access Denied
<body>
<h1>403 - File Access Denied</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/tar/frontcontroller12.phar.phpt b/ext/phar/tests/tar/frontcontroller12.phar.phpt
index 53804e476a..cbb928ff77 100644
--- a/ext/phar/tests/tar/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller12.phar.phpt
@@ -17,4 +17,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar
Stack trace:
#0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller12.phar.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller12.phar.php on line 2
diff --git a/ext/phar/tests/tar/frontcontroller13.phar.phpt b/ext/phar/tests/tar/frontcontroller13.phar.phpt
index 7fc0676aea..107961a70f 100644
--- a/ext/phar/tests/tar/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller13.phar.phpt
@@ -17,4 +17,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used (not a str
Stack trace:
#0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller13.phar.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller13.phar.php on line 2
diff --git a/ext/phar/tests/tar/frontcontroller15.phar.phpt b/ext/phar/tests/tar/frontcontroller15.phar.phpt
index 2147121dbe..eaaa62c56a 100644
--- a/ext/phar/tests/tar/frontcontroller15.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller15.phar.phpt
@@ -17,4 +17,3 @@ Content-type: text/html; charset=UTF-8
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
</code>
-
diff --git a/ext/phar/tests/tar/frontcontroller16.phar.phpt b/ext/phar/tests/tar/frontcontroller16.phar.phpt
index caa0c3119d..a74d99f248 100644
--- a/ext/phar/tests/tar/frontcontroller16.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller16.phar.phpt
@@ -14,4 +14,3 @@ files/frontcontroller8.phar.tar
Content-type: text/html; charset=UTF-8
--EXPECT--
hio1
-
diff --git a/ext/phar/tests/tar/frontcontroller17.phar.phpt b/ext/phar/tests/tar/frontcontroller17.phar.phpt
index 17d04baf30..0fc0adfddd 100644
--- a/ext/phar/tests/tar/frontcontroller17.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller17.phar.phpt
@@ -13,4 +13,3 @@ Content-type: application/octet-stream
Content-length: 4
--EXPECT--
hio3
-
diff --git a/ext/phar/tests/tar/frontcontroller6.phar.phpt b/ext/phar/tests/tar/frontcontroller6.phar.phpt
index b811f00f75..0b35b975b6 100644
--- a/ext/phar/tests/tar/frontcontroller6.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller6.phar.phpt
@@ -18,4 +18,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/tar/frontcontroller8.phar.phpt b/ext/phar/tests/tar/frontcontroller8.phar.phpt
index a180e2010a..bfa713afde 100644
--- a/ext/phar/tests/tar/frontcontroller8.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller8.phar.phpt
@@ -18,4 +18,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/tar/links6.phpt b/ext/phar/tests/tar/links6.phpt
index 95fd8fb701..e26b8379f7 100644
--- a/ext/phar/tests/tar/links6.phpt
+++ b/ext/phar/tests/tar/links6.phpt
@@ -26,4 +26,4 @@ hi there
there
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt
index a6759d8e92..95cba596f9 100644
--- a/ext/phar/tests/tar/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt
@@ -47,7 +47,6 @@ include $alias . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d
diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt
index 9e778e9279..9e73f1e899 100644
--- a/ext/phar/tests/tar/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt
@@ -41,7 +41,6 @@ include $alias . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d
diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
index f31878e3ef..c274e4c2c7 100644
--- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
@@ -48,7 +48,6 @@ include $alias . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d
diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
index 815d41c274..b5078426fe 100644
--- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
@@ -41,7 +41,6 @@ include $alias . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d
diff --git a/ext/phar/tests/test_alias_unset.phpt b/ext/phar/tests/test_alias_unset.phpt
index 0127d8bba2..de13acc315 100644
--- a/ext/phar/tests/test_alias_unset.phpt
+++ b/ext/phar/tests/test_alias_unset.phpt
@@ -42,4 +42,4 @@ Cannot open archive "%stest_alias_unset.2.phar.php", alias is already in use by
string(5) "first"
Warning: file_get_contents(phar://%sfile1.txt): failed to open stream: Cannot open archive "%stest_alias_unset.phar.php", alias is already in use by existing archive in %stest_alias_unset.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/test_unset.phpt b/ext/phar/tests/test_unset.phpt
index 3da537c13c..ae84823bc5 100644
--- a/ext/phar/tests/test_unset.phpt
+++ b/ext/phar/tests/test_unset.phpt
@@ -39,4 +39,4 @@ var_dump(file_exists($fname));
NULL
string(%d) "%stest_unset.phar.php"
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/webphar_compilefail.phpt b/ext/phar/tests/webphar_compilefail.phpt
index ab5532d6be..7d89509f77 100644
--- a/ext/phar/tests/webphar_compilefail.phpt
+++ b/ext/phar/tests/webphar_compilefail.phpt
@@ -14,4 +14,4 @@ echo $e->getMessage() . "\n";
__HALT_COMPILER();
?>
--EXPECTF--
-internal corruption of phar "%swebphar_compilefail.php" (truncated manifest at manifest length) \ No newline at end of file
+internal corruption of phar "%swebphar_compilefail.php" (truncated manifest at manifest length)
diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt
index 5fda5b4fdf..c0cb256925 100644
--- a/ext/phar/tests/zip/create_new_phar_b.phpt
+++ b/ext/phar/tests/zip/create_new_phar_b.phpt
@@ -17,7 +17,6 @@ include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.pha
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
--EXPECTF--
-
Warning: file_put_contents(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d
Warning: include(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d
diff --git a/ext/phar/tests/zip/delete.phpt b/ext/phar/tests/zip/delete.phpt
index 06078b3a39..bd2ce5fffa 100644
--- a/ext/phar/tests/zip/delete.phpt
+++ b/ext/phar/tests/zip/delete.phpt
@@ -28,4 +28,4 @@ echo file_get_contents($alias . '/a') . "\n";
--EXPECTF--
a
-Warning: file_get_contents(phar://%sdelete.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.zip" in %sdelete.php on line %d \ No newline at end of file
+Warning: file_get_contents(phar://%sdelete.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.zip" in %sdelete.php on line %d
diff --git a/ext/phar/tests/zip/delete_in_phar.phpt b/ext/phar/tests/zip/delete_in_phar.phpt
index f01280013f..b6f2dbb515 100644
--- a/ext/phar/tests/zip/delete_in_phar.phpt
+++ b/ext/phar/tests/zip/delete_in_phar.phpt
@@ -54,4 +54,4 @@ Warning: include(%sdelete_in_phar.phar.zip/b/c.php): failed to open stream: phar
Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d
===DONE===
- \ No newline at end of file
+
diff --git a/ext/phar/tests/zip/frontcontroller10.phar.phpt b/ext/phar/tests/zip/frontcontroller10.phar.phpt
index 5bbe9e1aff..ca4f55bcff 100644
--- a/ext/phar/tests/zip/frontcontroller10.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller10.phar.phpt
@@ -21,4 +21,4 @@ Status: 403 Access Denied
<body>
<h1>403 - File Access Denied</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/zip/frontcontroller12.phar.phpt b/ext/phar/tests/zip/frontcontroller12.phar.phpt
index a74a0d5d32..b0caca91ac 100644
--- a/ext/phar/tests/zip/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller12.phar.phpt
@@ -18,4 +18,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar
Stack trace:
#0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller12.phar.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller12.phar.php on line 2
diff --git a/ext/phar/tests/zip/frontcontroller13.phar.phpt b/ext/phar/tests/zip/frontcontroller13.phar.phpt
index 4ed1dc8670..18a1c1fd2f 100644
--- a/ext/phar/tests/zip/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller13.phar.phpt
@@ -18,4 +18,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used (not a str
Stack trace:
#0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller13.phar.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller13.phar.php on line 2
diff --git a/ext/phar/tests/zip/frontcontroller15.phar.phpt b/ext/phar/tests/zip/frontcontroller15.phar.phpt
index f6cd29a3c5..f6468ee521 100644
--- a/ext/phar/tests/zip/frontcontroller15.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller15.phar.phpt
@@ -18,4 +18,3 @@ Content-type: text/html; charset=UTF-8
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
</code>
-
diff --git a/ext/phar/tests/zip/frontcontroller16.phar.phpt b/ext/phar/tests/zip/frontcontroller16.phar.phpt
index d3f457bea6..890eb5d0e2 100644
--- a/ext/phar/tests/zip/frontcontroller16.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller16.phar.phpt
@@ -15,4 +15,3 @@ files/frontcontroller8.phar.zip
Content-type: text/html; charset=UTF-8
--EXPECT--
hio1
-
diff --git a/ext/phar/tests/zip/frontcontroller17.phar.phpt b/ext/phar/tests/zip/frontcontroller17.phar.phpt
index 5d52653687..d6ccdc6dfc 100644
--- a/ext/phar/tests/zip/frontcontroller17.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller17.phar.phpt
@@ -14,4 +14,3 @@ Content-type: application/octet-stream
Content-length: 4
--EXPECT--
hio3
-
diff --git a/ext/phar/tests/zip/frontcontroller6.phar.phpt b/ext/phar/tests/zip/frontcontroller6.phar.phpt
index 63f7c62e88..8188caf7c9 100644
--- a/ext/phar/tests/zip/frontcontroller6.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller6.phar.phpt
@@ -19,4 +19,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/zip/frontcontroller8.phar.phpt b/ext/phar/tests/zip/frontcontroller8.phar.phpt
index d4c3a3f9ea..15a898a53c 100644
--- a/ext/phar/tests/zip/frontcontroller8.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller8.phar.phpt
@@ -18,4 +18,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/zip/frontcontroller9.phar.phpt b/ext/phar/tests/zip/frontcontroller9.phar.phpt
index 4f12c9cd43..bdbf066194 100644
--- a/ext/phar/tests/zip/frontcontroller9.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller9.phar.phpt
@@ -16,4 +16,4 @@ Content-type: text/html; charset=UTF-8
<code><span style="color: #000000">
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
-</code> \ No newline at end of file
+</code>
diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt
index e77beaecef..e8d5a70fb1 100644
--- a/ext/phar/tests/zip/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt
@@ -44,7 +44,6 @@ include $alias . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_b.php on line %d
diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt
index 44c8f8bb30..adcb50ff93 100644
--- a/ext/phar/tests/zip/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt
@@ -38,7 +38,6 @@ include $alias . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d
diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
index da2b18beb0..cb328ae3d7 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
@@ -47,7 +47,6 @@ include $alias . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d
diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
index b94448b347..86e33da7c9 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
@@ -41,7 +41,6 @@ include $alias . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d
diff --git a/ext/phar/tests/zip/rename.phpt b/ext/phar/tests/zip/rename.phpt
index 9b1f5c98cd..10d73fd3d8 100644
--- a/ext/phar/tests/zip/rename.phpt
+++ b/ext/phar/tests/zip/rename.phpt
@@ -31,4 +31,4 @@ echo file_get_contents($alias . '/a') . "\n";
a
a
-Warning: file_get_contents(phar://%srename.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.zip" in %srename.php on line %d \ No newline at end of file
+Warning: file_get_contents(phar://%srename.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.zip" in %srename.php on line %d
diff --git a/ext/phar/tests/zip/rename_dir.phpt b/ext/phar/tests/zip/rename_dir.phpt
index bb03c7fd66..1885a7ce75 100644
--- a/ext/phar/tests/zip/rename_dir.phpt
+++ b/ext/phar/tests/zip/rename_dir.phpt
@@ -31,4 +31,4 @@ echo file_get_contents($alias . '/a/x') . "\n";
a
a
-Warning: file_get_contents(phar://%srename_dir.phar.zip/a/x): failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.zip" in %srename_dir.php on line %d \ No newline at end of file
+Warning: file_get_contents(phar://%srename_dir.phar.zip/a/x): failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.zip" in %srename_dir.php on line %d
diff --git a/ext/posix/tests/posix_getgrgid_basic.phpt b/ext/posix/tests/posix_getgrgid_basic.phpt
index be717da64a..61ec8ab0fc 100644
--- a/ext/posix/tests/posix_getgrgid_basic.phpt
+++ b/ext/posix/tests/posix_getgrgid_basic.phpt
@@ -27,4 +27,3 @@ Array
[gid] => %d
)
===DONE===
-
diff --git a/ext/posix/tests/posix_getgroups_basic.phpt b/ext/posix/tests/posix_getgroups_basic.phpt
index 2d309e61d4..dd17fd447f 100644
--- a/ext/posix/tests/posix_getgroups_basic.phpt
+++ b/ext/posix/tests/posix_getgroups_basic.phpt
@@ -21,4 +21,4 @@ Test posix_getgroups() function : basic functionality
--EXPECT--
Basic test of POSIX getgroups
TEST PASSED
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/posix/tests/posix_getpgid_basic.phpt b/ext/posix/tests/posix_getpgid_basic.phpt
index 500bc18cff..57efab7c3f 100644
--- a/ext/posix/tests/posix_getpgid_basic.phpt
+++ b/ext/posix/tests/posix_getpgid_basic.phpt
@@ -20,4 +20,4 @@ Basic test of posix_getpgid function
int(%d)
===DONE====
- \ No newline at end of file
+
diff --git a/ext/posix/tests/posix_getpgrp_basic.phpt b/ext/posix/tests/posix_getpgrp_basic.phpt
index f460e347ce..ceb78bb700 100644
--- a/ext/posix/tests/posix_getpgrp_basic.phpt
+++ b/ext/posix/tests/posix_getpgrp_basic.phpt
@@ -18,4 +18,4 @@ Test posix_getpgrp() function : basic functionality
Basic test of POSIX getpgrp function
int(%d)
===DONE====
- \ No newline at end of file
+
diff --git a/ext/posix/tests/posix_getpid_basic.phpt b/ext/posix/tests/posix_getpid_basic.phpt
index 40689583b5..a52895946d 100644
--- a/ext/posix/tests/posix_getpid_basic.phpt
+++ b/ext/posix/tests/posix_getpid_basic.phpt
@@ -18,4 +18,4 @@ Test posix_getpid() function : basic functionality
Basic test of POSIX getpid function
int(%d)
===DONE====
- \ No newline at end of file
+
diff --git a/ext/posix/tests/posix_getppid_basic.phpt b/ext/posix/tests/posix_getppid_basic.phpt
index 8d10afc456..2fc4ff43ae 100644
--- a/ext/posix/tests/posix_getppid_basic.phpt
+++ b/ext/posix/tests/posix_getppid_basic.phpt
@@ -18,4 +18,4 @@ Test posix_getppid() function : basic functionality
Basic test of POSIX getppid function
int(%d)
===DONE====
- \ No newline at end of file
+
diff --git a/ext/posix/tests/posix_getpwuid_basic.phpt b/ext/posix/tests/posix_getpwuid_basic.phpt
index 16e0ae1152..a604ce36cf 100644
--- a/ext/posix/tests/posix_getpwuid_basic.phpt
+++ b/ext/posix/tests/posix_getpwuid_basic.phpt
@@ -27,4 +27,4 @@ Array
\[dir\] => [^\r\n]+
\[shell\] => [^\r\n]+
\)
-===DONE==== \ No newline at end of file
+===DONE====
diff --git a/ext/posix/tests/posix_getrlimit_basic.phpt b/ext/posix/tests/posix_getrlimit_basic.phpt
index bace9fd5ee..57870477f8 100644
--- a/ext/posix/tests/posix_getrlimit_basic.phpt
+++ b/ext/posix/tests/posix_getrlimit_basic.phpt
@@ -17,4 +17,4 @@ Basic test of POSIX posix_getrlimit function
array(%d) {
%a
}
-===DONE==== \ No newline at end of file
+===DONE====
diff --git a/ext/posix/tests/posix_getsid_basic.phpt b/ext/posix/tests/posix_getsid_basic.phpt
index 5bf362efd4..758ec6055d 100644
--- a/ext/posix/tests/posix_getsid_basic.phpt
+++ b/ext/posix/tests/posix_getsid_basic.phpt
@@ -19,4 +19,4 @@ Test posix_getsid() function : basic functionality
Basic test of posix_getsid function
int(%d)
===DONE====
- \ No newline at end of file
+
diff --git a/ext/posix/tests/posix_kill_basic.phpt b/ext/posix/tests/posix_kill_basic.phpt
index fe9cf44692..4ce50ca497 100644
--- a/ext/posix/tests/posix_kill_basic.phpt
+++ b/ext/posix/tests/posix_kill_basic.phpt
@@ -36,4 +36,3 @@ bool(false)
int(%d)
string(%d) %s%rNo such process|Operation not permitted%r%s
===DONE====
-
diff --git a/ext/posix/tests/posix_mknod_basic.phpt b/ext/posix/tests/posix_mknod_basic.phpt
index e95aa301fd..568d8d3dc6 100644
--- a/ext/posix/tests/posix_mknod_basic.phpt
+++ b/ext/posix/tests/posix_mknod_basic.phpt
@@ -15,4 +15,4 @@ var_dump(posix_mknod(NULL, NULL, NULL, NULL));
--EXPECT--
Basic test of POSIX posix_mknod function
bool(false)
-===DONE==== \ No newline at end of file
+===DONE====
diff --git a/ext/posix/tests/posix_setegid_basic.phpt b/ext/posix/tests/posix_setegid_basic.phpt
index 1fe6e8a097..e1885c81f1 100644
--- a/ext/posix/tests/posix_setegid_basic.phpt
+++ b/ext/posix/tests/posix_setegid_basic.phpt
@@ -9,4 +9,4 @@ Test function posix_setegid() by calling it with its expected arguments
var_dump(posix_setegid(posix_getegid()));
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/posix/tests/posix_setgid_basic.phpt b/ext/posix/tests/posix_setgid_basic.phpt
index bb41e22989..d619476677 100644
--- a/ext/posix/tests/posix_setgid_basic.phpt
+++ b/ext/posix/tests/posix_setgid_basic.phpt
@@ -24,4 +24,4 @@ var_dump(posix_setgid( $gid ) );
*** Test by calling method or function with its expected arguments ***
bool(true)
===DONE===
- \ No newline at end of file
+
diff --git a/ext/posix/tests/posix_setgid_variation2.phpt b/ext/posix/tests/posix_setgid_variation2.phpt
index fb578f80ca..5a1b5a13a1 100644
--- a/ext/posix/tests/posix_setgid_variation2.phpt
+++ b/ext/posix/tests/posix_setgid_variation2.phpt
@@ -37,4 +37,3 @@ bool(false)
bool(false)
bool(false)
===DONE===
-
diff --git a/ext/posix/tests/posix_setgid_variation4.phpt b/ext/posix/tests/posix_setgid_variation4.phpt
index 1c791e9b0a..d85b5a900a 100644
--- a/ext/posix/tests/posix_setgid_variation4.phpt
+++ b/ext/posix/tests/posix_setgid_variation4.phpt
@@ -44,4 +44,3 @@ Warning: posix_setgid() expects parameter 1 to be int, float given in %s on line
bool(false)
bool(false)
===DONE===
-
diff --git a/ext/posix/tests/posix_setgid_variation5.phpt b/ext/posix/tests/posix_setgid_variation5.phpt
index baa4383dc3..ad9c79bd2b 100644
--- a/ext/posix/tests/posix_setgid_variation5.phpt
+++ b/ext/posix/tests/posix_setgid_variation5.phpt
@@ -35,4 +35,3 @@ bool(false)
bool(false)
bool(false)
===DONE===
-
diff --git a/ext/posix/tests/posix_setgid_variation6.phpt b/ext/posix/tests/posix_setgid_variation6.phpt
index 46174450d8..6be85e7a85 100644
--- a/ext/posix/tests/posix_setgid_variation6.phpt
+++ b/ext/posix/tests/posix_setgid_variation6.phpt
@@ -55,4 +55,4 @@ bool(false)
Error: 2 - posix_setgid() expects parameter 1 to be int, object given, %s
bool(false)
===DONE===
- \ No newline at end of file
+
diff --git a/ext/posix/tests/posix_setrlimit.phpt b/ext/posix/tests/posix_setrlimit.phpt
index fef2fa4c85..32124ca432 100644
--- a/ext/posix/tests/posix_setrlimit.phpt
+++ b/ext/posix/tests/posix_setrlimit.phpt
@@ -15,4 +15,3 @@ var_dump(posix_setrlimit(POSIX_RLIMIT_NOFILE, 129, 128));
--EXPECT--
bool(true)
bool(false)
-
diff --git a/ext/posix/tests/posix_uname_basic.phpt b/ext/posix/tests/posix_uname_basic.phpt
index c48694579a..49c2cf5609 100644
--- a/ext/posix/tests/posix_uname_basic.phpt
+++ b/ext/posix/tests/posix_uname_basic.phpt
@@ -25,4 +25,4 @@ Array
[machine] => %s
)
===DONE====
- \ No newline at end of file
+
diff --git a/ext/readline/tests/readline_info_001.phpt b/ext/readline/tests/readline_info_001.phpt
index 68599c1d67..8f5d641d94 100644
--- a/ext/readline/tests/readline_info_001.phpt
+++ b/ext/readline/tests/readline_info_001.phpt
@@ -62,4 +62,4 @@ int(1)
string(1) " "
string(0) ""
bool(false)
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/readline/tests/readline_read_history_open_basedir_001.phpt b/ext/readline/tests/readline_read_history_open_basedir_001.phpt
index 6b8ecce3a9..5b562deaec 100644
--- a/ext/readline/tests/readline_read_history_open_basedir_001.phpt
+++ b/ext/readline/tests/readline_read_history_open_basedir_001.phpt
@@ -14,4 +14,4 @@ var_dump(readline_read_history($name));
?>
--EXPECTF--
Warning: readline_read_history(): open_basedir restriction in effect. File(/tmp/out-of-sandbox) is not within the allowed path(s): (/tmp/some-sandbox) in %s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/readline/tests/readline_write_history_open_basedir_001.phpt b/ext/readline/tests/readline_write_history_open_basedir_001.phpt
index bd7880bb9b..4828a4147b 100644
--- a/ext/readline/tests/readline_write_history_open_basedir_001.phpt
+++ b/ext/readline/tests/readline_write_history_open_basedir_001.phpt
@@ -14,4 +14,4 @@ var_dump(readline_write_history($name));
?>
--EXPECTF--
Warning: readline_write_history(): open_basedir restriction in effect. File(/tmp/out-of-sandbox) is not within the allowed path(s): (/tmp/some-sandbox) in %s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/recode/tests/001.phpt b/ext/recode/tests/001.phpt
index c03b44a811..62dc40a15f 100644
--- a/ext/recode/tests/001.phpt
+++ b/ext/recode/tests/001.phpt
@@ -35,4 +35,4 @@ echo "#" . $lat1_hex . "#\n";
--EXPECT--
#31 32 33 c3 a5 c3 a4 c3 b6 61 62 63 #
#123&aring;&auml;&ouml;abc#
-#31 32 33 e5 e4 f6 61 62 63 # \ No newline at end of file
+#31 32 33 e5 e4 f6 61 62 63 #
diff --git a/ext/reflection/tests/007.phpt b/ext/reflection/tests/007.phpt
index 2b4f3df43f..8babf24282 100644
--- a/ext/reflection/tests/007.phpt
+++ b/ext/reflection/tests/007.phpt
@@ -91,7 +91,6 @@ test('WithCtorWithArgs');
===DONE===
<?php exit(0); ?>
--EXPECTF--
-
====>Class_does_not_exist
{closure}(Class_does_not_exist)
string(41) "Class Class_does_not_exist does not exist"
diff --git a/ext/reflection/tests/ReflectionClass_constructor_002.phpt b/ext/reflection/tests/ReflectionClass_constructor_002.phpt
index 64c299592d..c463bb72c1 100644
--- a/ext/reflection/tests/ReflectionClass_constructor_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_constructor_002.phpt
@@ -46,7 +46,6 @@ try {
?>
--EXPECTF--
-
Warning: ReflectionClass::__construct() expects exactly 1 parameter, 0 given in %s on line 3
object(ReflectionClass)#%d (1) {
["name"]=>
@@ -64,4 +63,4 @@ object(ReflectionClass)#%d (1) {
["name"]=>
string(0) ""
}
-Class X does not exist \ No newline at end of file
+Class X does not exist
diff --git a/ext/reflection/tests/ReflectionClass_export_basic1.phpt b/ext/reflection/tests/ReflectionClass_export_basic1.phpt
index 83c514adab..abfa41f3d7 100644
--- a/ext/reflection/tests/ReflectionClass_export_basic1.phpt
+++ b/ext/reflection/tests/ReflectionClass_export_basic1.phpt
@@ -59,4 +59,4 @@ Class [ <user> class C extends A ] {
}
}
}
-} \ No newline at end of file
+}
diff --git a/ext/reflection/tests/ReflectionClass_export_basic2.phpt b/ext/reflection/tests/ReflectionClass_export_basic2.phpt
index b6644883ee..5699529b3d 100644
--- a/ext/reflection/tests/ReflectionClass_export_basic2.phpt
+++ b/ext/reflection/tests/ReflectionClass_export_basic2.phpt
@@ -51,4 +51,4 @@ Class [ <user> class d extends c ] {
- Methods [0] {
}
-} \ No newline at end of file
+}
diff --git a/ext/reflection/tests/ReflectionClass_getConstant_error.phpt b/ext/reflection/tests/ReflectionClass_getConstant_error.phpt
index 907d6d8b7a..5260e719a3 100644
--- a/ext/reflection/tests/ReflectionClass_getConstant_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstant_error.phpt
@@ -34,4 +34,4 @@ Warning: ReflectionClass::getConstant() expects parameter 1 to be string, array
NULL
Warning: ReflectionClass::getConstant() expects parameter 1 to be string, object given in %s on line 15
-NULL \ No newline at end of file
+NULL
diff --git a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt
index 31e0e8e58b..9171a8dd25 100644
--- a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt
@@ -56,8 +56,6 @@ foreach ($classes as $class) {
?>
--EXPECTF--
-
-
---> Doc comment for class A:
string(%d) "/**
@@ -97,4 +95,4 @@ string(27) "/** ** Doc comment for G */"
---> Doc comment for class I:
string(%d) "/**
* Interface doc comment
- */" \ No newline at end of file
+ */"
diff --git a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
index f70e779e9f..1eb084214b 100644
--- a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
@@ -71,4 +71,4 @@ Warning: ReflectionClass::getMethod() expects parameter 1 to be string, array gi
NULL
Warning: ReflectionClass::getMethod() expects parameter 1 to be string, object given in %s on line 44
-NULL \ No newline at end of file
+NULL
diff --git a/ext/reflection/tests/ReflectionClass_getNamespaceName.phpt b/ext/reflection/tests/ReflectionClass_getNamespaceName.phpt
index 1c46e0656b..dceb18f7c5 100644
--- a/ext/reflection/tests/ReflectionClass_getNamespaceName.phpt
+++ b/ext/reflection/tests/ReflectionClass_getNamespaceName.phpt
@@ -27,4 +27,3 @@ bool(true)
string(7) "A\B\Foo"
string(3) "A\B"
string(3) "Foo"
-
diff --git a/ext/reflection/tests/ReflectionClass_getParentClass.phpt b/ext/reflection/tests/ReflectionClass_getParentClass.phpt
index 46884ca2ba..382948d3d3 100644
--- a/ext/reflection/tests/ReflectionClass_getParentClass.phpt
+++ b/ext/reflection/tests/ReflectionClass_getParentClass.phpt
@@ -13,7 +13,6 @@ class Bar extends Foo {}
$rc1 = new ReflectionClass("Bar");
var_dump($rc1->getParentClass());
?>
-
--EXPECTF--
object(ReflectionClass)#%d (1) {
["name"]=>
diff --git a/ext/reflection/tests/ReflectionClass_getProperties_003.phpt b/ext/reflection/tests/ReflectionClass_getProperties_003.phpt
index 229e828056..fe3792a30f 100644
--- a/ext/reflection/tests/ReflectionClass_getProperties_003.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperties_003.phpt
@@ -186,4 +186,4 @@ Private or static properties:array(6) {
["class"]=>
string(1) "C"
}
-} \ No newline at end of file
+}
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
index cf4aca51ea..68522e097a 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
@@ -69,4 +69,4 @@ Warning: ReflectionClass::getProperty() expects parameter 1 to be string, array
NULL
Warning: ReflectionClass::getProperty() expects parameter 1 to be string, object given in %s on line 44
-NULL \ No newline at end of file
+NULL
diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt
index 36b4744d8c..52fa378eb6 100644
--- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt
@@ -39,7 +39,6 @@ try {
?>
--EXPECTF--
-
Warning: ReflectionClass::getStaticPropertyValue() expects at most 2 parameters, 3 given in %s on line 8
NULL
@@ -49,4 +48,4 @@ Class C does not have a property named
string(3) "def"
Warning: ReflectionClass::getStaticPropertyValue() expects parameter 1 to be string, array given in %s on line 28
-NULL \ No newline at end of file
+NULL
diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt
index d26fad591d..84e334ba19 100644
--- a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt
@@ -33,4 +33,4 @@ Check existing constant: bool(true)
Check existing constant, different case: bool(false)
Check absent constant: bool(false)
Check inherited constant: bool(true)
-Check absent constant: bool(false) \ No newline at end of file
+Check absent constant: bool(false)
diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_002.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_002.phpt
index a0a76f024a..14c847401d 100644
--- a/ext/reflection/tests/ReflectionClass_hasConstant_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasConstant_002.phpt
@@ -37,4 +37,4 @@ Warning: ReflectionClass::hasConstant() expects parameter 1 to be string, array
NULL
Warning: ReflectionClass::hasConstant() expects parameter 1 to be string, object given in %s on line 15
-NULL \ No newline at end of file
+NULL
diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt
index b9eb013522..dec76febe1 100644
--- a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt
@@ -72,4 +72,4 @@ Reflecting on class subprivf:
--> Check for s(): bool(true)
--> Check for F(): bool(true)
--> Check for doesntExist(): bool(false)
- \ No newline at end of file
+
diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt
index a644b2e641..a6c3753a78 100644
--- a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt
@@ -72,4 +72,3 @@ Reflecting on class subprivf:
--> Check for a: bool(false)
--> Check for A: bool(false)
--> Check for doesntExist: bool(false)
-
diff --git a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
index 8a0098ad8d..10a86d9136 100644
--- a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
@@ -89,4 +89,4 @@ Test static invocation:
Fatal error: Uncaught Error: Non-static method ReflectionClass::isIterateable() cannot be called statically in %s:43
Stack trace:
#0 {main}
- thrown in %s on line 43 \ No newline at end of file
+ thrown in %s on line 43
diff --git a/ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt
index 083b277131..368ea7d7ec 100644
--- a/ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt
@@ -36,7 +36,6 @@ try {
}
?>
--EXPECTF--
-
Test bad arguments:
Warning: ReflectionClass::isSubclassOf() expects exactly 1 parameter, 0 given in %s on line 7
@@ -46,4 +45,4 @@ Warning: ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given in
NULL
Parameter one must either be a string or a ReflectionClass object
Class ThisClassDoesNotExist does not exist
-Parameter one must either be a string or a ReflectionClass object \ No newline at end of file
+Parameter one must either be a string or a ReflectionClass object
diff --git a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
index 2754b4c8e3..bd27dfc173 100644
--- a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
@@ -16,7 +16,6 @@ var_dump($a);
?>
--EXPECTF--
-
Fatal error: Uncaught TypeError: Argument 1 passed to ReflectionClass::newInstanceArgs() must be of the type array, string given in %s:8
Stack trace:
#0 %s(%d): ReflectionClass->newInstanceArgs('x')
diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt
index 3244ec30b9..14e8382e41 100644
--- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt
@@ -44,7 +44,6 @@ try {
?>
--EXPECTF--
-
Warning: ReflectionClass::setStaticPropertyValue() expects exactly 2 parameters, 3 given in %s on line 8
NULL
@@ -57,4 +56,4 @@ Class C does not have a property named
Class C does not have a property named 1.5
Warning: ReflectionClass::setStaticPropertyValue() expects parameter 1 to be string, array given in %s on line 33
-NULL \ No newline at end of file
+NULL
diff --git a/ext/reflection/tests/ReflectionClass_toString_002.phpt b/ext/reflection/tests/ReflectionClass_toString_002.phpt
index e9aaa502c6..5395ae66b9 100644
--- a/ext/reflection/tests/ReflectionClass_toString_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_toString_002.phpt
@@ -25,8 +25,6 @@ foreach (array('A', 'B', 'C', 'D') as $class) {
?>
--EXPECTF--
-
-
----( Reflection class A: )----
Class [ <user> class A ] {
@@ %s 2-4
@@ -120,4 +118,4 @@ Class [ <user> class D extends C ] {
@@ %s 12 - 12
}
}
-} \ No newline at end of file
+}
diff --git a/ext/reflection/tests/ReflectionClass_toString_003.phpt b/ext/reflection/tests/ReflectionClass_toString_003.phpt
index ce5afb09ed..1ce1fddf91 100644
--- a/ext/reflection/tests/ReflectionClass_toString_003.phpt
+++ b/ext/reflection/tests/ReflectionClass_toString_003.phpt
@@ -25,8 +25,6 @@ foreach (array('A', 'B', 'C', 'D') as $class) {
?>
--EXPECTF--
-
-
----( Reflection class A: )----
Class [ <user> class A ] {
@@ %s 2-4
diff --git a/ext/reflection/tests/ReflectionFunction_001.phpt b/ext/reflection/tests/ReflectionFunction_001.phpt
index 7c592dc612..6785e5d0b1 100644
--- a/ext/reflection/tests/ReflectionFunction_001.phpt
+++ b/ext/reflection/tests/ReflectionFunction_001.phpt
@@ -64,4 +64,4 @@ bool(false)
bool(false)
bool(false)
array(0) {
-} \ No newline at end of file
+}
diff --git a/ext/reflection/tests/ReflectionFunction_getDocComment.001.phpt b/ext/reflection/tests/ReflectionFunction_getDocComment.001.phpt
index 2d5bb928b2..03cec2ee79 100644
--- a/ext/reflection/tests/ReflectionFunction_getDocComment.001.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getDocComment.001.phpt
@@ -40,4 +40,3 @@ string(%d) "/**
*/"
bool(false)
bool(false)
-
diff --git a/ext/reflection/tests/ReflectionFunction_getExtension.phpt b/ext/reflection/tests/ReflectionFunction_getExtension.phpt
index 18345892c7..4abc11d8a9 100644
--- a/ext/reflection/tests/ReflectionFunction_getExtension.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getExtension.phpt
@@ -16,4 +16,3 @@ object(ReflectionExtension)#%i (1) {
string(8) "standard"
}
NULL
-
diff --git a/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt b/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt
index 7553a50b34..254a182452 100644
--- a/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getExtensionName.phpt
@@ -13,4 +13,3 @@ var_dump($function->getExtensionName());
--EXPECT--
string(8) "standard"
bool(false)
-
diff --git a/ext/reflection/tests/ReflectionFunction_getFileName.001.phpt b/ext/reflection/tests/ReflectionFunction_getFileName.001.phpt
index 5dbe7b54b7..d27fadec07 100644
--- a/ext/reflection/tests/ReflectionFunction_getFileName.001.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getFileName.001.phpt
@@ -15,4 +15,4 @@ var_dump($funcInfo->getFileName());
--EXPECTF--
%sincluded4.inc
%d
-string(%d) "%sincluded4.inc" \ No newline at end of file
+string(%d) "%sincluded4.inc"
diff --git a/ext/reflection/tests/ReflectionFunction_getFileName.002.phpt b/ext/reflection/tests/ReflectionFunction_getFileName.002.phpt
index 455935e380..cd75418584 100644
--- a/ext/reflection/tests/ReflectionFunction_getFileName.002.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getFileName.002.phpt
@@ -36,4 +36,3 @@ dumpFuncInfo('extract');
string(%d) "%sReflectionFunction_getFileName.002.php"
string(%d) "%sReflectionFunction_getFileName.002.php"
bool(false)
-
diff --git a/ext/reflection/tests/ReflectionFunction_getNamespaceName.phpt b/ext/reflection/tests/ReflectionFunction_getNamespaceName.phpt
index 08b3dddabd..0a6ac9f11d 100644
--- a/ext/reflection/tests/ReflectionFunction_getNamespaceName.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getNamespaceName.phpt
@@ -26,4 +26,3 @@ bool(true)
string(7) "A\B\foo"
string(3) "A\B"
string(3) "foo"
-
diff --git a/ext/reflection/tests/ReflectionMethod_basic1.phpt b/ext/reflection/tests/ReflectionMethod_basic1.phpt
index d403d2d2be..8eb970babb 100644
--- a/ext/reflection/tests/ReflectionMethod_basic1.phpt
+++ b/ext/reflection/tests/ReflectionMethod_basic1.phpt
@@ -294,5 +294,3 @@ isDestructor():
bool(true)
**********************************
-
-
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
index f7beea67a6..5c980536b9 100644
--- a/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
+++ b/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
@@ -100,4 +100,3 @@ Stack trace:
#0 %s ReflectionMethod->__construct('TestCla::foo')
#1 {main}
Class and Method in same string (ok):
-
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
index bb0543d098..723ab00f84 100644
--- a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
+++ b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
@@ -59,4 +59,3 @@ Ok - ReflectionMethod::__construct() expects exactly 1 parameter, 3 given
Ok - Class InvalidClassName does not exist
Ok - The parameter class is expected to be either a string or an object
Ok - ReflectionMethod::__construct() expects exactly 1 parameter, 2 given
-
diff --git a/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt
index 8e34d61731..d34c7f61a4 100644
--- a/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt
@@ -27,4 +27,3 @@ object(ReflectionClass)#%d (1) {
["name"]=>
string(1) "B"
}
-
diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt
index 2544b0e7ec..f999b72812 100644
--- a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt
@@ -64,8 +64,6 @@ foreach (array('A', 'B') as $class) {
}
?>
--EXPECTF--
-
-
---> Doc comment for A::f():
string(%d) "/**
* My Doc Comment for A::f
diff --git a/ext/reflection/tests/ReflectionObject___toString_basic1.phpt b/ext/reflection/tests/ReflectionObject___toString_basic1.phpt
index fefa220c9e..43210ea686 100644
--- a/ext/reflection/tests/ReflectionObject___toString_basic1.phpt
+++ b/ext/reflection/tests/ReflectionObject___toString_basic1.phpt
@@ -33,4 +33,4 @@ Object of class [ <user> class Foo ] {
- Methods [0] {
}
-} \ No newline at end of file
+}
diff --git a/ext/reflection/tests/ReflectionObject___toString_basic2.phpt b/ext/reflection/tests/ReflectionObject___toString_basic2.phpt
index 332386afd3..970d07b432 100644
--- a/ext/reflection/tests/ReflectionObject___toString_basic2.phpt
+++ b/ext/reflection/tests/ReflectionObject___toString_basic2.phpt
@@ -36,4 +36,4 @@ Object of class [ <user> class Foo ] {
- Methods [0] {
}
-} \ No newline at end of file
+}
diff --git a/ext/reflection/tests/ReflectionObject_export_basic1.phpt b/ext/reflection/tests/ReflectionObject_export_basic1.phpt
index f7dfef8670..2fbe6fd779 100644
--- a/ext/reflection/tests/ReflectionObject_export_basic1.phpt
+++ b/ext/reflection/tests/ReflectionObject_export_basic1.phpt
@@ -33,4 +33,4 @@ Object of class [ <user> class Foo ] {
- Methods [0] {
}
-} \ No newline at end of file
+}
diff --git a/ext/reflection/tests/ReflectionObject_export_basic2.phpt b/ext/reflection/tests/ReflectionObject_export_basic2.phpt
index 277f06eaf5..652a5556cd 100644
--- a/ext/reflection/tests/ReflectionObject_export_basic2.phpt
+++ b/ext/reflection/tests/ReflectionObject_export_basic2.phpt
@@ -36,4 +36,4 @@ Object of class [ <user> class Foo ] {
- Methods [0] {
}
-} \ No newline at end of file
+}
diff --git a/ext/reflection/tests/ReflectionObject_export_basic3.phpt b/ext/reflection/tests/ReflectionObject_export_basic3.phpt
index dfd3f2e803..c4afc22d64 100644
--- a/ext/reflection/tests/ReflectionObject_export_basic3.phpt
+++ b/ext/reflection/tests/ReflectionObject_export_basic3.phpt
@@ -35,4 +35,3 @@ Object of class [ <user> class D extends C ] {
- Methods [0] {
}
}
-
diff --git a/ext/reflection/tests/ReflectionObject_getName_basic.phpt b/ext/reflection/tests/ReflectionObject_getName_basic.phpt
index db0cbfb08d..68cea6a1cd 100644
--- a/ext/reflection/tests/ReflectionObject_getName_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getName_basic.phpt
@@ -18,10 +18,8 @@ var_dump($r3->getName());
?>
--EXPECTF--
-
Warning: ReflectionObject::__construct() expects exactly 1 parameter, 0 given in %s on line 2
string(0) ""
string(8) "stdClass"
string(1) "C"
string(16) "ReflectionObject"
-
diff --git a/ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt
index 2fb8cb0870..f05197ebaf 100644
--- a/ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt
+++ b/ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt
@@ -45,4 +45,4 @@ Warning: ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given in
NULL
Parameter one must either be a string or a ReflectionClass object
Class ThisClassDoesNotExist does not exist
-Parameter one must either be a string or a ReflectionClass object \ No newline at end of file
+Parameter one must either be a string or a ReflectionClass object
diff --git a/ext/reflection/tests/ReflectionParameter_001.phpt b/ext/reflection/tests/ReflectionParameter_001.phpt
index 71dc69ca4e..822da2fe9a 100644
--- a/ext/reflection/tests/ReflectionParameter_001.phpt
+++ b/ext/reflection/tests/ReflectionParameter_001.phpt
@@ -77,4 +77,4 @@ Parameters from noArgs:
array(0) {
}
-done \ No newline at end of file
+done
diff --git a/ext/reflection/tests/ReflectionParameter_002.phpt b/ext/reflection/tests/ReflectionParameter_002.phpt
index 349e6f0ca9..571edac7a9 100644
--- a/ext/reflection/tests/ReflectionParameter_002.phpt
+++ b/ext/reflection/tests/ReflectionParameter_002.phpt
@@ -77,4 +77,4 @@ object(ReflectionParameter)#%i (1) {
}
This param is passed by reference
-done \ No newline at end of file
+done
diff --git a/ext/reflection/tests/ReflectionParameter_export_error.phpt b/ext/reflection/tests/ReflectionParameter_export_error.phpt
index 31acfe12ae..e3d2bac0fc 100644
--- a/ext/reflection/tests/ReflectionParameter_export_error.phpt
+++ b/ext/reflection/tests/ReflectionParameter_export_error.phpt
@@ -14,7 +14,6 @@ foreach($reflect->getParameters() as $key => $value) {
?>
==DONE==
--EXPECTF--
-
Warning: ReflectionParameter::export() expects at least 2 parameters, 0 given in %s.php on line %d
Warning: ReflectionParameter::export() expects at least 2 parameters, 0 given in %s.php on line %d
diff --git a/ext/reflection/tests/ReflectionParameter_export_error3.phpt b/ext/reflection/tests/ReflectionParameter_export_error3.phpt
index 4e71f55d45..f5223c35fe 100644
--- a/ext/reflection/tests/ReflectionParameter_export_error3.phpt
+++ b/ext/reflection/tests/ReflectionParameter_export_error3.phpt
@@ -13,7 +13,6 @@ foreach($params as $key => $value) {
ReflectionParameter::export('ReflectionParameterTest', 'incorrect_parameter');
}
--EXPECTF--
-
Fatal error: Uncaught ReflectionException: The parameter specified by its name could not be found in %s.php:%d
Stack trace:
#0 [internal function]: ReflectionParameter->__construct('ReflectionParam...', 'incorrect_param...')
diff --git a/ext/reflection/tests/ReflectionProperty_basic1.phpt b/ext/reflection/tests/ReflectionProperty_basic1.phpt
index 63f9542015..18eb71fa10 100644
--- a/ext/reflection/tests/ReflectionProperty_basic1.phpt
+++ b/ext/reflection/tests/ReflectionProperty_basic1.phpt
@@ -156,5 +156,3 @@ isStatic():
bool(false)
**********************************
-
-
diff --git a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
index d744fc8995..6f39f9db6c 100644
--- a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
+++ b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
@@ -55,4 +55,4 @@ Property D::$p does not exist
Property D::$p does not exist
--> Reflect inherited private from subclass:
-Property D::$p does not exist \ No newline at end of file
+Property D::$p does not exist
diff --git a/ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt b/ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt
index 8491f32597..1dc7c9c727 100644
--- a/ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt
@@ -42,7 +42,6 @@ foreach(array('A', 'B') as $class) {
?>
--EXPECTF--
-
---> Doc comment for A::$a:
string(%d) "/**
* My Doc Comment for $a
diff --git a/ext/reflection/tests/ReflectionType_002.phpt b/ext/reflection/tests/ReflectionType_002.phpt
index 501dfc8d89..31d396f773 100644
--- a/ext/reflection/tests/ReflectionType_002.phpt
+++ b/ext/reflection/tests/ReflectionType_002.phpt
@@ -10,8 +10,6 @@ $rt = $rp->getType();
$rrt = $rm->getReturnType();
unset($rm, $rp);
var_dump($rt->getName(), $rrt->getName());
-
--EXPECT--
string(4) "Test"
string(5) "Test2"
-
diff --git a/ext/reflection/tests/bug46064_2.phpt b/ext/reflection/tests/bug46064_2.phpt
index 6ac72bbd27..65afa836b7 100644
--- a/ext/reflection/tests/bug46064_2.phpt
+++ b/ext/reflection/tests/bug46064_2.phpt
@@ -71,4 +71,4 @@ array(2) {
string(4) "test"
}
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/reflection/tests/bug67068.phpt b/ext/reflection/tests/bug67068.phpt
index 35c1b1674f..3c363561d3 100644
--- a/ext/reflection/tests/bug67068.phpt
+++ b/ext/reflection/tests/bug67068.phpt
@@ -15,4 +15,4 @@ $closureReflector = new \ReflectionFunction($closure);
var_dump($closureReflector->isClosure());
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/reflection/tests/traits004.phpt b/ext/reflection/tests/traits004.phpt
index ca0314d0df..d975a52726 100644
--- a/ext/reflection/tests/traits004.phpt
+++ b/ext/reflection/tests/traits004.phpt
@@ -55,4 +55,3 @@ array(2) {
string(2) "T2"
}
}
-
diff --git a/ext/reflection/tests/traits005.phpt b/ext/reflection/tests/traits005.phpt
index 4cfa6c04f0..fbc917eafc 100644
--- a/ext/reflection/tests/traits005.phpt
+++ b/ext/reflection/tests/traits005.phpt
@@ -38,4 +38,3 @@ array(2) {
["a2"]=>
string(6) "T1::m2"
}
-
diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt
index eb04dc1147..0643dce51f 100644
--- a/ext/session/tests/001.phpt
+++ b/ext/session/tests/001.phpt
@@ -33,4 +33,3 @@ print session_encode()."\n";
session_destroy();
--EXPECT--
baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}}
-
diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt
index 8725f06a69..eae636593d 100644
--- a/ext/session/tests/003.phpt
+++ b/ext/session/tests/003.phpt
@@ -43,4 +43,3 @@ array(1) {
int(2)
}
}
-
diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt
index 3a95c9f8f6..4046b3aebc 100644
--- a/ext/session/tests/005.phpt
+++ b/ext/session/tests/005.phpt
@@ -149,4 +149,3 @@ array(1) {
int(123)
DESTROY: abtest
CLOSE
-
diff --git a/ext/session/tests/009.phpt b/ext/session/tests/009.phpt
index 9624df0ae8..10069c21d0 100644
--- a/ext/session/tests/009.phpt
+++ b/ext/session/tests/009.phpt
@@ -55,4 +55,3 @@ array(0) {
}
array(0) {
}
-
diff --git a/ext/session/tests/016.phpt b/ext/session/tests/016.phpt
index 5e20ca348b..aa7ba1cebb 100644
--- a/ext/session/tests/016.phpt
+++ b/ext/session/tests/016.phpt
@@ -26,4 +26,3 @@ Warning: session_start(): Failed to create session data file path. Too short ses
Warning: session_start(): Failed to read session data: files (path: 123;:/really%scompletely:::/invalid;;,23123;213) in %s on line 4
I live
-
diff --git a/ext/session/tests/019.phpt b/ext/session/tests/019.phpt
index 5825007000..5846291769 100644
--- a/ext/session/tests/019.phpt
+++ b/ext/session/tests/019.phpt
@@ -46,7 +46,6 @@ var_dump($_SESSION);
session_destroy();
?>
--EXPECTF--
-
array(2) {
["o1"]=>
&object(TFoo)#%d (1) {
@@ -71,4 +70,3 @@ array(2) {
int(44)
}
}
-
diff --git a/ext/session/tests/bug31454.phpt b/ext/session/tests/bug31454.phpt
index 89b7048477..24da588aa4 100644
--- a/ext/session/tests/bug31454.phpt
+++ b/ext/session/tests/bug31454.phpt
@@ -16,6 +16,5 @@ session_set_save_handler(
echo "Done\n";
?>
--EXPECTF--
-
Warning: session_set_save_handler(): Argument 1 is not a valid callback in %sbug31454.php on line %d
Done
diff --git a/ext/session/tests/bug42596.phpt b/ext/session/tests/bug42596.phpt
index 3d11607b4c..6902d124b4 100644
--- a/ext/session/tests/bug42596.phpt
+++ b/ext/session/tests/bug42596.phpt
@@ -33,4 +33,3 @@ rmdir($sessdir);
--EXPECT--
hello world
string(6) "100777"
-
diff --git a/ext/session/tests/bug53141.phpt b/ext/session/tests/bug53141.phpt
index 765d2727e4..e240fec8a7 100644
--- a/ext/session/tests/bug53141.phpt
+++ b/ext/session/tests/bug53141.phpt
@@ -23,4 +23,4 @@ $_SESSION['foo'] = new Foo;
?>
--EXPECT--
-string(11) "Loading Bar" \ No newline at end of file
+string(11) "Loading Bar"
diff --git a/ext/session/tests/bug60634_error_1.phpt b/ext/session/tests/bug60634_error_1.phpt
index 5ad8fcb02a..c573b65e36 100644
--- a/ext/session/tests/bug60634_error_1.phpt
+++ b/ext/session/tests/bug60634_error_1.phpt
@@ -57,4 +57,3 @@ Stack trace:
#1 %s(%d): session_write_close()
#2 {main}
thrown in %s on line %d
-
diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt
index f6f641d94e..57156753fb 100644
--- a/ext/session/tests/bug60860.phpt
+++ b/ext/session/tests/bug60860.phpt
@@ -17,4 +17,3 @@ echo "ok\n";
--EXPECT--
PHP Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or session_module_name() in Unknown on line 0
ok
-
diff --git a/ext/session/tests/bug63379.phpt b/ext/session/tests/bug63379.phpt
index 06711727cf..ed009c3ac6 100644
--- a/ext/session/tests/bug63379.phpt
+++ b/ext/session/tests/bug63379.phpt
@@ -32,7 +32,6 @@ session_unset();
session_start();
var_dump($_SESSION);
-
--EXPECT--
array(1) {
["foo"]=>
diff --git a/ext/session/tests/bug63379_nodestroy.phpt b/ext/session/tests/bug63379_nodestroy.phpt
index 3e377f35b5..dbfedeaf05 100644
--- a/ext/session/tests/bug63379_nodestroy.phpt
+++ b/ext/session/tests/bug63379_nodestroy.phpt
@@ -32,7 +32,6 @@ session_unset();
session_start();
var_dump($_SESSION);
-
--EXPECT--
array(1) {
["foo"]=>
diff --git a/ext/session/tests/bug65475.phpt b/ext/session/tests/bug65475.phpt
index fcf5e59b60..d55fd74594 100644
--- a/ext/session/tests/bug65475.phpt
+++ b/ext/session/tests/bug65475.phpt
@@ -25,10 +25,8 @@ session_start();
var_dump($session_id === session_id());
var_dump($_SESSION['cnt']); // Should be int(2)
session_write_close();
-
--EXPECT--
Testing file module
bool(true)
bool(true)
int(2)
-
diff --git a/ext/session/tests/bug67972.phpt b/ext/session/tests/bug67972.phpt
index 92c3044ac5..e9ea7258e5 100644
--- a/ext/session/tests/bug67972.phpt
+++ b/ext/session/tests/bug67972.phpt
@@ -8,4 +8,3 @@ Bug #67972: SessionHandler Invalid memory read create_sid()
(new SessionHandler)->create_sid();
--EXPECTF--
Warning: SessionHandler::create_sid(): Session is not active in %s on line %d
-
diff --git a/ext/session/tests/bug70876.phpt b/ext/session/tests/bug70876.phpt
index 33e0323b9f..ab21f7d0f3 100644
--- a/ext/session/tests/bug70876.phpt
+++ b/ext/session/tests/bug70876.phpt
@@ -14,4 +14,4 @@ session_regenerate_id();
echo "ok";
?>
--EXPECT--
-ok \ No newline at end of file
+ok
diff --git a/ext/session/tests/bug71603.phpt b/ext/session/tests/bug71603.phpt
index 40032088fe..ee0ecf0d26 100644
--- a/ext/session/tests/bug71603.phpt
+++ b/ext/session/tests/bug71603.phpt
@@ -13,4 +13,3 @@ echo "ok\n";
?>
--EXPECT--
ok
-
diff --git a/ext/session/tests/bug71974.phpt b/ext/session/tests/bug71974.phpt
index 388befdaf3..e415bb5d4c 100644
--- a/ext/session/tests/bug71974.phpt
+++ b/ext/session/tests/bug71974.phpt
@@ -19,5 +19,3 @@ session_start()
<a href="some.php">abc</a>
--EXPECT--
<a href="some.php">abc</a>
-
-
diff --git a/ext/session/tests/bug73100.phpt b/ext/session/tests/bug73100.phpt
index b53ebc07b4..9334bbf16e 100644
--- a/ext/session/tests/bug73100.phpt
+++ b/ext/session/tests/bug73100.phpt
@@ -24,4 +24,3 @@ Warning: session_module_name(): Cannot change save handler module when session i
bool(true)
Recoverable fatal error: session_module_name(): Cannot set 'user' save handler by ini_set() or session_module_name() in %s on line 7
-
diff --git a/ext/session/tests/bug74833.phpt b/ext/session/tests/bug74833.phpt
index fdd6054f8a..fa167a1f3a 100644
--- a/ext/session/tests/bug74833.phpt
+++ b/ext/session/tests/bug74833.phpt
@@ -19,4 +19,3 @@ ob_end_flush();
--EXPECT--
bool(true)
==DONE==
-
diff --git a/ext/session/tests/session_basic2.phpt b/ext/session/tests/session_basic2.phpt
index 1ae44167e8..bafe3454eb 100644
--- a/ext/session/tests/session_basic2.phpt
+++ b/ext/session/tests/session_basic2.phpt
@@ -79,5 +79,3 @@ bool(true)
string(0) ""
bool(true)
bool(true)
-
-
diff --git a/ext/session/tests/session_basic4.phpt b/ext/session/tests/session_basic4.phpt
index 0a0f9749f8..32525640e8 100644
--- a/ext/session/tests/session_basic4.phpt
+++ b/ext/session/tests/session_basic4.phpt
@@ -52,8 +52,6 @@ echo '
<form action="" method="post">
</form>
';
-
-
--EXPECT--
*** Testing basic session functionality : variation4 use_trans_sid ***
*** Test trans sid ***
diff --git a/ext/session/tests/session_cache_expire_basic.phpt b/ext/session/tests/session_cache_expire_basic.phpt
index 078d69d837..871e32a317 100644
--- a/ext/session/tests/session_cache_expire_basic.phpt
+++ b/ext/session/tests/session_cache_expire_basic.phpt
@@ -36,4 +36,3 @@ int(180)
bool(true)
int(180)
Done
-
diff --git a/ext/session/tests/session_cache_expire_error.phpt b/ext/session/tests/session_cache_expire_error.phpt
index 4a335e7f67..5ae5d95637 100644
--- a/ext/session/tests/session_cache_expire_error.phpt
+++ b/ext/session/tests/session_cache_expire_error.phpt
@@ -167,4 +167,3 @@ int(0)
-- Iteration 24 --
int(0)
Done
-
diff --git a/ext/session/tests/session_cache_expire_variation1.phpt b/ext/session/tests/session_cache_expire_variation1.phpt
index 0884614a4d..1c6e5922b4 100644
--- a/ext/session/tests/session_cache_expire_variation1.phpt
+++ b/ext/session/tests/session_cache_expire_variation1.phpt
@@ -38,4 +38,3 @@ int(180)
bool(true)
int(180)
Done
-
diff --git a/ext/session/tests/session_cache_expire_variation2.phpt b/ext/session/tests/session_cache_expire_variation2.phpt
index 586a6ec023..b712266e80 100644
--- a/ext/session/tests/session_cache_expire_variation2.phpt
+++ b/ext/session/tests/session_cache_expire_variation2.phpt
@@ -37,5 +37,3 @@ int(180)
bool(true)
int(180)
Done
-
-
diff --git a/ext/session/tests/session_cache_expire_variation3.phpt b/ext/session/tests/session_cache_expire_variation3.phpt
index b9d29b4070..492816f276 100644
--- a/ext/session/tests/session_cache_expire_variation3.phpt
+++ b/ext/session/tests/session_cache_expire_variation3.phpt
@@ -44,4 +44,3 @@ bool(true)
int(1234567890)
string(10) "1234567890"
Done
-
diff --git a/ext/session/tests/session_cache_limiter_error.phpt b/ext/session/tests/session_cache_limiter_error.phpt
index b5bd42fdad..42b2cb0694 100644
--- a/ext/session/tests/session_cache_limiter_error.phpt
+++ b/ext/session/tests/session_cache_limiter_error.phpt
@@ -169,4 +169,3 @@ string(0) ""
Warning: session_cache_limiter() expects parameter 1 to be string, resource given in %s on line %d
NULL
Done
-
diff --git a/ext/session/tests/session_commit_basic.phpt b/ext/session/tests/session_commit_basic.phpt
index 1537af4abb..473be005f9 100644
--- a/ext/session/tests/session_commit_basic.phpt
+++ b/ext/session/tests/session_commit_basic.phpt
@@ -42,4 +42,3 @@ bool(true)
array(0) {
}
Done
-
diff --git a/ext/session/tests/session_commit_variation2.phpt b/ext/session/tests/session_commit_variation2.phpt
index c2ebc5235a..9de2fc12f7 100644
--- a/ext/session/tests/session_commit_variation2.phpt
+++ b/ext/session/tests/session_commit_variation2.phpt
@@ -56,4 +56,3 @@ array(0) {
bool(true)
bool(true)
Done
-
diff --git a/ext/session/tests/session_commit_variation3.phpt b/ext/session/tests/session_commit_variation3.phpt
index 94f11d4f12..38f7f885d3 100644
--- a/ext/session/tests/session_commit_variation3.phpt
+++ b/ext/session/tests/session_commit_variation3.phpt
@@ -36,4 +36,3 @@ array(0) {
bool(true)
bool(true)
Done
-
diff --git a/ext/session/tests/session_commit_variation4.phpt b/ext/session/tests/session_commit_variation4.phpt
index 9a6b929ca2..6c91e6578a 100644
--- a/ext/session/tests/session_commit_variation4.phpt
+++ b/ext/session/tests/session_commit_variation4.phpt
@@ -60,4 +60,3 @@ bool(true)
bool(true)
string(1) "0"
Done
-
diff --git a/ext/session/tests/session_commit_variation5.phpt b/ext/session/tests/session_commit_variation5.phpt
index 8b3535ba95..cc7f6f333e 100644
--- a/ext/session/tests/session_commit_variation5.phpt
+++ b/ext/session/tests/session_commit_variation5.phpt
@@ -67,4 +67,3 @@ string(32) "%s"
bool(true)
bool(true)
Done
-
diff --git a/ext/session/tests/session_decode_basic.phpt b/ext/session/tests/session_decode_basic.phpt
index 2cb3f1c962..2c61583117 100644
--- a/ext/session/tests/session_decode_basic.phpt
+++ b/ext/session/tests/session_decode_basic.phpt
@@ -270,4 +270,3 @@ array(1) {
}
bool(true)
Done
-
diff --git a/ext/session/tests/session_decode_basic_serialize.phpt b/ext/session/tests/session_decode_basic_serialize.phpt
index f9426c7ff7..43c30b9d58 100644
--- a/ext/session/tests/session_decode_basic_serialize.phpt
+++ b/ext/session/tests/session_decode_basic_serialize.phpt
@@ -271,4 +271,3 @@ array(1) {
}
bool(true)
Done
-
diff --git a/ext/session/tests/session_decode_variation1.phpt b/ext/session/tests/session_decode_variation1.phpt
index d9a498d2e9..70c8ada5bc 100644
--- a/ext/session/tests/session_decode_variation1.phpt
+++ b/ext/session/tests/session_decode_variation1.phpt
@@ -186,4 +186,3 @@ array(3) {
}
bool(true)
Done
-
diff --git a/ext/session/tests/session_decode_variation2.phpt b/ext/session/tests/session_decode_variation2.phpt
index a3cca07866..6b3a7325fc 100644
--- a/ext/session/tests/session_decode_variation2.phpt
+++ b/ext/session/tests/session_decode_variation2.phpt
@@ -75,4 +75,3 @@ array(4) {
}
bool(true)
Done
-
diff --git a/ext/session/tests/session_decode_variation4.phpt b/ext/session/tests/session_decode_variation4.phpt
index 9f9d6b3637..f239a86ab9 100644
--- a/ext/session/tests/session_decode_variation4.phpt
+++ b/ext/session/tests/session_decode_variation4.phpt
@@ -53,4 +53,3 @@ array(3) {
}
bool(true)
Done
-
diff --git a/ext/session/tests/session_destroy_error.phpt b/ext/session/tests/session_destroy_error.phpt
index a03face43d..4c1a293be2 100644
--- a/ext/session/tests/session_destroy_error.phpt
+++ b/ext/session/tests/session_destroy_error.phpt
@@ -215,4 +215,3 @@ NULL
Warning: session_destroy() expects exactly 0 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/session/tests/session_destroy_variation1.phpt b/ext/session/tests/session_destroy_variation1.phpt
index bb3de056c0..2863ba63b3 100644
--- a/ext/session/tests/session_destroy_variation1.phpt
+++ b/ext/session/tests/session_destroy_variation1.phpt
@@ -42,4 +42,3 @@ bool(false)
Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
bool(false)
Done
-
diff --git a/ext/session/tests/session_destroy_variation2.phpt b/ext/session/tests/session_destroy_variation2.phpt
index daaa580140..9e0913c9af 100644
--- a/ext/session/tests/session_destroy_variation2.phpt
+++ b/ext/session/tests/session_destroy_variation2.phpt
@@ -42,4 +42,3 @@ bool(true)
bool(true)
bool(true)
Done
-
diff --git a/ext/session/tests/session_destroy_variation3.phpt b/ext/session/tests/session_destroy_variation3.phpt
index f53d0420bd..2f8a37aa8a 100644
--- a/ext/session/tests/session_destroy_variation3.phpt
+++ b/ext/session/tests/session_destroy_variation3.phpt
@@ -38,4 +38,3 @@ string(%d) "%s"
bool(true)
string(0) ""
Done
-
diff --git a/ext/session/tests/session_encode_basic.phpt b/ext/session/tests/session_encode_basic.phpt
index de2a9c97ee..d0f37a3b29 100644
--- a/ext/session/tests/session_encode_basic.phpt
+++ b/ext/session/tests/session_encode_basic.phpt
@@ -173,4 +173,3 @@ string(7) "data|N;"
string(9) "data|i:0;"
bool(true)
Done
-
diff --git a/ext/session/tests/session_encode_error.phpt b/ext/session/tests/session_encode_error.phpt
index 54693963f1..bbd26f92f7 100644
--- a/ext/session/tests/session_encode_error.phpt
+++ b/ext/session/tests/session_encode_error.phpt
@@ -217,4 +217,3 @@ NULL
Warning: session_encode() expects exactly 0 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/session/tests/session_encode_serialize.phpt b/ext/session/tests/session_encode_serialize.phpt
index a5b147e504..7844e22381 100644
--- a/ext/session/tests/session_encode_serialize.phpt
+++ b/ext/session/tests/session_encode_serialize.phpt
@@ -21,4 +21,3 @@ echo 'Done'.PHP_EOL;
bool(true)
string(51) "a:3:{i:-3;s:3:"foo";i:3;s:3:"bar";s:3:"var";i:123;}"
Done
-
diff --git a/ext/session/tests/session_gc_basic.phpt b/ext/session/tests/session_gc_basic.phpt
index 86e9156ce6..483134061e 100644
--- a/ext/session/tests/session_gc_basic.phpt
+++ b/ext/session/tests/session_gc_basic.phpt
@@ -36,5 +36,3 @@ bool(true)
bool(true)
string(0) ""
Done
-
-
diff --git a/ext/session/tests/session_get_cookie_params_error.phpt b/ext/session/tests/session_get_cookie_params_error.phpt
index 0cf54efb02..d5b987fb57 100644
--- a/ext/session/tests/session_get_cookie_params_error.phpt
+++ b/ext/session/tests/session_get_cookie_params_error.phpt
@@ -214,4 +214,3 @@ NULL
Warning: session_get_cookie_params() expects exactly 0 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/session/tests/session_get_cookie_params_variation1.phpt b/ext/session/tests/session_get_cookie_params_variation1.phpt
index 85b05e34c2..13dc94442c 100644
--- a/ext/session/tests/session_get_cookie_params_variation1.phpt
+++ b/ext/session/tests/session_get_cookie_params_variation1.phpt
@@ -140,4 +140,3 @@ array(6) {
string(3) "foo"
}
Done
-
diff --git a/ext/session/tests/session_id_basic.phpt b/ext/session/tests/session_id_basic.phpt
index 7c3e465cb2..487b5d7a37 100644
--- a/ext/session/tests/session_id_basic.phpt
+++ b/ext/session/tests/session_id_basic.phpt
@@ -42,4 +42,3 @@ string(10) "1234567890"
bool(true)
string(0) ""
Done
-
diff --git a/ext/session/tests/session_id_basic2.phpt b/ext/session/tests/session_id_basic2.phpt
index 5b6acb1251..7a19696e61 100644
--- a/ext/session/tests/session_id_basic2.phpt
+++ b/ext/session/tests/session_id_basic2.phpt
@@ -35,4 +35,3 @@ echo "Done";
string(120) "%s"
string(22) "%s"
Done
-
diff --git a/ext/session/tests/session_id_error.phpt b/ext/session/tests/session_id_error.phpt
index 651092c01b..7a323bc3c1 100644
--- a/ext/session/tests/session_id_error.phpt
+++ b/ext/session/tests/session_id_error.phpt
@@ -169,4 +169,3 @@ string(0) ""
Warning: session_id() expects parameter 1 to be string, resource given in %s on line %d
NULL
Done
-
diff --git a/ext/session/tests/session_id_error3.phpt b/ext/session/tests/session_id_error3.phpt
index a3d17504b4..12fe5c2814 100644
--- a/ext/session/tests/session_id_error3.phpt
+++ b/ext/session/tests/session_id_error3.phpt
@@ -76,4 +76,3 @@ string(0) ""
string(0) ""
string(19) "¬``@~:{>?><,./[]+--"
Done
-
diff --git a/ext/session/tests/session_module_name_variation4.phpt b/ext/session/tests/session_module_name_variation4.phpt
index 132b94d658..00e6975045 100644
--- a/ext/session/tests/session_module_name_variation4.phpt
+++ b/ext/session/tests/session_module_name_variation4.phpt
@@ -63,4 +63,3 @@ bool(true)
array(0) {
}
bool(true)
-
diff --git a/ext/session/tests/session_name_basic.phpt b/ext/session/tests/session_name_basic.phpt
index 3d373ed5e0..5fb435b2bf 100644
--- a/ext/session/tests/session_name_basic.phpt
+++ b/ext/session/tests/session_name_basic.phpt
@@ -38,4 +38,3 @@ string(4) "blah"
bool(true)
string(4) "blah"
Done
-
diff --git a/ext/session/tests/session_name_error.phpt b/ext/session/tests/session_name_error.phpt
index 2d1f656b1d..641d8b6b93 100644
--- a/ext/session/tests/session_name_error.phpt
+++ b/ext/session/tests/session_name_error.phpt
@@ -233,4 +233,4 @@ string(12) "Hello World!"
Warning: session_name() expects parameter 1 to be string, resource given in %s on line %d
resource(%d) of type (stream)
NULL
-Done \ No newline at end of file
+Done
diff --git a/ext/session/tests/session_name_variation1.phpt b/ext/session/tests/session_name_variation1.phpt
index 901a472e3c..82e5278783 100644
--- a/ext/session/tests/session_name_variation1.phpt
+++ b/ext/session/tests/session_name_variation1.phpt
@@ -60,4 +60,3 @@ string(1) " "
bool(true)
string(1) " "
Done
-
diff --git a/ext/session/tests/session_name_variation2.phpt b/ext/session/tests/session_name_variation2.phpt
index eb22248e18..3111ceb00f 100644
--- a/ext/session/tests/session_name_variation2.phpt
+++ b/ext/session/tests/session_name_variation2.phpt
@@ -36,4 +36,3 @@ string(4) "blah"
bool(true)
string(4) "blah"
Done
-
diff --git a/ext/session/tests/session_regenerate_id_basic.phpt b/ext/session/tests/session_regenerate_id_basic.phpt
index 7121500db1..49a7e301d4 100644
--- a/ext/session/tests/session_regenerate_id_basic.phpt
+++ b/ext/session/tests/session_regenerate_id_basic.phpt
@@ -44,4 +44,3 @@ Warning: session_regenerate_id(): Cannot regenerate session id - session is not
bool(false)
string(0) ""
Done
-
diff --git a/ext/session/tests/session_regenerate_id_cookie.phpt b/ext/session/tests/session_regenerate_id_cookie.phpt
index d366d36e8d..9558beb814 100644
--- a/ext/session/tests/session_regenerate_id_cookie.phpt
+++ b/ext/session/tests/session_regenerate_id_cookie.phpt
@@ -82,4 +82,3 @@ string(32) "%s"
bool(true)
"
Done
-
diff --git a/ext/session/tests/session_regenerate_id_error.phpt b/ext/session/tests/session_regenerate_id_error.phpt
index a9a66c17e6..b3def66b53 100644
--- a/ext/session/tests/session_regenerate_id_error.phpt
+++ b/ext/session/tests/session_regenerate_id_error.phpt
@@ -215,4 +215,3 @@ bool(false)
Warning: session_regenerate_id() expects parameter 1 to be bool, resource given in %s on line %d
NULL
Done
-
diff --git a/ext/session/tests/session_regenerate_id_variation1.phpt b/ext/session/tests/session_regenerate_id_variation1.phpt
index a5670341af..484a7d001b 100644
--- a/ext/session/tests/session_regenerate_id_variation1.phpt
+++ b/ext/session/tests/session_regenerate_id_variation1.phpt
@@ -44,4 +44,3 @@ Warning: session_regenerate_id(): Cannot regenerate session id - session is not
bool(false)
string(0) ""
Done
-
diff --git a/ext/session/tests/session_save_path_basic.phpt b/ext/session/tests/session_save_path_basic.phpt
index 08acf5a3f5..4db8effdaa 100644
--- a/ext/session/tests/session_save_path_basic.phpt
+++ b/ext/session/tests/session_save_path_basic.phpt
@@ -33,4 +33,3 @@ string(0) ""
string(0) ""
string(%d) "%s"
Done
-
diff --git a/ext/session/tests/session_save_path_error.phpt b/ext/session/tests/session_save_path_error.phpt
index 809f0a7320..1df2c76cce 100644
--- a/ext/session/tests/session_save_path_error.phpt
+++ b/ext/session/tests/session_save_path_error.phpt
@@ -174,4 +174,3 @@ string(0) ""
Warning: session_save_path() expects parameter 1 to be string, resource given in %s on line %d
NULL
Done
-
diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt
index 1dd86f8afa..5d93a573b2 100644
--- a/ext/session/tests/session_save_path_variation5.phpt
+++ b/ext/session/tests/session_save_path_variation5.phpt
@@ -52,4 +52,3 @@ Warning: ini_set(): open_basedir restriction in effect. File(%s) is not within t
string(0) ""
bool(true)
Done
-
diff --git a/ext/session/tests/session_set_save_handler_class_001.phpt b/ext/session/tests/session_set_save_handler_class_001.phpt
index 94ab5f8247..ea8fc81d74 100644
--- a/ext/session/tests/session_set_save_handler_class_001.phpt
+++ b/ext/session/tests/session_set_save_handler_class_001.phpt
@@ -91,7 +91,6 @@ var_dump($_SESSION);
session_write_close();
session_unset();
var_dump($handler->i);
-
--EXPECTF--
*** Testing session_set_save_handler() : basic class wrapping existing handler ***
Open
diff --git a/ext/session/tests/session_set_save_handler_class_002.phpt b/ext/session/tests/session_set_save_handler_class_002.phpt
index fe34376673..29b1d270c6 100644
--- a/ext/session/tests/session_set_save_handler_class_002.phpt
+++ b/ext/session/tests/session_set_save_handler_class_002.phpt
@@ -89,7 +89,6 @@ var_dump($_SESSION);
session_write_close();
session_unset();
-
--EXPECTF--
*** Testing session_set_save_handler() : full handler implementation ***
string(%d) "%s"
diff --git a/ext/session/tests/session_set_save_handler_class_003.phpt b/ext/session/tests/session_set_save_handler_class_003.phpt
index b6b179913a..ba0311b96b 100644
--- a/ext/session/tests/session_set_save_handler_class_003.phpt
+++ b/ext/session/tests/session_set_save_handler_class_003.phpt
@@ -63,7 +63,6 @@ session_write_close();
session_unset();
var_dump(session_id(), $_SESSION, $handler->i);
-
--EXPECTF--
*** Testing session_set_save_handler() : inheritance ***
array(1) {
diff --git a/ext/session/tests/session_set_save_handler_class_004.phpt b/ext/session/tests/session_set_save_handler_class_004.phpt
index 71ebff2eca..eb1d8071ae 100644
--- a/ext/session/tests/session_set_save_handler_class_004.phpt
+++ b/ext/session/tests/session_set_save_handler_class_004.phpt
@@ -33,7 +33,6 @@ var_dump($_SESSION);
session_write_close();
session_unset();
-
--EXPECTF--
*** Testing session_set_save_handler() : default object ***
string(%d) "%s"
diff --git a/ext/session/tests/session_set_save_handler_class_005.phpt b/ext/session/tests/session_set_save_handler_class_005.phpt
index e788ad1197..bada7f52c5 100644
--- a/ext/session/tests/session_set_save_handler_class_005.phpt
+++ b/ext/session/tests/session_set_save_handler_class_005.phpt
@@ -39,8 +39,6 @@ var_dump(session_id(), ini_get('session.save_handler'), $_SESSION);
session_write_close();
session_unset();
-
-
--EXPECTF--
*** Testing session_set_save_handler() : incomplete implementation ***
diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt
index c901385edb..b7bcc3fca6 100644
--- a/ext/session/tests/session_set_save_handler_class_012.phpt
+++ b/ext/session/tests/session_set_save_handler_class_012.phpt
@@ -41,7 +41,6 @@ session_set_save_handler($handler);
var_dump(session_start());
var_dump(session_id(), $oldHandler, ini_get('session.save_handler'), $handler->i, $_SESSION);
-
--EXPECTF--
*** Testing session_set_save_handler() : incorrect arguments for existing handler open ***
Open
diff --git a/ext/session/tests/session_set_save_handler_class_013.phpt b/ext/session/tests/session_set_save_handler_class_013.phpt
index c882e90204..28e49c9f98 100644
--- a/ext/session/tests/session_set_save_handler_class_013.phpt
+++ b/ext/session/tests/session_set_save_handler_class_013.phpt
@@ -41,7 +41,6 @@ session_set_save_handler($handler);
session_start();
var_dump(session_id(), $oldHandler, ini_get('session.save_handler'), $handler->i, $_SESSION);
-
--EXPECTF--
*** Testing session_set_save_handler() : incorrect arguments for existing handler close ***
Open
diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt b/ext/session/tests/session_set_save_handler_class_014.phpt
index 6f8839aad8..0b647bcc59 100644
--- a/ext/session/tests/session_set_save_handler_class_014.phpt
+++ b/ext/session/tests/session_set_save_handler_class_014.phpt
@@ -26,8 +26,6 @@ $handler = new SessionHandler;
session_set_save_handler($handler);
session_start();
-
--EXPECT--
PHP Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or session_module_name() in Unknown on line 0
*** Testing session_set_save_handler() : calling default handler when save_handler=user ***
-
diff --git a/ext/session/tests/session_set_save_handler_class_015.phpt b/ext/session/tests/session_set_save_handler_class_015.phpt
index 2fabf79fcd..5fab0d4b22 100644
--- a/ext/session/tests/session_set_save_handler_class_015.phpt
+++ b/ext/session/tests/session_set_save_handler_class_015.phpt
@@ -19,6 +19,5 @@ ob_start();
echo "*** Testing session_set_save_handler() : register session handler but don't start ***\n";
session_set_save_handler(new SessionHandler);
-
--EXPECT--
*** Testing session_set_save_handler() : register session handler but don't start ***
diff --git a/ext/session/tests/session_set_save_handler_class_016.phpt b/ext/session/tests/session_set_save_handler_class_016.phpt
index 4095813c9d..eadfead304 100644
--- a/ext/session/tests/session_set_save_handler_class_016.phpt
+++ b/ext/session/tests/session_set_save_handler_class_016.phpt
@@ -75,7 +75,6 @@ var_dump($_SESSION);
session_write_close();
session_unset();
-
--EXPECTF--
*** Testing session_set_save_handler() function: class with create_sid ***
string(%d) "%s"
diff --git a/ext/session/tests/session_set_save_handler_class_017.phpt b/ext/session/tests/session_set_save_handler_class_017.phpt
index 720541f3fc..460552a620 100644
--- a/ext/session/tests/session_set_save_handler_class_017.phpt
+++ b/ext/session/tests/session_set_save_handler_class_017.phpt
@@ -75,7 +75,6 @@ var_dump($_SESSION);
session_write_close();
session_unset();
-
--EXPECTF--
*** Testing session_set_save_handler() function: class with create_sid ***
string(%d) "my_sid"
diff --git a/ext/session/tests/session_set_save_handler_class_018.phpt b/ext/session/tests/session_set_save_handler_class_018.phpt
index 7ff06e38cb..c0b2eb61bf 100644
--- a/ext/session/tests/session_set_save_handler_class_018.phpt
+++ b/ext/session/tests/session_set_save_handler_class_018.phpt
@@ -79,7 +79,6 @@ var_dump($_SESSION);
session_write_close();
session_unset();
-
--EXPECTF--
*** Testing session_set_save_handler() function: class with validate_sid ***
string(%d) "my_sid"
diff --git a/ext/session/tests/session_set_save_handler_error.phpt b/ext/session/tests/session_set_save_handler_error.phpt
index 2249d1e5a2..029d7dcba7 100644
--- a/ext/session/tests/session_set_save_handler_error.phpt
+++ b/ext/session/tests/session_set_save_handler_error.phpt
@@ -215,4 +215,3 @@ bool(false)
Warning: session_set_save_handler(): Argument 1 is not a valid callback in %s on line %d
bool(false)
Done
-
diff --git a/ext/session/tests/session_set_save_handler_error2.phpt b/ext/session/tests/session_set_save_handler_error2.phpt
index 4679f87901..fcd480f354 100644
--- a/ext/session/tests/session_set_save_handler_error2.phpt
+++ b/ext/session/tests/session_set_save_handler_error2.phpt
@@ -61,4 +61,3 @@ array(3) {
}
array(0) {
}
-
diff --git a/ext/session/tests/session_set_save_handler_iface_001.phpt b/ext/session/tests/session_set_save_handler_iface_001.phpt
index bfc9e2fa82..362ad90dd6 100644
--- a/ext/session/tests/session_set_save_handler_iface_001.phpt
+++ b/ext/session/tests/session_set_save_handler_iface_001.phpt
@@ -88,7 +88,6 @@ var_dump($_SESSION);
session_write_close();
session_unset();
-
--EXPECTF--
*** Testing session_set_save_handler() function: interface ***
string(%d) "%s"
diff --git a/ext/session/tests/session_set_save_handler_iface_002.phpt b/ext/session/tests/session_set_save_handler_iface_002.phpt
index 0000c50add..bc9f801a5e 100644
--- a/ext/session/tests/session_set_save_handler_iface_002.phpt
+++ b/ext/session/tests/session_set_save_handler_iface_002.phpt
@@ -80,7 +80,6 @@ $ret = session_set_save_handler($handler);
var_dump($ret);
session_start();
-
--EXPECTF--
*** Testing session_set_save_handler() function: interface wrong ***
bool(true)
diff --git a/ext/session/tests/session_set_save_handler_iface_003.phpt b/ext/session/tests/session_set_save_handler_iface_003.phpt
index 9e0ce33616..5a73d6d5f5 100644
--- a/ext/session/tests/session_set_save_handler_iface_003.phpt
+++ b/ext/session/tests/session_set_save_handler_iface_003.phpt
@@ -76,7 +76,6 @@ var_dump($_SESSION);
session_write_close();
session_unset();
-
--EXPECTF--
*** Testing session_set_save_handler() function: id interface ***
string(%d) "my_sid"
diff --git a/ext/session/tests/session_set_save_handler_sid_001.phpt b/ext/session/tests/session_set_save_handler_sid_001.phpt
index 24ba5d7489..4d297d98f7 100644
--- a/ext/session/tests/session_set_save_handler_sid_001.phpt
+++ b/ext/session/tests/session_set_save_handler_sid_001.phpt
@@ -71,7 +71,6 @@ var_dump($_SESSION);
session_write_close();
session_unset();
-
--EXPECTF--
*** Testing session_set_save_handler() function: create_sid ***
string(%d) "my_sid"
diff --git a/ext/session/tests/session_set_save_handler_sid_002.phpt b/ext/session/tests/session_set_save_handler_sid_002.phpt
index 8da4c589c6..9542832684 100644
--- a/ext/session/tests/session_set_save_handler_sid_002.phpt
+++ b/ext/session/tests/session_set_save_handler_sid_002.phpt
@@ -71,7 +71,6 @@ var_dump($_SESSION);
session_write_close();
session_unset();
-
--EXPECTF--
*** Testing session_set_save_handler() function: create_sid ***
diff --git a/ext/session/tests/session_set_save_handler_variation2.phpt b/ext/session/tests/session_set_save_handler_variation2.phpt
index 1e8a8f51c1..251b042d02 100644
--- a/ext/session/tests/session_set_save_handler_variation2.phpt
+++ b/ext/session/tests/session_set_save_handler_variation2.phpt
@@ -31,4 +31,3 @@ bool(true)
Warning: session_set_save_handler(): Cannot change save handler when session is active in %s on line 17
bool(false)
bool(true)
-
diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt
index d0903b2ffc..3fb18d9bf8 100644
--- a/ext/session/tests/session_set_save_handler_variation4.phpt
+++ b/ext/session/tests/session_set_save_handler_variation4.phpt
@@ -83,4 +83,3 @@ Destroy [%s,%s]
Warning: unlink(%s): No such file or directory in %s on line %d
Close [%s,PHPSESSID]
bool(true)
-
diff --git a/ext/session/tests/session_start_variation2.phpt b/ext/session/tests/session_start_variation2.phpt
index 9af8d38308..59cbfab326 100644
--- a/ext/session/tests/session_start_variation2.phpt
+++ b/ext/session/tests/session_start_variation2.phpt
@@ -42,4 +42,3 @@ bool(true)
bool(true)
bool(true)
Done
-
diff --git a/ext/session/tests/session_start_variation4.phpt b/ext/session/tests/session_start_variation4.phpt
index 9f6ffa5972..f14b2574e2 100644
--- a/ext/session/tests/session_start_variation4.phpt
+++ b/ext/session/tests/session_start_variation4.phpt
@@ -34,4 +34,3 @@ array(1) {
array(0) {
}
Done
-
diff --git a/ext/session/tests/session_start_variation5.phpt b/ext/session/tests/session_start_variation5.phpt
index a8eeb25f83..ca5cb85a10 100644
--- a/ext/session/tests/session_start_variation5.phpt
+++ b/ext/session/tests/session_start_variation5.phpt
@@ -55,4 +55,3 @@ array(4) {
int(6)
}
Done
-
diff --git a/ext/session/tests/session_start_variation6.phpt b/ext/session/tests/session_start_variation6.phpt
index 3a9b2e24fe..60b1438e45 100644
--- a/ext/session/tests/session_start_variation6.phpt
+++ b/ext/session/tests/session_start_variation6.phpt
@@ -66,4 +66,3 @@ array(4) {
int(6)
}
Done
-
diff --git a/ext/session/tests/session_start_variation7.phpt b/ext/session/tests/session_start_variation7.phpt
index 8e010f8182..47119f9971 100644
--- a/ext/session/tests/session_start_variation7.phpt
+++ b/ext/session/tests/session_start_variation7.phpt
@@ -58,4 +58,3 @@ array(4) {
array(0) {
}
Done
-
diff --git a/ext/session/tests/session_start_variation8.phpt b/ext/session/tests/session_start_variation8.phpt
index f37e1bf15f..3706ebc26e 100644
--- a/ext/session/tests/session_start_variation8.phpt
+++ b/ext/session/tests/session_start_variation8.phpt
@@ -32,4 +32,3 @@ string(%d) "%s"
bool(true)
string(0) ""
Done
-
diff --git a/ext/session/tests/session_unset_basic.phpt b/ext/session/tests/session_unset_basic.phpt
index bdd0319135..ba0a58f5a5 100644
--- a/ext/session/tests/session_unset_basic.phpt
+++ b/ext/session/tests/session_unset_basic.phpt
@@ -40,4 +40,3 @@ bool(true)
array(0) {
}
Done
-
diff --git a/ext/session/tests/session_unset_variation1.phpt b/ext/session/tests/session_unset_variation1.phpt
index 7c69dfd8f7..1e3cbf0631 100644
--- a/ext/session/tests/session_unset_variation1.phpt
+++ b/ext/session/tests/session_unset_variation1.phpt
@@ -45,4 +45,3 @@ array(1) {
}
bool(false)
Done
-
diff --git a/ext/session/tests/session_write_close_basic.phpt b/ext/session/tests/session_write_close_basic.phpt
index 6b734d12bf..c5f44caddb 100644
--- a/ext/session/tests/session_write_close_basic.phpt
+++ b/ext/session/tests/session_write_close_basic.phpt
@@ -42,4 +42,3 @@ bool(true)
array(0) {
}
Done
-
diff --git a/ext/session/tests/session_write_close_variation3.phpt b/ext/session/tests/session_write_close_variation3.phpt
index b200d14af1..72e3d2f55a 100644
--- a/ext/session/tests/session_write_close_variation3.phpt
+++ b/ext/session/tests/session_write_close_variation3.phpt
@@ -36,4 +36,3 @@ array(0) {
bool(true)
bool(true)
Done
-
diff --git a/ext/session/tests/session_write_close_variation4.phpt b/ext/session/tests/session_write_close_variation4.phpt
index aa6bd85a12..63311651a8 100644
--- a/ext/session/tests/session_write_close_variation4.phpt
+++ b/ext/session/tests/session_write_close_variation4.phpt
@@ -54,4 +54,3 @@ string(4) "test"
bool(true)
bool(true)
Done
-
diff --git a/ext/simplexml/tests/012.phpt b/ext/simplexml/tests/012.phpt
index 598aa3c17a..b687b71988 100644
--- a/ext/simplexml/tests/012.phpt
+++ b/ext/simplexml/tests/012.phpt
@@ -30,7 +30,6 @@ __HALT_COMPILER();
?>
===DONE===
--EXPECTF--
-
Warning: main(): Cannot write or create unnamed attribute in %s012.php on line %d
<?xml version="1.0" encoding="ISO-8859-1"?>
<foo attr="value"/>
diff --git a/ext/simplexml/tests/018.phpt b/ext/simplexml/tests/018.phpt
index 41a6f8259c..b6b07d4d39 100644
--- a/ext/simplexml/tests/018.phpt
+++ b/ext/simplexml/tests/018.phpt
@@ -62,4 +62,4 @@ echo "---Done---\n";
<child>
</child>
</person>
----Done--- \ No newline at end of file
+---Done---
diff --git a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
index 5cdb88e09a..aedd5978b7 100644
--- a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
@@ -18,4 +18,4 @@ object(SimpleXMLElement)#2 (1) {
string(6) "novels"
}
}
-Done \ No newline at end of file
+Done
diff --git a/ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt b/ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt
index 22ea4488e6..34e2e68319 100644
--- a/ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt
@@ -15,4 +15,3 @@ echo $a->asXML();
Warning: SimpleXMLElement::addAttribute(): Attribute name is required in %s on line %d
<?xml version="1.0"?>
<php>testfest</php>
-
diff --git a/ext/simplexml/tests/bug41175.phpt b/ext/simplexml/tests/bug41175.phpt
index 432f217b16..ae0204e05a 100644
--- a/ext/simplexml/tests/bug41175.phpt
+++ b/ext/simplexml/tests/bug41175.phpt
@@ -15,4 +15,4 @@ echo $xml->asXML();
--EXPECT--
<?xml version="1.0"?>
<img src="foo" alt=""/>
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/simplexml/tests/bug42369.phpt b/ext/simplexml/tests/bug42369.phpt
index e186770033..f8e030526c 100644
--- a/ext/simplexml/tests/bug42369.phpt
+++ b/ext/simplexml/tests/bug42369.phpt
@@ -22,4 +22,4 @@ Bug #42369 (Implicit conversion to string leaks memory)
--EXPECT--
explicit conversion
no conversion
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/simplexml/tests/bug43221.phpt b/ext/simplexml/tests/bug43221.phpt
index 53b6efdccd..bac2277597 100644
--- a/ext/simplexml/tests/bug43221.phpt
+++ b/ext/simplexml/tests/bug43221.phpt
@@ -17,4 +17,4 @@ Warning: SimpleXMLElement::addAttribute(): Attribute requires prefix for namespa
<?xml version="1.0" encoding="utf-8"?>
<root><node xmlns:foo="http://bar.com" a="b" foo:e="f">value</node></root>
===DONE===
- \ No newline at end of file
+
diff --git a/ext/simplexml/tests/bug44478.phpt b/ext/simplexml/tests/bug44478.phpt
index 377754f792..34630593f8 100644
--- a/ext/simplexml/tests/bug44478.phpt
+++ b/ext/simplexml/tests/bug44478.phpt
@@ -26,4 +26,4 @@ a & b
<?xml version="1.0"?>
<root><node1>a &amp;#38; b</node1><node2>a &amp; b</node2></root>
===DONE===
- \ No newline at end of file
+
diff --git a/ext/simplexml/tests/bug45553.phpt b/ext/simplexml/tests/bug45553.phpt
index 6634498556..9147fdaba1 100644
--- a/ext/simplexml/tests/bug45553.phpt
+++ b/ext/simplexml/tests/bug45553.phpt
@@ -33,4 +33,4 @@ I am a:A
I am a:Nothing
I am Nothing
===DONE===
- \ No newline at end of file
+
diff --git a/ext/simplexml/tests/bug46003.phpt b/ext/simplexml/tests/bug46003.phpt
index e21a4ce742..1a67c6e9ee 100644
--- a/ext/simplexml/tests/bug46003.phpt
+++ b/ext/simplexml/tests/bug46003.phpt
@@ -32,4 +32,4 @@ bool(false)
bool(false)
bool(true)
===DONE===
- \ No newline at end of file
+
diff --git a/ext/simplexml/tests/bug46047.phpt b/ext/simplexml/tests/bug46047.phpt
index 59d14b09c0..921da30bd1 100644
--- a/ext/simplexml/tests/bug46047.phpt
+++ b/ext/simplexml/tests/bug46047.phpt
@@ -50,4 +50,4 @@ SimpleXMLElement Object
)
===DONE===
- \ No newline at end of file
+
diff --git a/ext/simplexml/tests/bug62639.phpt b/ext/simplexml/tests/bug62639.phpt
index 4a4e157b76..8d161836c3 100644
--- a/ext/simplexml/tests/bug62639.phpt
+++ b/ext/simplexml/tests/bug62639.phpt
@@ -60,4 +60,4 @@ object(A)#3 (2) {
}
[0]=>
string(10) "Some Value"
-} \ No newline at end of file
+}
diff --git a/ext/simplexml/tests/feature55218.phpt b/ext/simplexml/tests/feature55218.phpt
index c5b09b4fb8..5aac70ea2a 100644
--- a/ext/simplexml/tests/feature55218.phpt
+++ b/ext/simplexml/tests/feature55218.phpt
@@ -114,4 +114,4 @@ array(1) {
}
array(0) {
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/simplexml/tests/profile09.phpt b/ext/simplexml/tests/profile09.phpt
index 714572df1e..627ad20b8f 100644
--- a/ext/simplexml/tests/profile09.phpt
+++ b/ext/simplexml/tests/profile09.phpt
@@ -15,5 +15,4 @@ echo $root->child;
echo "\n---Done---\n";
?>
--EXPECT--
-
---Done---
diff --git a/ext/simplexml/tests/simplexml_load_file.phpt b/ext/simplexml/tests/simplexml_load_file.phpt
index db4f3d115a..91543979f4 100644
--- a/ext/simplexml/tests/simplexml_load_file.phpt
+++ b/ext/simplexml/tests/simplexml_load_file.phpt
@@ -29,4 +29,4 @@ object(SimpleXMLElement)#1 (1) {
}
}
}
-Done \ No newline at end of file
+Done
diff --git a/ext/simplexml/tests/sxe_003.phpt b/ext/simplexml/tests/sxe_003.phpt
index 583242a61e..f3a2e5c5bc 100644
--- a/ext/simplexml/tests/sxe_003.phpt
+++ b/ext/simplexml/tests/sxe_003.phpt
@@ -59,7 +59,6 @@ for ($sxe->rewind(); $sxe->valid(); $sxe->next()) {
?>
===DONE===
--EXPECTF--
-
Warning: Invalid argument supplied for foreach() in %ssxe_003.php on line %d
===RESET===
bool(true)
diff --git a/ext/snmp/tests/bug72479.phpt b/ext/snmp/tests/bug72479.phpt
index c4bb621e66..c941ca73ae 100644
--- a/ext/snmp/tests/bug72479.phpt
+++ b/ext/snmp/tests/bug72479.phpt
@@ -32,4 +32,4 @@ function ptr2str($ptr)
}
?>
--EXPECT--
-int(1) \ No newline at end of file
+int(1)
diff --git a/ext/snmp/tests/generic_timeout_error.phpt b/ext/snmp/tests/generic_timeout_error.phpt
index adcc3a7299..98966c4f42 100644
--- a/ext/snmp/tests/generic_timeout_error.phpt
+++ b/ext/snmp/tests/generic_timeout_error.phpt
@@ -24,4 +24,3 @@ bool(false)
Warning: snmpget(): No response from %s in %s on line %d
bool(false)
-
diff --git a/ext/snmp/tests/ipv6.phpt b/ext/snmp/tests/ipv6.phpt
index 1cda76565c..9cf83e00bd 100644
--- a/ext/snmp/tests/ipv6.phpt
+++ b/ext/snmp/tests/ipv6.phpt
@@ -26,4 +26,4 @@ var_dump(snmpget('[dead:beef::', $community, '.1.3.6.1.2.1.1.1.0'));
string(%d) "%s"
Warning: snmpget(): malformed IPv6 address, closing square bracket missing in %s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/snmp/tests/snmp-object-setSecurity_error.phpt b/ext/snmp/tests/snmp-object-setSecurity_error.phpt
index 3fd14f2a5c..94a3f77205 100644
--- a/ext/snmp/tests/snmp-object-setSecurity_error.phpt
+++ b/ext/snmp/tests/snmp-object-setSecurity_error.phpt
@@ -33,7 +33,6 @@ var_dump($session->close());
?>
--EXPECTF--
-
Warning: SNMP::setSecurity() expects at least 1 parameter, 0 given in %s on line %d
bool(false)
diff --git a/ext/snmp/tests/snmp_get_quick_print.phpt b/ext/snmp/tests/snmp_get_quick_print.phpt
index bc842aba4f..81d10cf055 100644
--- a/ext/snmp/tests/snmp_get_quick_print.phpt
+++ b/ext/snmp/tests/snmp_get_quick_print.phpt
@@ -38,4 +38,3 @@ Checking working
bool(%s)
bool(false)
bool(true)
-
diff --git a/ext/soap/tests/bug70388.phpt b/ext/soap/tests/bug70388.phpt
index 49a8efc0ff..6c0d1081de 100644
--- a/ext/soap/tests/bug70388.phpt
+++ b/ext/soap/tests/bug70388.phpt
@@ -14,4 +14,4 @@ try {
?>
--EXPECTF--
string(%d) "%s"
-string(9) "SoapFault" \ No newline at end of file
+string(9) "SoapFault"
diff --git a/ext/soap/tests/bugs/bug27722.phpt b/ext/soap/tests/bugs/bug27722.phpt
index d6d933b503..3619fb12a3 100644
--- a/ext/soap/tests/bugs/bug27722.phpt
+++ b/ext/soap/tests/bugs/bug27722.phpt
@@ -12,4 +12,4 @@ $x = new SoapClient(dirname(__FILE__)."/bug27722.wsdl");
echo "ok\n";
?>
--EXPECT--
-ok \ No newline at end of file
+ok
diff --git a/ext/soap/tests/bugs/bug29061.phpt b/ext/soap/tests/bugs/bug29061.phpt
index 0ded544b94..42e4ed517b 100644
--- a/ext/soap/tests/bugs/bug29061.phpt
+++ b/ext/soap/tests/bugs/bug29061.phpt
@@ -11,4 +11,4 @@ $client->getQuote("ibm");
echo "ok\n";
?>
--EXPECT--
-ok \ No newline at end of file
+ok
diff --git a/ext/soap/tests/bugs/bug29109.phpt b/ext/soap/tests/bugs/bug29109.phpt
index f16b4c5851..acbc7d4cd1 100644
--- a/ext/soap/tests/bugs/bug29109.phpt
+++ b/ext/soap/tests/bugs/bug29109.phpt
@@ -13,4 +13,4 @@ var_dump($client->__getFunctions());
array(1) {
[0]=>
string(53) "HelloWorldResponse HelloWorld(HelloWorld $parameters)"
-} \ No newline at end of file
+}
diff --git a/ext/soap/tests/bugs/bug42359.phpt b/ext/soap/tests/bugs/bug42359.phpt
index 94738fff34..42ad8b8a06 100644
--- a/ext/soap/tests/bugs/bug42359.phpt
+++ b/ext/soap/tests/bugs/bug42359.phpt
@@ -17,4 +17,3 @@ Array
[2] => string enumItem
[3] => list listItem2 {enumItem}
)
-
diff --git a/ext/soap/tests/bugs/bug42488.phpt b/ext/soap/tests/bugs/bug42488.phpt
index 4069c9f6be..e7edc79f9e 100644
--- a/ext/soap/tests/bugs/bug42488.phpt
+++ b/ext/soap/tests/bugs/bug42488.phpt
@@ -19,4 +19,4 @@ $soap->handle($request);
?>
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>SOAP-ERROR: Encoding: string 'stuff\x93...' is not a valid utf-8 string</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope> \ No newline at end of file
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>SOAP-ERROR: Encoding: string 'stuff\x93...' is not a valid utf-8 string</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/bugs/bug44686.phpt b/ext/soap/tests/bugs/bug44686.phpt
index cff97999c6..89a06a1b08 100644
--- a/ext/soap/tests/bugs/bug44686.phpt
+++ b/ext/soap/tests/bugs/bug44686.phpt
@@ -11,4 +11,3 @@ echo "ok\n";
?>
--EXPECT--
ok
-
diff --git a/ext/soap/tests/bugs/bug47273.phpt b/ext/soap/tests/bugs/bug47273.phpt
index 85abf432da..c23bb5a592 100644
--- a/ext/soap/tests/bugs/bug47273.phpt
+++ b/ext/soap/tests/bugs/bug47273.phpt
@@ -47,4 +47,3 @@ try {
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://127.0.0.1:8080/test/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test1Response><return xsi:type="xsd:string">Test #1 exception with some special chars: ΓƒΒ„ΓƒΒŸΓƒΒΆ</return></ns1:test1Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
<?xml version="1.0" encoding="UTF-8"?>
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>Sender</faultcode><faultstring>Test #2 exception with some special chars: ΓƒΒ„ΓƒΒŸΓƒΒΆ</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
-
diff --git a/ext/soap/tests/bugs/bug70469.phpt b/ext/soap/tests/bugs/bug70469.phpt
index ca3ab80950..1186cc003f 100644
--- a/ext/soap/tests/bugs/bug70469.phpt
+++ b/ext/soap/tests/bugs/bug70469.phpt
@@ -17,4 +17,4 @@ if ($error === null) {
?>
--EXPECT--
catched
-ok \ No newline at end of file
+ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt
index 8aadcbb6f7..fb900e8b11 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt
@@ -16,4 +16,4 @@ echo "ok\n";
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoString><param0 xsi:nil="true"/></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
<?xml version="1.0" encoding="UTF-8"?>
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringResponse><outputString xsi:nil="true"/></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok \ No newline at end of file
+ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt
index e215ec1b07..d4c41cd21f 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt
@@ -16,4 +16,4 @@ echo "ok\n";
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoString><inputString xsi:nil="true"/></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
<?xml version="1.0" encoding="UTF-8"?>
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringResponse><outputString xsi:nil="true"/></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok \ No newline at end of file
+ok
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt
index 7dbaa23ab2..154d57d104 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt
@@ -18,4 +18,4 @@ echo "ok\n";
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoString><inputString xsi:nil="true"/></ns1:echoString></SOAP-ENV:Body></SOAP-ENV:Envelope>
<?xml version="1.0" encoding="UTF-8"?>
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringResponse><outputString xsi:nil="true"/></ns1:echoStringResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok \ No newline at end of file
+ok
diff --git a/ext/soap/tests/schema/schema008.phpt b/ext/soap/tests/schema/schema008.phpt
index 1c4005f690..7d8a440dd9 100644
--- a/ext/soap/tests/schema/schema008.phpt
+++ b/ext/soap/tests/schema/schema008.phpt
@@ -24,4 +24,3 @@ echo "ok";
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:test><testParam xsi:type="ns1:testElement">123</testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
int(123)
ok
-
diff --git a/ext/soap/tests/schema/schema068.phpt b/ext/soap/tests/schema/schema068.phpt
index 88fdac334f..5ab63be097 100644
--- a/ext/soap/tests/schema/schema068.phpt
+++ b/ext/soap/tests/schema/schema068.phpt
@@ -15,4 +15,4 @@ test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>4));
echo "ok";
?>
--EXPECTF--
-Fatal error: SOAP-ERROR: Encoding: Attribute 'int' has fixed value '5' (value '4' is not allowed) in %stest_schema.inc on line %d \ No newline at end of file
+Fatal error: SOAP-ERROR: Encoding: Attribute 'int' has fixed value '5' (value '4' is not allowed) in %stest_schema.inc on line %d
diff --git a/ext/soap/tests/server029.phpt b/ext/soap/tests/server029.phpt
index b65b23fd06..f5b28699a5 100644
--- a/ext/soap/tests/server029.phpt
+++ b/ext/soap/tests/server029.phpt
@@ -52,4 +52,4 @@ INPUT:
<?xml version="1.0" encoding="UTF-8"?>
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testuri.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:testResponse><return xsi:type="xsd:string">Hello World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
-ok \ No newline at end of file
+ok
diff --git a/ext/soap/tests/soap12/T27.phpt b/ext/soap/tests/soap12/T27.phpt
index 6371113994..81db8ee5bc 100644
--- a/ext/soap/tests/soap12/T27.phpt
+++ b/ext/soap/tests/soap12/T27.phpt
@@ -26,4 +26,3 @@ include "soap12-test.inc";
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>SOAP-ERROR: Encoding: Violation of encoding rules</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
-
diff --git a/ext/soap/tests/soap12/T28.phpt b/ext/soap/tests/soap12/T28.phpt
index 6118b478d8..751df133db 100644
--- a/ext/soap/tests/soap12/T28.phpt
+++ b/ext/soap/tests/soap12/T28.phpt
@@ -19,4 +19,3 @@ include "soap12-test.inc";
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Sender</env:Value></env:Code><env:Reason><env:Text>encodingStyle cannot be specified on the Body</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
-
diff --git a/ext/soap/tests/soap12/T31.phpt b/ext/soap/tests/soap12/T31.phpt
index 04f0353bf0..f00e25a59a 100644
--- a/ext/soap/tests/soap12/T31.phpt
+++ b/ext/soap/tests/soap12/T31.phpt
@@ -19,4 +19,3 @@ include "soap12-test.inc";
<?xml version="1.0" encoding="UTF-8"?>
<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://example.org/ts-tests" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"><env:Body><ns1:returnVoidResponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"/></env:Body></env:Envelope>
ok
-
diff --git a/ext/soap/tests/soap12/T40.phpt b/ext/soap/tests/soap12/T40.phpt
index 27b4a21c47..332e5768dd 100644
--- a/ext/soap/tests/soap12/T40.phpt
+++ b/ext/soap/tests/soap12/T40.phpt
@@ -23,4 +23,4 @@ include "soap12-test.inc";
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body/></env:Envelope>
-ok \ No newline at end of file
+ok
diff --git a/ext/soap/tests/soap12/T56.phpt b/ext/soap/tests/soap12/T56.phpt
index ca134270a3..7a773a8a3e 100644
--- a/ext/soap/tests/soap12/T56.phpt
+++ b/ext/soap/tests/soap12/T56.phpt
@@ -31,4 +31,3 @@ include "soap12-test.inc";
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>SOAP-ERROR: Encoding: Unresolved reference '#data-2'</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
-
diff --git a/ext/soap/tests/soap12/T58.phpt b/ext/soap/tests/soap12/T58.phpt
index 1c3e8ba7f5..aa53985486 100644
--- a/ext/soap/tests/soap12/T58.phpt
+++ b/ext/soap/tests/soap12/T58.phpt
@@ -25,4 +25,3 @@ include "soap12-test.inc";
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value>env:Receiver</env:Value></env:Code><env:Reason><env:Text>SOAP-ERROR: Encoding: Violation of encoding rules</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
-
diff --git a/ext/sockets/tests/mcast_ipv4_send.phpt b/ext/sockets/tests/mcast_ipv4_send.phpt
index 0dd858f297..58395aed26 100644
--- a/ext/sockets/tests/mcast_ipv4_send.phpt
+++ b/ext/sockets/tests/mcast_ipv4_send.phpt
@@ -45,7 +45,6 @@ var_dump($r);
$r = socket_get_option($s, $level, IP_MULTICAST_IF);
var_dump($r);
echo "\n";
-
--EXPECT--
Setting IP_MULTICAST_TTL
bool(true)
diff --git a/ext/sockets/tests/mcast_ipv4_send_error.phpt b/ext/sockets/tests/mcast_ipv4_send_error.phpt
index 5cd3d8e7d7..0929c79bdd 100644
--- a/ext/sockets/tests/mcast_ipv4_send_error.phpt
+++ b/ext/sockets/tests/mcast_ipv4_send_error.phpt
@@ -52,7 +52,6 @@ var_dump($r);
$r = socket_get_option($s, $level, IP_MULTICAST_TTL);
var_dump($r);
echo "\n";
-
--EXPECTF--
Setting IP_MULTICAST_LOOP with 256
bool(true)
diff --git a/ext/sockets/tests/mcast_ipv6_recv.phpt b/ext/sockets/tests/mcast_ipv6_recv.phpt
index 6ff97b60d5..83fc5064c7 100644
--- a/ext/sockets/tests/mcast_ipv6_recv.phpt
+++ b/ext/sockets/tests/mcast_ipv6_recv.phpt
@@ -43,7 +43,6 @@ $so = socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_SOURCE_GROUP, array(
if ($so === false) {
die('skip protocol independent multicast API is unavailable.');
}
-
--FILE--
<?php
include __DIR__."/mcast_helpers.php.inc";
diff --git a/ext/sockets/tests/mcast_ipv6_recv_limited.phpt b/ext/sockets/tests/mcast_ipv6_recv_limited.phpt
index 9fd5459950..e989e9b58c 100644
--- a/ext/sockets/tests/mcast_ipv6_recv_limited.phpt
+++ b/ext/sockets/tests/mcast_ipv6_recv_limited.phpt
@@ -38,7 +38,6 @@ if (defined("MCAST_JOIN_SOURCE_GROUP")) {
die('skip protocol independent multicast API is available.');
}
}
-
--FILE--
<?php
include __DIR__."/mcast_helpers.php.inc";
diff --git a/ext/sockets/tests/mcast_ipv6_send.phpt b/ext/sockets/tests/mcast_ipv6_send.phpt
index a9d6293fc9..99010d369e 100644
--- a/ext/sockets/tests/mcast_ipv6_send.phpt
+++ b/ext/sockets/tests/mcast_ipv6_send.phpt
@@ -49,7 +49,6 @@ var_dump($r);
$r = socket_get_option($s, $level, IPV6_MULTICAST_IF);
var_dump($r);
echo "\n";
-
--EXPECT--
Setting IPV6_MULTICAST_TTL
bool(true)
diff --git a/ext/sockets/tests/socket_bind.phpt b/ext/sockets/tests/socket_bind.phpt
index 118361e42c..8417801c37 100644
--- a/ext/sockets/tests/socket_bind.phpt
+++ b/ext/sockets/tests/socket_bind.phpt
@@ -32,10 +32,8 @@ fa@php.net
$s_close = socket_close($s_c);
var_dump($s_close);
?>
-
--EXPECT--
bool(true)
bool(true)
int(16)
NULL
-
diff --git a/ext/sockets/tests/socket_bind_params.phpt b/ext/sockets/tests/socket_bind_params.phpt
index 29af2a2d45..23b8c58b0d 100644
--- a/ext/sockets/tests/socket_bind_params.phpt
+++ b/ext/sockets/tests/socket_bind_params.phpt
@@ -21,7 +21,6 @@ fa@php.net
?>
--EXPECTF--
-
Warning: socket_bind() expects at least 2 parameters, 0 given in %s on line %d
NULL
diff --git a/ext/sockets/tests/socket_close_params.phpt b/ext/sockets/tests/socket_close_params.phpt
index 91cc85195e..c15059907b 100644
--- a/ext/sockets/tests/socket_close_params.phpt
+++ b/ext/sockets/tests/socket_close_params.phpt
@@ -16,6 +16,5 @@ fa@php.net
var_dump($s_c);
?>
--EXPECTF--
-
Warning: socket_close() expects exactly 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/sockets/tests/socket_cmsg_credentials.phpt b/ext/sockets/tests/socket_cmsg_credentials.phpt
index 6fa2517db2..09266e6cbd 100644
--- a/ext/sockets/tests/socket_cmsg_credentials.phpt
+++ b/ext/sockets/tests/socket_cmsg_credentials.phpt
@@ -18,7 +18,6 @@ die('skip SO_PASSCRED is not defined');
<?php
$path = __DIR__ . "/unix_sock";
@unlink($path);
-
--FILE--
<?php
include __DIR__."/mcast_helpers.php.inc";
@@ -57,7 +56,6 @@ print_r($data);
$pid = getmypid();
var_dump($data['control'][0]['data']['pid'] === $pid);
-
--EXPECTF--
creating send socket
resource(%d) of type (Socket)
diff --git a/ext/sockets/tests/socket_cmsg_rights.phpt b/ext/sockets/tests/socket_cmsg_rights.phpt
index e4d1f03b87..75ce0680b9 100644
--- a/ext/sockets/tests/socket_cmsg_rights.phpt
+++ b/ext/sockets/tests/socket_cmsg_rights.phpt
@@ -15,7 +15,6 @@ die('skip not for AIX');
<?php
$path = __DIR__ . "/unix_sock";
@unlink($path);
-
--FILE--
<?php
include __DIR__."/mcast_helpers.php.inc";
diff --git a/ext/sockets/tests/socket_connect_error.phpt b/ext/sockets/tests/socket_connect_error.phpt
index 713791d849..675bc97d1c 100644
--- a/ext/sockets/tests/socket_connect_error.phpt
+++ b/ext/sockets/tests/socket_connect_error.phpt
@@ -30,4 +30,3 @@ Warning: socket_create() expects exactly 3 parameters, 0 given in %s on line %d
Warning: socket_create() expects exactly 3 parameters, 2 given in %s on line %d
Warning: socket_create() expects parameter 1 to be int, array given in %s on line %d
-
diff --git a/ext/sockets/tests/socket_connect_params.phpt b/ext/sockets/tests/socket_connect_params.phpt
index e731672f57..94c38de1cb 100644
--- a/ext/sockets/tests/socket_connect_params.phpt
+++ b/ext/sockets/tests/socket_connect_params.phpt
@@ -23,7 +23,6 @@ fa@php.net
?>
--EXPECTF--
-
Warning: socket_connect() expects at least 2 parameters, 0 given in %s on line %d
Warning: socket_connect() expects at least 2 parameters, 1 given in %s on line %d
diff --git a/ext/sockets/tests/socket_create_listen-nobind.phpt b/ext/sockets/tests/socket_create_listen-nobind.phpt
index 90ae26e073..bd7e5bfd43 100644
--- a/ext/sockets/tests/socket_create_listen-nobind.phpt
+++ b/ext/sockets/tests/socket_create_listen-nobind.phpt
@@ -22,4 +22,4 @@ Warning: socket_create_listen(): unable to bind to given address [13]: Permissio
unlink(dirname(__FILE__) . '/006_root_check.tmp');
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/sockets/tests/socket_create_params.phpt b/ext/sockets/tests/socket_create_params.phpt
index f1f76fa4b9..2f121cdb53 100644
--- a/ext/sockets/tests/socket_create_params.phpt
+++ b/ext/sockets/tests/socket_create_params.phpt
@@ -16,7 +16,6 @@ fa@php.net
$s_w = socket_create(AF_INET, SOCK_STREAM);
?>
--EXPECTF--
-
Warning: socket_create() expects exactly 3 parameters, 0 given in %s on line %d
Warning: socket_create() expects exactly 3 parameters, 1 given in %s on line %d
diff --git a/ext/sockets/tests/socket_export_stream-1.phpt b/ext/sockets/tests/socket_export_stream-1.phpt
index 498e0a277c..f8f560b60b 100644
--- a/ext/sockets/tests/socket_export_stream-1.phpt
+++ b/ext/sockets/tests/socket_export_stream-1.phpt
@@ -5,7 +5,6 @@ socket_export_stream: Basic test
if (!extension_loaded('sockets')) {
die('SKIP sockets extension not available.');
}
-
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_export_stream-2.phpt b/ext/sockets/tests/socket_export_stream-2.phpt
index c33fba3cc2..d3db5e36c8 100644
--- a/ext/sockets/tests/socket_export_stream-2.phpt
+++ b/ext/sockets/tests/socket_export_stream-2.phpt
@@ -5,7 +5,6 @@ socket_export_stream: Bad arguments
if (!extension_loaded('sockets')) {
die('SKIP sockets extension not available.');
}
-
--FILE--
<?php
@@ -45,4 +44,3 @@ resource(%d) of type (Socket)
Warning: socket_export_stream(): supplied resource is not a valid Socket resource in %s on line %d
bool(false)
Done.
-
diff --git a/ext/sockets/tests/socket_export_stream-3.phpt b/ext/sockets/tests/socket_export_stream-3.phpt
index b13bb34739..b7233dc7b9 100644
--- a/ext/sockets/tests/socket_export_stream-3.phpt
+++ b/ext/sockets/tests/socket_export_stream-3.phpt
@@ -44,4 +44,3 @@ resource(%d) of type (Socket)
int(10)
string(10) "my message"
Done.
-
diff --git a/ext/sockets/tests/socket_export_stream-4-win.phpt b/ext/sockets/tests/socket_export_stream-4-win.phpt
index e38db7bd08..cd118c034a 100644
--- a/ext/sockets/tests/socket_export_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_export_stream-4-win.phpt
@@ -8,7 +8,6 @@ if (!extension_loaded('sockets')) {
if(substr(PHP_OS, 0, 3) != 'WIN' ) {
die("skip Not Valid for Linux");
}
-
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_getpeername.phpt b/ext/sockets/tests/socket_getpeername.phpt
index 34de42de80..dc00d44641 100644
--- a/ext/sockets/tests/socket_getpeername.phpt
+++ b/ext/sockets/tests/socket_getpeername.phpt
@@ -23,7 +23,6 @@ fa@php.net
var_dump($port);
socket_close($s_c);
?>
-
--EXPECTF--
bool(true)
diff --git a/ext/sockets/tests/socket_getsockname.phpt b/ext/sockets/tests/socket_getsockname.phpt
index f3f392130c..9039acc555 100644
--- a/ext/sockets/tests/socket_getsockname.phpt
+++ b/ext/sockets/tests/socket_getsockname.phpt
@@ -23,10 +23,8 @@ fa@php.net
var_dump($port);
socket_close($s_c);
?>
-
--EXPECTF--
bool(true)
bool(true)
string(7) "0.0.0.0"
int(%i)
-
diff --git a/ext/sockets/tests/socket_import_stream-1.phpt b/ext/sockets/tests/socket_import_stream-1.phpt
index 222fca5e2d..925966312d 100644
--- a/ext/sockets/tests/socket_import_stream-1.phpt
+++ b/ext/sockets/tests/socket_import_stream-1.phpt
@@ -5,7 +5,6 @@ socket_import_stream: Basic test
if (!extension_loaded('sockets')) {
die('SKIP sockets extension not available.');
}
-
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt
index fd4c9e8e2d..e1fada608e 100644
--- a/ext/sockets/tests/socket_import_stream-2.phpt
+++ b/ext/sockets/tests/socket_import_stream-2.phpt
@@ -5,7 +5,6 @@ socket_import_stream: Bad arguments
if (!extension_loaded('sockets')) {
die('SKIP sockets extension not available.');
}
-
--FILE--
<?php
@@ -46,4 +45,3 @@ bool(true)
Warning: socket_import_stream(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Done.
-
diff --git a/ext/sockets/tests/socket_import_stream-3.phpt b/ext/sockets/tests/socket_import_stream-3.phpt
index 2261a03ee4..53814d11cb 100644
--- a/ext/sockets/tests/socket_import_stream-3.phpt
+++ b/ext/sockets/tests/socket_import_stream-3.phpt
@@ -43,4 +43,3 @@ resource(%d) of type (Socket)
int(10)
string(10) "my message"
Done.
-
diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt b/ext/sockets/tests/socket_import_stream-4-win.phpt
index 1c9a7789c6..6c62a89fff 100644
--- a/ext/sockets/tests/socket_import_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_import_stream-4-win.phpt
@@ -8,7 +8,6 @@ if (!extension_loaded('sockets')) {
if(substr(PHP_OS, 0, 3) != 'WIN' ) {
die("skip Not Valid for Linux");
}
-
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_listen_params.phpt b/ext/sockets/tests/socket_listen_params.phpt
index 5e20999374..0d5922c240 100644
--- a/ext/sockets/tests/socket_listen_params.phpt
+++ b/ext/sockets/tests/socket_listen_params.phpt
@@ -16,6 +16,5 @@ fa@php.net
var_dump($s_c);
?>
--EXPECTF--
-
Warning: socket_listen() expects at least 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/sockets/tests/socket_read_params.phpt b/ext/sockets/tests/socket_read_params.phpt
index 52dc1bebce..acf1d2f35d 100644
--- a/ext/sockets/tests/socket_read_params.phpt
+++ b/ext/sockets/tests/socket_read_params.phpt
@@ -20,7 +20,6 @@ fa@php.net
socket_close($s_c_l);
?>
--EXPECTF--
-
Warning: socket_read() expects at least 2 parameters, 0 given in %s on line %d
Warning: socket_read() expects at least 2 parameters, 1 given in %s on line %d
diff --git a/ext/sockets/tests/socket_recvmsg.phpt b/ext/sockets/tests/socket_recvmsg.phpt
index a2204112b3..4265e02535 100644
--- a/ext/sockets/tests/socket_recvmsg.phpt
+++ b/ext/sockets/tests/socket_recvmsg.phpt
@@ -47,7 +47,6 @@ $data = [
];
if (!socket_recvmsg($s, $data, 0)) die("recvmsg");
print_r($data);
-
--EXPECTF--
creating send socket
resource(%d) of type (Socket)
diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt
index fb9a311b17..5082e74f8f 100644
--- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt
+++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt
@@ -60,7 +60,6 @@ $data = [
];
if (!socket_recvmsg($s, $data, 0)) die("recvmsg");
print_r($data);
-
--EXPECTF--
creating send socket
resource(5) of type (Socket)
diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
index 750b22dabf..70867e755a 100644
--- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
+++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
@@ -10,7 +10,6 @@ if (!defined('IPPROTO_IPV6'))
* WSARecvMsg (though only the top 6 bits seem to reported), but WSASendMsg
* does not accept IPV6_TCLASS messages. We still test that sendmsg() works
* corectly by sending an IPV6_PKTINFO message that will have no effect */
-
--FILE--
<?php
include __DIR__."/mcast_helpers.php.inc";
@@ -55,7 +54,6 @@ $data = [
];
if (!socket_recvmsg($s, $data, 0)) die("recvmsg");
print_r($data);
-
--EXPECTF--
creating send socket
resource(%d) of type (Socket)
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
index ced060e8a3..689421011e 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
@@ -46,7 +46,6 @@ if (!extension_loaded('sockets')) {
socket_close($socket);
--EXPECTF--
-
Warning: Wrong parameter count for socket_sendto() in %s on line %d
bool(false)
diff --git a/ext/sockets/tests/socket_set_block-wrongparams.phpt b/ext/sockets/tests/socket_set_block-wrongparams.phpt
index 7c80695525..80c7f164ec 100644
--- a/ext/sockets/tests/socket_set_block-wrongparams.phpt
+++ b/ext/sockets/tests/socket_set_block-wrongparams.phpt
@@ -15,4 +15,3 @@ Warning: socket_set_block() expects parameter 1 to be resource, array given in %
--CREDITS--
Robin Mehner, robin@coding-robin.de
PHP Testfest Berlin 2009-05-09
-
diff --git a/ext/sockets/tests/socket_set_nonblock.phpt b/ext/sockets/tests/socket_set_nonblock.phpt
index 55137d3582..29c9372ef8 100644
--- a/ext/sockets/tests/socket_set_nonblock.phpt
+++ b/ext/sockets/tests/socket_set_nonblock.phpt
@@ -18,7 +18,5 @@ fa@php.net
#socket_accept($s_c_l);
socket_close($s_c_l);
?>
-
--EXPECTF--
resource(%i) of type (Socket)
-
diff --git a/ext/sockets/tests/socket_set_option_bindtodevice.phpt b/ext/sockets/tests/socket_set_option_bindtodevice.phpt
index 05d718ce63..fe0afd7c51 100644
--- a/ext/sockets/tests/socket_set_option_bindtodevice.phpt
+++ b/ext/sockets/tests/socket_set_option_bindtodevice.phpt
@@ -30,7 +30,6 @@ var_dump($retval_2);
socket_close($socket);
?>
-
--EXPECTF--
bool(true)
diff --git a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
index c44f58e793..8ee5218cb0 100644
--- a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
+++ b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
@@ -31,7 +31,6 @@ var_dump(socket_set_option($s, IPPROTO_IPV6, IPV6_PKTINFO, [
//A work-around with is sort-of possible (with IPV6_2292PKTOPTIONS),
//but not worth it
//var_dump(socket_get_option($s, IPPROTO_IPV6, IPV6_PKTINFO));
-
--EXPECTF--
Warning: socket_set_option(): error converting user data (path: in6_pktinfo): The key 'addr' is required in %s on line %d
bool(false)
diff --git a/ext/sockets/tests/socket_set_option_rcvtimeo.phpt b/ext/sockets/tests/socket_set_option_rcvtimeo.phpt
index 57d8656e87..a27d4075db 100644
--- a/ext/sockets/tests/socket_set_option_rcvtimeo.phpt
+++ b/ext/sockets/tests/socket_set_option_rcvtimeo.phpt
@@ -29,7 +29,6 @@ var_dump($retval_2);
var_dump($retval_3 === $options);
socket_close($socket);
?>
-
--EXPECTF--
Warning: socket_set_option(): no key "sec" passed in optval in %s on line %d
bool(true)
diff --git a/ext/sockets/tests/socket_set_option_seolinger.phpt b/ext/sockets/tests/socket_set_option_seolinger.phpt
index 36606b4eed..4d171fc70a 100644
--- a/ext/sockets/tests/socket_set_option_seolinger.phpt
+++ b/ext/sockets/tests/socket_set_option_seolinger.phpt
@@ -36,7 +36,6 @@ var_dump((bool)$retval_3["l_onoff"] === (bool)$options["l_onoff"]);
socket_close($socket);
?>
-
--EXPECTF--
Warning: socket_set_option(): no key "l_onoff" passed in optval in %s on line %d
diff --git a/ext/sockets/tests/socket_set_option_sndtimeo.phpt b/ext/sockets/tests/socket_set_option_sndtimeo.phpt
index 3be634341b..1b4fb5570d 100644
--- a/ext/sockets/tests/socket_set_option_sndtimeo.phpt
+++ b/ext/sockets/tests/socket_set_option_sndtimeo.phpt
@@ -29,7 +29,6 @@ var_dump($retval_2);
var_dump($retval_3 === $options);
socket_close($socket);
?>
-
--EXPECTF--
Warning: socket_set_option(): no key "sec" passed in optval in %s on line %d
bool(true)
diff --git a/ext/sockets/tests/socket_strerror.phpt b/ext/sockets/tests/socket_strerror.phpt
index 033e37742d..aef56e5a84 100644
--- a/ext/sockets/tests/socket_strerror.phpt
+++ b/ext/sockets/tests/socket_strerror.phpt
@@ -20,7 +20,6 @@ fa@php.net
}
?>
--EXPECTF--
-
Warning: socket_strerror() expects exactly 1 parameter, 0 given in %s on line %d
string(7) "Success"
string(23) "Operation not permitted"
diff --git a/ext/sockets/tests/socket_write_params.phpt b/ext/sockets/tests/socket_write_params.phpt
index 9991de53ed..5a1a5a89ff 100644
--- a/ext/sockets/tests/socket_write_params.phpt
+++ b/ext/sockets/tests/socket_write_params.phpt
@@ -20,7 +20,6 @@ fa@php.net
socket_close($s_c);
?>
--EXPECTF--
-
Warning: socket_write() expects at least 2 parameters, 0 given in %s on line %d
Warning: socket_write() expects at least 2 parameters, 1 given in %s on line %d
diff --git a/ext/sockets/tests/wsaprotocol_info_0.phpt b/ext/sockets/tests/wsaprotocol_info_0.phpt
index 19550d11e9..2750b32080 100644
--- a/ext/sockets/tests/wsaprotocol_info_0.phpt
+++ b/ext/sockets/tests/wsaprotocol_info_0.phpt
@@ -57,4 +57,3 @@ Warning: socket_wsaprotocol_info_export(): Unable to export WSA protocol info [0
in %s on line %d
Warning: socket_wsaprotocol_info_import(): Unable to open file mapping [0x00000002] in %s on line %d
-
diff --git a/ext/sodium/tests/crypto_secretstream.phpt b/ext/sodium/tests/crypto_secretstream.phpt
index ef92a0c98a..1ccac32fd8 100644
--- a/ext/sodium/tests/crypto_secretstream.phpt
+++ b/ext/sodium/tests/crypto_secretstream.phpt
@@ -46,7 +46,6 @@ $r1 = sodium_crypto_secretstream_xchacha20poly1305_pull($stream, $c1, $ad);
var_dump($r1);
$r2 = sodium_crypto_secretstream_xchacha20poly1305_pull($stream, $c2);
var_dump($r2);
-
--EXPECT--
secretstream_xchacha20poly1305:
bool(true)
diff --git a/ext/sodium/tests/version.phpt b/ext/sodium/tests/version.phpt
index f13345ea07..e9495d7a44 100644
--- a/ext/sodium/tests/version.phpt
+++ b/ext/sodium/tests/version.phpt
@@ -14,4 +14,3 @@ echo SODIUM_LIBRARY_MINOR_VERSION >= 0;
1
1
1
-
diff --git a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt
index 216a40bd6a..6a05aa0aa2 100644
--- a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt
+++ b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt
@@ -40,7 +40,6 @@ try {
} catch(Exception $e) {
echo $e->getMessage() . "\n";
}
-
--EXPECT--
CallbackFilterIterator::__construct() expects exactly 2 parameters, 0 given
Argument 1 passed to CallbackFilterIterator::__construct() must implement interface Iterator, null given
diff --git a/ext/spl/tests/DirectoryIterator_empty_constructor.phpt b/ext/spl/tests/DirectoryIterator_empty_constructor.phpt
index d0753fc33e..cf96425892 100644
--- a/ext/spl/tests/DirectoryIterator_empty_constructor.phpt
+++ b/ext/spl/tests/DirectoryIterator_empty_constructor.phpt
@@ -12,4 +12,4 @@ Fatal error: Uncaught RuntimeException: Directory name must not be empty. in %s:
Stack trace:
#0 %s(%d): DirectoryIterator->__construct('')
#1 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt b/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt
index e356e2a017..157449c5cd 100644
--- a/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt
+++ b/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt
@@ -47,4 +47,3 @@ array(3) {
[2]=>
string(3) "txt"
}
-
diff --git a/ext/spl/tests/DirectoryIterator_getInode_error.phpt b/ext/spl/tests/DirectoryIterator_getInode_error.phpt
index b6a07f6be9..42bfa35847 100644
--- a/ext/spl/tests/DirectoryIterator_getInode_error.phpt
+++ b/ext/spl/tests/DirectoryIterator_getInode_error.phpt
@@ -19,7 +19,6 @@ if (PHP_OS_FAMILY === 'Windows') { die('SKIP Testing file inodes, not available
$fileInfo = new SplFileInfo('not_existing');
var_dump($fileInfo->getInode());
?>
-
--EXPECTF--
Fatal error: Uncaught RuntimeException: SplFileInfo::getInode(): stat failed for %s in %s
Stack trace:
diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
index f6bc266cb1..4d8c1394b6 100644
--- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
+++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt
@@ -41,7 +41,6 @@ function rrmdir($dir) {
$targetDir = __DIR__.DIRECTORY_SEPARATOR . "depth01";
rrmdir($targetDir);
?>
-
--EXPECTF--
depth1
depth1
diff --git a/ext/spl/tests/SplArray_fromArray.phpt b/ext/spl/tests/SplArray_fromArray.phpt
index 1144f5f8dc..143d2755a8 100644
--- a/ext/spl/tests/SplArray_fromArray.phpt
+++ b/ext/spl/tests/SplArray_fromArray.phpt
@@ -14,4 +14,4 @@ try {
}
?>
--EXPECT--
-integer overflow detected \ No newline at end of file
+integer overflow detected
diff --git a/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter1.phpt b/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter1.phpt
index 12cfe40008..4af0d0b704 100644
--- a/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter1.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter1.phpt
@@ -8,4 +8,3 @@ var_dump($dll->add());
--EXPECTF--
Warning: SplDoublyLinkedList::add() expects exactly 2 parameters, 0 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter2.phpt b/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter2.phpt
index c9c319316f..ac87bf1979 100644
--- a/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter2.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_add_missing_parameter2.phpt
@@ -8,4 +8,3 @@ var_dump($dll->add(2));
--EXPECTF--
Warning: SplDoublyLinkedList::add() expects exactly 2 parameters, 1 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt
index 60203eb4a0..463f1a104d 100644
--- a/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt
@@ -8,4 +8,4 @@ $dll = new SplDoublyLinkedList(2);
$dll->count(new SplDoublyLinkedList(2));
?>
--EXPECTF--
-Warning: SplDoublyLinkedList::count() expects exactly 0 parameters, 1 given in %s on line %d \ No newline at end of file
+Warning: SplDoublyLinkedList::count() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/spl/tests/SplDoublyLinkedList_current_empty.phpt b/ext/spl/tests/SplDoublyLinkedList_current_empty.phpt
index 558504b38b..4f80525f75 100644
--- a/ext/spl/tests/SplDoublyLinkedList_current_empty.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_current_empty.phpt
@@ -10,4 +10,4 @@ var_dump($list->current());
?>
--EXPECT--
-NULL \ No newline at end of file
+NULL
diff --git a/ext/spl/tests/SplDoublyLinkedList_getIteratorMode_error.phpt b/ext/spl/tests/SplDoublyLinkedList_getIteratorMode_error.phpt
index cb43bee1ce..b9810fc214 100644
--- a/ext/spl/tests/SplDoublyLinkedList_getIteratorMode_error.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_getIteratorMode_error.phpt
@@ -9,4 +9,3 @@ $list->getIteratorMode(24);
?>
--EXPECTF--
Warning: SplDoublyLinkedList::getIteratorMode() expects exactly 0 parameters, 1 given in %s on line %d
-
diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt
index a05ba68f7a..18456244bd 100644
--- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt
@@ -11,4 +11,4 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
?>
--EXPECTF--
Warning: SplDoublyLinkedList::isEmpty() expects exactly 0 parameters, %d given in %s
-NULL \ No newline at end of file
+NULL
diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt
index 5e3d8e9ee2..c88a72a25c 100644
--- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt
@@ -17,4 +17,4 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
?>
--EXPECTF--
Warning: SplDoublyLinkedList::isEmpty() expects exactly 0 parameters, %d given in %s
-NULL \ No newline at end of file
+NULL
diff --git a/ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt b/ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt
index 86a84567a8..faa009daf4 100644
--- a/ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt
@@ -20,4 +20,4 @@ while ($tmp = $list->current()) {
}
?>
--EXPECT--
-foo \ No newline at end of file
+foo
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_empty.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_empty.phpt
index 36c47fef2e..d776d69223 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetGet_empty.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetGet_empty.phpt
@@ -11,4 +11,4 @@ $get = $array->offsetGet();
?>
--EXPECTF--
-Warning: SplDoublyLinkedList::offsetGet() expects exactly 1 parameter, 0 given in %s on line %d \ No newline at end of file
+Warning: SplDoublyLinkedList::offsetGet() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt
index b2bc444550..b6debb109b 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt
@@ -15,4 +15,4 @@ Fatal error: Uncaught OutOfRangeException: Offset invalid or out of range in %s
Stack trace:
#0 %s
#1 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt
index a387439d16..43ce18c5c5 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt
@@ -15,4 +15,4 @@ Fatal error: Uncaught OutOfRangeException: Offset invalid or out of range in %s
Stack trace:
#0 %s
#1 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt
index 687fcad78c..2512e23e78 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt
@@ -1,9 +1,7 @@
--TEST--
Doubly Linked List - offsetUnset > number elements
-
--CREDITS--
PHPNW Test Fest 2009 - Mat Griffin
-
--FILE--
<?php
$ll = new SplDoublyLinkedList();
diff --git a/ext/spl/tests/SplDoublyLinkedList_pop_params.phpt b/ext/spl/tests/SplDoublyLinkedList_pop_params.phpt
index 11ab343dbe..a3df71bc71 100644
--- a/ext/spl/tests/SplDoublyLinkedList_pop_params.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_pop_params.phpt
@@ -11,4 +11,4 @@ $get = $array->pop( 'param' );
?>
--EXPECTF--
-Warning: SplDoublyLinkedList::pop() expects exactly 0 parameters, 1 given in %s on line %d \ No newline at end of file
+Warning: SplDoublyLinkedList::pop() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/spl/tests/SplDoublyLinkedList_push_missing_parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_push_missing_parameter.phpt
index 057751c2eb..26fb3a9b8d 100644
--- a/ext/spl/tests/SplDoublyLinkedList_push_missing_parameter.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_push_missing_parameter.phpt
@@ -10,4 +10,3 @@ var_dump($dll->push());
--EXPECTF--
Warning: SplDoublyLinkedList::push() expects exactly 1 parameter, 0 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
index 9d6c4505d8..a990394334 100644
--- a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
@@ -8,4 +8,4 @@ $dll = new SplDoublyLinkedList(2);
$dll->setIteratorMode(new SplDoublyLinkedList(2));
?>
--EXPECTF--
-Warning: SplDoublyLinkedList::setIteratorMode() expects parameter 1 to be int, object given in %s on line %d \ No newline at end of file
+Warning: SplDoublyLinkedList::setIteratorMode() expects parameter 1 to be int, object given in %s on line %d
diff --git a/ext/spl/tests/SplDoublyLinkedList_unshift_missing_parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_unshift_missing_parameter.phpt
index 18afa034bb..adc631407c 100644
--- a/ext/spl/tests/SplDoublyLinkedList_unshift_missing_parameter.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_unshift_missing_parameter.phpt
@@ -10,4 +10,3 @@ var_dump($dll->unshift());
--EXPECTF--
Warning: SplDoublyLinkedList::unshift() expects exactly 1 parameter, 0 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplFileInfo_getGroup_error.phpt b/ext/spl/tests/SplFileInfo_getGroup_error.phpt
index 79492e0e9c..60dea49a10 100644
--- a/ext/spl/tests/SplFileInfo_getGroup_error.phpt
+++ b/ext/spl/tests/SplFileInfo_getGroup_error.phpt
@@ -19,7 +19,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms
$fileInfo = new SplFileInfo('not_existing');
var_dump($fileInfo->getGroup());
?>
-
--EXPECTF--
Fatal error: Uncaught RuntimeException: SplFileInfo::getGroup(): stat failed for not_existing in %s
Stack trace:
diff --git a/ext/spl/tests/SplFileInfo_getInode_error.phpt b/ext/spl/tests/SplFileInfo_getInode_error.phpt
index c2b9803735..3bee5a982b 100644
--- a/ext/spl/tests/SplFileInfo_getInode_error.phpt
+++ b/ext/spl/tests/SplFileInfo_getInode_error.phpt
@@ -19,7 +19,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms
$fileInfo = new SplFileInfo('not_existing');
var_dump($fileInfo->getInode());
?>
-
--EXPECTF--
Fatal error: Uncaught RuntimeException: SplFileInfo::getInode(): stat failed for not_existing in %s
Stack trace:
diff --git a/ext/spl/tests/SplFileInfo_getOwner_error.phpt b/ext/spl/tests/SplFileInfo_getOwner_error.phpt
index 073744aa00..d160b74298 100644
--- a/ext/spl/tests/SplFileInfo_getOwner_error.phpt
+++ b/ext/spl/tests/SplFileInfo_getOwner_error.phpt
@@ -19,7 +19,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms
$fileInfo = new SplFileInfo('not_existing');
var_dump($fileInfo->getOwner());
?>
-
--EXPECTF--
Fatal error: Uncaught RuntimeException: SplFileInfo::getOwner(): stat failed for not_existing in %s
Stack trace:
diff --git a/ext/spl/tests/SplFileInfo_getPerms_error.phpt b/ext/spl/tests/SplFileInfo_getPerms_error.phpt
index 4b70c2635b..632a053345 100644
--- a/ext/spl/tests/SplFileInfo_getPerms_error.phpt
+++ b/ext/spl/tests/SplFileInfo_getPerms_error.phpt
@@ -19,7 +19,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms
$fileInfo = new SplFileInfo('not_existing');
var_dump($fileInfo->getPerms() == 0100557);
?>
-
--EXPECTF--
Fatal error: Uncaught RuntimeException: SplFileInfo::getPerms(): stat failed for %s in %s
Stack trace:
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt
index f5583a8195..879edefddf 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt
@@ -823,4 +823,3 @@ bool(false)
string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,&
"
Done
-
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt
index 57f5681517..d23808b5ab 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt
@@ -324,4 +324,3 @@ bool(false)
string(%d) "
"
Done
-
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt
index ede8e59413..ab78d21b80 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt
@@ -823,4 +823,3 @@ bool(false)
string(%d) ""&""""""""&:&""&:,:"":&,&:,,,,"
"
Done
-
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt
index c4bc9f112d..b530cf61cf 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt
@@ -824,4 +824,3 @@ bool(false)
string(%d) ""&""""""""&:&""&:,:"":&,&:,,,,"
"
Done
-
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt
index 4b9e930c7c..002a7075a6 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt
@@ -823,4 +823,3 @@ bool(false)
string(%d) ""&""""""""&:&""&:,:"":&,&:,,,,"
"
Done
-
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt
index 842bb563d1..1f177df19f 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt
@@ -826,4 +826,3 @@ bool(false)
string(%d) "&""""&:&"&:,:":&,&:,,,,
"
Done
-
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt
index 0f9b8ce366..d42b455820 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt
@@ -826,4 +826,3 @@ bool(false)
string(%d) "&&&""""&&:&&"&&:,:":&&,&&:,,,,&
"
Done
-
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt
index 64f32187ac..f7cbd72b76 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt
@@ -826,4 +826,3 @@ bool(false)
string(%d) "+&""""&:&"&:,:":&,&:,,,,+
"
Done
-
diff --git a/ext/spl/tests/SplFileObject_seek_error_001.phpt b/ext/spl/tests/SplFileObject_seek_error_001.phpt
index bcf44b098e..4de5bcdd4d 100644
--- a/ext/spl/tests/SplFileObject_seek_error_001.phpt
+++ b/ext/spl/tests/SplFileObject_seek_error_001.phpt
@@ -12,7 +12,6 @@ try {
}
?>
--EXPECTF--
-
Warning: SplFileObject::seek() expects exactly 1 parameter, 2 given in %s
Warning: SplFileObject::seek() expects exactly 1 parameter, 0 given in %s
diff --git a/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt b/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt
index b2630606e8..c7f4710868 100644
--- a/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt
+++ b/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt
@@ -27,4 +27,3 @@ unlink('csv_control_data.csv');
groene appelen : 10
gele bananen : 20
rode kersen : 30
-
diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt
index f582a4a894..384fed5d23 100644
--- a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt
+++ b/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt
@@ -21,4 +21,3 @@ unlink('csv_control_data.csv');
?>
--EXPECTF--
Warning: SplFileObject::setCsvControl(): delimiter must be a character in %s on line %d
-
diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt
index bcfd9c4dd6..6452212ee7 100644
--- a/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt
+++ b/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt
@@ -21,4 +21,3 @@ unlink('csv_control_data.csv');
?>
--EXPECTF--
Warning: SplFileObject::setCsvControl(): enclosure must be a character in %s on line %d
-
diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt
index 8b1f54d5a4..927172a8dc 100644
--- a/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt
+++ b/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt
@@ -23,4 +23,3 @@ unlink('csv_control_data.csv');
?>
--EXPECTF--
Warning: SplFileObject::setCsvControl(): escape must be a character in %s on line %d
-
diff --git a/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt b/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt
index 7aaf8a3fe6..c6da6b3d48 100644
--- a/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt
+++ b/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt
@@ -27,4 +27,3 @@ unlink('csv_control_data.csv');
groene appelen : 10
gele bananen : 20
rode kersen : 30
-
diff --git a/ext/spl/tests/SplFixedArray__construct_param_float.phpt b/ext/spl/tests/SplFixedArray__construct_param_float.phpt
index 670a1095eb..f570289e6c 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_float.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_float.phpt
@@ -11,4 +11,4 @@ echo $array->getSize();
?>
--EXPECT--
-3 \ No newline at end of file
+3
diff --git a/ext/spl/tests/SplFixedArray__construct_param_null.phpt b/ext/spl/tests/SplFixedArray__construct_param_null.phpt
index 4685c20b29..919c72021a 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_null.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_null.phpt
@@ -13,4 +13,4 @@ print_r( $array );
--EXPECT--
SplFixedArray Object
(
-) \ No newline at end of file
+)
diff --git a/ext/spl/tests/SplFixedArray_count_checkParams.phpt b/ext/spl/tests/SplFixedArray_count_checkParams.phpt
index 5cbe2e80ce..5cb12feee7 100644
--- a/ext/spl/tests/SplFixedArray_count_checkParams.phpt
+++ b/ext/spl/tests/SplFixedArray_count_checkParams.phpt
@@ -13,4 +13,3 @@ echo $ar->count(3);
?>
--EXPECTF--
Warning: SplFixedArray::count() expects exactly 0 parameters, 1 given in %s on line %d
-
diff --git a/ext/spl/tests/SplFixedArray_count_param_int.phpt b/ext/spl/tests/SplFixedArray_count_param_int.phpt
index 108bb2db69..0cb4d06fdd 100644
--- a/ext/spl/tests/SplFixedArray_count_param_int.phpt
+++ b/ext/spl/tests/SplFixedArray_count_param_int.phpt
@@ -8,4 +8,4 @@ $array = new SplFixedArray(5);
echo $array->count(3);
?>
--EXPECTF--
-Warning: SplFixedArray::count() expects exactly 0 parameters, 1 given in %s on line %d \ No newline at end of file
+Warning: SplFixedArray::count() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt b/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt
index 2f77e8a449..5c8f526d66 100644
--- a/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt
+++ b/ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt
@@ -7,4 +7,4 @@ Philip Norton philipnorton42@gmail.com
$array = SplFixedArray::fromArray(true);
?>
--EXPECTF--
-Warning: SplFixedArray::fromArray() expects parameter 1 to be array, bool given in %s on line %d \ No newline at end of file
+Warning: SplFixedArray::fromArray() expects parameter 1 to be array, bool given in %s on line %d
diff --git a/ext/spl/tests/SplFixedArray_key_setsize.phpt b/ext/spl/tests/SplFixedArray_key_setsize.phpt
index 97e48115fb..091c4650e2 100644
--- a/ext/spl/tests/SplFixedArray_key_setsize.phpt
+++ b/ext/spl/tests/SplFixedArray_key_setsize.phpt
@@ -17,4 +17,4 @@ foreach ( $array as $value ) {
?>
--EXPECT--
-0123 \ No newline at end of file
+0123
diff --git a/ext/spl/tests/SplFixedArray_setSize_filled_to_smaller.phpt b/ext/spl/tests/SplFixedArray_setSize_filled_to_smaller.phpt
index a460747608..80df45120f 100644
--- a/ext/spl/tests/SplFixedArray_setSize_filled_to_smaller.phpt
+++ b/ext/spl/tests/SplFixedArray_setSize_filled_to_smaller.phpt
@@ -19,4 +19,4 @@ object(SplFixedArray)#1 (2) {
int(1)
[1]=>
int(1)
-} \ No newline at end of file
+}
diff --git a/ext/spl/tests/SplFixedArray_setsize_grow.phpt b/ext/spl/tests/SplFixedArray_setsize_grow.phpt
index 418d1ac37c..317059c152 100644
--- a/ext/spl/tests/SplFixedArray_setsize_grow.phpt
+++ b/ext/spl/tests/SplFixedArray_setsize_grow.phpt
@@ -27,4 +27,4 @@ SplFixedArray Object
[1] => Value 2
[2] => Value 3
[3] => Value 4
-) \ No newline at end of file
+)
diff --git a/ext/spl/tests/SplHeap_count_invalid_parameter.phpt b/ext/spl/tests/SplHeap_count_invalid_parameter.phpt
index 727790eabd..e8b122ec10 100644
--- a/ext/spl/tests/SplHeap_count_invalid_parameter.phpt
+++ b/ext/spl/tests/SplHeap_count_invalid_parameter.phpt
@@ -44,4 +44,3 @@ NULL
Warning: SplHeap::count() expects exactly 0 parameters, 1 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplHeap_extract_invalid_parameter.phpt b/ext/spl/tests/SplHeap_extract_invalid_parameter.phpt
index ba03976396..d3c9f76589 100644
--- a/ext/spl/tests/SplHeap_extract_invalid_parameter.phpt
+++ b/ext/spl/tests/SplHeap_extract_invalid_parameter.phpt
@@ -44,4 +44,3 @@ NULL
Warning: SplHeap::extract() expects exactly 0 parameters, 1 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplHeap_insert_invalid_parameter.phpt b/ext/spl/tests/SplHeap_insert_invalid_parameter.phpt
index 86c6b6370e..f2bec5a66f 100644
--- a/ext/spl/tests/SplHeap_insert_invalid_parameter.phpt
+++ b/ext/spl/tests/SplHeap_insert_invalid_parameter.phpt
@@ -13,4 +13,3 @@ var_dump($h->insert());
--EXPECTF--
Warning: SplHeap::insert() expects exactly 1 parameter, 0 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplHeap_isEmpty.phpt b/ext/spl/tests/SplHeap_isEmpty.phpt
index c3f79c6882..89d2570661 100644
--- a/ext/spl/tests/SplHeap_isEmpty.phpt
+++ b/ext/spl/tests/SplHeap_isEmpty.phpt
@@ -12,4 +12,3 @@ var_dump($h->isEmpty());
?>
--EXPECT--
bool(true)
-
diff --git a/ext/spl/tests/SplHeap_isEmpty_invalid_parameter.phpt b/ext/spl/tests/SplHeap_isEmpty_invalid_parameter.phpt
index 021aff423f..f98a69cadf 100644
--- a/ext/spl/tests/SplHeap_isEmpty_invalid_parameter.phpt
+++ b/ext/spl/tests/SplHeap_isEmpty_invalid_parameter.phpt
@@ -44,4 +44,3 @@ NULL
Warning: SplHeap::isEmpty() expects exactly 0 parameters, 1 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
index 91f010930c..3401439d97 100644
--- a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
@@ -40,4 +40,3 @@ NULL
Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, null given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt
index 80e5e100b4..a6e68854da 100644
--- a/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt
@@ -17,4 +17,3 @@ NULL
Warning: SplObjectStorage::attach() expects at most 2 parameters, 3 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
index 90ee41b212..0f21923949 100644
--- a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
@@ -40,4 +40,3 @@ NULL
Warning: SplObjectStorage::contains() expects parameter 1 to be object, null given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_current_empty_storage.phpt b/ext/spl/tests/SplObjectStorage_current_empty_storage.phpt
index 65fa69147a..4807f28c0b 100644
--- a/ext/spl/tests/SplObjectStorage_current_empty_storage.phpt
+++ b/ext/spl/tests/SplObjectStorage_current_empty_storage.phpt
@@ -12,4 +12,3 @@ var_dump($s->current());
?>
--EXPECT--
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
index 3122616802..6b4a8f798f 100644
--- a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
@@ -40,4 +40,3 @@ NULL
Warning: SplObjectStorage::detach() expects parameter 1 to be object, null given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_getInfo_empty_storage.phpt b/ext/spl/tests/SplObjectStorage_getInfo_empty_storage.phpt
index e6c4de88c1..8ea88ddbd3 100644
--- a/ext/spl/tests/SplObjectStorage_getInfo_empty_storage.phpt
+++ b/ext/spl/tests/SplObjectStorage_getInfo_empty_storage.phpt
@@ -12,4 +12,3 @@ var_dump($s->getInfo());
?>
--EXPECT--
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_offsetGet.phpt b/ext/spl/tests/SplObjectStorage_offsetGet.phpt
index e73f6b1bd6..676cbf2226 100644
--- a/ext/spl/tests/SplObjectStorage_offsetGet.phpt
+++ b/ext/spl/tests/SplObjectStorage_offsetGet.phpt
@@ -14,4 +14,3 @@ echo $s->offsetGet($o1);
?>
--EXPECT--
some_value
-
diff --git a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
index 185d31fa49..7561bc0765 100644
--- a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
@@ -42,4 +42,3 @@ NULL
Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, null given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_offsetGet_missing_object.phpt b/ext/spl/tests/SplObjectStorage_offsetGet_missing_object.phpt
index 72b032c4ad..fa2c7aabe9 100644
--- a/ext/spl/tests/SplObjectStorage_offsetGet_missing_object.phpt
+++ b/ext/spl/tests/SplObjectStorage_offsetGet_missing_object.phpt
@@ -17,4 +17,3 @@ try {
?>
--EXPECT--
Object not found
-
diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
index d94f030498..fe5b63d07e 100644
--- a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
@@ -41,4 +41,3 @@ NULL
Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, null given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
index 6bd0de6330..a1c6f938b2 100644
--- a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
@@ -40,4 +40,3 @@ NULL
Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, null given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_setInfo_empty_storage.phpt b/ext/spl/tests/SplObjectStorage_setInfo_empty_storage.phpt
index c8c3cd1030..e074951c9e 100644
--- a/ext/spl/tests/SplObjectStorage_setInfo_empty_storage.phpt
+++ b/ext/spl/tests/SplObjectStorage_setInfo_empty_storage.phpt
@@ -12,4 +12,3 @@ var_dump($s->setInfo('some_value'));
?>
--EXPECT--
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_setInfo_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_setInfo_invalid_parameter.phpt
index 52f8f9b8e6..939fd5d52d 100644
--- a/ext/spl/tests/SplObjectStorage_setInfo_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_setInfo_invalid_parameter.phpt
@@ -13,4 +13,3 @@ var_dump($s->setInfo());
--EXPECTF--
Warning: SplObjectStorage::setInfo() expects exactly 1 parameter, 0 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt
index c8254e74c6..8eef31382d 100644
--- a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt
+++ b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt
@@ -24,4 +24,3 @@ NULL
Warning: SplObjectStorage::unserialize() expects parameter 1 to be string, object given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter2.phpt b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter2.phpt
index be2bb331b4..8ea0b6656e 100644
--- a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter2.phpt
+++ b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter2.phpt
@@ -31,4 +31,3 @@ Error at offset %d of %d bytes
Error at offset %d of %d bytes
Error at offset %d of %d bytes
Error at offset %d of %d bytes
-
diff --git a/ext/spl/tests/SplObjectStorage_unserialize_nested.phpt b/ext/spl/tests/SplObjectStorage_unserialize_nested.phpt
index e96a82a7a1..daf415049c 100644
--- a/ext/spl/tests/SplObjectStorage_unserialize_nested.phpt
+++ b/ext/spl/tests/SplObjectStorage_unserialize_nested.phpt
@@ -17,7 +17,6 @@ echo $s."\n";
$so1 = unserialize($s);
var_dump($so1);
-
--EXPECTF--
C:16:"SplObjectStorage":76:{x:i:2;O:8:"stdClass":1:{s:1:"a";O:8:"stdClass":0:{}},i:1;;r:4;,i:2;;m:a:0:{}}
object(SplObjectStorage)#4 (1) {
@@ -44,4 +43,3 @@ object(SplObjectStorage)#4 (1) {
}
}
}
-
diff --git a/ext/spl/tests/SplPriorityQueue_extract_invalid_parameter.phpt b/ext/spl/tests/SplPriorityQueue_extract_invalid_parameter.phpt
index 7dda782b93..79b75ae4a0 100644
--- a/ext/spl/tests/SplPriorityQueue_extract_invalid_parameter.phpt
+++ b/ext/spl/tests/SplPriorityQueue_extract_invalid_parameter.phpt
@@ -44,4 +44,3 @@ NULL
Warning: SplPriorityQueue::extract() expects exactly 0 parameters, 1 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/SplPriorityQueue_insert_invalid_parameter.phpt b/ext/spl/tests/SplPriorityQueue_insert_invalid_parameter.phpt
index 7d7b589356..08314fd74c 100644
--- a/ext/spl/tests/SplPriorityQueue_insert_invalid_parameter.phpt
+++ b/ext/spl/tests/SplPriorityQueue_insert_invalid_parameter.phpt
@@ -13,4 +13,3 @@ var_dump($h->insert(NULL));
--EXPECTF--
Warning: SplPriorityQueue::insert() expects exactly 2 parameters, 1 given in %s on line %d
NULL
-
diff --git a/ext/spl/tests/arrayObject_count_basic1.phpt b/ext/spl/tests/arrayObject_count_basic1.phpt
index b0643d5754..41e1527f93 100644
--- a/ext/spl/tests/arrayObject_count_basic1.phpt
+++ b/ext/spl/tests/arrayObject_count_basic1.phpt
@@ -81,4 +81,4 @@ int(99)
int(1)
Warning: ArrayIterator::count() expects exactly 0 parameters, 1 given in %s on line %d
-NULL \ No newline at end of file
+NULL
diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic2.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic2.phpt
index c7f1b3a7af..1f037e9073 100644
--- a/ext/spl/tests/arrayObject_exchangeArray_basic2.phpt
+++ b/ext/spl/tests/arrayObject_exchangeArray_basic2.phpt
@@ -94,4 +94,4 @@ object(ArrayObject)#%d (1) {
}
}
}
-} \ No newline at end of file
+}
diff --git a/ext/spl/tests/arrayObject_getFlags_basic1.phpt b/ext/spl/tests/arrayObject_getFlags_basic1.phpt
index b9445d4119..612a753680 100644
--- a/ext/spl/tests/arrayObject_getFlags_basic1.phpt
+++ b/ext/spl/tests/arrayObject_getFlags_basic1.phpt
@@ -22,4 +22,4 @@ int(0)
int(1)
int(2)
int(3)
-int(3) \ No newline at end of file
+int(3)
diff --git a/ext/spl/tests/arrayObject_getFlags_basic2.phpt b/ext/spl/tests/arrayObject_getFlags_basic2.phpt
index 651c240303..db44322d67 100644
--- a/ext/spl/tests/arrayObject_getFlags_basic2.phpt
+++ b/ext/spl/tests/arrayObject_getFlags_basic2.phpt
@@ -21,4 +21,4 @@ int(3)
int(3)
int(3)
int(3)
-int(0) \ No newline at end of file
+int(0)
diff --git a/ext/spl/tests/arrayObject_natsort_basic1.phpt b/ext/spl/tests/arrayObject_natsort_basic1.phpt
index 478dd2b562..1bd1d0b6e8 100644
--- a/ext/spl/tests/arrayObject_natsort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_natsort_basic1.phpt
@@ -54,4 +54,3 @@ object(ArrayObject)#2 (1) {
}
}
===DONE===
-
diff --git a/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt b/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt
index e20e9918d7..160601aefb 100644
--- a/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt
+++ b/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt
@@ -7,4 +7,4 @@ var_dump($ao->offsetExists('foo'));
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/spl/tests/array_013.phpt b/ext/spl/tests/array_013.phpt
index 6533819b68..3aad7bf6f7 100644
--- a/ext/spl/tests/array_013.phpt
+++ b/ext/spl/tests/array_013.phpt
@@ -80,4 +80,4 @@ Fatal error: Uncaught Error: Cannot append properties to objects, use ArrayItera
Stack trace:
#0 %s(%d): ArrayIterator->append('three')
#1 {main}
- thrown in %s on line %d \ No newline at end of file
+ thrown in %s on line %d
diff --git a/ext/spl/tests/bug45622.phpt b/ext/spl/tests/bug45622.phpt
index 1638000f09..e2a7b905d5 100644
--- a/ext/spl/tests/bug45622.phpt
+++ b/ext/spl/tests/bug45622.phpt
@@ -30,7 +30,6 @@ var_dump(isset($ao->p));
var_dump($ao->p);
?>
--EXPECTF--
-
--> Access the real property:
bool(true)
string(15) "object property"
@@ -48,4 +47,3 @@ NULL
--> Re-add the real property:
bool(true)
string(15) "object property"
-
diff --git a/ext/spl/tests/bug45622b.phpt b/ext/spl/tests/bug45622b.phpt
index 879d610301..bf0ab8242e 100644
--- a/ext/spl/tests/bug45622b.phpt
+++ b/ext/spl/tests/bug45622b.phpt
@@ -30,4 +30,4 @@ Doesn't trigger __set.
Doesn't trigger __unset.
Notice: Undefined index: prop3 in %s on line 17
-Shouldn't trigger __isset. \ No newline at end of file
+Shouldn't trigger __isset.
diff --git a/ext/spl/tests/bug48361.phpt b/ext/spl/tests/bug48361.phpt
index 44b05abba1..61c62c7b3f 100644
--- a/ext/spl/tests/bug48361.phpt
+++ b/ext/spl/tests/bug48361.phpt
@@ -11,4 +11,3 @@ var_dump($info->getPathInfo()->getRealPath());
string(%d) "%stests%sbug48361.php"
string(%d) "%stests"
===DONE===
-
diff --git a/ext/spl/tests/bug52861.phpt b/ext/spl/tests/bug52861.phpt
index 30a3261c4e..1213a1e1bc 100644
--- a/ext/spl/tests/bug52861.phpt
+++ b/ext/spl/tests/bug52861.phpt
@@ -19,4 +19,3 @@ Array
)
)
-
diff --git a/ext/spl/tests/bug53144.phpt b/ext/spl/tests/bug53144.phpt
index 8fb86e8204..f228f968dc 100644
--- a/ext/spl/tests/bug53144.phpt
+++ b/ext/spl/tests/bug53144.phpt
@@ -17,4 +17,4 @@ var_dump(count($b));
?>
--EXPECT--
int(2)
-int(0) \ No newline at end of file
+int(0)
diff --git a/ext/spl/tests/bug54291.phpt b/ext/spl/tests/bug54291.phpt
index c0119c4360..b15a3723d4 100644
--- a/ext/spl/tests/bug54291.phpt
+++ b/ext/spl/tests/bug54291.phpt
@@ -10,4 +10,3 @@ Stack trace:
#0 %s(%d): DirectoryIterator->__construct('\x00/abc')
#1 {main}
thrown in %s on line %d
-
diff --git a/ext/spl/tests/bug54304.phpt b/ext/spl/tests/bug54304.phpt
index 32cbe486a0..143c26e153 100644
--- a/ext/spl/tests/bug54304.phpt
+++ b/ext/spl/tests/bug54304.phpt
@@ -23,4 +23,3 @@ int(42)
string(5) "test3"
string(2) "42"
int(42)
-
diff --git a/ext/spl/tests/bug54384.phpt b/ext/spl/tests/bug54384.phpt
index a1ce7edff3..a9dae2e736 100644
--- a/ext/spl/tests/bug54384.phpt
+++ b/ext/spl/tests/bug54384.phpt
@@ -152,7 +152,6 @@ foreach ($o as $a) {
echo $a,"\n";
}
} );
-
--EXPECT--
IteratorIterator... exception (expected)
FilterIterator... exception (expected)
diff --git a/ext/spl/tests/bug55701.phpt b/ext/spl/tests/bug55701.phpt
index 7d4e832d9b..28713700d1 100644
--- a/ext/spl/tests/bug55701.phpt
+++ b/ext/spl/tests/bug55701.phpt
@@ -293,9 +293,6 @@ testChildClass( function() {
$o = new SplTempFileObjectChild();
$o->count();
} );
-
-
-
--EXPECT--
->count()... ran normally (expected)
->rewind()... ran normally (expected)
diff --git a/ext/spl/tests/bug61347.phpt b/ext/spl/tests/bug61347.phpt
index cb091858ae..f893b24527 100644
--- a/ext/spl/tests/bug61347.phpt
+++ b/ext/spl/tests/bug61347.phpt
@@ -22,8 +22,6 @@ var_dump(isset($b[37])); //true
var_dump(isset($b['no_exists'])); //false
var_dump(empty($b['b'])); //true
var_dump(empty($b[37])); //true
-
-
--EXPECT--
bool(false)
bool(false)
diff --git a/ext/spl/tests/bug62904.phpt b/ext/spl/tests/bug62904.phpt
index 36585a5609..966f1db44e 100644
--- a/ext/spl/tests/bug62904.phpt
+++ b/ext/spl/tests/bug62904.phpt
@@ -12,7 +12,5 @@ $x = new foo(2);
$z = clone $x;
echo "No crash.";
-
--EXPECT--
No crash.
-
diff --git a/ext/spl/tests/bug64023.phpt b/ext/spl/tests/bug64023.phpt
index 2c177f9512..cb98445279 100644
--- a/ext/spl/tests/bug64023.phpt
+++ b/ext/spl/tests/bug64023.phpt
@@ -14,7 +14,6 @@ echo $a, $a->__toString(), $a->__toString() . '', "\n";
// Does not work - outputs parent::__toString()
echo $a . '', "\n";
-
--EXPECT--
-expected- -expected- -expected-
-expected-
diff --git a/ext/spl/tests/bug64228.phpt b/ext/spl/tests/bug64228.phpt
index 3f30dd2b23..fd7b1b628b 100644
--- a/ext/spl/tests/bug64228.phpt
+++ b/ext/spl/tests/bug64228.phpt
@@ -22,4 +22,3 @@ Array
[0] => .
[1] => ..
)
-
diff --git a/ext/spl/tests/bug66702.phpt b/ext/spl/tests/bug66702.phpt
index 3e4df51abe..f1260afa02 100644
--- a/ext/spl/tests/bug66702.phpt
+++ b/ext/spl/tests/bug66702.phpt
@@ -17,7 +17,6 @@ $it2 = new \RegexIterator($it, "/^ba/", \RegexIterator::MATCH, \RegexIterator::U
print_r(iterator_to_array($it2));
$it2 = new \RegexIterator($it, "/^ba/", \RegexIterator::MATCH, \RegexIterator::USE_KEY | \RegexIterator::INVERT_MATCH);
print_r(iterator_to_array($it2));
-
--EXPECT--
Array
(
@@ -37,4 +36,3 @@ Array
(
[foo] => 1
)
-
diff --git a/ext/spl/tests/bug68128.phpt b/ext/spl/tests/bug68128.phpt
index ff41dd4931..5ac7f8b2fb 100644
--- a/ext/spl/tests/bug68128.phpt
+++ b/ext/spl/tests/bug68128.phpt
@@ -88,4 +88,3 @@ Array
)
)
-
diff --git a/ext/spl/tests/bug70068.phpt b/ext/spl/tests/bug70068.phpt
index 96b2fa808f..dc949da8fa 100644
--- a/ext/spl/tests/bug70068.phpt
+++ b/ext/spl/tests/bug70068.phpt
@@ -11,4 +11,4 @@ $a = unserialize('a:3:{i:0;C:11:"ArrayObject":20:{x:i:0;r:3;;m:a:0:{};}i:1;d:11;
OK
--EXPECT--
Error at offset 10 of 20 bytes
-OK \ No newline at end of file
+OK
diff --git a/ext/spl/tests/bug70366.phpt b/ext/spl/tests/bug70366.phpt
index c9aa584ae2..da4cc2d389 100644
--- a/ext/spl/tests/bug70366.phpt
+++ b/ext/spl/tests/bug70366.phpt
@@ -51,4 +51,4 @@ array(5) {
}
[4]=>
string(24) "%s"
-} \ No newline at end of file
+}
diff --git a/ext/spl/tests/bug70573.phpt b/ext/spl/tests/bug70573.phpt
index b93e48876d..add2ca9a94 100644
--- a/ext/spl/tests/bug70573.phpt
+++ b/ext/spl/tests/bug70573.phpt
@@ -11,5 +11,3 @@ echo "ok\n";
?>
--EXPECT--
ok
-
-
diff --git a/ext/spl/tests/bug70868.phpt b/ext/spl/tests/bug70868.phpt
index a253927d1d..724576d3bc 100644
--- a/ext/spl/tests/bug70868.phpt
+++ b/ext/spl/tests/bug70868.phpt
@@ -25,7 +25,6 @@ echo "Done", PHP_EOL;
?>
--EXPECT--
-
string(6) "A.phpt"
string(6) "B.phpt"
string(6) "C.phpt"
diff --git a/ext/spl/tests/bug71735.phpt b/ext/spl/tests/bug71735.phpt
index 92568028c4..1134b5d6dd 100644
--- a/ext/spl/tests/bug71735.phpt
+++ b/ext/spl/tests/bug71735.phpt
@@ -12,4 +12,4 @@ $var_1->offsetSet(100,new DateTime('2000-01-01'));
===DONE===
--EXPECT--
Offset invalid or out of range
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/spl/tests/bug74478.phpt b/ext/spl/tests/bug74478.phpt
index c384648466..3609db53ee 100644
--- a/ext/spl/tests/bug74478.phpt
+++ b/ext/spl/tests/bug74478.phpt
@@ -59,4 +59,4 @@ offsetGet(0)
offsetExists(1)
offsetGet(1)
offsetExists(2)
-int(42) \ No newline at end of file
+int(42)
diff --git a/ext/spl/tests/countable_count_variation1.phpt b/ext/spl/tests/countable_count_variation1.phpt
index 642887d0c4..0a99399329 100644
--- a/ext/spl/tests/countable_count_variation1.phpt
+++ b/ext/spl/tests/countable_count_variation1.phpt
@@ -65,4 +65,4 @@ int(1)
Count returns an array:
int(1)
Count throws an exception:
-Thrown from count \ No newline at end of file
+Thrown from count
diff --git a/ext/spl/tests/dit_001_noglob.phpt b/ext/spl/tests/dit_001_noglob.phpt
index f1104c881b..00deac36b8 100644
--- a/ext/spl/tests/dit_001_noglob.phpt
+++ b/ext/spl/tests/dit_001_noglob.phpt
@@ -24,4 +24,3 @@ object(DirectoryIterator)#%d (3) {
bool(false)
bool(false)
===DONE===
-
diff --git a/ext/spl/tests/fileobject_005.phpt b/ext/spl/tests/fileobject_005.phpt
index 781614abcc..7b012e7710 100644
--- a/ext/spl/tests/fileobject_005.phpt
+++ b/ext/spl/tests/fileobject_005.phpt
@@ -39,4 +39,4 @@ NULL
Warning: SplFileObject::ftruncate() expects exactly 1 parameter, 0 given in %s on line %d
NULL
-==DONE== \ No newline at end of file
+==DONE==
diff --git a/ext/spl/tests/heap_corruption.phpt b/ext/spl/tests/heap_corruption.phpt
index 6b85681de5..47e8d008c0 100644
--- a/ext/spl/tests/heap_corruption.phpt
+++ b/ext/spl/tests/heap_corruption.phpt
@@ -67,4 +67,4 @@ bool(false)
Compare Exception: Compare exception
Corruption Exception: Heap is corrupted, heap properties are no longer ensured.
bool(true)
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/spl/tests/heap_current_variation_001.phpt b/ext/spl/tests/heap_current_variation_001.phpt
index eb6df2b88e..f67eb428c3 100644
--- a/ext/spl/tests/heap_current_variation_001.phpt
+++ b/ext/spl/tests/heap_current_variation_001.phpt
@@ -19,4 +19,4 @@ var_dump($heap->current());
?>
--EXPECT--
-NULL \ No newline at end of file
+NULL
diff --git a/ext/spl/tests/iterator_036.phpt b/ext/spl/tests/iterator_036.phpt
index a4ff7a214c..74d393b677 100644
--- a/ext/spl/tests/iterator_036.phpt
+++ b/ext/spl/tests/iterator_036.phpt
@@ -18,5 +18,4 @@ test(new CachingIterator($ar, 0));
?>
===DONE===
--EXPECTF--
-
Fatal error: Method CachingIterator::__toString() must not throw an exception, caught BadMethodCallException: CachingIterator does not fetch string value (see CachingIterator::__construct) in %siterator_036.php on line %d
diff --git a/ext/spl/tests/iterator_070.phpt b/ext/spl/tests/iterator_070.phpt
index fadd88185a..681e327523 100644
--- a/ext/spl/tests/iterator_070.phpt
+++ b/ext/spl/tests/iterator_070.phpt
@@ -13,8 +13,7 @@ var_dump($recItIt->endIteration());
var_dump($recItIt->nextElement());
?>
-
--EXPECT--
NULL
NULL
-NULL \ No newline at end of file
+NULL
diff --git a/ext/spl/tests/iterator_071.phpt b/ext/spl/tests/iterator_071.phpt
index 930499bef5..9f48f6ee14 100644
--- a/ext/spl/tests/iterator_071.phpt
+++ b/ext/spl/tests/iterator_071.phpt
@@ -29,4 +29,4 @@ MyRecursiveIteratorIterator::nextelement
MyRecursiveIteratorIterator::nextelement
0
MyRecursiveIteratorIterator::nextelement
-1 \ No newline at end of file
+1
diff --git a/ext/spl/tests/limititerator_seek.phpt b/ext/spl/tests/limititerator_seek.phpt
index a59a49bee8..3336cd0a39 100644
--- a/ext/spl/tests/limititerator_seek.phpt
+++ b/ext/spl/tests/limititerator_seek.phpt
@@ -13,6 +13,4 @@ $lt->seek(1,1); // Should throw a warning as seek expects only 1 argument
?>
--EXPECTF--
-
Warning: LimitIterator::seek() expects exactly 1 parameter, 2 given in %s on line %d
-
diff --git a/ext/spl/tests/pqueue_compare_error.phpt b/ext/spl/tests/pqueue_compare_error.phpt
index 610be2a569..99b47bb437 100644
--- a/ext/spl/tests/pqueue_compare_error.phpt
+++ b/ext/spl/tests/pqueue_compare_error.phpt
@@ -16,4 +16,3 @@ Warning: SplPriorityQueue::compare() expects exactly 2 parameters, 0 given in %s
Warning: SplPriorityQueue::compare() expects exactly 2 parameters, 1 given in %s
Warning: SplPriorityQueue::compare() expects exactly 2 parameters, 3 given in %s
-
diff --git a/ext/spl/tests/recursiveiteratoriterator_beginiteration_basic.phpt b/ext/spl/tests/recursiveiteratoriterator_beginiteration_basic.phpt
index c9476e0e56..0eea8b28fa 100644
--- a/ext/spl/tests/recursiveiteratoriterator_beginiteration_basic.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_beginiteration_basic.phpt
@@ -29,4 +29,3 @@ int(1)
int(2)
::beginIteration() was invoked
int(2)
-
diff --git a/ext/spl/tests/recursiveiteratoriterator_enditeration_basic.phpt b/ext/spl/tests/recursiveiteratoriterator_enditeration_basic.phpt
index 0355401f27..b7c3cf6702 100644
--- a/ext/spl/tests/recursiveiteratoriterator_enditeration_basic.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_enditeration_basic.phpt
@@ -29,4 +29,3 @@ int(2)
int(1)
int(2)
::endIteration() was invoked
-
diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_basic.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_basic.phpt
index 5d1c958d92..7cbfa165fb 100644
--- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_basic.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_basic.phpt
@@ -17,4 +17,3 @@ var_dump($iterator->getSubIterator() === $not_sub_iterator);
--EXPECT--
bool(true)
bool(false)
-
diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_error.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_error.phpt
index 760082f6bd..068ace9d8c 100644
--- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_error.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_error.phpt
@@ -12,4 +12,3 @@ $iterator->getSubIterator(0, 0);
?>
--EXPECTF--
Warning: RecursiveIteratorIterator::getSubIterator() expects at most 1 parameter, 2 given in %s on line 5
-
diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
index 83d2caa2a8..dc1551113a 100644
--- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
@@ -39,4 +39,3 @@ array(2) {
[1]=>
int(4)
}
-
diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_002.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_002.phpt
index aac4e65bb8..a898a03f80 100644
--- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_002.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_002.phpt
@@ -17,4 +17,3 @@ var_dump(is_null($iterator->getSubIterator()));
--EXPECT--
bool(false)
bool(false)
-
diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_003.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_003.phpt
index ff18840391..7a4dbc2e33 100644
--- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_003.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_003.phpt
@@ -39,4 +39,3 @@ array(2) {
int(4)
}
NULL
-
diff --git a/ext/spl/tests/recursiveiteratoriterator_nextelement_basic.phpt b/ext/spl/tests/recursiveiteratoriterator_nextelement_basic.phpt
index 0bf4f198f3..b5508f73e4 100644
--- a/ext/spl/tests/recursiveiteratoriterator_nextelement_basic.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_nextelement_basic.phpt
@@ -36,4 +36,3 @@ int(2)
int(3)
::nextElement() was invoked
int(4)
-
diff --git a/ext/spl/tests/regexiterator_getpregflags.phpt b/ext/spl/tests/regexiterator_getpregflags.phpt
index 9c4d8eaecb..6dd7c068c7 100644
--- a/ext/spl/tests/regexiterator_getpregflags.phpt
+++ b/ext/spl/tests/regexiterator_getpregflags.phpt
@@ -30,4 +30,4 @@ echo is_long($r->getPregFlags());
?>
--EXPECT--
-1 \ No newline at end of file
+1
diff --git a/ext/spl/tests/regexiterator_setflags_exception.phpt b/ext/spl/tests/regexiterator_setflags_exception.phpt
index 44108c746d..7cf771db6f 100644
--- a/ext/spl/tests/regexiterator_setflags_exception.phpt
+++ b/ext/spl/tests/regexiterator_setflags_exception.phpt
@@ -32,4 +32,4 @@ try{
?>
--EXPECTF--
-Warning: RegexIterator::setFlags() expects exactly 1 parameter, 0 given in %s \ No newline at end of file
+Warning: RegexIterator::setFlags() expects exactly 1 parameter, 0 given in %s
diff --git a/ext/spl/tests/regexiterator_setpregflags.phpt b/ext/spl/tests/regexiterator_setpregflags.phpt
index ffccdca7fd..7db7a63973 100644
--- a/ext/spl/tests/regexiterator_setpregflags.phpt
+++ b/ext/spl/tests/regexiterator_setpregflags.phpt
@@ -31,4 +31,4 @@ echo $r->getPregFlags();
?>
--EXPECT--
-256 \ No newline at end of file
+256
diff --git a/ext/spl/tests/regexiterator_setpregflags_exception.phpt b/ext/spl/tests/regexiterator_setpregflags_exception.phpt
index c84af67d2b..5750e72af1 100644
--- a/ext/spl/tests/regexiterator_setpregflags_exception.phpt
+++ b/ext/spl/tests/regexiterator_setpregflags_exception.phpt
@@ -33,4 +33,4 @@ try{
?>
--EXPECTF--
-Warning: RegexIterator::setPregFlags() expects exactly 1 parameter, 0 given in %s \ No newline at end of file
+Warning: RegexIterator::setPregFlags() expects exactly 1 parameter, 0 given in %s
diff --git a/ext/spl/tests/spl_autoload_013.phpt b/ext/spl/tests/spl_autoload_013.phpt
index 44d4d857f2..c956ccd92f 100644
--- a/ext/spl/tests/spl_autoload_013.phpt
+++ b/ext/spl/tests/spl_autoload_013.phpt
@@ -48,4 +48,4 @@ array(3) {
string(2) "d2"
}
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/spl/tests/spl_autoload_014.phpt b/ext/spl/tests/spl_autoload_014.phpt
index a68fcb7e60..782fe8d07e 100644
--- a/ext/spl/tests/spl_autoload_014.phpt
+++ b/ext/spl/tests/spl_autoload_014.phpt
@@ -44,4 +44,4 @@ closure called with class TestX
Autoloader('d1') called with TestX
WorkingAutoloader() called with TestX
WorkingAutoloader() called with TestY
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/spl/tests/spl_autoload_bug48541.phpt b/ext/spl/tests/spl_autoload_bug48541.phpt
index 9937a7f42c..4936270d3b 100644
--- a/ext/spl/tests/spl_autoload_bug48541.phpt
+++ b/ext/spl/tests/spl_autoload_bug48541.phpt
@@ -36,4 +36,4 @@ a called
a2 called
b called
foo
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/spl/tests/spl_classes.phpt b/ext/spl/tests/spl_classes.phpt
index 9d897c497d..a47c86eff8 100644
--- a/ext/spl/tests/spl_classes.phpt
+++ b/ext/spl/tests/spl_classes.phpt
@@ -10,4 +10,3 @@ var_dump(is_array(spl_classes()));
?>
--EXPECT--
bool(true)
-
diff --git a/ext/spl/tests/spl_heap_isempty.phpt b/ext/spl/tests/spl_heap_isempty.phpt
index 2729c7fa87..fb016f4737 100644
--- a/ext/spl/tests/spl_heap_isempty.phpt
+++ b/ext/spl/tests/spl_heap_isempty.phpt
@@ -18,4 +18,4 @@ TestFest London May 2009
--EXPECT--
Checking a new heap is empty: bool(true)
Checking after insert: bool(false)
-Checking after extract: bool(true) \ No newline at end of file
+Checking after extract: bool(true)
diff --git a/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt b/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt
index 823c809f82..126d394f29 100644
--- a/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt
+++ b/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt
@@ -10,6 +10,4 @@ TestFest London May 2009
$h->recoverFromCorruption("no args");
?>
--EXPECTF--
-
Warning: SplHeap::recoverFromCorruption() expects exactly 0 parameters, 1 given in %s on line %d
-
diff --git a/ext/spl/tests/spl_iterator_caching_count_basic.phpt b/ext/spl/tests/spl_iterator_caching_count_basic.phpt
index b11eb7b540..4d9c90f86b 100644
--- a/ext/spl/tests/spl_iterator_caching_count_basic.phpt
+++ b/ext/spl/tests/spl_iterator_caching_count_basic.phpt
@@ -18,4 +18,4 @@ foreach ($i as $value) {
3
4
5
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/spl/tests/spl_iterator_caching_count_error.phpt b/ext/spl/tests/spl_iterator_caching_count_error.phpt
index 70aa2be30b..68d92dcf38 100644
--- a/ext/spl/tests/spl_iterator_caching_count_error.phpt
+++ b/ext/spl/tests/spl_iterator_caching_count_error.phpt
@@ -18,4 +18,4 @@ try {
===DONE===
--EXPECT--
Exception raised
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/spl/tests/spl_iterator_caching_getcache_error.phpt b/ext/spl/tests/spl_iterator_caching_getcache_error.phpt
index 2ea4bd819b..9db726df43 100644
--- a/ext/spl/tests/spl_iterator_caching_getcache_error.phpt
+++ b/ext/spl/tests/spl_iterator_caching_getcache_error.phpt
@@ -18,4 +18,4 @@ try {
===DONE===
--EXPECT--
Exception raised
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/spl/tests/spl_minheap_compare_error.phpt b/ext/spl/tests/spl_minheap_compare_error.phpt
index 7120a6cd11..d7e5cbb5a1 100644
--- a/ext/spl/tests/spl_minheap_compare_error.phpt
+++ b/ext/spl/tests/spl_minheap_compare_error.phpt
@@ -28,4 +28,3 @@ Warning: SplMinHeap::compare() expects exactly 2 parameters, 0 given in %s
Warning: SplMinHeap::compare() expects exactly 2 parameters, 1 given in %s
Warning: SplMinHeap::compare() expects exactly 2 parameters, 3 given in %s
-
diff --git a/ext/spl/tests/spl_pq_top_basic.phpt b/ext/spl/tests/spl_pq_top_basic.phpt
index 14e0af51cb..b9a88fc8ef 100644
--- a/ext/spl/tests/spl_pq_top_basic.phpt
+++ b/ext/spl/tests/spl_pq_top_basic.phpt
@@ -45,4 +45,4 @@ Array
[priority] => 2
)
EXTR_DATA
-value: b \ No newline at end of file
+value: b
diff --git a/ext/spl/tests/spl_pq_top_error_args.phpt b/ext/spl/tests/spl_pq_top_error_args.phpt
index a0e5969034..8e26c6c7b8 100644
--- a/ext/spl/tests/spl_pq_top_error_args.phpt
+++ b/ext/spl/tests/spl_pq_top_error_args.phpt
@@ -9,4 +9,4 @@ $priorityQueue = new SplPriorityQueue();
$priorityQueue->top('var');
?>
--EXPECTF--
-Warning: SplPriorityQueue::top() expects exactly 0 parameters, 1 given in %s \ No newline at end of file
+Warning: SplPriorityQueue::top() expects exactly 0 parameters, 1 given in %s
diff --git a/ext/spl/tests/splpriorityqueue_extract.phpt b/ext/spl/tests/splpriorityqueue_extract.phpt
index eee7bb2f73..c3af4dd8f1 100644
--- a/ext/spl/tests/splpriorityqueue_extract.phpt
+++ b/ext/spl/tests/splpriorityqueue_extract.phpt
@@ -14,6 +14,4 @@ $sp->extract(1); // Should throw a warning as extract expects NO arguments
?>
--EXPECTF--
-
Warning: SplPriorityQueue::extract() expects exactly 0 parameters, 1 given in %s on line %d
-
diff --git a/ext/spl/tests/splpriorityqueue_setextractflags.phpt b/ext/spl/tests/splpriorityqueue_setextractflags.phpt
index 97d86f375e..0326dbb03c 100644
--- a/ext/spl/tests/splpriorityqueue_setextractflags.phpt
+++ b/ext/spl/tests/splpriorityqueue_setextractflags.phpt
@@ -12,6 +12,4 @@ $sp->setExtractFlags(1,1); // Should throw a warning as setExtractFlags expects
?>
--EXPECTF--
-
Warning: SplPriorityQueue::setExtractFlags() expects exactly 1 parameter, 2 given in %s on line %d
-
diff --git a/ext/sqlite3/tests/bug53463.phpt b/ext/sqlite3/tests/bug53463.phpt
index 3d907811c1..70715cf935 100644
--- a/ext/sqlite3/tests/bug53463.phpt
+++ b/ext/sqlite3/tests/bug53463.phpt
@@ -27,4 +27,4 @@ echo "Done\n";
--EXPECT--
string(8) "whatever"
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/sqlite3/tests/bug68760.phpt b/ext/sqlite3/tests/bug68760.phpt
index 901926ebd7..7eb97ee013 100644
--- a/ext/sqlite3/tests/bug68760.phpt
+++ b/ext/sqlite3/tests/bug68760.phpt
@@ -32,4 +32,3 @@ catch(\Exception $e) {
--EXPECT--
callback
Exception: oops
-
diff --git a/ext/sqlite3/tests/sqlite3_31_changes.phpt b/ext/sqlite3/tests/sqlite3_31_changes.phpt
index 1c16497bce..4a63d1108b 100644
--- a/ext/sqlite3/tests/sqlite3_31_changes.phpt
+++ b/ext/sqlite3/tests/sqlite3_31_changes.phpt
@@ -17,4 +17,3 @@ object(SQLite3)#1 (0) {
}
int(0)
Done
-
diff --git a/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt b/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt
index 5138b87663..8b1c3dca08 100644
--- a/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt
+++ b/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt
@@ -15,4 +15,3 @@ echo "Done\n";
Warning: SQLite3::loadExtension() expects parameter 1 to be string, array given in %s on line %d
NULL
Done
-
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
index 74e571160e..4af2097a7d 100644
--- a/ext/standard/tests/array/each.phpt
+++ b/ext/standard/tests/array/each.phpt
Binary files differ
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
index 7b806f3977..04b36f3695 100644
--- a/ext/standard/tests/array/natcasesort_variation9.phpt
+++ b/ext/standard/tests/array/natcasesort_variation9.phpt
Binary files differ
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
index f856d1665a..3c3abea05a 100644
--- a/ext/standard/tests/file/copy_variation4.phpt
+++ b/ext/standard/tests/file/copy_variation4.phpt
Binary files differ
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
index 20a2861bca..4aef0644f9 100644
--- a/ext/standard/tests/file/file_put_contents_variation8.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation8.phpt
Binary files differ
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
index d887aba236..cb50d5174b 100644
--- a/ext/standard/tests/serialize/serialization_objects_001.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_001.phpt
Binary files differ
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έ\œΘέ]ΪYHH˜\Ω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
index 2d67ed06e1..628c87cbce 100644
--- a/ext/standard/tests/strings/chop_variation4.phpt
+++ b/ext/standard/tests/strings/chop_variation4.phpt
Binary files differ
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) "&lt;"
}
-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) "&lt;"
}
-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: &#x25A0; => fe
NO-BREAK SPACE: &#xA0; => ff
&#xFF; => &#xFF;
-
-
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: &#xFE; => fe
LATIN SMALL LETTER Y WITH DIAERESIS: &#xFF; => ff
&#xFF; => 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: &#x45E; => 2623783435453b
CYRILLIC SMALL LETTER DZHE: &#x45F; => 2623783435463b
&#xFF; => &#xFF;
-
-
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: &#x427; => fe
CYRILLIC CAPITAL LETTER HARD SIGN: &#x42A; => ff
&#xFF; => &#xFF;
-
-
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: &#x2DB; => fe
CARON: &#x2C7; => ff
&#xFF; => 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: &#x44E; => fe
CYRILLIC SMALL LETTER YA: &#x44F; => ff
&#xFF; => &#xFF;
-
-
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: &#x17E; => 9e
LATIN CAPITAL LETTER Y WITH DIAERESIS: &#x178; => 9f
&#x9F; => &#x9F;
-
-
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) "&bdquo;&lsquo;"
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) {
&nsupseteqq; U+02AC6 U+00338
&vsubnE; U+02ACB U+0FE00
&varsupsetneqq; U+02ACC U+0FE00
-&parsl;οΈ€ U+02AFD U+0FE00 \ No newline at end of file
+&parsl;οΈ€ 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) "&lt;br&gt;"
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 &lt; 400"
Try with double decode TRUE
Test 28: &amp;quot;&amp;amp;xyz&amp;gt;abc&amp;quot;
Test 29: &amp;quot;&amp;amp;123&amp;lt;456&amp;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 &#039;single quoted&#039; /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
index 8e91776781..3e996eccd3 100644
--- a/ext/standard/tests/strings/md5_file.phpt
+++ b/ext/standard/tests/strings/md5_file.phpt
Binary files differ
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
index 308bb7ebcc..d908d40632 100644
--- a/ext/standard/tests/strings/sprintf_variation15.phpt
+++ b/ext/standard/tests/strings/sprintf_variation15.phpt
Binary files differ
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
index 0280a6a0e8..e12da7f75f 100644
--- a/ext/standard/tests/strings/sprintf_variation22.phpt
+++ b/ext/standard/tests/strings/sprintf_variation22.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/sprintf_variation24.phpt b/ext/standard/tests/strings/sprintf_variation24.phpt
index b4e8f51e91..e3324ce417 100644
--- a/ext/standard/tests/strings/sprintf_variation24.phpt
+++ b/ext/standard/tests/strings/sprintf_variation24.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/sprintf_variation25.phpt b/ext/standard/tests/strings/sprintf_variation25.phpt
index 1e81c7137a..195ec29ea1 100644
--- a/ext/standard/tests/strings/sprintf_variation25.phpt
+++ b/ext/standard/tests/strings/sprintf_variation25.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/sprintf_variation26.phpt b/ext/standard/tests/strings/sprintf_variation26.phpt
index 0b1170142b..b6e52fe948 100644
--- a/ext/standard/tests/strings/sprintf_variation26.phpt
+++ b/ext/standard/tests/strings/sprintf_variation26.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt
index b660334741..0dc39db05d 100644
--- a/ext/standard/tests/strings/sprintf_variation27.phpt
+++ b/ext/standard/tests/strings/sprintf_variation27.phpt
Binary files differ
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
index 5cf7f7c014..cbb2e0e5ed 100644
--- a/ext/standard/tests/strings/str_replace_variation2.phpt
+++ b/ext/standard/tests/strings/str_replace_variation2.phpt
Binary files differ
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
index 3286765b3a..3e0fb6f2ab 100644
--- a/ext/standard/tests/strings/stripslashes_basic.phpt
+++ b/ext/standard/tests/strings/stripslashes_basic.phpt
Binary files differ
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
index 6b46273836..5043128945 100644
--- a/ext/standard/tests/strings/strrchr_variation1.phpt
+++ b/ext/standard/tests/strings/strrchr_variation1.phpt
Binary files differ
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
index 7ec5b830ba..730811ea47 100644
--- a/ext/standard/tests/strings/strrchr_variation12.phpt
+++ b/ext/standard/tests/strings/strrchr_variation12.phpt
Binary files differ
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
index eccf5dff34..229fc1fbb6 100644
--- a/ext/standard/tests/strings/strspn_variation5.phpt
+++ b/ext/standard/tests/strings/strspn_variation5.phpt
Binary files differ
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
index 3cff71936e..2908de7a27 100644
--- a/ext/standard/tests/strings/strstr.phpt
+++ b/ext/standard/tests/strings/strstr.phpt
Binary files differ
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
index 2096b61f22..d0e4070d80 100644
--- a/ext/standard/tests/strings/trim1.phpt
+++ b/ext/standard/tests/strings/trim1.phpt
Binary files differ
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
index d81d6c6a87..205be0ac45 100644
--- a/ext/standard/tests/strings/vsprintf_variation10.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation10.phpt
Binary files differ
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
index 8f5b8862c2..57ac54fda9 100644
--- a/ext/standard/tests/strings/vsprintf_variation7.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation7.phpt
Binary files differ
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
index f1ed093218..fc9b16dbee 100644
--- a/ext/standard/tests/strings/vsprintf_variation9.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation9.phpt
Binary files differ
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
diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt
index 9a2fc895f6..0a3d3422e8 100644
--- a/ext/sysvshm/tests/005.phpt
+++ b/ext/sysvshm/tests/005.phpt
@@ -41,7 +41,6 @@ shm_remove($s);
echo "Done\n";
?>
--EXPECTF--
-
Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s005.php on line %d
NULL
diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt
index d5418f3f26..b38aee02a1 100644
--- a/ext/sysvshm/tests/006.phpt
+++ b/ext/sysvshm/tests/006.phpt
@@ -29,7 +29,6 @@ shm_remove($s);
echo "Done\n";
?>
--EXPECTF--
-
Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s006.php on line %d
NULL
diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt
index 86ac09d6c2..a165a8bfbf 100644
--- a/ext/sysvshm/tests/007.phpt
+++ b/ext/sysvshm/tests/007.phpt
@@ -24,7 +24,6 @@ var_dump(shm_remove($s));
echo "Done\n";
?>
--EXPECTF--
-
Warning: shm_remove() expects exactly 1 parameter, 0 given in %s007.php on line %d
NULL
@@ -41,4 +40,3 @@ bool(true)
Warning: shm_remove(): supplied resource is not a valid sysvshm resource in %s007.php on line %d
bool(false)
Done
-
diff --git a/ext/sysvshm/tests/shutdown_crash_0.phpt b/ext/sysvshm/tests/shutdown_crash_0.phpt
index 8509316fa1..0f2a02dfb5 100644
--- a/ext/sysvshm/tests/shutdown_crash_0.phpt
+++ b/ext/sysvshm/tests/shutdown_crash_0.phpt
@@ -15,8 +15,6 @@ var_dump($s = shm_attach($key, 1024));
shm_remove($s);
var_dump($s = shm_attach($key, 1024));
shm_remove($s);
-
--EXPECTF--
resource(%d) of type (sysvshm)
resource(%d) of type (sysvshm)
-
diff --git a/ext/tidy/tests/002.phpt b/ext/tidy/tests/002.phpt
index cd06733a2c..c6092c7b94 100644
--- a/ext/tidy/tests/002.phpt
+++ b/ext/tidy/tests/002.phpt
@@ -15,4 +15,4 @@ tidy_parse_string()
</head>
<body>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/tidy/tests/005-mb.phpt b/ext/tidy/tests/005-mb.phpt
index 1e5f021463..d19104ab29 100644
--- a/ext/tidy/tests/005-mb.phpt
+++ b/ext/tidy/tests/005-mb.phpt
@@ -15,4 +15,4 @@ tidy_parse_file()
</head>
<body>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/tidy/tests/005.phpt b/ext/tidy/tests/005.phpt
index 144a5862d4..ea4aab3125 100644
--- a/ext/tidy/tests/005.phpt
+++ b/ext/tidy/tests/005.phpt
@@ -15,4 +15,4 @@ tidy_parse_file()
</head>
<body>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/tidy/tests/006.phpt b/ext/tidy/tests/006.phpt
index 3c00fb452e..a36006f346 100644
--- a/ext/tidy/tests/006.phpt
+++ b/ext/tidy/tests/006.phpt
@@ -13,4 +13,4 @@ line 1 column 1 - Warning: missing <!DOCTYPE> declaration
line 1 column 7 - Error: <asd> is not recognized!
line 1 column 7 - Warning: discarding unexpected <asd>
line 1 column 17 - Warning: discarding unexpected </html>
-line 1 column 7 - Warning: inserting missing 'title' element \ No newline at end of file
+line 1 column 7 - Warning: inserting missing 'title' element
diff --git a/ext/tidy/tests/008.phpt b/ext/tidy/tests/008.phpt
index 7c1c945ba0..303a2f9d8a 100644
--- a/ext/tidy/tests/008.phpt
+++ b/ext/tidy/tests/008.phpt
@@ -12,4 +12,4 @@ line 1 column 1 - Warning: missing <!DOCTYPE> declaration
line 1 column 7 - Error: <asd> is not recognized!
line 1 column 7 - Warning: discarding unexpected <asd>
line 1 column 17 - Warning: discarding unexpected </html>
-line 1 column 7 - Warning: inserting missing 'title' element \ No newline at end of file
+line 1 column 7 - Warning: inserting missing 'title' element
diff --git a/ext/tidy/tests/009.phpt b/ext/tidy/tests/009.phpt
index d04a684e8e..c2bbfb9760 100644
--- a/ext/tidy/tests/009.phpt
+++ b/ext/tidy/tests/009.phpt
@@ -16,4 +16,4 @@ tidy_doc object overloading
</head>
<body>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/tidy/tests/011.phpt b/ext/tidy/tests/011.phpt
index f664c50a3e..56cb0aa893 100644
--- a/ext/tidy/tests/011.phpt
+++ b/ext/tidy/tests/011.phpt
@@ -19,4 +19,4 @@ array(2) {
string(7) "#000000"
}
Attrib 'bgcolor': #FFFFFF
-Attrib 'alink': #000000 \ No newline at end of file
+Attrib 'alink': #000000
diff --git a/ext/tidy/tests/014.phpt b/ext/tidy/tests/014.phpt
index a2389f0b7e..fd0d55b1fb 100644
--- a/ext/tidy/tests/014.phpt
+++ b/ext/tidy/tests/014.phpt
@@ -11,4 +11,4 @@ Passing configuration options through tidy_parse_string().
?>
--EXPECT--
-<b>testing</b> \ No newline at end of file
+<b>testing</b>
diff --git a/ext/tidy/tests/015.phpt b/ext/tidy/tests/015.phpt
index ae2e9d3b02..5b8255c52b 100644
--- a/ext/tidy/tests/015.phpt
+++ b/ext/tidy/tests/015.phpt
@@ -10,4 +10,4 @@ Passing configuration options through tidy_parse_file().
?>
--EXPECT--
-<b>testing</b> \ No newline at end of file
+<b>testing</b>
diff --git a/ext/tidy/tests/017.phpt b/ext/tidy/tests/017.phpt
index 24597e1a4a..d27a42fe84 100644
--- a/ext/tidy/tests/017.phpt
+++ b/ext/tidy/tests/017.phpt
@@ -14,4 +14,4 @@ The Tidy Output Buffer Filter
<body>
<b>testing</b>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/tidy/tests/tidy_error.phpt b/ext/tidy/tests/tidy_error.phpt
index 5416da8669..f8aae96ef6 100644
--- a/ext/tidy/tests/tidy_error.phpt
+++ b/ext/tidy/tests/tidy_error.phpt
@@ -38,4 +38,3 @@ echo tidy_get_status($tidy);
?>
--EXPECT--
012
-
diff --git a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
index 3d2a37e64f..3a08ae5df7 100644
--- a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
+++ b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
@@ -85,4 +85,4 @@ L12: T_STRING CONTINUE
L12: T_LNUMBER 1
;
}
-Done \ No newline at end of file
+Done
diff --git a/ext/tokenizer/tests/token_get_all_basic.phpt b/ext/tokenizer/tests/token_get_all_basic.phpt
index 2e3b1b4672..7d3b4ff4e7 100644
--- a/ext/tokenizer/tests/token_get_all_basic.phpt
+++ b/ext/tokenizer/tests/token_get_all_basic.phpt
@@ -96,4 +96,4 @@ array(1) {
int(1)
}
}
-Done \ No newline at end of file
+Done
diff --git a/ext/tokenizer/tests/token_get_all_error.phpt b/ext/tokenizer/tests/token_get_all_error.phpt
index 35b5048b6b..495d539b94 100644
--- a/ext/tokenizer/tests/token_get_all_error.phpt
+++ b/ext/tokenizer/tests/token_get_all_error.phpt
@@ -34,4 +34,4 @@ NULL
Warning: token_get_all() expects at most 2 parameters, 3 given in %s on line 17
NULL
-Done \ No newline at end of file
+Done
diff --git a/ext/wddx/tests/bug45901.phpt b/ext/wddx/tests/bug45901.phpt
index e76e47eab7..6713856055 100644
--- a/ext/wddx/tests/bug45901.phpt
+++ b/ext/wddx/tests/bug45901.phpt
@@ -14,7 +14,6 @@ echo wddx_serialize_value($xml, 'Variables') . "\n";
echo "DONE";
?>
--EXPECTF--
-
Warning: wddx_serialize_value(): Class SimpleXMLElement can not be serialized in %sbug45901.php on line %d
<wddxPacket version='1.0'><header><comment>Variables</comment></header><data></data></wddxPacket>
-DONE \ No newline at end of file
+DONE
diff --git a/ext/wddx/tests/bug70661.phpt b/ext/wddx/tests/bug70661.phpt
index 402f81f276..b7fcb1b3b8 100644
--- a/ext/wddx/tests/bug70661.phpt
+++ b/ext/wddx/tests/bug70661.phpt
@@ -66,4 +66,4 @@ array(1) {
}
}
}
-DONE \ No newline at end of file
+DONE
diff --git a/ext/wddx/tests/bug70741.phpt b/ext/wddx/tests/bug70741.phpt
index ac890f9b95..061fa65ef8 100644
--- a/ext/wddx/tests/bug70741.phpt
+++ b/ext/wddx/tests/bug70741.phpt
@@ -22,6 +22,5 @@ session_decode($wddx);
?>
DONE
--EXPECTF--
-
Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d
-DONE \ No newline at end of file
+DONE
diff --git a/ext/wddx/tests/bug72750.phpt b/ext/wddx/tests/bug72750.phpt
index ae77ff75dc..b88a1e0a9e 100644
--- a/ext/wddx/tests/bug72750.phpt
+++ b/ext/wddx/tests/bug72750.phpt
@@ -31,4 +31,4 @@ var_dump($array);
array(1) {
["aBinary"]=>
string(9) "΅‰₯Ή…ΙFF"
-} \ No newline at end of file
+}
diff --git a/ext/wddx/tests/bug72790.phpt b/ext/wddx/tests/bug72790.phpt
index 3b08e58cc6..0898786824 100644
--- a/ext/wddx/tests/bug72790.phpt
+++ b/ext/wddx/tests/bug72790.phpt
@@ -32,4 +32,4 @@ $array = wddx_deserialize($xml);
var_dump($array);
?>
--EXPECT--
-NULL \ No newline at end of file
+NULL
diff --git a/ext/wddx/tests/bug72799.phpt b/ext/wddx/tests/bug72799.phpt
index 5861d5538f..c117279c2c 100644
--- a/ext/wddx/tests/bug72799.phpt
+++ b/ext/wddx/tests/bug72799.phpt
@@ -25,4 +25,4 @@ $array = wddx_deserialize($xml);
var_dump($array);
?>
--EXPECT--
-NULL \ No newline at end of file
+NULL
diff --git a/ext/wddx/tests/bug72860.phpt b/ext/wddx/tests/bug72860.phpt
index 6385457e8e..a35f993b07 100644
--- a/ext/wddx/tests/bug72860.phpt
+++ b/ext/wddx/tests/bug72860.phpt
@@ -24,4 +24,4 @@ var_dump(wddx_deserialize($xml));
DONE
--EXPECT--
NULL
-DONE \ No newline at end of file
+DONE
diff --git a/ext/wddx/tests/bug73065.phpt b/ext/wddx/tests/bug73065.phpt
index 056d95ca54..d7c7868946 100644
--- a/ext/wddx/tests/bug73065.phpt
+++ b/ext/wddx/tests/bug73065.phpt
@@ -95,4 +95,4 @@ array(1) {
}
array(0) {
}
-DONE \ No newline at end of file
+DONE
diff --git a/ext/wddx/tests/bug73331.phpt b/ext/wddx/tests/bug73331.phpt
index 7e4cda1ea1..13f3747d3e 100644
--- a/ext/wddx/tests/bug73331.phpt
+++ b/ext/wddx/tests/bug73331.phpt
@@ -9,7 +9,5 @@ $wddx = "<wddxPacket version='1.0'><header/><data><struct><var name='php_class_n
var_dump(wddx_deserialize($wddx));
?>
--EXPECTF--
-
Warning: wddx_deserialize(): Class pdorow can not be unserialized in %s73331.php on line %d
NULL
-
diff --git a/ext/wddx/tests/bug74145.phpt b/ext/wddx/tests/bug74145.phpt
index 16e49d4eb8..a7009035bf 100644
--- a/ext/wddx/tests/bug74145.phpt
+++ b/ext/wddx/tests/bug74145.phpt
@@ -13,4 +13,4 @@ var_dump($wddx);
DONE
--EXPECT--
NULL
-DONE \ No newline at end of file
+DONE
diff --git a/ext/xml/tests/bug72099.phpt b/ext/xml/tests/bug72099.phpt
index 50173a6a4c..b32de02b24 100644
--- a/ext/xml/tests/bug72099.phpt
+++ b/ext/xml/tests/bug72099.phpt
@@ -14,4 +14,4 @@ xml_parse_into_struct($var1, $var2, $var3, $var4);
var_dump($var3);
--EXPECT--
array(0) {
-} \ No newline at end of file
+}
diff --git a/ext/xml/tests/xml_error_string_error.phpt b/ext/xml/tests/xml_error_string_error.phpt
index 369e3cfb7c..e7cc6dea19 100644
--- a/ext/xml/tests/xml_error_string_error.phpt
+++ b/ext/xml/tests/xml_error_string_error.phpt
@@ -41,4 +41,3 @@ NULL
Warning: xml_error_string() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_error_string_variation1.phpt b/ext/xml/tests/xml_error_string_variation1.phpt
index b06bfac8b3..7143e871ad 100644
--- a/ext/xml/tests/xml_error_string_variation1.phpt
+++ b/ext/xml/tests/xml_error_string_variation1.phpt
@@ -175,5 +175,3 @@ string(8) "No error"
Arg value
string(8) "No error"
Done
-
-
diff --git a/ext/xml/tests/xml_get_current_byte_index_error.phpt b/ext/xml/tests/xml_get_current_byte_index_error.phpt
index 3e837ef8b5..14a7456e3b 100644
--- a/ext/xml/tests/xml_get_current_byte_index_error.phpt
+++ b/ext/xml/tests/xml_get_current_byte_index_error.phpt
@@ -41,4 +41,3 @@ NULL
Warning: xml_get_current_byte_index() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
index 720b233db8..87740185d9 100644
--- a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
@@ -237,4 +237,3 @@ Arg value
Warning: xml_get_current_byte_index() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_get_current_column_number_error.phpt b/ext/xml/tests/xml_get_current_column_number_error.phpt
index 547b0248a7..9e915dd233 100644
--- a/ext/xml/tests/xml_get_current_column_number_error.phpt
+++ b/ext/xml/tests/xml_get_current_column_number_error.phpt
@@ -41,4 +41,3 @@ NULL
Warning: xml_get_current_column_number() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_get_current_column_number_variation1.phpt b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
index 3825bc39dc..2fde617f60 100644
--- a/ext/xml/tests/xml_get_current_column_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
@@ -238,4 +238,3 @@ Arg value
Warning: xml_get_current_column_number() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_get_current_line_number_error.phpt b/ext/xml/tests/xml_get_current_line_number_error.phpt
index db4fe9fdaf..c10ebeca90 100644
--- a/ext/xml/tests/xml_get_current_line_number_error.phpt
+++ b/ext/xml/tests/xml_get_current_line_number_error.phpt
@@ -41,4 +41,3 @@ NULL
Warning: xml_get_current_line_number() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_get_current_line_number_variation1.phpt b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
index 143b6e092b..6155c0696c 100644
--- a/ext/xml/tests/xml_get_current_line_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
@@ -237,4 +237,3 @@ Arg value
Warning: xml_get_current_line_number() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_get_error_code_error.phpt b/ext/xml/tests/xml_get_error_code_error.phpt
index 2e97ba92b6..86b037eaf7 100644
--- a/ext/xml/tests/xml_get_error_code_error.phpt
+++ b/ext/xml/tests/xml_get_error_code_error.phpt
@@ -41,4 +41,3 @@ NULL
Warning: xml_get_error_code() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_get_error_code_variation1.phpt b/ext/xml/tests/xml_get_error_code_variation1.phpt
index a8a4ad47e7..73feae24c2 100644
--- a/ext/xml/tests/xml_get_error_code_variation1.phpt
+++ b/ext/xml/tests/xml_get_error_code_variation1.phpt
@@ -237,4 +237,3 @@ Arg value
Warning: xml_get_error_code() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parse_error.phpt b/ext/xml/tests/xml_parse_error.phpt
index e5036ddbeb..68723bd6c3 100644
--- a/ext/xml/tests/xml_parse_error.phpt
+++ b/ext/xml/tests/xml_parse_error.phpt
@@ -45,4 +45,3 @@ NULL
Warning: xml_parse() expects at least 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parse_into_struct_error.phpt b/ext/xml/tests/xml_parse_into_struct_error.phpt
index 56d943d00f..9d448ca45d 100644
--- a/ext/xml/tests/xml_parse_into_struct_error.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_error.phpt
@@ -46,4 +46,3 @@ NULL
Warning: xml_parse_into_struct() expects at least 3 parameters, 2 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parse_into_struct_variation.phpt b/ext/xml/tests/xml_parse_into_struct_variation.phpt
index eadc3edc94..28c7acf9c3 100644
--- a/ext/xml/tests/xml_parse_into_struct_variation.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_variation.phpt
@@ -117,4 +117,4 @@ Array
)
)
-Done \ No newline at end of file
+Done
diff --git a/ext/xml/tests/xml_parse_into_struct_variation1.phpt b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
index 0cb22a5371..811f4c8a3c 100644
--- a/ext/xml/tests/xml_parse_into_struct_variation1.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
@@ -238,4 +238,3 @@ Arg value
Warning: xml_parse_into_struct() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parse_variation1.phpt b/ext/xml/tests/xml_parse_variation1.phpt
index 685a50eed1..d902fab34f 100644
--- a/ext/xml/tests/xml_parse_variation1.phpt
+++ b/ext/xml/tests/xml_parse_variation1.phpt
@@ -239,4 +239,3 @@ Arg value
Warning: xml_parse() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parser_create_ns_error.phpt b/ext/xml/tests/xml_parser_create_ns_error.phpt
index f1fd3f00fe..37d1a8f944 100644
--- a/ext/xml/tests/xml_parser_create_ns_error.phpt
+++ b/ext/xml/tests/xml_parser_create_ns_error.phpt
@@ -33,4 +33,4 @@ echo "Done";
Warning: xml_parser_create_ns() expects at most 2 parameters, 3 given in %s on line %d
bool(false)
-Done \ No newline at end of file
+Done
diff --git a/ext/xml/tests/xml_parser_create_variation1.phpt b/ext/xml/tests/xml_parser_create_variation1.phpt
index 2caefa0d82..347ff26514 100644
--- a/ext/xml/tests/xml_parser_create_variation1.phpt
+++ b/ext/xml/tests/xml_parser_create_variation1.phpt
@@ -242,4 +242,4 @@ resource(%d) of type (xml)
Arg value
resource(%d) of type (xml)
-Done \ No newline at end of file
+Done
diff --git a/ext/xml/tests/xml_parser_free_error.phpt b/ext/xml/tests/xml_parser_free_error.phpt
index f1a1846a3b..0502f1fecb 100644
--- a/ext/xml/tests/xml_parser_free_error.phpt
+++ b/ext/xml/tests/xml_parser_free_error.phpt
@@ -41,4 +41,3 @@ NULL
Warning: xml_parser_free() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parser_free_variation1.phpt b/ext/xml/tests/xml_parser_free_variation1.phpt
index be14effc8a..1e91e452eb 100644
--- a/ext/xml/tests/xml_parser_free_variation1.phpt
+++ b/ext/xml/tests/xml_parser_free_variation1.phpt
@@ -237,4 +237,3 @@ Arg value
Warning: xml_parser_free() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parser_get_option_error.phpt b/ext/xml/tests/xml_parser_get_option_error.phpt
index 2455dd5d32..10218fa8f9 100644
--- a/ext/xml/tests/xml_parser_get_option_error.phpt
+++ b/ext/xml/tests/xml_parser_get_option_error.phpt
@@ -43,4 +43,3 @@ NULL
Warning: xml_parser_get_option() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parser_get_option_variation1.phpt b/ext/xml/tests/xml_parser_get_option_variation1.phpt
index 853548f010..c45644b561 100644
--- a/ext/xml/tests/xml_parser_get_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation1.phpt
@@ -238,4 +238,3 @@ Arg value
Warning: xml_parser_get_option() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parser_get_option_variation2.phpt b/ext/xml/tests/xml_parser_get_option_variation2.phpt
index f3307c4b7f..eb965b7a8d 100644
--- a/ext/xml/tests/xml_parser_get_option_variation2.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation2.phpt
@@ -223,4 +223,3 @@ Arg value
Warning: xml_parser_get_option(): Unknown option in %s on line %d
bool(false)
Done
-
diff --git a/ext/xml/tests/xml_parser_set_option_error.phpt b/ext/xml/tests/xml_parser_set_option_error.phpt
index 6c68252c13..b99050dc19 100644
--- a/ext/xml/tests/xml_parser_set_option_error.phpt
+++ b/ext/xml/tests/xml_parser_set_option_error.phpt
@@ -46,4 +46,3 @@ NULL
Warning: xml_parser_set_option() expects exactly 3 parameters, 2 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parser_set_option_variation1.phpt b/ext/xml/tests/xml_parser_set_option_variation1.phpt
index c5159f6a53..23a24d58b9 100644
--- a/ext/xml/tests/xml_parser_set_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation1.phpt
@@ -238,4 +238,3 @@ Arg value
Warning: xml_parser_set_option() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_parser_set_option_variation2.phpt b/ext/xml/tests/xml_parser_set_option_variation2.phpt
index 043ab287df..b2c49806d1 100644
--- a/ext/xml/tests/xml_parser_set_option_variation2.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation2.phpt
@@ -213,4 +213,3 @@ Arg value
Warning: xml_parser_set_option(): Unknown option in %s on line %d
bool(false)
Done
-
diff --git a/ext/xml/tests/xml_set_character_data_handler_error.phpt b/ext/xml/tests/xml_set_character_data_handler_error.phpt
index a0597386ac..21fbbe0a12 100644
--- a/ext/xml/tests/xml_set_character_data_handler_error.phpt
+++ b/ext/xml/tests/xml_set_character_data_handler_error.phpt
@@ -44,4 +44,3 @@ NULL
Warning: xml_set_character_data_handler() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
index 6519f83cb6..3291853f0c 100644
--- a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
@@ -242,4 +242,3 @@ Arg value
Warning: xml_set_character_data_handler() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_default_handler_error.phpt b/ext/xml/tests/xml_set_default_handler_error.phpt
index 3adc40a6c7..6ebe364096 100644
--- a/ext/xml/tests/xml_set_default_handler_error.phpt
+++ b/ext/xml/tests/xml_set_default_handler_error.phpt
@@ -44,4 +44,3 @@ NULL
Warning: xml_set_default_handler() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_default_handler_variation1.phpt b/ext/xml/tests/xml_set_default_handler_variation1.phpt
index 83b73cc4c3..8ce13842a2 100644
--- a/ext/xml/tests/xml_set_default_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_default_handler_variation1.phpt
@@ -242,4 +242,3 @@ Arg value
Warning: xml_set_default_handler() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_element_handler_error.phpt b/ext/xml/tests/xml_set_element_handler_error.phpt
index 7661df8ea6..e759d0632f 100644
--- a/ext/xml/tests/xml_set_element_handler_error.phpt
+++ b/ext/xml/tests/xml_set_element_handler_error.phpt
@@ -44,4 +44,3 @@ NULL
Warning: xml_set_element_handler() expects exactly 3 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_element_handler_variation1.phpt b/ext/xml/tests/xml_set_element_handler_variation1.phpt
index e8797b4225..258b676d99 100644
--- a/ext/xml/tests/xml_set_element_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_element_handler_variation1.phpt
@@ -242,4 +242,3 @@ Arg value
Warning: xml_set_element_handler() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt
index 35f923d72c..9be5ce069a 100644
--- a/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt
@@ -44,4 +44,3 @@ NULL
Warning: xml_set_end_namespace_decl_handler() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
index fa1a411c4b..67b25356f6 100644
--- a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
@@ -242,4 +242,3 @@ Arg value
Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt
index 7ba32b9a1e..b18852dde2 100644
--- a/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt
+++ b/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt
@@ -44,4 +44,3 @@ NULL
Warning: xml_set_external_entity_ref_handler() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
index a724e316ba..1d628b9a0c 100644
--- a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
@@ -242,4 +242,3 @@ Arg value
Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_notation_decl_handler_error.phpt b/ext/xml/tests/xml_set_notation_decl_handler_error.phpt
index 60fc4383a7..c9d68d0b7c 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_error.phpt
@@ -44,4 +44,3 @@ NULL
Warning: xml_set_notation_decl_handler() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
index 8281105081..1c4bdf1ffb 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
@@ -242,4 +242,3 @@ Arg value
Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_object_error.phpt b/ext/xml/tests/xml_set_object_error.phpt
index 39a8511218..5a1fb4cb24 100644
--- a/ext/xml/tests/xml_set_object_error.phpt
+++ b/ext/xml/tests/xml_set_object_error.phpt
@@ -48,4 +48,3 @@ NULL
Warning: xml_set_object() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_object_variation1.phpt b/ext/xml/tests/xml_set_object_variation1.phpt
index bdea52cc8d..5d34d03b09 100644
--- a/ext/xml/tests/xml_set_object_variation1.phpt
+++ b/ext/xml/tests/xml_set_object_variation1.phpt
@@ -238,4 +238,3 @@ Arg value
Warning: xml_set_object() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_object_variation2.phpt b/ext/xml/tests/xml_set_object_variation2.phpt
index 83af35b93d..f2a064d217 100644
--- a/ext/xml/tests/xml_set_object_variation2.phpt
+++ b/ext/xml/tests/xml_set_object_variation2.phpt
@@ -227,4 +227,3 @@ Arg value
Warning: xml_set_object() expects parameter 2 to be object, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
index d38085d26c..cd5dda7763 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
@@ -49,4 +49,4 @@ echo "Done\n";
Simple test of xml_set_processing_instruction_handler() function
Target: xml-stylesheet
Data: href="default.xsl" type="text/xml"
-Done \ No newline at end of file
+Done
diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt
index 561bd35472..0016e00e93 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt
@@ -44,4 +44,3 @@ NULL
Warning: xml_set_processing_instruction_handler() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
index 8bc93c72e5..8b2ea91444 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
@@ -242,4 +242,3 @@ Arg value
Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt
index 08ea65f8bb..8ee12e77cd 100644
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt
@@ -58,4 +58,3 @@ Namespace_Start_Handler called
...Prefix: aw2
...Uri: file:/DTD/somewhere.dtd
Done
-
diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt
index e3cab09be2..5de0bbfc1a 100644
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt
@@ -44,4 +44,3 @@ NULL
Warning: xml_set_start_namespace_decl_handler() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
index 0600362cb8..472e8a3eaa 100644
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
@@ -242,4 +242,3 @@ Arg value
Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt
index c0aac2339e..b196ffb48a 100644
--- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt
@@ -44,4 +44,3 @@ NULL
Warning: xml_set_unparsed_entity_decl_handler() expects exactly 2 parameters, 1 given in %s on line %d
NULL
Done
-
diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
index ed58275dcc..6d94c656ec 100644
--- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
@@ -242,4 +242,3 @@ Arg value
Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, null given in %s on line %d
NULL
Done
-
diff --git a/ext/xmlreader/tests/002.phpt b/ext/xmlreader/tests/002.phpt
index 23c43373a0..6101d6cc48 100644
--- a/ext/xmlreader/tests/002.phpt
+++ b/ext/xmlreader/tests/002.phpt
@@ -33,7 +33,6 @@ unlink($filename);
?>
===DONE===
--EXPECTF--
-
Warning: XMLReader::open(): Empty string supplied as input in %s on line %d
books
books
diff --git a/ext/xmlreader/tests/expand.phpt b/ext/xmlreader/tests/expand.phpt
index 9b8b7258b7..3d9b0a53c3 100644
--- a/ext/xmlreader/tests/expand.phpt
+++ b/ext/xmlreader/tests/expand.phpt
@@ -34,4 +34,4 @@ $reader->close();
===DONE===
--EXPECT--
base book
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/xmlreader/tests/expand_error.phpt b/ext/xmlreader/tests/expand_error.phpt
index 4b2799336b..2813e836d9 100644
--- a/ext/xmlreader/tests/expand_error.phpt
+++ b/ext/xmlreader/tests/expand_error.phpt
@@ -26,4 +26,4 @@ Warning: XMLReader::expand(): Load Data before trying to expand in %s on line %d
bool(false)
Warning: XMLReader::expand(): An Error Occurred while expanding in %s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/xmlrpc/tests/003.phpt b/ext/xmlrpc/tests/003.phpt
index 3d6796dbab..1125ff2b9c 100644
--- a/ext/xmlrpc/tests/003.phpt
+++ b/ext/xmlrpc/tests/003.phpt
@@ -31,7 +31,6 @@ $params = array(
$response = xmlrpc_encode($params);
echo $response;
-
--EXPECT--
<?xml version="1.0" encoding="utf-8"?>
<params>
@@ -106,4 +105,4 @@ echo $response;
</struct>
</value>
</param>
-</params> \ No newline at end of file
+</params>
diff --git a/ext/xmlrpc/tests/004.phpt b/ext/xmlrpc/tests/004.phpt
index 04f3ef315e..fc29884752 100644
--- a/ext/xmlrpc/tests/004.phpt
+++ b/ext/xmlrpc/tests/004.phpt
@@ -7,7 +7,6 @@ xmlrpc_encode() Simple test encode int
$response = xmlrpc_encode(1);
echo $response;
-
--EXPECT--
<?xml version="1.0" encoding="utf-8"?>
<params>
@@ -16,4 +15,4 @@ echo $response;
<int>1</int>
</value>
</param>
-</params> \ No newline at end of file
+</params>
diff --git a/ext/xmlrpc/tests/005.phpt b/ext/xmlrpc/tests/005.phpt
index 613dfde249..a3ba6ddb15 100644
--- a/ext/xmlrpc/tests/005.phpt
+++ b/ext/xmlrpc/tests/005.phpt
@@ -1,13 +1,10 @@
--TEST--
xmlrpc_encode() Simple test encode type double and String
-
--CREDITS--
Michel Araujo <araujo_michel@yahoo.com.br>
#PHPSP 2013-08-22
-
--SKIPIF--
<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
-
--FILE--
<?php
@@ -19,7 +16,6 @@ echo $response;
$response = xmlrpc_encode('Is string');
echo $response;
-
--EXPECT--
<?xml version="1.0" encoding="utf-8"?>
<params>
@@ -44,4 +40,4 @@ echo $response;
<string>Is string</string>
</value>
</param>
-</params> \ No newline at end of file
+</params>
diff --git a/ext/xmlrpc/tests/006.phpt b/ext/xmlrpc/tests/006.phpt
index f33932d5a2..d8eaa971f7 100644
--- a/ext/xmlrpc/tests/006.phpt
+++ b/ext/xmlrpc/tests/006.phpt
@@ -1,13 +1,10 @@
--TEST--
xmlrpc_decode() Simple test decode type string
-
--CREDITS--
Michel Araujo <araujo_michel@yahoo.com.br>
#PHPSP 2013-08-22
-
--SKIPIF--
<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
-
--FILE--
<?php
@@ -24,6 +21,5 @@ XML;
$response = xmlrpc_decode($xml);
echo $response;
-
--EXPECT--
-Is string \ No newline at end of file
+Is string
diff --git a/ext/xmlrpc/tests/007.phpt b/ext/xmlrpc/tests/007.phpt
index 84c15a7d8a..3d65af77aa 100644
--- a/ext/xmlrpc/tests/007.phpt
+++ b/ext/xmlrpc/tests/007.phpt
@@ -1,13 +1,10 @@
--TEST--
xmlrpc_decode() Simple test decode type int
-
--CREDITS--
Michel Araujo <araujo_michel@yahoo.com.br>
#PHPSP 2013-08-22
-
--SKIPIF--
<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
-
--FILE--
<?php
@@ -24,6 +21,5 @@ XML;
$response = xmlrpc_decode($xml);
echo $response;
-
--EXPECT--
-1 \ No newline at end of file
+1
diff --git a/ext/xmlwriter/tests/bug48204.phpt b/ext/xmlwriter/tests/bug48204.phpt
index 1ce6b06fb6..cb05211df5 100644
--- a/ext/xmlwriter/tests/bug48204.phpt
+++ b/ext/xmlwriter/tests/bug48204.phpt
@@ -12,6 +12,5 @@ Koen Kuipers koenk82@gmail.com
Theo van der Zee
#Test Fest Utrecht 09-05-2009
--EXPECTF--
-
Warning: xmlwriter_open_uri(): Unable to resolve file path in %s on line %d
bool(false)
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
index 1e97b02f16..64d93a19c2 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
@@ -11,6 +11,5 @@ Koen Kuipers koenk82@gmail.com
Theo van der Zee
#Test Fest Utrecht 09-05-2009
--EXPECTF--
-
Warning: xmlwriter_open_uri(): Empty string as source in %s on line %d
bool(false)
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt
index c8410604cf..524a228de3 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt
@@ -11,6 +11,5 @@ Koen Kuipers koenk82@gmail.com
Theo van der Zee
#Test Fest Utrecht 09-05-2009
--EXPECTF--
-
Warning: xmlwriter_open_uri() expects exactly %d parameter, %d given in %s on line %d
NULL
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
index 7065eed54d..7dd5ee8082 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
@@ -11,6 +11,5 @@ Koen Kuipers koenk82@gmail.com
Theo van der Zee
#Test Fest Utrecht 09-05-2009
--EXPECTF--
-
Warning: xmlwriter_open_uri(): Unable to resolve file path in %s on line %d
bool(false)
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
index 8f5be51c5b..76de97011d 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
@@ -11,6 +11,5 @@ Koen Kuipers koenk82@gmail.com
Theo van der Zee
#Test Fest Utrecht 09-05-2009
--EXPECTF--
-
Warning: xmlwriter_open_uri(): Unable to resolve file path in %s on line %d
bool(false)
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt
index 0df6ce06d1..0df701b3c9 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt
@@ -11,6 +11,5 @@ Koen Kuipers koenk82@gmail.com
Theo van der Zee
#Test Fest Utrecht 09-05-2009
--EXPECTF--
-
Warning: xmlwriter_open_uri(): Unable to resolve file path in %s on line %d
bool(false)
diff --git a/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt
index c10ed7bf66..5bf4eb2e88 100644
--- a/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt
@@ -19,6 +19,5 @@ unlink($temp_filename);
--CREDITS--
Koen Kuipers koenk82@gmail.com
--EXPECTF--
-
Warning: xmlwriter_set_indent_string() expects exactly %d parameters, %d given in %s on line %d
NULL
diff --git a/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_basic_001.phpt b/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_basic_001.phpt
index f248049646..9715a267ab 100644
--- a/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_basic_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_basic_001.phpt
@@ -25,4 +25,3 @@ Koen Kuipers koenk82@gmail.com
<root prefix:id="elem1" xmlns:prefix="http://www.php.net/uri">
<elem1 attr1="first"/>
</root>
-
diff --git a/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt
index 7f1cd0c640..26fef24e7a 100644
--- a/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt
@@ -26,7 +26,6 @@ print xmlwriter_output_memory($xw);
--CREDITS--
Koen Kuipers koenk82@gmail.com
--EXPECTF--
-
Warning: xmlwriter_write_attribute_ns() expects exactly %d parameters, %d given in %s on line %d
<?xml version="1.0" encoding="UTF-8"?>
<root>
diff --git a/ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt
index 69a6a7f6cb..e71dd6f6d1 100644
--- a/ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt
@@ -10,6 +10,5 @@ var_dump(xmlwriter_write_dtd($xmlwriter));
--CREDITS--
Koen Kuipers koenk82@gmail.com
--EXPECTF--
-
Warning: xmlwriter_write_dtd() expects at least %d parameters, %d given in %s on line %d
NULL
diff --git a/ext/xsl/tests/bug26384.phpt b/ext/xsl/tests/bug26384.phpt
index e415ec9b5a..b6d2940ae6 100644
--- a/ext/xsl/tests/bug26384.phpt
+++ b/ext/xsl/tests/bug26384.phpt
@@ -27,7 +27,6 @@ print $proc->transformToXml($dom);
//this segfaulted before
print $dom->documentElement->firstChild->nextSibling->nodeName;
-
--EXPECT--
HERE
ROW
diff --git a/ext/xsl/tests/bug54446.phpt b/ext/xsl/tests/bug54446.phpt
index dc027fdebd..2335319009 100644
--- a/ext/xsl/tests/bug54446.phpt
+++ b/ext/xsl/tests/bug54446.phpt
@@ -69,8 +69,6 @@ if (file_exists($outputfile)) {
} else {
print "OK, no file created\n";
}
-
-
--EXPECTF--
Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %s element output in %s on line %d
@@ -92,4 +90,3 @@ Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/
OK, no file created
--CREDITS--
Christian Stocker, chregu@php.net
-
diff --git a/ext/xsl/tests/bug54446_with_ini.phpt b/ext/xsl/tests/bug54446_with_ini.phpt
index 4de826dce9..92a71cad09 100644
--- a/ext/xsl/tests/bug54446_with_ini.phpt
+++ b/ext/xsl/tests/bug54446_with_ini.phpt
@@ -92,4 +92,3 @@ Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/
OK, no file created
--CREDITS--
Christian Stocker, chregu@php.net
-
diff --git a/ext/xsl/tests/xslt001.phpt b/ext/xsl/tests/xslt001.phpt
index ec5538a648..70d4446928 100644
--- a/ext/xsl/tests/xslt001.phpt
+++ b/ext/xsl/tests/xslt001.phpt
@@ -10,8 +10,6 @@ $proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXml($dom);
print "\n";
-
-
--EXPECT--
Test 1: Transform To XML String
<?xml version="1.0" encoding="iso-8859-1"?>
diff --git a/ext/xsl/tests/xslt002.phpt b/ext/xsl/tests/xslt002.phpt
index 5ce2eb9d57..deb86aa215 100644
--- a/ext/xsl/tests/xslt002.phpt
+++ b/ext/xsl/tests/xslt002.phpt
@@ -18,8 +18,6 @@ $proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXml($dom);
print "\n";
-
-
--EXPECT--
Test 2: Transform To HTML String
<html><body>bar
diff --git a/ext/xsl/tests/xslt003.phpt b/ext/xsl/tests/xslt003.phpt
index 60a8427d16..992e5c7cf0 100644
--- a/ext/xsl/tests/xslt003.phpt
+++ b/ext/xsl/tests/xslt003.phpt
@@ -11,8 +11,6 @@ $proc->setParameter( "", "foo","hello world");
print "\n";
print $proc->transformToXml($dom);
print "\n";
-
-
--EXPECT--
Test 3: Using Parameters
<?xml version="1.0" encoding="iso-8859-1"?>
diff --git a/ext/xsl/tests/xslt004.phpt b/ext/xsl/tests/xslt004.phpt
index e5432323c4..e2076032a9 100644
--- a/ext/xsl/tests/xslt004.phpt
+++ b/ext/xsl/tests/xslt004.phpt
@@ -17,8 +17,6 @@ $proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXml($dom);
print "\n";
-
-
--EXPECT--
Test 4: Checking UTF8 Output
<?xml version="1.0" encoding="utf-8"?>
diff --git a/ext/xsl/tests/xslt005.phpt b/ext/xsl/tests/xslt005.phpt
index 5492bf812b..49027e1b16 100644
--- a/ext/xsl/tests/xslt005.phpt
+++ b/ext/xsl/tests/xslt005.phpt
@@ -17,8 +17,6 @@ $proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXml($dom);
print "\n";
-
-
--EXPECT--
Test 5: Checking Indent
<?xml version="1.0" encoding="iso-8859-1"?>
diff --git a/ext/xsl/tests/xslt006.phpt b/ext/xsl/tests/xslt006.phpt
index 2c0cfedb4e..60ca1812e3 100644
--- a/ext/xsl/tests/xslt006.phpt
+++ b/ext/xsl/tests/xslt006.phpt
@@ -11,8 +11,6 @@ print "\n";
$doc = $proc->transformToDoc($dom);
print $doc->saveXML();
print "\n";
-
-
--EXPECT--
Test 6: Transform To Doc
<?xml version="1.0" encoding="iso-8859-1"?>
diff --git a/ext/xsl/tests/xslt007.phpt b/ext/xsl/tests/xslt007.phpt
index 486560b85b..bb4d0ba657 100644
--- a/ext/xsl/tests/xslt007.phpt
+++ b/ext/xsl/tests/xslt007.phpt
@@ -12,8 +12,6 @@ $doc = $proc->transformToUri($dom, "file://".dirname(__FILE__)."/out.xml");
print file_get_contents(dirname(__FILE__)."/out.xml");
unlink(dirname(__FILE__)."/out.xml");
print "\n";
-
-
--EXPECT--
Test 7: Transform To Uri
<?xml version="1.0" encoding="iso-8859-1"?>
diff --git a/ext/xsl/tests/xslt008-mb.phpt b/ext/xsl/tests/xslt008-mb.phpt
index e13b576588..52940cecd3 100644
--- a/ext/xsl/tests/xslt008-mb.phpt
+++ b/ext/xsl/tests/xslt008-mb.phpt
@@ -19,8 +19,6 @@ chdir(dirname(__FILE__));
$proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXML($dom);
-
-
--EXPECT--
Test 8: Stream Wrapper Includes
<?xml version="1.0" encoding="iso-8859-1"?>
diff --git a/ext/xsl/tests/xslt008.phpt b/ext/xsl/tests/xslt008.phpt
index 438a566c8b..4c72bf81c3 100644
--- a/ext/xsl/tests/xslt008.phpt
+++ b/ext/xsl/tests/xslt008.phpt
@@ -19,8 +19,6 @@ chdir(dirname(__FILE__));
$proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXML($dom);
-
-
--EXPECT--
Test 8: Stream Wrapper Includes
<?xml version="1.0" encoding="iso-8859-1"?>
diff --git a/ext/xsl/tests/xslt009.phpt b/ext/xsl/tests/xslt009.phpt
index 9d1110ddeb..b4e8390985 100644
--- a/ext/xsl/tests/xslt009.phpt
+++ b/ext/xsl/tests/xslt009.phpt
@@ -20,8 +20,6 @@ if(!$xsl) {
$proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXML($dom);
-
-
--EXPECT--
Test 9: Stream Wrapper XPath-Document()
<?xml version="1.0" encoding="iso-8859-1"?>
diff --git a/ext/xsl/tests/xslt010.phpt b/ext/xsl/tests/xslt010.phpt
index a805e9fbaa..aeedabc513 100644
--- a/ext/xsl/tests/xslt010.phpt
+++ b/ext/xsl/tests/xslt010.phpt
@@ -204,4 +204,3 @@ Test 10: EXSLT Support
hour-in-day : NaN
minute-in-hour : NaN
second-in-minute : NaN
-
diff --git a/ext/xsl/tests/xslt010_gt10129.phpt b/ext/xsl/tests/xslt010_gt10129.phpt
index a04f289984..999ec807a3 100644
--- a/ext/xsl/tests/xslt010_gt10129.phpt
+++ b/ext/xsl/tests/xslt010_gt10129.phpt
@@ -203,4 +203,3 @@ Test 10: EXSLT Support
hour-in-day : NaN
minute-in-hour : NaN
second-in-minute : NaN
-
diff --git a/ext/xsl/tests/xslt011.phpt b/ext/xsl/tests/xslt011.phpt
index 2ca4e91fe9..92777b8a56 100644
--- a/ext/xsl/tests/xslt011.phpt
+++ b/ext/xsl/tests/xslt011.phpt
@@ -45,7 +45,6 @@ $dom = new domDocument();
return $id;
}
}
-
--EXPECTF--
Test 11: php:function Support
@@ -56,4 +55,3 @@ foobar -
this is from an external DomDocument
from the Input Document
static
-
diff --git a/ext/xsl/tests/xslt012.phpt b/ext/xsl/tests/xslt012.phpt
index 9fd3fbd1ef..6cb3f5ec71 100644
--- a/ext/xsl/tests/xslt012.phpt
+++ b/ext/xsl/tests/xslt012.phpt
@@ -39,8 +39,6 @@ $proc->setParameter( "", $parameters);
print "\n";
print $proc->transformToXml($dom);
print "\n";
-
-
--EXPECT--
Test 12: Using Associative Array of Parameters
<?xml version="1.0" encoding="iso-8859-1"?>
diff --git a/ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt b/ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt
index 74cd38951e..ef3cae6901 100644
--- a/ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt
+++ b/ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt
@@ -10,4 +10,4 @@ $proc = new XSLTProcessor();
var_dump($proc->hasExsltSupport());
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/xsl/tests/xsltprocessor_hasExsltSupport_wrongparam_001.phpt b/ext/xsl/tests/xsltprocessor_hasExsltSupport_wrongparam_001.phpt
index d7f82a18b4..bdbdd5da58 100644
--- a/ext/xsl/tests/xsltprocessor_hasExsltSupport_wrongparam_001.phpt
+++ b/ext/xsl/tests/xsltprocessor_hasExsltSupport_wrongparam_001.phpt
@@ -10,4 +10,4 @@ $proc = new XSLTProcessor();
var_dump($proc->hasExsltSupport('stringValue'));
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt
index af9d633d1d..f61b7abe89 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt
@@ -21,7 +21,6 @@ var_dump($proc->transformToXml($dom));
//var_dump($proc->registerPHPFunctions(array()));
//var_dump($proc->transformToXml($dom));
-
--EXPECT--
NULL
string(18) "This Is An Example"
diff --git a/ext/xsl/tests/xsltprocessor_transformToDoc.phpt b/ext/xsl/tests/xsltprocessor_transformToDoc.phpt
index ff4be47e3f..8670511f35 100644
--- a/ext/xsl/tests/xsltprocessor_transformToDoc.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToDoc.phpt
@@ -48,4 +48,4 @@ $proc->importStyleSheet($xsldoc);
var_dump($proc->transformToDoc($xmldoc)->firstChild->tagName);
?>
--EXPECT--
-string(4) "html" \ No newline at end of file
+string(4) "html"
diff --git a/ext/xsl/tests/xsltprocessor_transformToDoc_nullparam.phpt b/ext/xsl/tests/xsltprocessor_transformToDoc_nullparam.phpt
index f56cfa8158..6f7980d013 100644
--- a/ext/xsl/tests/xsltprocessor_transformToDoc_nullparam.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToDoc_nullparam.phpt
@@ -51,4 +51,4 @@ $proc->importStyleSheet($xsldoc);
echo $proc->transformToDoc(null);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToDoc() expects parameter 1 to be object, null given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToDoc() expects parameter 1 to be object, null given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_001.phpt b/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_001.phpt
index 3591f02602..7f6ed55678 100644
--- a/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_001.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_001.phpt
@@ -53,4 +53,4 @@ $wrong_parameter = array();
echo $proc->transformToDoc($wrong_parameter);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToDoc() expects parameter 1 to be object, array given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToDoc() expects parameter 1 to be object, array given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_003.phpt b/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_003.phpt
index a3aca78bd4..2c4e56713b 100644
--- a/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_003.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_003.phpt
@@ -53,4 +53,4 @@ $wrong_parameter = 'stringValue';
echo $proc->transformToDoc($wrong_parameter);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToDoc() expects parameter 1 to be object, string given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToDoc() expects parameter 1 to be object, string given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_004.phpt b/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_004.phpt
index 42aaf95878..bfcb9033a6 100644
--- a/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_004.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToDoc_wrongparam_004.phpt
@@ -53,4 +53,4 @@ $wrong_parameter = true;
echo $proc->transformToDoc($wrong_parameter);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToDoc() expects parameter 1 to be object, bool given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToDoc() expects parameter 1 to be object, bool given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToURI.phpt b/ext/xsl/tests/xsltprocessor_transformToURI.phpt
index f2fe9bdb57..bfc80cb473 100644
--- a/ext/xsl/tests/xsltprocessor_transformToURI.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToURI.phpt
@@ -50,4 +50,4 @@ $proc->importStyleSheet($xsldoc);
var_dump($proc->transformToURI($xsldoc, 'php://output'));
?>
--EXPECT--
-int(56) \ No newline at end of file
+int(56)
diff --git a/ext/xsl/tests/xsltprocessor_transformToURI_nullparam.phpt b/ext/xsl/tests/xsltprocessor_transformToURI_nullparam.phpt
index 891e6ca9f3..cfbdb0d983 100644
--- a/ext/xsl/tests/xsltprocessor_transformToURI_nullparam.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToURI_nullparam.phpt
@@ -51,4 +51,4 @@ $proc->importStyleSheet($xsldoc);
echo $proc->transformToURI(null, null);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToUri() expects parameter 1 to be object, null given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToUri() expects parameter 1 to be object, null given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_001.phpt b/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_001.phpt
index 25e3a27ce7..edae589907 100644
--- a/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_001.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_001.phpt
@@ -54,4 +54,4 @@ $uri = 'php://output';
echo $proc->transformToURI($wrong_parameter, $uri);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToUri() expects parameter 1 to be object, array given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToUri() expects parameter 1 to be object, array given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_002.phpt b/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_002.phpt
index 7bc2e057fa..df7d771663 100644
--- a/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_002.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_002.phpt
@@ -54,4 +54,4 @@ $uri = 'php://output';
echo $proc->transformToURI($wrong_parameter, $uri);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToUri() expects parameter 1 to be object, string given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToUri() expects parameter 1 to be object, string given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_003.phpt b/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_003.phpt
index 07892d1171..971b2caa24 100644
--- a/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_003.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_003.phpt
@@ -54,4 +54,4 @@ $uri = 'php://output';
echo $proc->transformToURI($wrong_parameter, $uri);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToUri() expects parameter 1 to be object, bool given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToUri() expects parameter 1 to be object, bool given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_004.phpt b/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_004.phpt
index e40dacb4b8..9c32511096 100644
--- a/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_004.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToURI_wrongparam_004.phpt
@@ -53,4 +53,4 @@ $uri = 'php://output';
echo $proc->transformToURI($xsldoc, $uri, 'stringValue');
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToUri() expects exactly 2 parameters, 3 given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToUri() expects exactly 2 parameters, 3 given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToXML.phpt b/ext/xsl/tests/xsltprocessor_transformToXML.phpt
index c70200d102..dac8c9ac1a 100644
--- a/ext/xsl/tests/xsltprocessor_transformToXML.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToXML.phpt
@@ -58,4 +58,4 @@ string(135) "<html xmlns:php="http://php.net/xsl"><body>
<tr><td>Joe</td></tr>
</table>
</body></html>
-" \ No newline at end of file
+"
diff --git a/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_001.phpt b/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_001.phpt
index 32e1a8095b..4bd598a3c0 100644
--- a/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_001.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_001.phpt
@@ -52,4 +52,4 @@ $wrong_parameter = array();
echo $proc->transformToXML($wrong_parameter);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToXml() expects parameter 1 to be object, array given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToXml() expects parameter 1 to be object, array given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_003.phpt b/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_003.phpt
index 05cb7ebd9e..599fa10068 100644
--- a/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_003.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_003.phpt
@@ -52,4 +52,4 @@ $wrong_parameter = 'stringValue';
echo $proc->transformToXML($wrong_parameter);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToXml() expects parameter 1 to be object, string given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToXml() expects parameter 1 to be object, string given in %s on line %d
diff --git a/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_004.phpt b/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_004.phpt
index f8a5db63f7..5cefb9c2b2 100644
--- a/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_004.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToXML_wrongparam_004.phpt
@@ -52,4 +52,4 @@ $wrong_parameter = true;
echo $proc->transformToXML($wrong_parameter);
?>
--EXPECTF--
-Warning: XSLTProcessor::transformToXml() expects parameter 1 to be object, bool given in %s on line %d \ No newline at end of file
+Warning: XSLTProcessor::transformToXml() expects parameter 1 to be object, bool given in %s on line %d
diff --git a/ext/zip/tests/bug47667.phpt b/ext/zip/tests/bug47667.phpt
index 6914b5b109..e52f7470a8 100644
--- a/ext/zip/tests/bug47667.phpt
+++ b/ext/zip/tests/bug47667.phpt
@@ -35,6 +35,5 @@ echo "files: " , $zip->numFiles;
$zip->close();
unlink($filename);
-
--EXPECT--
files: 1
diff --git a/ext/zip/tests/bug49072.phpt b/ext/zip/tests/bug49072.phpt
index 2ad727d905..731f015fc5 100644
--- a/ext/zip/tests/bug49072.phpt
+++ b/ext/zip/tests/bug49072.phpt
@@ -19,5 +19,4 @@ while (! feof($r)) {
}
?>
--EXPECTF--
-
Warning: fread(): Zip stream error: CRC error in %s on line %d
diff --git a/ext/zip/tests/bug53603.phpt b/ext/zip/tests/bug53603.phpt
index f8ff1b4d44..56d84ad3de 100644
--- a/ext/zip/tests/bug53603.phpt
+++ b/ext/zip/tests/bug53603.phpt
@@ -27,9 +27,6 @@ if ($zip->open($file) !== TRUE) {
$a = $zip->extractTo('teststream://test');
var_dump($a);
-
--EXPECTF--
-
Warning: ZipArchive::extractTo(teststream://test/foo): failed to open stream: "TestStream::stream_open" call failed in %s on line %d
bool(false)
-
diff --git a/ext/zip/tests/bug8009.phpt b/ext/zip/tests/bug8009.phpt
index a5c023288b..61aaca77bd 100644
--- a/ext/zip/tests/bug8009.phpt
+++ b/ext/zip/tests/bug8009.phpt
@@ -21,6 +21,5 @@ $zip->close();
unlink($filename);
echo "status: " . $zip->status . "\n";
echo "\n";
-
--EXPECT--
status: 0
diff --git a/ext/zip/tests/bug8700.phpt b/ext/zip/tests/bug8700.phpt
index 280097c926..5a25af3a11 100644
--- a/ext/zip/tests/bug8700.phpt
+++ b/ext/zip/tests/bug8700.phpt
@@ -24,6 +24,5 @@ if ($contents_from_idx != $contents_from_name) {
$zip->close();
echo "status: " . $zip->status . "\n";
echo "\n";
-
--EXPECT--
status: 0
diff --git a/ext/zip/tests/oo_getstatusstring.phpt b/ext/zip/tests/oo_getstatusstring.phpt
index efd19e318e..87462694ac 100644
--- a/ext/zip/tests/oo_getstatusstring.phpt
+++ b/ext/zip/tests/oo_getstatusstring.phpt
@@ -25,4 +25,3 @@ unlink($dirname.'foo.zip');
--EXPECT--
string(8) "No error"
string(16) "Invalid argument"
-
diff --git a/ext/zip/tests/oo_properties.phpt b/ext/zip/tests/oo_properties.phpt
index 4fa38dd100..bcd6f2fc28 100644
--- a/ext/zip/tests/oo_properties.phpt
+++ b/ext/zip/tests/oo_properties.phpt
@@ -56,4 +56,3 @@ zip->filename (%d):
zip->comment (19):
empty(): 0
isset(): 1
-
diff --git a/ext/zip/tests/zip_entry_compressionmethod.phpt b/ext/zip/tests/zip_entry_compressionmethod.phpt
index 966bdf1b34..0695256b77 100644
--- a/ext/zip/tests/zip_entry_compressionmethod.phpt
+++ b/ext/zip/tests/zip_entry_compressionmethod.phpt
@@ -20,4 +20,3 @@ stored
stored
stored
deflated
-
diff --git a/ext/zlib/tests/005.phpt b/ext/zlib/tests/005.phpt
index 24d272ece0..6333612183 100644
--- a/ext/zlib/tests/005.phpt
+++ b/ext/zlib/tests/005.phpt
@@ -34,7 +34,6 @@ var_dump(gzuncompress($data2));
echo "Done\n";
?>
--EXPECTF--
-
Warning: gzcompress() expects at least 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/zlib/tests/deflate_add_block_v123.phpt b/ext/zlib/tests/deflate_add_block_v123.phpt
index 786f8aed56..c103dcb07d 100644
--- a/ext/zlib/tests/deflate_add_block_v123.phpt
+++ b/ext/zlib/tests/deflate_add_block_v123.phpt
@@ -18,7 +18,6 @@ var_dump(deflate_add($resource, "aaaaaaaaaaaaaaaaaaaaaa", ZLIB_BLOCK));
?>
===DONE===
--EXPECTF--
-
Warning: deflate_add(): zlib >= 1.2.4 required for BLOCK deflate; current version: %s in %s on line %d
bool(false)
===DONE===
diff --git a/ext/zlib/tests/deflate_add_error.phpt b/ext/zlib/tests/deflate_add_error.phpt
index e02cec3832..060a005779 100644
--- a/ext/zlib/tests/deflate_add_error.phpt
+++ b/ext/zlib/tests/deflate_add_error.phpt
@@ -16,7 +16,6 @@ $badFlushType = 6789;
var_dump(deflate_add($resource, "test", $badFlushType));
?>
--EXPECTF--
-
Warning: deflate_add(): Invalid deflate resource in %s on line %d
bool(false)
diff --git a/ext/zlib/tests/deflate_init_error.phpt b/ext/zlib/tests/deflate_init_error.phpt
index e7166455a9..340a3f1062 100644
--- a/ext/zlib/tests/deflate_init_error.phpt
+++ b/ext/zlib/tests/deflate_init_error.phpt
@@ -15,7 +15,6 @@ var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['memory' => 0]));
var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['memory' => 10]));
?>
--EXPECTF--
-
Warning: deflate_init(): encoding mode must be ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
bool(false)
diff --git a/ext/zlib/tests/gzclose_error.phpt b/ext/zlib/tests/gzclose_error.phpt
index 3e1a035060..8390e263f2 100644
--- a/ext/zlib/tests/gzclose_error.phpt
+++ b/ext/zlib/tests/gzclose_error.phpt
@@ -24,10 +24,9 @@ gzclose($h);
?>
===DONE===
--EXPECTF--
-
Warning: gzclose() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
Warning: gzclose() 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/zlib/tests/gzeof_basic.phpt b/ext/zlib/tests/gzeof_basic.phpt
index 4b2bb1aec9..6ee8d8e181 100644
--- a/ext/zlib/tests/gzeof_basic.phpt
+++ b/ext/zlib/tests/gzeof_basic.phpt
@@ -55,4 +55,4 @@ reading 250 characters. eof should be true
bool(true)
reading 20 characters. eof should be true still
bool(true)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzeof_error.phpt b/ext/zlib/tests/gzeof_error.phpt
index a495b9b646..a7211d2a72 100644
--- a/ext/zlib/tests/gzeof_error.phpt
+++ b/ext/zlib/tests/gzeof_error.phpt
@@ -19,10 +19,9 @@ gzclose($h)
?>
===DONE===
--EXPECTF--
-
Warning: gzeof() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
Warning: gzeof() 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/zlib/tests/gzfile_error.phpt b/ext/zlib/tests/gzfile_error.phpt
index cea150a86d..474f5365aa 100644
--- a/ext/zlib/tests/gzfile_error.phpt
+++ b/ext/zlib/tests/gzfile_error.phpt
@@ -20,10 +20,9 @@ var_dump(gzfile( ) );
?>
===DONE===
--EXPECTF--
-
Warning: gzfile() expects at most 2 parameters, 3 given in %s on line %d
NULL
Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzfile_variation1.phpt b/ext/zlib/tests/gzfile_variation1.phpt
index 131170b4b7..a2d307de98 100644
--- a/ext/zlib/tests/gzfile_variation1.phpt
+++ b/ext/zlib/tests/gzfile_variation1.phpt
@@ -28,7 +28,6 @@ foreach ( $variation as $var ) {
?>
===DONE===
--EXPECTF--
-
Warning: gzfile() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
diff --git a/ext/zlib/tests/gzfile_variation10.phpt b/ext/zlib/tests/gzfile_variation10.phpt
index 81f844402b..e5b3ea9741 100644
--- a/ext/zlib/tests/gzfile_variation10.phpt
+++ b/ext/zlib/tests/gzfile_variation10.phpt
@@ -116,4 +116,4 @@ array(6) {
string(39) "and I know that it descends down on me
"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzfile_variation12.phpt b/ext/zlib/tests/gzfile_variation12.phpt
index be28f01681..e16a91822b 100644
--- a/ext/zlib/tests/gzfile_variation12.phpt
+++ b/ext/zlib/tests/gzfile_variation12.phpt
@@ -105,4 +105,4 @@ array(6) {
string(39) "and I know that it descends down on me
"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzfile_variation13.phpt b/ext/zlib/tests/gzfile_variation13.phpt
index f090ac38b8..2920fc108c 100644
--- a/ext/zlib/tests/gzfile_variation13.phpt
+++ b/ext/zlib/tests/gzfile_variation13.phpt
@@ -48,4 +48,4 @@ Error: 2 - gzfile() expects parameter 2 to be int, object given, %s(%d)
NULL
Error: 2 - gzfile() expects parameter 2 to be int, object given, %s(%d)
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzfile_variation14.phpt b/ext/zlib/tests/gzfile_variation14.phpt
index 1d7ec54433..9176d3662a 100644
--- a/ext/zlib/tests/gzfile_variation14.phpt
+++ b/ext/zlib/tests/gzfile_variation14.phpt
@@ -29,7 +29,6 @@ foreach ( $variation_array as $var ) {
?>
===DONE===
--EXPECTF--
-
Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
@@ -41,4 +40,4 @@ NULL
Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt
index bcc29ec102..02eb2df81f 100644
--- a/ext/zlib/tests/gzfile_variation15.phpt
+++ b/ext/zlib/tests/gzfile_variation15.phpt
@@ -106,4 +106,3 @@ array(1) {
}
===DONE===
-
diff --git a/ext/zlib/tests/gzfile_variation2.phpt b/ext/zlib/tests/gzfile_variation2.phpt
index a866ba26c4..9021a90cd2 100644
--- a/ext/zlib/tests/gzfile_variation2.phpt
+++ b/ext/zlib/tests/gzfile_variation2.phpt
@@ -25,7 +25,6 @@ foreach ( $variation as $var ) {
?>
===DONE===
--EXPECTF--
-
Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
@@ -37,4 +36,4 @@ NULL
Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzfile_variation3.phpt b/ext/zlib/tests/gzfile_variation3.phpt
index cf4520d412..5871b34f78 100644
--- a/ext/zlib/tests/gzfile_variation3.phpt
+++ b/ext/zlib/tests/gzfile_variation3.phpt
@@ -47,4 +47,4 @@ bool(false)
Warning: gzfile(): Filename cannot be empty in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzfile_variation5.phpt b/ext/zlib/tests/gzfile_variation5.phpt
index 6a874a5786..1627d2eb11 100644
--- a/ext/zlib/tests/gzfile_variation5.phpt
+++ b/ext/zlib/tests/gzfile_variation5.phpt
@@ -36,4 +36,4 @@ bool(false)
Warning: gzfile(-2345): 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/zlib/tests/gzfile_variation7.phpt b/ext/zlib/tests/gzfile_variation7.phpt
index c9dd298269..04fa2e666b 100644
--- a/ext/zlib/tests/gzfile_variation7.phpt
+++ b/ext/zlib/tests/gzfile_variation7.phpt
@@ -29,7 +29,6 @@ foreach ( $variation_array as $var ) {
?>
===DONE===
--EXPECTF--
-
Warning: gzfile(string): failed to open stream: No such file or directory in %s on line %d
bool(false)
diff --git a/ext/zlib/tests/gzfile_variation8.phpt b/ext/zlib/tests/gzfile_variation8.phpt
index 9c9a29d485..c4964141b0 100644
--- a/ext/zlib/tests/gzfile_variation8.phpt
+++ b/ext/zlib/tests/gzfile_variation8.phpt
@@ -28,7 +28,6 @@ foreach ( $variation as $var ) {
?>
===DONE===
--EXPECTF--
-
Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
@@ -40,4 +39,4 @@ NULL
Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzfile_variation9.phpt b/ext/zlib/tests/gzfile_variation9.phpt
index 3675dcbef9..6cb5a53331 100644
--- a/ext/zlib/tests/gzfile_variation9.phpt
+++ b/ext/zlib/tests/gzfile_variation9.phpt
@@ -104,4 +104,4 @@ array(6) {
string(39) "and I know that it descends down on me
"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzgetc_error.phpt b/ext/zlib/tests/gzgetc_error.phpt
index 2298fa358a..9882118156 100644
--- a/ext/zlib/tests/gzgetc_error.phpt
+++ b/ext/zlib/tests/gzgetc_error.phpt
@@ -20,10 +20,9 @@ gzclose($h);
?>
===DONE===
--EXPECTF--
-
Warning: gzgetc() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
Warning: gzgetc() 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/zlib/tests/gzgets_basic.phpt b/ext/zlib/tests/gzgets_basic.phpt
index 0e683d1b32..20d43e1eb3 100644
--- a/ext/zlib/tests/gzgets_basic.phpt
+++ b/ext/zlib/tests/gzgets_basic.phpt
@@ -43,4 +43,4 @@ string(19) "as it turns around
"
string(39) "and I know that it descends down on me
"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzgets_error.phpt b/ext/zlib/tests/gzgets_error.phpt
index 10b5f0db29..3b38e26dae 100644
--- a/ext/zlib/tests/gzgets_error.phpt
+++ b/ext/zlib/tests/gzgets_error.phpt
@@ -21,10 +21,9 @@ var_dump(gzgets());
?>
===DONE===
--EXPECTF--
-
Warning: gzgets() expects at most 2 parameters, 3 given in %s on line %d
bool(false)
Warning: gzgets() expects at least 1 parameter, 0 given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzinflate_error1.phpt b/ext/zlib/tests/gzinflate_error1.phpt
index 92a5b8dcfd..cbfe615511 100644
--- a/ext/zlib/tests/gzinflate_error1.phpt
+++ b/ext/zlib/tests/gzinflate_error1.phpt
@@ -72,4 +72,4 @@ NULL
Warning: gzinflate() expects parameter 2 to be int, object given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzinflate_length.phpt b/ext/zlib/tests/gzinflate_length.phpt
index 6e86d865ee..cea2c5d6f2 100644
--- a/ext/zlib/tests/gzinflate_length.phpt
+++ b/ext/zlib/tests/gzinflate_length.phpt
@@ -23,4 +23,3 @@ Strings are equal
Warning: gzinflate(): insufficient memory in %s on line %d
Failed (as expected)
-
diff --git a/ext/zlib/tests/gzopen_variation1.phpt b/ext/zlib/tests/gzopen_variation1.phpt
index bca48f39c9..270758911f 100644
--- a/ext/zlib/tests/gzopen_variation1.phpt
+++ b/ext/zlib/tests/gzopen_variation1.phpt
@@ -225,4 +225,3 @@ bool(false)
Error: 2 - gzopen() expects parameter 1 to be a valid path, resource given, %s(%d)
NULL
===DONE===
-
diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt
index bf374eee01..a00fd878fe 100644
--- a/ext/zlib/tests/gzopen_variation4.phpt
+++ b/ext/zlib/tests/gzopen_variation4.phpt
@@ -158,4 +158,3 @@ This is a file in dir1
This is a file in working dir
This is a file in script dir
===DONE===
-
diff --git a/ext/zlib/tests/gzopen_variation7.phpt b/ext/zlib/tests/gzopen_variation7.phpt
index 911c7fd73c..cc627374bf 100644
--- a/ext/zlib/tests/gzopen_variation7.phpt
+++ b/ext/zlib/tests/gzopen_variation7.phpt
@@ -28,4 +28,4 @@ string(15) "lings
Destiny f"
string(50) "e taught through feelings
Destiny flying high abov"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzopen_variation9.phpt b/ext/zlib/tests/gzopen_variation9.phpt
index 7359a98cfa..b308316335 100644
--- a/ext/zlib/tests/gzopen_variation9.phpt
+++ b/ext/zlib/tests/gzopen_variation9.phpt
@@ -52,4 +52,4 @@ mode=e
Warning: gzopen(%s/004.txt.gz): failed to open stream: %s in %s on line %d
gzopen=bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzpassthru_basic.phpt b/ext/zlib/tests/gzpassthru_basic.phpt
index 8b3e9c1123..10ff6630b2 100644
--- a/ext/zlib/tests/gzpassthru_basic.phpt
+++ b/ext/zlib/tests/gzpassthru_basic.phpt
@@ -29,4 +29,4 @@ as it turns around
and I know that it descends down on me
int(176)
int(0)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzpassthru_error.phpt b/ext/zlib/tests/gzpassthru_error.phpt
index 39d5fef908..06c348cc3d 100644
--- a/ext/zlib/tests/gzpassthru_error.phpt
+++ b/ext/zlib/tests/gzpassthru_error.phpt
@@ -20,10 +20,9 @@ gzclose($h);
?>
===DONE===
--EXPECTF--
-
Warning: gzpassthru() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
Warning: gzpassthru() 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/zlib/tests/gzputs_basic.phpt b/ext/zlib/tests/gzputs_basic.phpt
index 5f00a18626..72173bb7b9 100644
--- a/ext/zlib/tests/gzputs_basic.phpt
+++ b/ext/zlib/tests/gzputs_basic.phpt
@@ -28,4 +28,4 @@ unlink($filename);
int(34)
int(10)
Here is the string to be written. Here is th
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzread_basic.phpt b/ext/zlib/tests/gzread_basic.phpt
index 825902e7c0..b41720c396 100644
--- a/ext/zlib/tests/gzread_basic.phpt
+++ b/ext/zlib/tests/gzread_basic.phpt
@@ -34,4 +34,4 @@ as it turns "
string(46) "around
and I know that it descends down on me
"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzread_error.phpt b/ext/zlib/tests/gzread_error.phpt
index 3baf5247b9..13129c2c56 100644
--- a/ext/zlib/tests/gzread_error.phpt
+++ b/ext/zlib/tests/gzread_error.phpt
@@ -23,10 +23,9 @@ gzclose($h);
?>
===DONE===
--EXPECTF--
-
Warning: gzread() expects exactly 2 parameters, 3 given in %s on line %d
bool(false)
Warning: gzread() expects exactly 2 parameters, 0 given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzread_error2.phpt b/ext/zlib/tests/gzread_error2.phpt
index 07367fdf3e..5b97993482 100644
--- a/ext/zlib/tests/gzread_error2.phpt
+++ b/ext/zlib/tests/gzread_error2.phpt
@@ -29,4 +29,4 @@ string(5) "e tau"
Warning: gzread(): Length parameter must be greater than 0 in %s on line %d
bool(false)
string(8) "ght thro"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzread_variation1.phpt b/ext/zlib/tests/gzread_variation1.phpt
index 4aefe3f910..d544d6d4c2 100644
--- a/ext/zlib/tests/gzread_variation1.phpt
+++ b/ext/zlib/tests/gzread_variation1.phpt
@@ -31,4 +31,4 @@ string(0) ""
string(0) ""
string(0) ""
Here is the string to be written.
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzrewind_basic.phpt b/ext/zlib/tests/gzrewind_basic.phpt
index ba2ecae5b7..e415a0e105 100644
--- a/ext/zlib/tests/gzrewind_basic.phpt
+++ b/ext/zlib/tests/gzrewind_basic.phpt
@@ -33,4 +33,4 @@ int(30)
int(0)
first 10 characters=When you'r
first 20 characters=When you're taught t
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzrewind_basic2.phpt b/ext/zlib/tests/gzrewind_basic2.phpt
index 00c99801cc..277d8a02ad 100644
--- a/ext/zlib/tests/gzrewind_basic2.phpt
+++ b/ext/zlib/tests/gzrewind_basic2.phpt
@@ -31,4 +31,4 @@ int(176)
bool(false)
int(0)
first 20 characters=When you're taught t
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzrewind_error.phpt b/ext/zlib/tests/gzrewind_error.phpt
index d99e2d0a45..63ab9335ba 100644
--- a/ext/zlib/tests/gzrewind_error.phpt
+++ b/ext/zlib/tests/gzrewind_error.phpt
@@ -24,4 +24,4 @@ bool(false)
Warning: gzrewind() 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/zlib/tests/gzrewind_variation1.phpt b/ext/zlib/tests/gzrewind_variation1.phpt
index b42a44ad0d..8319a27181 100644
--- a/ext/zlib/tests/gzrewind_variation1.phpt
+++ b/ext/zlib/tests/gzrewind_variation1.phpt
@@ -25,4 +25,4 @@ echo "\n";
--EXPECT--
bool(false)
The first string.The second string.
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzseek_basic.phpt b/ext/zlib/tests/gzseek_basic.phpt
index 2f0b5ae451..8ef4ef070d 100644
--- a/ext/zlib/tests/gzseek_basic.phpt
+++ b/ext/zlib/tests/gzseek_basic.phpt
@@ -46,4 +46,4 @@ move backward to the 20th byte
int(0)
tell=20
string(10) "hrough fee"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzseek_error.phpt b/ext/zlib/tests/gzseek_error.phpt
index e6c43e7b3a..0436ebb5c3 100644
--- a/ext/zlib/tests/gzseek_error.phpt
+++ b/ext/zlib/tests/gzseek_error.phpt
@@ -21,7 +21,6 @@ var_dump(gzseek());
?>
===DONE===
--EXPECTF--
-
Warning: gzseek() expects at most 3 parameters, 4 given in %s on line %d
bool(false)
@@ -30,4 +29,4 @@ bool(false)
Warning: gzseek() expects at least 2 parameters, 0 given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzseek_variation2.phpt b/ext/zlib/tests/gzseek_variation2.phpt
index 615dfe96a3..6063f42b4d 100644
--- a/ext/zlib/tests/gzseek_variation2.phpt
+++ b/ext/zlib/tests/gzseek_variation2.phpt
@@ -46,4 +46,4 @@ move backward to the 20th byte
int(0)
tell=20
string(10) "hrough fee"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzseek_variation3.phpt b/ext/zlib/tests/gzseek_variation3.phpt
index 02dc7ac825..196f69361e 100644
--- a/ext/zlib/tests/gzseek_variation3.phpt
+++ b/ext/zlib/tests/gzseek_variation3.phpt
@@ -47,4 +47,4 @@ move backward to the 77th byte
int(0)
tell=77
string(10) "hat you ca"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzseek_variation6.phpt b/ext/zlib/tests/gzseek_variation6.phpt
index bb5d9ed65b..888adac310 100644
--- a/ext/zlib/tests/gzseek_variation6.phpt
+++ b/ext/zlib/tests/gzseek_variation6.phpt
@@ -36,4 +36,4 @@ int(-1)
tell=int(40)
eof=bool(false)
string(10) "iny flying"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gztell_basic.phpt b/ext/zlib/tests/gztell_basic.phpt
index 7d7e96d341..3e33fcd3fc 100644
--- a/ext/zlib/tests/gztell_basic.phpt
+++ b/ext/zlib/tests/gztell_basic.phpt
@@ -31,4 +31,4 @@ int(100)
int(127)
int(142)
int(176)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gztell_error.phpt b/ext/zlib/tests/gztell_error.phpt
index b563a33484..aad308d67b 100644
--- a/ext/zlib/tests/gztell_error.phpt
+++ b/ext/zlib/tests/gztell_error.phpt
@@ -17,10 +17,9 @@ gzclose($h);
?>
===DONE===
--EXPECTF--
-
Warning: gztell() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
Warning: gztell() 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/zlib/tests/gzuncompress_basic1.phpt b/ext/zlib/tests/gzuncompress_basic1.phpt
index 43bc6eb9ab..3d593e466c 100644
--- a/ext/zlib/tests/gzuncompress_basic1.phpt
+++ b/ext/zlib/tests/gzuncompress_basic1.phpt
@@ -40,4 +40,4 @@ int(0)
-- Calling gzuncompress() with max length of 3547 --
Result length is 3547
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzwrite_basic.phpt b/ext/zlib/tests/gzwrite_basic.phpt
index 05d877158b..7d3700b8cf 100644
--- a/ext/zlib/tests/gzwrite_basic.phpt
+++ b/ext/zlib/tests/gzwrite_basic.phpt
@@ -28,4 +28,4 @@ unlink($filename);
int(34)
int(10)
Here is the string to be written. Here is th
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzwrite_error.phpt b/ext/zlib/tests/gzwrite_error.phpt
index fca081171c..c8aaacb001 100644
--- a/ext/zlib/tests/gzwrite_error.phpt
+++ b/ext/zlib/tests/gzwrite_error.phpt
@@ -23,7 +23,6 @@ unlink($filename);
?>
===DONE===
--EXPECTF--
-
Warning: gzwrite() expects at most 3 parameters, 4 given in %s on line %d
bool(false)
@@ -32,4 +31,4 @@ bool(false)
Warning: gzwrite() expects at least 2 parameters, 0 given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzwrite_error2.phpt b/ext/zlib/tests/gzwrite_error2.phpt
index 803e34a5cc..0cd0baa14e 100644
--- a/ext/zlib/tests/gzwrite_error2.phpt
+++ b/ext/zlib/tests/gzwrite_error2.phpt
@@ -27,4 +27,4 @@ unlink($filename);
int(0)
int(0)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzwrite_variation1.phpt b/ext/zlib/tests/gzwrite_variation1.phpt
index 29a67861fd..aa556ca5a4 100644
--- a/ext/zlib/tests/gzwrite_variation1.phpt
+++ b/ext/zlib/tests/gzwrite_variation1.phpt
@@ -24,4 +24,4 @@ gzclose($h);
int(0)
string(10) "When you'r"
int(0)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/inflate_add_error.phpt b/ext/zlib/tests/inflate_add_error.phpt
index 63c827e4e1..3bc04a0b7c 100644
--- a/ext/zlib/tests/inflate_add_error.phpt
+++ b/ext/zlib/tests/inflate_add_error.phpt
@@ -15,7 +15,6 @@ $badFlushType = 6789;
var_dump(inflate_add($resource, "test", $badFlushType));
?>
--EXPECTF--
-
Warning: inflate_add(): Invalid zlib.inflate resource in %s on line %d
bool(false)
diff --git a/ext/zlib/tests/inflate_init_error.phpt b/ext/zlib/tests/inflate_init_error.phpt
index fb80573c1c..58773e61d3 100644
--- a/ext/zlib/tests/inflate_init_error.phpt
+++ b/ext/zlib/tests/inflate_init_error.phpt
@@ -12,7 +12,6 @@ var_dump(inflate_init());
var_dump(inflate_init(42));
?>
--EXPECTF--
-
Warning: inflate_init() expects at least 1 parameter, 0 given in %s on line %d
NULL
diff --git a/ext/zlib/tests/ob_001.phpt b/ext/zlib/tests/ob_001.phpt
index abf8ce34ac..a8de244d18 100644
--- a/ext/zlib/tests/ob_001.phpt
+++ b/ext/zlib/tests/ob_001.phpt
@@ -17,4 +17,3 @@ echo "hi\n";
?>
--EXPECTF--
‹%a
-
diff --git a/ext/zlib/tests/ob_002.phpt b/ext/zlib/tests/ob_002.phpt
index 3b7681b43a..81622dc440 100644
--- a/ext/zlib/tests/ob_002.phpt
+++ b/ext/zlib/tests/ob_002.phpt
@@ -15,4 +15,3 @@ echo "hi\n";
?>
--EXPECT--
hi
-
diff --git a/ext/zlib/tests/ob_004.phpt b/ext/zlib/tests/ob_004.phpt
index ecbc150c89..b12c5afdbc 100644
--- a/ext/zlib/tests/ob_004.phpt
+++ b/ext/zlib/tests/ob_004.phpt
@@ -21,4 +21,3 @@ echo "hi\n";
--EXPECTHEADERS--
Content-Encoding: gzip
Vary: Accept-Encoding
-
diff --git a/ext/zlib/tests/readgzfile_error.phpt b/ext/zlib/tests/readgzfile_error.phpt
index 6d393423f7..083a801866 100644
--- a/ext/zlib/tests/readgzfile_error.phpt
+++ b/ext/zlib/tests/readgzfile_error.phpt
@@ -20,10 +20,9 @@ var_dump(readgzfile( ) );
?>
===DONE===
--EXPECTF--
-
Warning: readgzfile() expects at most 2 parameters, 3 given in %s on line %d
NULL
Warning: readgzfile() expects at least 1 parameter, 0 given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation1.phpt b/ext/zlib/tests/readgzfile_variation1.phpt
index 5d9b639d29..68ec906719 100644
--- a/ext/zlib/tests/readgzfile_variation1.phpt
+++ b/ext/zlib/tests/readgzfile_variation1.phpt
@@ -28,7 +28,6 @@ foreach ( $variation as $var ) {
?>
===DONE===
--EXPECTF--
-
Warning: readgzfile() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
diff --git a/ext/zlib/tests/readgzfile_variation10.phpt b/ext/zlib/tests/readgzfile_variation10.phpt
index 323dca16ce..004a07775a 100644
--- a/ext/zlib/tests/readgzfile_variation10.phpt
+++ b/ext/zlib/tests/readgzfile_variation10.phpt
@@ -64,4 +64,4 @@ Destiny who cares
as it turns around
and I know that it descends down on me
int(176)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation12.phpt b/ext/zlib/tests/readgzfile_variation12.phpt
index 06486acdd0..82e7b07a5d 100644
--- a/ext/zlib/tests/readgzfile_variation12.phpt
+++ b/ext/zlib/tests/readgzfile_variation12.phpt
@@ -53,4 +53,4 @@ Destiny who cares
as it turns around
and I know that it descends down on me
int(176)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation13.phpt b/ext/zlib/tests/readgzfile_variation13.phpt
index e7fe83ccc2..718d6935fa 100644
--- a/ext/zlib/tests/readgzfile_variation13.phpt
+++ b/ext/zlib/tests/readgzfile_variation13.phpt
@@ -48,4 +48,4 @@ Error: 2 - readgzfile() expects parameter 2 to be int, object given, %s(%d)
NULL
Error: 2 - readgzfile() expects parameter 2 to be int, object given, %s(%d)
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation14.phpt b/ext/zlib/tests/readgzfile_variation14.phpt
index 23ba1dcf0c..89b801e97b 100644
--- a/ext/zlib/tests/readgzfile_variation14.phpt
+++ b/ext/zlib/tests/readgzfile_variation14.phpt
@@ -29,7 +29,6 @@ foreach ( $variation_array as $var ) {
?>
===DONE===
--EXPECTF--
-
Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
NULL
diff --git a/ext/zlib/tests/readgzfile_variation15.phpt b/ext/zlib/tests/readgzfile_variation15.phpt
index dbed5238af..5a97949050 100644
--- a/ext/zlib/tests/readgzfile_variation15.phpt
+++ b/ext/zlib/tests/readgzfile_variation15.phpt
@@ -91,4 +91,3 @@ file content:This is a file in dir1
file content:This is a file in working dir
file content:This is a file in script dir
===DONE===
-
diff --git a/ext/zlib/tests/readgzfile_variation2.phpt b/ext/zlib/tests/readgzfile_variation2.phpt
index 95c6f4cc43..b82ecf6216 100644
--- a/ext/zlib/tests/readgzfile_variation2.phpt
+++ b/ext/zlib/tests/readgzfile_variation2.phpt
@@ -25,7 +25,6 @@ foreach ( $variation as $var ) {
?>
===DONE===
--EXPECTF--
-
Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
@@ -37,4 +36,4 @@ NULL
Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation3.phpt b/ext/zlib/tests/readgzfile_variation3.phpt
index 8afb16946e..9b8c142781 100644
--- a/ext/zlib/tests/readgzfile_variation3.phpt
+++ b/ext/zlib/tests/readgzfile_variation3.phpt
@@ -47,4 +47,4 @@ bool(false)
Warning: readgzfile(): Filename cannot be empty in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation8.phpt b/ext/zlib/tests/readgzfile_variation8.phpt
index bd2a58382b..fd4a175675 100644
--- a/ext/zlib/tests/readgzfile_variation8.phpt
+++ b/ext/zlib/tests/readgzfile_variation8.phpt
@@ -28,7 +28,6 @@ foreach ( $variation as $var ) {
?>
===DONE===
--EXPECTF--
-
Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
@@ -40,4 +39,4 @@ NULL
Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation9.phpt b/ext/zlib/tests/readgzfile_variation9.phpt
index d90058f8d2..50fdd62f06 100644
--- a/ext/zlib/tests/readgzfile_variation9.phpt
+++ b/ext/zlib/tests/readgzfile_variation9.phpt
@@ -52,4 +52,4 @@ Destiny who cares
as it turns around
and I know that it descends down on me
int(176)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_copy_basic.phpt b/ext/zlib/tests/zlib_scheme_copy_basic.phpt
index ca1a42a85c..179545ee44 100644
--- a/ext/zlib/tests/zlib_scheme_copy_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_copy_basic.phpt
@@ -34,4 +34,4 @@ unlink($outputFileName);
===DONE===
--EXPECT--
OK: Copy identical
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_copy_variation1.phpt b/ext/zlib/tests/zlib_scheme_copy_variation1.phpt
index f410b6e4f1..728275986d 100644
--- a/ext/zlib/tests/zlib_scheme_copy_variation1.phpt
+++ b/ext/zlib/tests/zlib_scheme_copy_variation1.phpt
@@ -35,4 +35,4 @@ unlink($outputFileName);
===DONE===
--EXPECT--
OK: Copy identical
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
index 43e5d9b2fc..02fae273bc 100644
--- a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
+++ b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
@@ -50,4 +50,4 @@ unlink($outputFileName);
===DONE===
--EXPECT--
OK: Copy identical
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_dir_basic.phpt b/ext/zlib/tests/zlib_scheme_dir_basic.phpt
index 80189f2de9..41a2683f06 100644
--- a/ext/zlib/tests/zlib_scheme_dir_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_dir_basic.phpt
@@ -23,4 +23,4 @@ bool(false)
Warning: opendir(compress.zlib://%s/dir.gz): failed to open dir: not implemented in %s on line %d
bool(false)
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_file_basic.phpt b/ext/zlib/tests/zlib_scheme_file_basic.phpt
index f08183fd25..c2264159bb 100644
--- a/ext/zlib/tests/zlib_scheme_file_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_basic.phpt
@@ -35,4 +35,4 @@ array(6) {
string(39) "and I know that it descends down on me
"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt b/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt
index 071fcd716e..3882389b16 100644
--- a/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt
@@ -21,4 +21,4 @@ all I know is that you can realize it
Destiny who cares
as it turns around
and I know that it descends down on me
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt b/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt
index 2f36d1f619..cadaeae532 100644
--- a/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt
@@ -28,4 +28,4 @@ unlink($outputFileName);
Here is some plain
text to be read
and displayed.
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt b/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt
index eb7fde37b4..99ff70de79 100644
--- a/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt
@@ -20,4 +20,4 @@ all I know is that you can realize it
Destiny who cares
as it turns around
and I know that it descends down on me
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_fopen_basic.phpt b/ext/zlib/tests/zlib_scheme_fopen_basic.phpt
index 8ec10ac463..a282aa9c3b 100644
--- a/ext/zlib/tests/zlib_scheme_fopen_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_fopen_basic.phpt
@@ -22,4 +22,4 @@ all I know is that you can realize it
Destiny who cares
as it turns around
and I know that it descends down on me
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt b/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt
index 88057eb3e3..670d67532d 100644
--- a/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt
+++ b/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt
@@ -27,4 +27,4 @@ all I know is that you can realize it
Destiny who cares
as it turns around
and I know that it descends down on me
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_rename_basic.phpt b/ext/zlib/tests/zlib_scheme_rename_basic.phpt
index ee693de97a..53bc70a4cf 100644
--- a/ext/zlib/tests/zlib_scheme_rename_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_rename_basic.phpt
@@ -15,7 +15,6 @@ var_dump(file_exists($inputFileName));
?>
===DONE===
--EXPECTF--
-
Warning: rename(): ZLIB wrapper does not support renaming in %s on line %d
bool(true)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_stat_basic.phpt b/ext/zlib/tests/zlib_scheme_stat_basic.phpt
index ab673700dc..80c26bd62a 100644
--- a/ext/zlib/tests/zlib_scheme_stat_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_stat_basic.phpt
@@ -15,8 +15,7 @@ lstat($srcFile);
?>
===DONE===
--EXPECTF--
-
Warning: stat(): stat failed for compress.zlib://%s/004.txt.gz in %s on line %d
Warning: lstat(): Lstat failed for compress.zlib://%s/004.txt.gz in %s on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_stat_basic2.phpt b/ext/zlib/tests/zlib_scheme_stat_basic2.phpt
index d16e2a8ade..8081fc805b 100644
--- a/ext/zlib/tests/zlib_scheme_stat_basic2.phpt
+++ b/ext/zlib/tests/zlib_scheme_stat_basic2.phpt
@@ -43,4 +43,4 @@ bool(false)
fileatime=
Warning: fileatime(): stat failed for compress.zlib://%s004.txt.gz in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_scheme_unlink_basic.phpt b/ext/zlib/tests/zlib_scheme_unlink_basic.phpt
index 3aa25f9dda..afa62f51f5 100644
--- a/ext/zlib/tests/zlib_scheme_unlink_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_unlink_basic.phpt
@@ -15,7 +15,6 @@ var_dump(file_exists($inputFileName));
?>
===DONE===
--EXPECTF--
-
Warning: unlink(): ZLIB does not allow unlinking in %s on line %d
bool(true)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
index c706b2a7b7..d4e7214937 100644
--- a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
@@ -30,4 +30,4 @@ unlink($filename);
bool(true)
bool(true)
Here is the string to be written.Here is the string to be written.
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_wrapper_flock_basic.phpt b/ext/zlib/tests/zlib_wrapper_flock_basic.phpt
index ec1b67a64b..f8b776ae33 100644
--- a/ext/zlib/tests/zlib_wrapper_flock_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_flock_basic.phpt
@@ -16,4 +16,4 @@ gzclose($h);
===DONE===
--EXPECT--
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt b/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt
index 4c185be689..4996d9e2c7 100644
--- a/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt
@@ -16,4 +16,4 @@ fclose($h);
===DONE===
--EXPECT--
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
index 399d32c5f3..0bc6f4f3e0 100644
--- a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
@@ -25,8 +25,7 @@ unlink($f2);
?>
===DONE===
--EXPECTF--
-
Warning: ftruncate(): Can't truncate this stream! in %s on line %d
Warning: ftruncate(): Can't truncate this stream! in %s on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt b/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt
index 87fa6227ab..1a2993acbf 100644
--- a/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt
@@ -62,4 +62,4 @@ array(9) {
["uri"]=>
string(%d) "compress.zlib://%s/004.txt.gz"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/sapi/cli/tests/020.phpt b/sapi/cli/tests/020.phpt
index ac23e77f6a..001cf62a38 100644
--- a/sapi/cli/tests/020.phpt
+++ b/sapi/cli/tests/020.phpt
@@ -29,4 +29,3 @@ Directive => Local Value => Master Value
%a
Done
-
diff --git a/sapi/cli/tests/bug66830.phpt b/sapi/cli/tests/bug66830.phpt
index b21b33627e..a53dbb8a20 100644
--- a/sapi/cli/tests/bug66830.phpt
+++ b/sapi/cli/tests/bug66830.phpt
@@ -41,4 +41,3 @@ Date: %s
Connection: close
X-Powered-By: %s
Content-type: text/html; charset=UTF-8
-
diff --git a/sapi/cli/tests/bug67429.phpt b/sapi/cli/tests/bug67429.phpt
index 2e0b6ad627..a047de6e31 100644
--- a/sapi/cli/tests/bug67429.phpt
+++ b/sapi/cli/tests/bug67429.phpt
@@ -53,4 +53,3 @@ Date: %s
Connection: close
X-Powered-By: %s
Content-type: text/html; charset=UTF-8
-
diff --git a/sapi/cli/tests/bug67741.phpt b/sapi/cli/tests/bug67741.phpt
index df0981443f..0861eeb653 100644
--- a/sapi/cli/tests/bug67741.phpt
+++ b/sapi/cli/tests/bug67741.phpt
@@ -14,4 +14,4 @@ echo "primary lineno: ", __LINE__, "\n";
?>
--EXPECT--
prepend lineno: 2
-primary lineno: 3 \ No newline at end of file
+primary lineno: 3
diff --git a/sapi/cli/tests/php_cli_server_013.phpt b/sapi/cli/tests/php_cli_server_013.phpt
index cfed0c5531..ec8957c8d1 100644
--- a/sapi/cli/tests/php_cli_server_013.phpt
+++ b/sapi/cli/tests/php_cli_server_013.phpt
@@ -80,7 +80,6 @@ echo preg_replace("/<style>(.*?)<\/style>/s", "<style>AAA</style>", $output), "\
fclose($fp);
?>
--EXPECTF--
-
HTTP/1.1 404 Not Found
Host: %s
Date: %s
@@ -108,4 +107,3 @@ Content-Length: %d
<!doctype html><html><head><title>404 Not Found</title><style>AAA</style>
</head><body><h1>Not Found</h1><p>The requested resource <code class="url">/main/foo/bar</code> was not found on this server.</p></body></html>
-
diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt
index 7210321925..11db82ce90 100644
--- a/sapi/cli/tests/php_cli_server_014.phpt
+++ b/sapi/cli/tests/php_cli_server_014.phpt
@@ -62,7 +62,6 @@ fclose($fp);
?>
--EXPECTF--
-
HTTP/1.1 200 OK
Host: %s
Date: %s
diff --git a/sapi/fpm/tests/log-bwd-msg-with-nl.phpt b/sapi/fpm/tests/log-bwd-msg-with-nl.phpt
index 99385400b9..67a793f8a0 100644
--- a/sapi/fpm/tests/log-bwd-msg-with-nl.phpt
+++ b/sapi/fpm/tests/log-bwd-msg-with-nl.phpt
@@ -43,4 +43,4 @@ Done
<?php
require_once "tester.inc";
FPM\Tester::clean();
-?> \ No newline at end of file
+?>
diff --git a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt
index a21e4722b3..1517f4a554 100644
--- a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt
+++ b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt
@@ -47,4 +47,4 @@ Done
<?php
require_once "tester.inc";
FPM\Tester::clean();
-?> \ No newline at end of file
+?>
diff --git a/sapi/fpm/tests/pool-apparmor-basic.phpt b/sapi/fpm/tests/pool-apparmor-basic.phpt
index 733f42f3f5..53245b7ea7 100644
--- a/sapi/fpm/tests/pool-apparmor-basic.phpt
+++ b/sapi/fpm/tests/pool-apparmor-basic.phpt
@@ -60,4 +60,4 @@ Done
<?php
require_once "tester.inc";
FPM\Tester::clean();
-?> \ No newline at end of file
+?>
diff --git a/sapi/fpm/tests/pool-prefix.phpt b/sapi/fpm/tests/pool-prefix.phpt
index b32b37e13a..d128c23287 100644
--- a/sapi/fpm/tests/pool-prefix.phpt
+++ b/sapi/fpm/tests/pool-prefix.phpt
@@ -51,4 +51,4 @@ Done
<?php
require_once "tester.inc";
FPM\Tester::clean();
-?> \ No newline at end of file
+?>
diff --git a/sapi/fpm/tests/proc-user-ignored.phpt b/sapi/fpm/tests/proc-user-ignored.phpt
index 42a7dc2392..e1902af11b 100644
--- a/sapi/fpm/tests/proc-user-ignored.phpt
+++ b/sapi/fpm/tests/proc-user-ignored.phpt
@@ -43,4 +43,4 @@ Done
<?php
require_once "tester.inc";
FPM\Tester::clean();
-?> \ No newline at end of file
+?>
diff --git a/sapi/fpm/tests/socket-uds-acl.phpt b/sapi/fpm/tests/socket-uds-acl.phpt
index 6423ae446c..775d6561d4 100644
--- a/sapi/fpm/tests/socket-uds-acl.phpt
+++ b/sapi/fpm/tests/socket-uds-acl.phpt
@@ -84,4 +84,4 @@ Done
<?php
require_once "tester.inc";
FPM\Tester::clean();
-?> \ No newline at end of file
+?>
diff --git a/sapi/phpdbg/tests/breakpoints_001.phpt b/sapi/phpdbg/tests/breakpoints_001.phpt
index 17e7c65cbf..28f11760c8 100644
--- a/sapi/phpdbg/tests/breakpoints_001.phpt
+++ b/sapi/phpdbg/tests/breakpoints_001.phpt
@@ -30,4 +30,3 @@ echo $i++;
echo $i++;
echo $i++;
echo $i++;
-
diff --git a/sapi/phpdbg/tests/breakpoints_002.phpt b/sapi/phpdbg/tests/breakpoints_002.phpt
index 96c98194b1..93351321a8 100644
--- a/sapi/phpdbg/tests/breakpoints_002.phpt
+++ b/sapi/phpdbg/tests/breakpoints_002.phpt
@@ -37,4 +37,3 @@ echo $i++;
echo $i++;
echo $i++;
echo $i++;
-
diff --git a/sapi/phpdbg/tests/breakpoints_003.phpt b/sapi/phpdbg/tests/breakpoints_003.phpt
index 12b2504487..9a1f7cccc5 100644
--- a/sapi/phpdbg/tests/breakpoints_003.phpt
+++ b/sapi/phpdbg/tests/breakpoints_003.phpt
@@ -30,4 +30,3 @@ echo $i++;
echo $i++;
echo $i++;
echo $i++;
-
diff --git a/sapi/phpdbg/tests/breakpoints_005.phpt b/sapi/phpdbg/tests/breakpoints_005.phpt
index 653dab9fcc..3120405896 100644
--- a/sapi/phpdbg/tests/breakpoints_005.phpt
+++ b/sapi/phpdbg/tests/breakpoints_005.phpt
@@ -25,4 +25,3 @@ function foo($bar) {
}
foo("test");
-
diff --git a/sapi/phpdbg/tests/breakpoints_006.phpt b/sapi/phpdbg/tests/breakpoints_006.phpt
index fa6f0cdc5b..3e0e94541d 100644
--- a/sapi/phpdbg/tests/breakpoints_006.phpt
+++ b/sapi/phpdbg/tests/breakpoints_006.phpt
@@ -23,4 +23,3 @@ function foo($bar) {
}
foo("test");
-
diff --git a/sapi/phpdbg/tests/breakpoints_007.phpt b/sapi/phpdbg/tests/breakpoints_007.phpt
index f921c257c5..900ccee083 100644
--- a/sapi/phpdbg/tests/breakpoints_007.phpt
+++ b/sapi/phpdbg/tests/breakpoints_007.phpt
@@ -22,4 +22,3 @@ class bar {
}
(new bar)->foo("test");
-
diff --git a/sapi/phpdbg/tests/breakpoints_008.phpt b/sapi/phpdbg/tests/breakpoints_008.phpt
index cbe5042c2b..3aa7aa2595 100644
--- a/sapi/phpdbg/tests/breakpoints_008.phpt
+++ b/sapi/phpdbg/tests/breakpoints_008.phpt
@@ -31,4 +31,3 @@ namespace Foo {
namespace {
(new \Foo\Bar)->Foo("test");
}
-
diff --git a/sapi/phpdbg/tests/include_once.phpt b/sapi/phpdbg/tests/include_once.phpt
index 0a00e04cde..b91f5e83a0 100644
--- a/sapi/phpdbg/tests/include_once.phpt
+++ b/sapi/phpdbg/tests/include_once.phpt
@@ -13,4 +13,3 @@ prompt>
include_once __DIR__.'/include.inc';
include_once __DIR__.'/include.inc';
-
diff --git a/sapi/phpdbg/tests/phpdbg_oplog_001.phpt b/sapi/phpdbg/tests/phpdbg_oplog_001.phpt
index e4e558b9fa..5a5e9ba61c 100644
--- a/sapi/phpdbg/tests/phpdbg_oplog_001.phpt
+++ b/sapi/phpdbg/tests/phpdbg_oplog_001.phpt
@@ -55,4 +55,3 @@ $a->b();
$a->b('ha');
var_dump(phpdbg_end_oplog(["functions" => true]));
-
diff --git a/sapi/tests/test001.phpt b/sapi/tests/test001.phpt
index a964393fd9..318ab7a90f 100644
--- a/sapi/tests/test001.phpt
+++ b/sapi/tests/test001.phpt
@@ -13,4 +13,4 @@ END;
echo "HELLO";
?>
--EXPECT--
-HELLO \ No newline at end of file
+HELLO
diff --git a/sapi/tests/test002.phpt b/sapi/tests/test002.phpt
index 42ade3d96b..4afd8e276f 100644
--- a/sapi/tests/test002.phpt
+++ b/sapi/tests/test002.phpt
@@ -19,4 +19,4 @@ END;
echo "HELLO";
?>
--EXPECT--
-HELLO \ No newline at end of file
+HELLO
diff --git a/sapi/tests/test003.phpt b/sapi/tests/test003.phpt
index 5cabe66b32..24abdbbf41 100644
--- a/sapi/tests/test003.phpt
+++ b/sapi/tests/test003.phpt
@@ -18,4 +18,4 @@ END;
echo $_SERVER['PATH_INFO'];
?>
--EXPECT--
-/path/info \ No newline at end of file
+/path/info
diff --git a/sapi/tests/test004.phpt b/sapi/tests/test004.phpt
index ef4377484e..d1da1db6ed 100644
--- a/sapi/tests/test004.phpt
+++ b/sapi/tests/test004.phpt
@@ -23,4 +23,4 @@ END;
echo $_SERVER['PATH_INFO'];
?>
--EXPECT--
-/path/info \ No newline at end of file
+/path/info
diff --git a/sapi/tests/test006.phpt b/sapi/tests/test006.phpt
index d3cd74e7da..c43fe493c3 100644
--- a/sapi/tests/test006.phpt
+++ b/sapi/tests/test006.phpt
@@ -43,7 +43,6 @@ Content-Type: application/octet-stream
phpinfo();
?>
-----------------------------240723202011929--
-
--FILE--
<?php
error_reporting(0);
diff --git a/sapi/tests/test007.phpt b/sapi/tests/test007.phpt
index 84d9bdb89a..76fca8fcd6 100644
--- a/sapi/tests/test007.phpt
+++ b/sapi/tests/test007.phpt
@@ -38,7 +38,6 @@ Content-Type: application/octet-stream
phpinfo();
?>
-----------------------------240723202011929--
-
--FILE--
<?php
print @$_POST['choices'];
diff --git a/tests/basic/bug20539.phpt b/tests/basic/bug20539.phpt
index 1406ce088e..6c2cfb2647 100644
--- a/tests/basic/bug20539.phpt
+++ b/tests/basic/bug20539.phpt
@@ -17,4 +17,3 @@ session.save_path=./tests/basic/
--EXPECT--
good :)
bool(true)
-
diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt
index 30662add36..24d1b1b0b4 100644
--- a/tests/classes/__call_003.phpt
+++ b/tests/classes/__call_003.phpt
@@ -30,4 +30,3 @@ array(1) {
[0]=>
&string(7) "changed"
}
-
diff --git a/tests/classes/abstract_derived.phpt b/tests/classes/abstract_derived.phpt
index 21f8fd8788..a23205f9a5 100644
--- a/tests/classes/abstract_derived.phpt
+++ b/tests/classes/abstract_derived.phpt
@@ -14,5 +14,4 @@ class derived extends base {
===DONE===
<?php exit(0); ?>
--EXPECTF--
-
Fatal error: Class derived contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (derived::show) in %sabstract_derived.php on line %d
diff --git a/tests/classes/abstract_final.phpt b/tests/classes/abstract_final.phpt
index cdf61d17e7..a82bfff227 100644
--- a/tests/classes/abstract_final.phpt
+++ b/tests/classes/abstract_final.phpt
@@ -10,5 +10,4 @@ class fail {
echo "Done\n"; // Shouldn't be displayed
?>
--EXPECTF--
-
Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d
diff --git a/tests/classes/abstract_inherit.phpt b/tests/classes/abstract_inherit.phpt
index 1acf19d7c0..8e9e118e08 100644
--- a/tests/classes/abstract_inherit.phpt
+++ b/tests/classes/abstract_inherit.phpt
@@ -16,7 +16,6 @@ $t = new pass();
echo "Done\n"; // Shouldn't be displayed
?>
--EXPECTF--
-
Fatal error: Uncaught Error: Cannot instantiate abstract class fail in %s:%d
Stack trace:
#0 {main}
diff --git a/tests/classes/abstract_redeclare.phpt b/tests/classes/abstract_redeclare.phpt
index 8e09a3a12b..5643cb7a61 100644
--- a/tests/classes/abstract_redeclare.phpt
+++ b/tests/classes/abstract_redeclare.phpt
@@ -16,5 +16,4 @@ class fail extends pass {
echo "Done\n"; // Shouldn't be displayed
?>
--EXPECTF--
-
Fatal error: Class fail contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (fail::show) in %sabstract_redeclare.php on line %d
diff --git a/tests/classes/array_access_012.phpt b/tests/classes/array_access_012.phpt
index 1fe0b24865..ba3d6780f1 100644
--- a/tests/classes/array_access_012.phpt
+++ b/tests/classes/array_access_012.phpt
@@ -30,7 +30,6 @@ $data['element'] = &$test;
===DONE===
<?php exit(0); ?>
--EXPECTF--
-
Notice: Indirect modification of overloaded element of ArrayAccessImpl has no effect in %sarray_access_012.php on line 24
Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %sarray_access_012.php:24
diff --git a/tests/classes/autoload_018.phpt b/tests/classes/autoload_018.phpt
index 4a21fad338..e83767d632 100644
--- a/tests/classes/autoload_018.phpt
+++ b/tests/classes/autoload_018.phpt
@@ -44,4 +44,3 @@ OUT: autoload(UndefinedClass2)
OUT: autoload(UndefinedClass1)
OUT: autoload(UndefinedClass0)
bool(false)
-
diff --git a/tests/classes/class_example.phpt b/tests/classes/class_example.phpt
index b0e9cf8f6e..7ee0615784 100644
--- a/tests/classes/class_example.phpt
+++ b/tests/classes/class_example.phpt
@@ -1,7 +1,6 @@
--TEST--
Classes general test
--FILE--
-
<?php
/* pretty nifty object oriented code! */
diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt
index 03af299ba8..b60991844f 100644
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -58,7 +58,6 @@ Class constant declarations
echo "\nYou should not see this.";
?>
--EXPECTF--
-
Notice: Undefined variable: undef in %s on line 5
Attempt to access various kinds of class constants:
diff --git a/tests/classes/constants_basic_002.phpt b/tests/classes/constants_basic_002.phpt
index 006e5fbab9..def661ec45 100644
--- a/tests/classes/constants_basic_002.phpt
+++ b/tests/classes/constants_basic_002.phpt
@@ -18,7 +18,6 @@ Basic class support - defining and reading a class constant.
var_dump($myInstance)
?>
--EXPECTF--
-
Read class constant.
string(5) "hello"
diff --git a/tests/classes/constants_basic_004.phpt b/tests/classes/constants_basic_004.phpt
index e893768629..c3df0747a4 100644
--- a/tests/classes/constants_basic_004.phpt
+++ b/tests/classes/constants_basic_004.phpt
@@ -42,7 +42,6 @@ Test properties with array default values using class constants as keys and valu
var_dump($x, $b, $c);
?>
--EXPECTF--
-
Static properties:
array(1) {
["key"]=>
diff --git a/tests/classes/constants_basic_005.phpt b/tests/classes/constants_basic_005.phpt
index 55d23f77b1..6d1ac8355d 100644
--- a/tests/classes/constants_basic_005.phpt
+++ b/tests/classes/constants_basic_005.phpt
@@ -13,4 +13,3 @@ Test constants with default values based on other constants.
--EXPECT--
string(5) "hello"
string(5) "hello"
-
diff --git a/tests/classes/constants_error_001.phpt b/tests/classes/constants_error_001.phpt
index 9bb5533d7e..60ec7e6638 100644
--- a/tests/classes/constants_error_001.phpt
+++ b/tests/classes/constants_error_001.phpt
@@ -9,5 +9,4 @@ Error case: duplicate class constant definition
}
?>
--EXPECTF--
-
Fatal error: Cannot redefine class constant myclass::myConst in %s on line 5
diff --git a/tests/classes/constants_error_003.phpt b/tests/classes/constants_error_003.phpt
index b56679b388..fa7984f06e 100644
--- a/tests/classes/constants_error_003.phpt
+++ b/tests/classes/constants_error_003.phpt
@@ -16,5 +16,4 @@ Basic class support - attempting to pass a class constant by reference.
var_dump(aclass::myConst);
?>
--EXPECTF--
-
Fatal error: Only variables can be passed by reference in %s on line 12
diff --git a/tests/classes/constants_error_006.phpt b/tests/classes/constants_error_006.phpt
index 01839ba7ef..b8f970a16f 100644
--- a/tests/classes/constants_error_006.phpt
+++ b/tests/classes/constants_error_006.phpt
@@ -12,5 +12,4 @@ Basic class support - attempting to modify a class constant by assignment
var_dump(aclass::myConst);
?>
--EXPECTF--
-
Parse error: %s in %s on line %d
diff --git a/tests/classes/constants_error_007.phpt b/tests/classes/constants_error_007.phpt
index 54b32e4ab2..b26ae3906c 100644
--- a/tests/classes/constants_error_007.phpt
+++ b/tests/classes/constants_error_007.phpt
@@ -11,5 +11,4 @@ Basic class support - attempting to create a reference to a class constant
$a = &aclass::myConst;
?>
--EXPECTF--
-
Parse error: %s in %s on line %d
diff --git a/tests/classes/constants_scope_001.phpt b/tests/classes/constants_scope_001.phpt
index 650bcc2228..7adf3f8681 100644
--- a/tests/classes/constants_scope_001.phpt
+++ b/tests/classes/constants_scope_001.phpt
@@ -28,7 +28,6 @@ ErrorCodesDerived::print_fatal_error_codes();
?>
--EXPECTF--
-
Warning: Use of undefined constant FATAL - assumed 'FATAL' (this will throw an Error in a future version of PHP) in %sconstants_scope_001.php on line %d
FATAL = FATAL
self::FATAL = Fatal error
diff --git a/tests/classes/constants_visibility_006.phpt b/tests/classes/constants_visibility_006.phpt
index 537c8eac0f..a3317cca8a 100644
--- a/tests/classes/constants_visibility_006.phpt
+++ b/tests/classes/constants_visibility_006.phpt
@@ -8,4 +8,3 @@ class A {
?>
--EXPECTF--
Fatal error: Cannot use 'abstract' as constant modifier in %s on line 3
-
diff --git a/tests/classes/constants_visibility_error_003.phpt b/tests/classes/constants_visibility_error_003.phpt
index c385bbd300..6f62069c2e 100644
--- a/tests/classes/constants_visibility_error_003.phpt
+++ b/tests/classes/constants_visibility_error_003.phpt
@@ -10,7 +10,5 @@ class A {
class B extends A {
protected const publicConst = 1;
}
-
-
--EXPECTF--
Fatal error: Access level to B::publicConst must be public (as in class A) in %s on line 9
diff --git a/tests/classes/constants_visibility_error_004.phpt b/tests/classes/constants_visibility_error_004.phpt
index fe37b0691f..65bfbd3c2b 100644
--- a/tests/classes/constants_visibility_error_004.phpt
+++ b/tests/classes/constants_visibility_error_004.phpt
@@ -10,7 +10,5 @@ class A {
class B extends A {
private const protectedConst = 1;
}
-
-
--EXPECTF--
Fatal error: Access level to B::protectedConst must be protected (as in class A) or weaker in %s on line 9
diff --git a/tests/classes/factory_and_singleton_006.phpt b/tests/classes/factory_and_singleton_006.phpt
index 5bc9433e32..b11c9f05d4 100644
--- a/tests/classes/factory_and_singleton_006.phpt
+++ b/tests/classes/factory_and_singleton_006.phpt
@@ -18,4 +18,3 @@ Fatal error: Uncaught Error: Call to private test::__destruct() from context ''
Stack trace:
#0 {main}
thrown in %sfactory_and_singleton_006.php on line %d
-
diff --git a/tests/classes/final_abstract.phpt b/tests/classes/final_abstract.phpt
index 25c2cfc810..229ae896b0 100644
--- a/tests/classes/final_abstract.phpt
+++ b/tests/classes/final_abstract.phpt
@@ -10,5 +10,4 @@ class fail {
echo "Done\n"; // Shouldn't be displayed
?>
--EXPECTF--
-
Fatal error: Cannot use the final modifier on an abstract class member in %s
diff --git a/tests/classes/implicit_instantiation_001.phpt b/tests/classes/implicit_instantiation_001.phpt
index 67be8c4dc9..495a8a1e35 100644
--- a/tests/classes/implicit_instantiation_001.phpt
+++ b/tests/classes/implicit_instantiation_001.phpt
@@ -34,8 +34,6 @@ var_dump($c);
?>
--EXPECTF--
-
-
---( $c->boolFalse )---
--> Attempting implicit conversion to object using increment...
diff --git a/tests/classes/inheritance_003.phpt b/tests/classes/inheritance_003.phpt
index 919e03126f..bcbead1be7 100644
--- a/tests/classes/inheritance_003.phpt
+++ b/tests/classes/inheritance_003.phpt
@@ -16,6 +16,5 @@ class B extends A
?>
===DONE===
--EXPECTF--
-
Warning: Declaration of B::f() should be compatible with A::f($x) in %sinheritance_003.php on line %d
===DONE===
diff --git a/tests/classes/inheritance_004.phpt b/tests/classes/inheritance_004.phpt
index d92ed830e8..7eb57b2770 100644
--- a/tests/classes/inheritance_004.phpt
+++ b/tests/classes/inheritance_004.phpt
@@ -16,6 +16,5 @@ class B extends A
?>
===DONE===
--EXPECTF--
-
Warning: Declaration of B::f($x) should be compatible with A::f() in %sinheritance_004.php on line %d
===DONE===
diff --git a/tests/classes/interface_constant_inheritance_001.phpt b/tests/classes/interface_constant_inheritance_001.phpt
index 046f3b1c5a..9f5e76d297 100644
--- a/tests/classes/interface_constant_inheritance_001.phpt
+++ b/tests/classes/interface_constant_inheritance_001.phpt
@@ -13,5 +13,4 @@ interface I2 extends I1 {
echo "Done\n";
?>
--EXPECTF--
-
Fatal error: Cannot inherit previously-inherited or override constant FOO from interface I1 in %s on line 6
diff --git a/tests/classes/interface_constant_inheritance_002.phpt b/tests/classes/interface_constant_inheritance_002.phpt
index 952dbaf7f4..681de11cbf 100644
--- a/tests/classes/interface_constant_inheritance_002.phpt
+++ b/tests/classes/interface_constant_inheritance_002.phpt
@@ -13,5 +13,4 @@ class C implements I {
echo "Done\n";
?>
--EXPECTF--
-
Fatal error: Cannot inherit previously-inherited or override constant FOO from interface I in %s on line 6
diff --git a/tests/classes/interface_constant_inheritance_003.phpt b/tests/classes/interface_constant_inheritance_003.phpt
index 908ca7b4d6..b4902f7306 100644
--- a/tests/classes/interface_constant_inheritance_003.phpt
+++ b/tests/classes/interface_constant_inheritance_003.phpt
@@ -16,5 +16,4 @@ class C implements I1,I2 {
echo "Done\n";
?>
--EXPECTF--
-
Fatal error: Cannot inherit previously-inherited or override constant FOO from interface I2 in %s on line 10
diff --git a/tests/classes/interface_constant_inheritance_005.phpt b/tests/classes/interface_constant_inheritance_005.phpt
index 60bf222e85..1abb85751e 100644
--- a/tests/classes/interface_constant_inheritance_005.phpt
+++ b/tests/classes/interface_constant_inheritance_005.phpt
@@ -9,4 +9,4 @@ interface IA {
echo "Done\n";
?>
--EXPECT--
-Done \ No newline at end of file
+Done
diff --git a/tests/classes/interface_constant_inheritance_006.phpt b/tests/classes/interface_constant_inheritance_006.phpt
index 125326b224..7e303bb152 100644
--- a/tests/classes/interface_constant_inheritance_006.phpt
+++ b/tests/classes/interface_constant_inheritance_006.phpt
@@ -1,6 +1,5 @@
--TEST--
Ensure a interface can not have protected constants
-
--FILE--
<?php
interface A {
diff --git a/tests/classes/interface_constant_inheritance_007.phpt b/tests/classes/interface_constant_inheritance_007.phpt
index 52695343e1..766f89b95d 100644
--- a/tests/classes/interface_constant_inheritance_007.phpt
+++ b/tests/classes/interface_constant_inheritance_007.phpt
@@ -1,6 +1,5 @@
--TEST--
Ensure a interface can not have private constants
-
--FILE--
<?php
interface A {
diff --git a/tests/classes/interface_method.phpt b/tests/classes/interface_method.phpt
index f3e465b21b..491b4c21d6 100644
--- a/tests/classes/interface_method.phpt
+++ b/tests/classes/interface_method.phpt
@@ -9,5 +9,4 @@ interface if_a {
?>
--EXPECTF--
-
Fatal error: Interface function if_a::err() cannot contain body %s on line %d
diff --git a/tests/classes/interface_method_final.phpt b/tests/classes/interface_method_final.phpt
index 74c86f1e50..e936b5a03a 100644
--- a/tests/classes/interface_method_final.phpt
+++ b/tests/classes/interface_method_final.phpt
@@ -9,5 +9,4 @@ class if_a {
?>
--EXPECTF--
-
Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d
diff --git a/tests/classes/interface_method_private.phpt b/tests/classes/interface_method_private.phpt
index 000b33fae4..11f8bf648f 100644
--- a/tests/classes/interface_method_private.phpt
+++ b/tests/classes/interface_method_private.phpt
@@ -9,5 +9,4 @@ interface if_a {
?>
--EXPECTF--
-
Fatal error: Access type for interface method if_a::err() must be omitted in %s on line %d
diff --git a/tests/classes/interface_optional_arg.phpt b/tests/classes/interface_optional_arg.phpt
index 9c0de6cfb0..6fc97f55fb 100644
--- a/tests/classes/interface_optional_arg.phpt
+++ b/tests/classes/interface_optional_arg.phpt
@@ -22,4 +22,3 @@ $foo->bar();
?>
--EXPECT--
foo
-
diff --git a/tests/classes/interfaces_001.phpt b/tests/classes/interfaces_001.phpt
index d8d801192f..97b48aa03d 100644
--- a/tests/classes/interfaces_001.phpt
+++ b/tests/classes/interfaces_001.phpt
@@ -21,4 +21,3 @@ echo $foo->getMessage() . "\n";
?>
--EXPECT--
foo
-
diff --git a/tests/classes/interfaces_002.phpt b/tests/classes/interfaces_002.phpt
index fad961bf27..6cc899bf1d 100644
--- a/tests/classes/interfaces_002.phpt
+++ b/tests/classes/interfaces_002.phpt
@@ -23,5 +23,4 @@ echo "Message: " . $foo->getMessage() . "\n";
?>
===DONE===
--EXPECTF--
-
Fatal error: Class Exception_foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (ThrowableInterface::getErrno) in %s on line %d
diff --git a/tests/classes/interfaces_003.phpt b/tests/classes/interfaces_003.phpt
index 28680096c5..97b5f7dde5 100644
--- a/tests/classes/interfaces_003.phpt
+++ b/tests/classes/interfaces_003.phpt
@@ -22,7 +22,6 @@ $obj = new MyTestClass;
?>
===DONE===
--EXPECTF--
-
Fatal error: Uncaught ArgumentCountError: Too few arguments to function MyTestClass::__construct(), 0 passed in %sinterfaces_003.php on line 17 and exactly 1 expected in %sinterfaces_003.php:12
Stack trace:
#0 %s(%d): MyTestClass->__construct()
diff --git a/tests/classes/property_override_protectedStatic_private.phpt b/tests/classes/property_override_protectedStatic_private.phpt
index 712f51cd3c..1914825804 100644
--- a/tests/classes/property_override_protectedStatic_private.phpt
+++ b/tests/classes/property_override_protectedStatic_private.phpt
@@ -28,6 +28,4 @@ Redeclare inherited protected static property as private.
$b->showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18
-
diff --git a/tests/classes/property_override_protectedStatic_privateStatic.phpt b/tests/classes/property_override_protectedStatic_privateStatic.phpt
index 72e6e8a0a2..126afb36a7 100644
--- a/tests/classes/property_override_protectedStatic_privateStatic.phpt
+++ b/tests/classes/property_override_protectedStatic_privateStatic.phpt
@@ -27,6 +27,4 @@ Redeclare inherited protected static property as private static.
B::showB();
?>
--EXPECTF--
-
Fatal error: Access level to B::$p must be protected (as in class A) or weaker in %s on line 18
-
diff --git a/tests/classes/property_override_protectedStatic_protected.phpt b/tests/classes/property_override_protectedStatic_protected.phpt
index b6780586c4..4706115724 100644
--- a/tests/classes/property_override_protectedStatic_protected.phpt
+++ b/tests/classes/property_override_protectedStatic_protected.phpt
@@ -28,6 +28,4 @@ Redeclare inherited protected static property as protected.
$b->showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18
-
diff --git a/tests/classes/property_override_protectedStatic_public.phpt b/tests/classes/property_override_protectedStatic_public.phpt
index 14daa455a6..a0a68eebbd 100644
--- a/tests/classes/property_override_protectedStatic_public.phpt
+++ b/tests/classes/property_override_protectedStatic_public.phpt
@@ -28,6 +28,4 @@ Redeclare inherited protected static property as public.
$b->showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18
-
diff --git a/tests/classes/property_override_protectedStatic_publicStatic.phpt b/tests/classes/property_override_protectedStatic_publicStatic.phpt
index a214af9994..7c39838228 100644
--- a/tests/classes/property_override_protectedStatic_publicStatic.phpt
+++ b/tests/classes/property_override_protectedStatic_publicStatic.phpt
@@ -30,4 +30,3 @@ Redeclare inherited protected static property as public static.
A::p (static)
A::p (static)
B::p (static)
-
diff --git a/tests/classes/property_override_protected_private.phpt b/tests/classes/property_override_protected_private.phpt
index 9875dd59b8..b19185d541 100644
--- a/tests/classes/property_override_protected_private.phpt
+++ b/tests/classes/property_override_protected_private.phpt
@@ -29,5 +29,4 @@ Redeclare inherited protected property as private (duplicates Zend/tests/errmsg_
$b->showB();
?>
--EXPECTF--
-
Fatal error: Access level to B::$p must be protected (as in class A) or weaker in %s on line 18
diff --git a/tests/classes/property_override_protected_privateStatic.phpt b/tests/classes/property_override_protected_privateStatic.phpt
index 7193178d48..149107424c 100644
--- a/tests/classes/property_override_protected_privateStatic.phpt
+++ b/tests/classes/property_override_protected_privateStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited protected property as private static.
B::showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/property_override_protected_protectedStatic.phpt b/tests/classes/property_override_protected_protectedStatic.phpt
index abac19a793..e05b5f6f68 100644
--- a/tests/classes/property_override_protected_protectedStatic.phpt
+++ b/tests/classes/property_override_protected_protectedStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited protected property as protected static.
B::showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/property_override_protected_publicStatic.phpt b/tests/classes/property_override_protected_publicStatic.phpt
index 37865cc7d4..59132bf6ce 100644
--- a/tests/classes/property_override_protected_publicStatic.phpt
+++ b/tests/classes/property_override_protected_publicStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited protected property as public static.
B::showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/property_override_publicStatic_private.phpt b/tests/classes/property_override_publicStatic_private.phpt
index 6fd2774c54..1e5d28680c 100644
--- a/tests/classes/property_override_publicStatic_private.phpt
+++ b/tests/classes/property_override_publicStatic_private.phpt
@@ -28,6 +28,4 @@ Redeclare inherited public static property as private.
$b->showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18
-
diff --git a/tests/classes/property_override_publicStatic_privateStatic.phpt b/tests/classes/property_override_publicStatic_privateStatic.phpt
index 3635b918db..12b0c3fcaa 100644
--- a/tests/classes/property_override_publicStatic_privateStatic.phpt
+++ b/tests/classes/property_override_publicStatic_privateStatic.phpt
@@ -27,6 +27,4 @@ Redeclare inherited public static property as private static.
B::showB();
?>
--EXPECTF--
-
Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18
-
diff --git a/tests/classes/property_override_publicStatic_protected.phpt b/tests/classes/property_override_publicStatic_protected.phpt
index a5eaaea714..1b0fd0bdf1 100644
--- a/tests/classes/property_override_publicStatic_protected.phpt
+++ b/tests/classes/property_override_publicStatic_protected.phpt
@@ -28,6 +28,4 @@ Redeclare inherited public static property as protected.
$b->showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18
-
diff --git a/tests/classes/property_override_publicStatic_protectedStatic.phpt b/tests/classes/property_override_publicStatic_protectedStatic.phpt
index 00eb647d5d..c1f6f8ff1d 100644
--- a/tests/classes/property_override_publicStatic_protectedStatic.phpt
+++ b/tests/classes/property_override_publicStatic_protectedStatic.phpt
@@ -27,6 +27,4 @@ Redeclare inherited public static property as protected static.
B::showB();
?>
--EXPECTF--
-
Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18
-
diff --git a/tests/classes/property_override_publicStatic_public.phpt b/tests/classes/property_override_publicStatic_public.phpt
index f6ea7643c1..c6b6bf1b24 100644
--- a/tests/classes/property_override_publicStatic_public.phpt
+++ b/tests/classes/property_override_publicStatic_public.phpt
@@ -28,6 +28,4 @@ Redeclare inherited public static property as public.
$b->showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18
-
diff --git a/tests/classes/property_override_public_private.phpt b/tests/classes/property_override_public_private.phpt
index 581d663b60..fe4df691cc 100644
--- a/tests/classes/property_override_public_private.phpt
+++ b/tests/classes/property_override_public_private.phpt
@@ -29,6 +29,4 @@ Redeclare inherited public property as private.
$b->showB();
?>
--EXPECTF--
-
Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18
-
diff --git a/tests/classes/property_override_public_privateStatic.phpt b/tests/classes/property_override_public_privateStatic.phpt
index bacdc9ffe1..41daac4503 100644
--- a/tests/classes/property_override_public_privateStatic.phpt
+++ b/tests/classes/property_override_public_privateStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited public property as private static.
B::showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/property_override_public_protected.phpt b/tests/classes/property_override_public_protected.phpt
index aa79a53595..eb7f1d7b2c 100644
--- a/tests/classes/property_override_public_protected.phpt
+++ b/tests/classes/property_override_public_protected.phpt
@@ -29,6 +29,4 @@ Redeclare inherited public property as protected.
$b->showB();
?>
--EXPECTF--
-
Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18
-
diff --git a/tests/classes/property_override_public_protectedStatic.phpt b/tests/classes/property_override_public_protectedStatic.phpt
index 8d78713add..2582305471 100644
--- a/tests/classes/property_override_public_protectedStatic.phpt
+++ b/tests/classes/property_override_public_protectedStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited public property as protected static.
B::showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/property_override_public_publicStatic.phpt b/tests/classes/property_override_public_publicStatic.phpt
index 94feea8a22..bb6021454c 100644
--- a/tests/classes/property_override_public_publicStatic.phpt
+++ b/tests/classes/property_override_public_publicStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited public property as public static.
B::showB();
?>
--EXPECTF--
-
Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt
index 68a57a8f89..08a89568e4 100644
--- a/tests/classes/static_properties_003_error1.phpt
+++ b/tests/classes/static_properties_003_error1.phpt
@@ -12,7 +12,6 @@ unset($c->y);
?>
==Done==
--EXPECTF--
-
--> Access non-visible static prop like instance prop:
Fatal error: Uncaught Error: Cannot access protected property C::$y in %s:8
diff --git a/tests/classes/static_properties_003_error2.phpt b/tests/classes/static_properties_003_error2.phpt
index b428b4ff6e..45ccff11b6 100644
--- a/tests/classes/static_properties_003_error2.phpt
+++ b/tests/classes/static_properties_003_error2.phpt
@@ -12,7 +12,6 @@ echo $c->y;
?>
==Done==
--EXPECTF--
-
--> Access non-visible static prop like instance prop:
Fatal error: Uncaught Error: Cannot access protected property C::$y in %s:8
diff --git a/tests/classes/static_properties_003_error3.phpt b/tests/classes/static_properties_003_error3.phpt
index b9423639b0..e8588a1160 100644
--- a/tests/classes/static_properties_003_error3.phpt
+++ b/tests/classes/static_properties_003_error3.phpt
@@ -12,7 +12,6 @@ $c->y = 1;
?>
==Done==
--EXPECTF--
-
--> Access non-visible static prop like instance prop:
Fatal error: Uncaught Error: Cannot access protected property C::$y in %s:8
diff --git a/tests/classes/static_properties_003_error4.phpt b/tests/classes/static_properties_003_error4.phpt
index 6501689ddb..6a4eafcd2a 100644
--- a/tests/classes/static_properties_003_error4.phpt
+++ b/tests/classes/static_properties_003_error4.phpt
@@ -12,7 +12,6 @@ $c->y =& $ref;
?>
==Done==
--EXPECTF--
-
--> Access non-visible static prop like instance prop:
Fatal error: Uncaught Error: Cannot access protected property C::$y in %s:8
diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt
index bfaa57e36f..907f7bc306 100644
--- a/tests/classes/tostring_004.phpt
+++ b/tests/classes/tostring_004.phpt
@@ -52,4 +52,3 @@ Error: 4096 - Method badToString::__toString() must return a string value
Try 2:
Error: 4096 - Method badToString::__toString() must return a string value
-
diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt
index 318dcbe086..35356581f4 100644
--- a/tests/classes/type_hinting_001.phpt
+++ b/tests/classes/type_hinting_001.phpt
@@ -32,7 +32,6 @@ $a->b($b);
?>
--EXPECTF--
-
Fatal error: Uncaught TypeError: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s:12
Stack trace:
#0 %s(%d): FooBar->a(Object(Blort))
diff --git a/tests/classes/unset_properties.phpt b/tests/classes/unset_properties.phpt
index e19a7d92d5..417542ddea 100644
--- a/tests/classes/unset_properties.phpt
+++ b/tests/classes/unset_properties.phpt
@@ -126,7 +126,6 @@ echo $o->getPrivateProperty();
echo "\n\n";
?>
-
--EXPECT--
publicProperty set
true
diff --git a/tests/func/003.phpt b/tests/func/003.phpt
index 1135009e21..8234af2e17 100644
--- a/tests/func/003.phpt
+++ b/tests/func/003.phpt
@@ -288,4 +288,3 @@ factorial(4) = 24
3
4
5
-
diff --git a/tests/func/004.phpt b/tests/func/004.phpt
index 79c891a223..6dbef57363 100644
--- a/tests/func/004.phpt
+++ b/tests/func/004.phpt
@@ -34,7 +34,6 @@ some_other_function();
?>
--EXPECT--
-
Before function declaration...
After function declaration...
Calling function for the first time...
diff --git a/tests/func/005.phpt b/tests/func/005.phpt
index e19eda496b..1ba45123c4 100644
--- a/tests/func/005.phpt
+++ b/tests/func/005.phpt
@@ -16,4 +16,3 @@ print "foo() will be called on shutdown...\n";
--EXPECT--
foo() will be called on shutdown...
foo
-
diff --git a/tests/func/ini_alter.phpt b/tests/func/ini_alter.phpt
index 111e826f71..258e4d2db0 100644
--- a/tests/func/ini_alter.phpt
+++ b/tests/func/ini_alter.phpt
@@ -16,4 +16,3 @@ var_dump($var);
--EXPECT--
string(1) "1"
string(1) "0"
-
diff --git a/tests/lang/028.phpt b/tests/lang/028.phpt
index 0c2f2f0756..e455c3b446 100644
--- a/tests/lang/028.phpt
+++ b/tests/lang/028.phpt
@@ -1055,4 +1055,3 @@ I'm still alive
Hey there!!
199
Dafna
-
diff --git a/tests/lang/032.phpt b/tests/lang/032.phpt
index caa4c7e430..abc98f752d 100644
--- a/tests/lang/032.phpt
+++ b/tests/lang/032.phpt
@@ -33,4 +33,3 @@ echo "OK\n";
?>
--EXPECT--
OK
-
diff --git a/tests/lang/bug21094.phpt b/tests/lang/bug21094.phpt
index ac3ae2a2c7..346185ba83 100644
--- a/tests/lang/bug21094.phpt
+++ b/tests/lang/bug21094.phpt
@@ -14,4 +14,3 @@ trigger_error("test");
?>
--EXPECTF--
[1024] errstr: test, errfile: %s, errline: %d
-
diff --git a/tests/lang/bug22690.phpt b/tests/lang/bug22690.phpt
index 9d5444051b..85ddcd3487 100644
--- a/tests/lang/bug22690.phpt
+++ b/tests/lang/bug22690.phpt
@@ -8,7 +8,6 @@ Bug #22690 (ob_start() is broken with create_function() callbacks)
?>
bar
--EXPECTF--
-
Deprecated: Function create_function() is deprecated in %s on line %d
BAR
BAR
diff --git a/tests/lang/bug24054.phpt b/tests/lang/bug24054.phpt
index 7bf87212c1..fd9a9bf0c7 100644
--- a/tests/lang/bug24054.phpt
+++ b/tests/lang/bug24054.phpt
@@ -18,7 +18,6 @@ $i === $j
TESTS;
include(dirname(__FILE__) . '/../quicktester.inc');
-
--EXPECT--
1,1,0,0
OK
diff --git a/tests/lang/bug24573.phpt b/tests/lang/bug24573.phpt
index 4a088c35e8..0e7456d3d2 100644
--- a/tests/lang/bug24573.phpt
+++ b/tests/lang/bug24573.phpt
@@ -20,5 +20,4 @@ echo "OK\n";
?>
--EXPECTF--
-
Fatal error: Cannot re-assign $this in %s on line %d
diff --git a/tests/lang/bug28800.phpt b/tests/lang/bug28800.phpt
index 8bd2c306e1..1b84cd6d0d 100644
--- a/tests/lang/bug28800.phpt
+++ b/tests/lang/bug28800.phpt
@@ -8,7 +8,6 @@ Bug #28800 (Incorrect string to number conversion for strings starting with 'inf
}
?>
--EXPECTF--
-
Warning: A non-numeric value encountered in %s on line %d
0
@@ -26,4 +25,3 @@ Warning: A non-numeric value encountered in %s on line %d
Warning: A non-numeric value encountered in %s on line %d
0
-
diff --git a/tests/lang/bug43958.phpt b/tests/lang/bug43958.phpt
index bc88bcda0f..c1fca9d633 100644
--- a/tests/lang/bug43958.phpt
+++ b/tests/lang/bug43958.phpt
@@ -14,4 +14,3 @@ MyClass::loadCode('file-which-does-not-exist-on-purpose.php');
Warning: include(file-which-does-not-exist-on-purpose.php): failed to open stream: No such file or directory in %sbug43958.php on line 5
Warning: include(): Failed opening 'file-which-does-not-exist-on-purpose.php' for inclusion (include_path='%s') in %sbug43958.php on line 5
-
diff --git a/tests/lang/bug44827.phpt b/tests/lang/bug44827.phpt
index 90bf1d8893..d871cfd2a8 100644
--- a/tests/lang/bug44827.phpt
+++ b/tests/lang/bug44827.phpt
@@ -14,4 +14,3 @@ Warning: Class constants cannot be defined or redefined in %s on line %d
Warning: constant(): Couldn't find constant :: in %s on line %d
NULL
-
diff --git a/tests/lang/bug71897.phpt b/tests/lang/bug71897.phpt
index bd76921af6..5864b1dece 100644
--- a/tests/lang/bug71897.phpt
+++ b/tests/lang/bug71897.phpt
@@ -10,7 +10,6 @@ eval("
?>
--EXPECTF--
-
Warning: Unexpected character in input: '%s' (ASCII=127) state=0 in %s(%d) : eval()'d code on line %d
Parse error: syntax error, unexpected 'b' (T_STRING) in %s(%d) : eval()'d code on line %d
diff --git a/tests/lang/compare_objects_basic1.phpt b/tests/lang/compare_objects_basic1.phpt
index e54fb2173e..90eb9a0581 100644
--- a/tests/lang/compare_objects_basic1.phpt
+++ b/tests/lang/compare_objects_basic1.phpt
@@ -1,7 +1,6 @@
--TEST--
Test standard 'compare' object handler
--FILE--
-
<?php
echo "Simple test for standard compare object handler\n";
diff --git a/tests/lang/compare_objects_basic2.phpt b/tests/lang/compare_objects_basic2.phpt
index c38dbcec42..ccd3a001fc 100644
--- a/tests/lang/compare_objects_basic2.phpt
+++ b/tests/lang/compare_objects_basic2.phpt
@@ -1,7 +1,6 @@
--TEST--
Test object compare when object handler different
--FILE--
-
<?php
//Set the default time zone
diff --git a/tests/lang/each_binary_safety.phpt b/tests/lang/each_binary_safety.phpt
index 37b18b32c7..ce175495aa 100644
--- a/tests/lang/each_binary_safety.phpt
+++ b/tests/lang/each_binary_safety.phpt
@@ -10,6 +10,5 @@ while (list($key, $val) = each($arr)) {
}
?>
--EXPECTF--
-
Deprecated: The each() function is deprecated. This message will be suppressed on further calls in %s on line %d
7: foo%00bar => foo%00bar
diff --git a/tests/lang/engine_assignExecutionOrder_001.phpt b/tests/lang/engine_assignExecutionOrder_001.phpt
index f5140b54e2..a70e3eee93 100644
--- a/tests/lang/engine_assignExecutionOrder_001.phpt
+++ b/tests/lang/engine_assignExecutionOrder_001.phpt
@@ -72,8 +72,6 @@ var_dump(C::$string);
?>
--EXPECTF--
-
-
Order with local assignment:
in f()
in g()
diff --git a/tests/lang/foreachLoop.002.phpt b/tests/lang/foreachLoop.002.phpt
index 5b92736e5d..e0426e810f 100644
--- a/tests/lang/foreachLoop.002.phpt
+++ b/tests/lang/foreachLoop.002.phpt
@@ -72,7 +72,6 @@ var_dump($a);
?>
--EXPECT--
-
Directly changing array values.
string(10) "original.1"
string(10) "original.2"
diff --git a/tests/lang/foreachLoop.003.phpt b/tests/lang/foreachLoop.003.phpt
index a62d5dbb3b..3f20021a7b 100644
--- a/tests/lang/foreachLoop.003.phpt
+++ b/tests/lang/foreachLoop.003.phpt
@@ -31,7 +31,6 @@ foreach ($a as $v) {
echo "done.\n";
?>
--EXPECTF--
-
Not an array.
Warning: Invalid argument supplied for foreach() in %s on line 4
diff --git a/tests/lang/foreachLoop.009.phpt b/tests/lang/foreachLoop.009.phpt
index 37b0163358..9bf2957e12 100644
--- a/tests/lang/foreachLoop.009.phpt
+++ b/tests/lang/foreachLoop.009.phpt
@@ -51,7 +51,6 @@ foreach ($refedArray as $k=>&$v4) {
?>
--EXPECT--
-
Remove elements from a referenced array during loop
key: 0; value: original.0
key: 1; value: original.1
@@ -75,4 +74,3 @@ key: 4; value: new.1
key: 5; value: new.2
key: 6; value: new.3
Loop detected, as expected.
-
diff --git a/tests/lang/foreachLoop.011.phpt b/tests/lang/foreachLoop.011.phpt
index 1f57e0acdf..b1048fa9a2 100644
--- a/tests/lang/foreachLoop.011.phpt
+++ b/tests/lang/foreachLoop.011.phpt
@@ -22,7 +22,6 @@ foreach ($a as $v) {
?>
--EXPECT--
-
Change from array to non iterable:
int(1)
int(2)
diff --git a/tests/lang/foreachLoop.012.phpt b/tests/lang/foreachLoop.012.phpt
index b308e9ff57..4d7beeba4f 100644
--- a/tests/lang/foreachLoop.012.phpt
+++ b/tests/lang/foreachLoop.012.phpt
@@ -69,7 +69,6 @@ withRefValue(4, $transform);
?>
--EXPECT--
-
Popping elements off end of an unreferenced array
---( Array with 1 element(s): )---
--> State of array before loop:
diff --git a/tests/lang/foreachLoop.013.phpt b/tests/lang/foreachLoop.013.phpt
index e53130da00..acc197f86f 100644
--- a/tests/lang/foreachLoop.013.phpt
+++ b/tests/lang/foreachLoop.013.phpt
@@ -69,7 +69,6 @@ withRefValue(4, $transform);
?>
--EXPECT--
-
Popping elements off end of an unreferenced array, using &$value.
---( Array with 1 element(s): )---
--> State of array before loop:
diff --git a/tests/lang/foreachLoop.015.phpt b/tests/lang/foreachLoop.015.phpt
index 876c867512..ef5d030cd0 100644
--- a/tests/lang/foreachLoop.015.phpt
+++ b/tests/lang/foreachLoop.015.phpt
@@ -71,7 +71,6 @@ withRefValue(4, $transform);
?>
--EXPECT--
-
Popping elements off end of a referenced array, using &$value
---( Array with 1 element(s): )---
--> State of referenced array before loop:
diff --git a/tests/lang/foreachLoop.016.phpt b/tests/lang/foreachLoop.016.phpt
index 01c44449a7..00deb5f1db 100644
--- a/tests/lang/foreachLoop.016.phpt
+++ b/tests/lang/foreachLoop.016.phpt
@@ -117,7 +117,6 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
unset(C::$a[0]->b, $b);
?>
--EXPECTF--
-
$a
array(1) {
[0]=>
diff --git a/tests/lang/foreachLoopObjects.001.phpt b/tests/lang/foreachLoopObjects.001.phpt
index 93eeaadc6a..7e8a40438e 100644
--- a/tests/lang/foreachLoopObjects.001.phpt
+++ b/tests/lang/foreachLoopObjects.001.phpt
@@ -35,8 +35,6 @@ echo "\nCheck key and value after the loop.\n";
var_dump($k, $v);
?>
--EXPECT--
-
-
Simple loop.
string(10) "Original a"
string(10) "Original b"
diff --git a/tests/lang/foreachLoopObjects.005.phpt b/tests/lang/foreachLoopObjects.005.phpt
index 624d9ad10c..8d6a4d5dc3 100644
--- a/tests/lang/foreachLoopObjects.005.phpt
+++ b/tests/lang/foreachLoopObjects.005.phpt
@@ -43,7 +43,6 @@ var_dump($obj);
?>
--EXPECTF--
-
Removing properties before the current element from an iterated object.
string(10) "Original a"
string(10) "Original b"
diff --git a/tests/lang/foreach_with_references_001.phpt b/tests/lang/foreach_with_references_001.phpt
index eb52bb8c10..a1f7c33600 100644
--- a/tests/lang/foreach_with_references_001.phpt
+++ b/tests/lang/foreach_with_references_001.phpt
@@ -16,7 +16,6 @@ foreach($arr as $key => &$val) {
}
print_r($arr);
-
--EXPECT--
Array
(
diff --git a/tests/lang/func_get_arg_variation.phpt b/tests/lang/func_get_arg_variation.phpt
index 83b20848fe..741b6604c0 100644
--- a/tests/lang/func_get_arg_variation.phpt
+++ b/tests/lang/func_get_arg_variation.phpt
@@ -25,4 +25,3 @@ Warning: func_get_arg() expects parameter 1 to be int, string given in %s on lin
Warning: func_get_arg(): The argument number should be >= 0 in %s on line %d
Warning: func_get_arg(): Argument 2 not passed to function in %s on line %d
-
diff --git a/tests/lang/func_get_args.002.phpt b/tests/lang/func_get_args.002.phpt
index ea78d99a2b..f516893418 100644
--- a/tests/lang/func_get_args.002.phpt
+++ b/tests/lang/func_get_args.002.phpt
@@ -19,4 +19,3 @@ array(3) {
[2]=>
int(3)
}
-
diff --git a/tests/lang/func_get_args.004.phpt b/tests/lang/func_get_args.004.phpt
index bafd9539ea..6e98c763b2 100644
--- a/tests/lang/func_get_args.004.phpt
+++ b/tests/lang/func_get_args.004.phpt
@@ -30,7 +30,6 @@ refVal($b, $b);
var_dump($b);
?>
--EXPECT--
-
-- Val, Ref --
string(10) "original.a"
string(10) "original.a"
diff --git a/tests/lang/func_num_args.003.phpt b/tests/lang/func_num_args.003.phpt
index 168f79d04e..1520c31ed4 100644
--- a/tests/lang/func_num_args.003.phpt
+++ b/tests/lang/func_num_args.003.phpt
@@ -7,6 +7,5 @@ var_dump(func_num_args());
?>
--EXPECTF--
-
Warning: func_num_args(): Called from the global scope - no function context in %s on line %d
int(-1)
diff --git a/tests/lang/func_num_args.004.phpt b/tests/lang/func_num_args.004.phpt
index aef61668a4..7924a85a68 100644
--- a/tests/lang/func_num_args.004.phpt
+++ b/tests/lang/func_num_args.004.phpt
@@ -30,8 +30,6 @@ refVal($b, $b);
var_dump($b);
?>
--EXPECT--
-
-
-- Val, Ref --
string(10) "original.a"
string(10) "original.a"
diff --git a/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt b/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt
index 960fd73e73..16d7dba40f 100644
--- a/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt
+++ b/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt
@@ -580,4 +580,3 @@ int(-1)
--- testing: 9223372036854775807 | -9.2233720368548E+18 ---
int(-1)
===DONE===
-
diff --git a/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt b/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt
index a082617ea8..1ed750cca9 100644
--- a/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt
+++ b/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt
@@ -580,4 +580,3 @@ int(-2)
--- testing: 9223372036854775807 ^ -9.2233720368548E+18 ---
int(-1)
===DONE===
-
diff --git a/tests/lang/operators/nan-comparison-false.phpt b/tests/lang/operators/nan-comparison-false.phpt
index f7679b8b67..2c44405670 100644
--- a/tests/lang/operators/nan-comparison-false.phpt
+++ b/tests/lang/operators/nan-comparison-false.phpt
@@ -15,7 +15,6 @@ var_dump(0 < $nan);
var_dump(0 <= $nan);
var_dump(0 > $nan);
var_dump(0 >= $nan);
-
--EXPECT--
** CONST
bool(false)
diff --git a/tests/lang/operators/operator_identical_recusion-01.phpt b/tests/lang/operators/operator_identical_recusion-01.phpt
index 3680e30e4d..70a7605bae 100644
--- a/tests/lang/operators/operator_identical_recusion-01.phpt
+++ b/tests/lang/operators/operator_identical_recusion-01.phpt
@@ -7,4 +7,4 @@ $a = [[$n]];
$b = [&$a];
var_dump($a === $b);
--EXPECT--
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/tests/lang/passByReference_003.phpt b/tests/lang/passByReference_003.phpt
index 8fe27407f1..be002031d7 100644
--- a/tests/lang/passByReference_003.phpt
+++ b/tests/lang/passByReference_003.phpt
@@ -23,7 +23,6 @@ echo "\nAfter call\n";
var_dump($undef2)
?>
--EXPECTF--
-
Passing undefined by value
Notice: Undefined variable: undef1 in %s on line 13
diff --git a/tests/lang/passByReference_005.phpt b/tests/lang/passByReference_005.phpt
index e3b0e21c5c..dc32962d67 100644
--- a/tests/lang/passByReference_005.phpt
+++ b/tests/lang/passByReference_005.phpt
@@ -143,7 +143,6 @@ var_dump($u1, $u2);
?>
--EXPECTF--
-
---- Pass by ref / pass by val: functions ----
Notice: Undefined variable: u1 in %s on line 72
diff --git a/tests/lang/passByReference_006.phpt b/tests/lang/passByReference_006.phpt
index f725092618..9f5d275333 100644
--- a/tests/lang/passByReference_006.phpt
+++ b/tests/lang/passByReference_006.phpt
@@ -54,7 +54,6 @@ var_dump($u1, $u2, $u3, $u4, $u5);
?>
--EXPECTF--
-
---- Pass uninitialised array & object by ref: function call ---
array(1) {
[0]=>
diff --git a/tests/lang/passByReference_008.phpt b/tests/lang/passByReference_008.phpt
index 4fd9a819a8..5042b72e4b 100644
--- a/tests/lang/passByReference_008.phpt
+++ b/tests/lang/passByReference_008.phpt
@@ -26,8 +26,6 @@ refVal($b, $b);
var_dump($b);
?>
--EXPECT--
-
-
-- Val, Ref --
string(10) "original.a"
string(10) "original.a"
diff --git a/tests/lang/passByReference_010.phpt b/tests/lang/passByReference_010.phpt
index 431659a24a..f996073c0f 100644
--- a/tests/lang/passByReference_010.phpt
+++ b/tests/lang/passByReference_010.phpt
@@ -33,8 +33,6 @@ var_dump($a);
?>
--EXPECTF--
-
-
---> Pass constant assignment by reference:
Notice: Only variables should be passed by reference in %s on line 9
diff --git a/tests/lang/returnByReference.002.phpt b/tests/lang/returnByReference.002.phpt
index 0880a8b7a5..67061048b3 100644
--- a/tests/lang/returnByReference.002.phpt
+++ b/tests/lang/returnByReference.002.phpt
@@ -23,7 +23,6 @@ $b = "changed";
var_dump($a); //expecting "changed"
?>
--EXPECTF--
-
Notice: Only variables should be assigned by reference in %s on line 13
string(8) "original"
string(7) "changed"
diff --git a/tests/lang/returnByReference.003.phpt b/tests/lang/returnByReference.003.phpt
index b14ae69549..44b5f7825b 100644
--- a/tests/lang/returnByReference.003.phpt
+++ b/tests/lang/returnByReference.003.phpt
@@ -37,7 +37,6 @@ var_dump($a, $b);
?>
--EXPECTF--
-
---> 1. Trying to assign by reference the return value of a function that returns by value:
Notice: Only variables should be assigned by reference in %s on line 17
diff --git a/tests/lang/returnByReference.004.phpt b/tests/lang/returnByReference.004.phpt
index 1b01bafae6..63d4c709a3 100644
--- a/tests/lang/returnByReference.004.phpt
+++ b/tests/lang/returnByReference.004.phpt
@@ -39,7 +39,6 @@ var_dump($a, $b);
?>
--EXPECTF--
-
---> 1. Trying to assign by reference the return value of a function that returns by value:
Notice: Only variables should be assigned by reference in %s on line 19
diff --git a/tests/lang/returnByReference.005.phpt b/tests/lang/returnByReference.005.phpt
index d446553973..1d7a390b15 100644
--- a/tests/lang/returnByReference.005.phpt
+++ b/tests/lang/returnByReference.005.phpt
@@ -40,7 +40,6 @@ var_dump($a, $b);
?>
--EXPECTF--
-
---> 1. Trying to assign by reference the return value of a function that returns by value:
Notice: Only variables should be assigned by reference in %s on line 20
diff --git a/tests/lang/returnByReference.007.phpt b/tests/lang/returnByReference.007.phpt
index 4879c16f93..b38dfa0cb1 100644
--- a/tests/lang/returnByReference.007.phpt
+++ b/tests/lang/returnByReference.007.phpt
@@ -43,7 +43,6 @@ var_dump($a, $b);
?>
--EXPECTF--
-
---> 1. Via a return by ref function call, assign by reference the return value of a function that returns by value:
Notice: Only variable references should be returned by reference in %s on line 16
diff --git a/tests/lang/returnByReference.008.phpt b/tests/lang/returnByReference.008.phpt
index b39832b5d8..360df577c2 100644
--- a/tests/lang/returnByReference.008.phpt
+++ b/tests/lang/returnByReference.008.phpt
@@ -44,7 +44,6 @@ var_dump($a, $b);
?>
--EXPECTF--
-
---> 1. Via a return by ref function call, assign by reference the return value of a function that returns by value:
Notice: Only variable references should be returned by reference in %s on line 16
diff --git a/tests/lang/returnByReference.009.phpt b/tests/lang/returnByReference.009.phpt
index 0d51a22158..68662f53eb 100644
--- a/tests/lang/returnByReference.009.phpt
+++ b/tests/lang/returnByReference.009.phpt
@@ -28,7 +28,6 @@ var_dump (testReturnVarByRef());
echo "\n---> 2. Return a value by reference -> Warning:\n";
var_dump (testReturnValByRef());
-
--EXPECTF--
---> 1. Return a variable by reference -> No warning:
int(1)
diff --git a/tests/lang/static_basic_001.phpt b/tests/lang/static_basic_001.phpt
index 47da74d8ce..302d2cf131 100644
--- a/tests/lang/static_basic_001.phpt
+++ b/tests/lang/static_basic_001.phpt
@@ -46,7 +46,6 @@ for ($i=0; $i<3; $i++) {
}
?>
--EXPECT--
-
Same variable used as static and non static.
---------
0
diff --git a/tests/lang/string/unicode_escape.phpt b/tests/lang/string/unicode_escape.phpt
index 0e9ac2cfc5..1092cee533 100644
--- a/tests/lang/string/unicode_escape.phpt
+++ b/tests/lang/string/unicode_escape.phpt
@@ -9,8 +9,6 @@ var_dump("\u{ff}"); // case-insensitive
var_dump("\u{2603}"); // Unicode snowman
var_dump("\u{1F602}"); // FACE WITH TEARS OF JOY emoji
var_dump("\u{0000001F602}"); // Leading zeroes permitted
-
-
--EXPECT--
string(1) "a"
string(2) "ΓΏ"
diff --git a/tests/lang/string/unicode_escape_legacy.phpt b/tests/lang/string/unicode_escape_legacy.phpt
index 9d3f40215e..c5cac68669 100644
--- a/tests/lang/string/unicode_escape_legacy.phpt
+++ b/tests/lang/string/unicode_escape_legacy.phpt
@@ -7,7 +7,6 @@ Tolerated Unicode escape sequences: Legacy compatibility
var_dump("\u");
var_dump("\u202e");
var_dump("\ufoobar");
-
--EXPECT--
string(2) "\u"
string(6) "\u202e"
diff --git a/tests/lang/string/unicode_escape_surrogates.phpt b/tests/lang/string/unicode_escape_surrogates.phpt
index cbd78a2496..09e525ad12 100644
--- a/tests/lang/string/unicode_escape_surrogates.phpt
+++ b/tests/lang/string/unicode_escape_surrogates.phpt
@@ -9,7 +9,6 @@ Valid Unicode escape sequences: Surrogate halves
var_dump(bin2hex("\u{D801}"));
var_dump(bin2hex("\u{DC00}"));
var_dump(bin2hex("\u{D801}\u{DC00}")); // CESU-8 encoding of U+10400
-
--EXPECT--
string(6) "eda081"
string(6) "edb080"
diff --git a/tests/lang/string_decimals_001.phpt b/tests/lang/string_decimals_001.phpt
index 8313a66369..2bd3ef62a2 100644
--- a/tests/lang/string_decimals_001.phpt
+++ b/tests/lang/string_decimals_001.phpt
@@ -17,7 +17,6 @@ test("9.9.9");
?>
===DONE===
--EXPECT--
-
--> Testing ..9:
int(0)
float(0)
diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt
index 65f1dc398d..f82a53fe75 100644
--- a/tests/lang/type_hints_001.phpt
+++ b/tests/lang/type_hints_001.phpt
@@ -20,7 +20,6 @@ type_hint_foo($bar);
?>
--EXPECTF--
-
Fatal error: Uncaught TypeError: Argument 1 passed to type_hint_foo() must be an instance of Foo, instance of Bar given, called in %s on line 16 and defined in %s:9
Stack trace:
#0 %s(%d): type_hint_foo(Object(Bar))
diff --git a/tests/lang/type_hints_002.phpt b/tests/lang/type_hints_002.phpt
index bdd5b4e93e..cd348ebfb2 100644
--- a/tests/lang/type_hints_002.phpt
+++ b/tests/lang/type_hints_002.phpt
@@ -23,4 +23,3 @@ NULL
-
NULL
-
-
diff --git a/tests/lang/type_hints_003.phpt b/tests/lang/type_hints_003.phpt
index d2c48a3ad7..f6b04dabff 100644
--- a/tests/lang/type_hints_003.phpt
+++ b/tests/lang/type_hints_003.phpt
@@ -8,5 +8,4 @@ class T {
}
?>
--EXPECTF--
-
Fatal error: Default value for parameters with a class type can only be NULL in %stype_hints_003.php on line 3
diff --git a/tests/output/bug60768.phpt b/tests/output/bug60768.phpt
index 2527e8e84a..4de7fbd69f 100644
--- a/tests/output/bug60768.phpt
+++ b/tests/output/bug60768.phpt
@@ -22,4 +22,3 @@ DONE
--EXPECT--
Output size: 120, expected 120
DONE
-
diff --git a/tests/output/bug65593.phpt b/tests/output/bug65593.phpt
index 2e40afa076..d20c3b0c24 100644
--- a/tests/output/bug65593.phpt
+++ b/tests/output/bug65593.phpt
@@ -10,4 +10,3 @@ ob_start(function(){ob_start();});
Test
Fatal error: ob_start(): Cannot use output buffering in output buffering display handlers in %sbug65593.php on line %d
-
diff --git a/tests/output/ob_end_clean_basic_001.phpt b/tests/output/ob_end_clean_basic_001.phpt
index 87942c2f6d..6824857675 100644
--- a/tests/output/ob_end_clean_basic_001.phpt
+++ b/tests/output/ob_end_clean_basic_001.phpt
@@ -20,7 +20,6 @@ var_dump(ob_end_clean());
?>
--EXPECTF--
-
Notice: ob_end_clean(): failed to delete buffer. No buffer to delete in %s on line 7
bool(false)
bool(true)
@@ -28,4 +27,3 @@ bool(true)
Notice: ob_end_clean(): failed to delete buffer. No buffer to delete in %s on line 16
bool(false)
-
diff --git a/tests/output/ob_end_clean_error_001.phpt b/tests/output/ob_end_clean_error_001.phpt
index 09bacaa081..821831ee50 100644
--- a/tests/output/ob_end_clean_error_001.phpt
+++ b/tests/output/ob_end_clean_error_001.phpt
@@ -15,7 +15,6 @@ var_dump(ob_end_clean($extra_arg));
?>
--EXPECTF--
-
Too many arguments
Warning: ob_end_clean() expects exactly 0 parameters, 1 given in %s on line 10
diff --git a/tests/output/ob_get_clean_error_001.phpt b/tests/output/ob_get_clean_error_001.phpt
index 563e62c35a..cbedc03297 100644
--- a/tests/output/ob_get_clean_error_001.phpt
+++ b/tests/output/ob_get_clean_error_001.phpt
@@ -15,7 +15,6 @@ var_dump(ob_get_clean($extra_arg));
?>
--EXPECTF--
-
Too many arguments
Warning: ob_get_clean() expects exactly 0 parameters, 1 given in %s on line 10
diff --git a/tests/output/ob_get_length_error_001.phpt b/tests/output/ob_get_length_error_001.phpt
index 8e4318122b..f7fcfd2c96 100644
--- a/tests/output/ob_get_length_error_001.phpt
+++ b/tests/output/ob_get_length_error_001.phpt
@@ -15,7 +15,6 @@ var_dump(ob_get_length($extra_arg));
?>
--EXPECTF--
-
Too many arguments
Warning: ob_get_length() expects exactly 0 parameters, 1 given in %s on line 10
diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt
index eff1204236..ba75c16de9 100644
--- a/tests/output/ob_start_basic_004.phpt
+++ b/tests/output/ob_start_basic_004.phpt
@@ -34,7 +34,6 @@ for ($cs=-1; $cs<10; $cs++) {
?>
--EXPECT--
-
----( chunk_size: -1, output append size: 1 )----
f[call:1; len:8]12345678
diff --git a/tests/run-test/bug75042-3.phpt b/tests/run-test/bug75042-3.phpt
index 76ec2b5ff0..0e46d1e40f 100644
--- a/tests/run-test/bug75042-3.phpt
+++ b/tests/run-test/bug75042-3.phpt
@@ -5,4 +5,4 @@ nonexistentsharedmodule
--FILE--
<?php
--EXPECTF--
-PHP Warning: PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A \ No newline at end of file
+PHP Warning: PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A
diff --git a/tests/security/open_basedir_001.phpt b/tests/security/open_basedir_001.phpt
index c4459686fb..e6068350a8 100644
--- a/tests/security/open_basedir_001.phpt
+++ b/tests/security/open_basedir_001.phpt
@@ -22,4 +22,3 @@ string(10) "/usr/local"
string(14) "/usr/local/bin"
bool(false)
string(14) "/usr/local/bin"
-
diff --git a/tests/security/open_basedir_chdir.phpt b/tests/security/open_basedir_chdir.phpt
index aa8cef52da..20d6f82bc3 100644
--- a/tests/security/open_basedir_chdir.phpt
+++ b/tests/security/open_basedir_chdir.phpt
@@ -47,4 +47,3 @@ bool(false)
Warning: chdir(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d
bool(false)
*** Finished testing open_basedir configuration [chdir] ***
-
diff --git a/tests/security/open_basedir_chmod.phpt b/tests/security/open_basedir_chmod.phpt
index 7256d6ed7d..fd9953f86a 100644
--- a/tests/security/open_basedir_chmod.phpt
+++ b/tests/security/open_basedir_chmod.phpt
@@ -69,4 +69,3 @@ bool(true)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [chmod] ***
-
diff --git a/tests/security/open_basedir_copy.phpt b/tests/security/open_basedir_copy.phpt
index 7cb902add0..989570d640 100644
--- a/tests/security/open_basedir_copy.phpt
+++ b/tests/security/open_basedir_copy.phpt
@@ -75,4 +75,3 @@ bool(false)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [copy] ***
-
diff --git a/tests/security/open_basedir_copy_variation1.phpt b/tests/security/open_basedir_copy_variation1.phpt
index 899b31da27..e388ad76d7 100644
--- a/tests/security/open_basedir_copy_variation1.phpt
+++ b/tests/security/open_basedir_copy_variation1.phpt
@@ -31,4 +31,3 @@ bool(false)
Warning: unlink(copy.txt): No such file or directory in %s on line %d
bool(false)
*** Finished testing open_basedir configuration [copy] ***
-
diff --git a/tests/security/open_basedir_dir.phpt b/tests/security/open_basedir_dir.phpt
index 6dababa54b..90f55e5a95 100644
--- a/tests/security/open_basedir_dir.phpt
+++ b/tests/security/open_basedir_dir.phpt
@@ -86,4 +86,3 @@ object(Directory)#%d (2) {
resource(%d) of type (stream)
}
*** Finished testing open_basedir configuration [dir] ***
-
diff --git a/tests/security/open_basedir_error_log.phpt b/tests/security/open_basedir_error_log.phpt
index e89e190215..9c5890a262 100644
--- a/tests/security/open_basedir_error_log.phpt
+++ b/tests/security/open_basedir_error_log.phpt
@@ -42,4 +42,3 @@ bool(false)
string(0) ""
string(%d) "%s/test/ok/ok.txt"
*** Finished testing open_basedir configuration [error_log] ***
-
diff --git a/tests/security/open_basedir_error_log_variation.phpt b/tests/security/open_basedir_error_log_variation.phpt
index ab182669a8..e3cb15d258 100644
--- a/tests/security/open_basedir_error_log_variation.phpt
+++ b/tests/security/open_basedir_error_log_variation.phpt
@@ -46,4 +46,3 @@ Warning: error_log(%s/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
bool(true)
*** Finished testing open_basedir configuration [error_log] ***
-
diff --git a/tests/security/open_basedir_file.phpt b/tests/security/open_basedir_file.phpt
index e319482f7d..3382ae865d 100644
--- a/tests/security/open_basedir_file.phpt
+++ b/tests/security/open_basedir_file.phpt
@@ -85,4 +85,3 @@ array(1) {
string(12) "Hello World!"
}
*** Finished testing open_basedir configuration [file] ***
-
diff --git a/tests/security/open_basedir_file_exists.phpt b/tests/security/open_basedir_file_exists.phpt
index c249fc1165..2c90fd550b 100644
--- a/tests/security/open_basedir_file_exists.phpt
+++ b/tests/security/open_basedir_file_exists.phpt
@@ -52,4 +52,3 @@ bool(true)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [file_exists] ***
-
diff --git a/tests/security/open_basedir_file_put_contents.phpt b/tests/security/open_basedir_file_put_contents.phpt
index 0235c509b5..9f1f3bf13b 100644
--- a/tests/security/open_basedir_file_put_contents.phpt
+++ b/tests/security/open_basedir_file_put_contents.phpt
@@ -54,4 +54,3 @@ Warning: file_put_contents(): open_basedir restriction in effect. File%s/test/ba
Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
*** Finished testing open_basedir configuration [file_put_contents] ***
-
diff --git a/tests/security/open_basedir_fileatime.phpt b/tests/security/open_basedir_fileatime.phpt
index 02cc94f83f..4cb7aefc39 100644
--- a/tests/security/open_basedir_fileatime.phpt
+++ b/tests/security/open_basedir_fileatime.phpt
@@ -52,4 +52,3 @@ int(%d)
int(%d)
int(%d)
*** Finished testing open_basedir configuration [fileatime] ***
-
diff --git a/tests/security/open_basedir_filectime.phpt b/tests/security/open_basedir_filectime.phpt
index 542c8423ed..08c7ecd5f2 100644
--- a/tests/security/open_basedir_filectime.phpt
+++ b/tests/security/open_basedir_filectime.phpt
@@ -52,4 +52,3 @@ int(%d)
int(%d)
int(%d)
*** Finished testing open_basedir configuration [filectime] ***
-
diff --git a/tests/security/open_basedir_filegroup.phpt b/tests/security/open_basedir_filegroup.phpt
index 5f6279aa8f..f85f81bb7b 100644
--- a/tests/security/open_basedir_filegroup.phpt
+++ b/tests/security/open_basedir_filegroup.phpt
@@ -52,4 +52,3 @@ int(%d)
int(%d)
int(%d)
*** Finished testing open_basedir configuration [filegroup] ***
-
diff --git a/tests/security/open_basedir_fileinode.phpt b/tests/security/open_basedir_fileinode.phpt
index 070c2c806c..08e378bb6f 100644
--- a/tests/security/open_basedir_fileinode.phpt
+++ b/tests/security/open_basedir_fileinode.phpt
@@ -52,4 +52,3 @@ int(%d)
int(%d)
int(%d)
*** Finished testing open_basedir configuration [fileinode] ***
-
diff --git a/tests/security/open_basedir_filemtime.phpt b/tests/security/open_basedir_filemtime.phpt
index 7213ddb5b9..36e2de9ce8 100644
--- a/tests/security/open_basedir_filemtime.phpt
+++ b/tests/security/open_basedir_filemtime.phpt
@@ -52,4 +52,3 @@ int(%d)
int(%d)
int(%d)
*** Finished testing open_basedir configuration [filemtime] ***
-
diff --git a/tests/security/open_basedir_fileowner.phpt b/tests/security/open_basedir_fileowner.phpt
index b363b7e0e8..7ce6cb30f8 100644
--- a/tests/security/open_basedir_fileowner.phpt
+++ b/tests/security/open_basedir_fileowner.phpt
@@ -52,4 +52,3 @@ int(%d)
int(%d)
int(%d)
*** Finished testing open_basedir configuration [fileowner] ***
-
diff --git a/tests/security/open_basedir_fileperms.phpt b/tests/security/open_basedir_fileperms.phpt
index a1e6511b08..944f1cd5ed 100644
--- a/tests/security/open_basedir_fileperms.phpt
+++ b/tests/security/open_basedir_fileperms.phpt
@@ -52,4 +52,3 @@ int(%d)
int(%d)
int(%d)
*** Finished testing open_basedir configuration [fileperms] ***
-
diff --git a/tests/security/open_basedir_filesize.phpt b/tests/security/open_basedir_filesize.phpt
index a335dfd17c..e682c2fac4 100644
--- a/tests/security/open_basedir_filesize.phpt
+++ b/tests/security/open_basedir_filesize.phpt
@@ -52,4 +52,3 @@ int(%d)
int(%d)
int(%d)
*** Finished testing open_basedir configuration [filesize] ***
-
diff --git a/tests/security/open_basedir_filetype.phpt b/tests/security/open_basedir_filetype.phpt
index 5091db56f9..31a5aa4e23 100644
--- a/tests/security/open_basedir_filetype.phpt
+++ b/tests/security/open_basedir_filetype.phpt
@@ -52,4 +52,3 @@ string(4) "file"
string(4) "file"
string(4) "file"
*** Finished testing open_basedir configuration [filetype] ***
-
diff --git a/tests/security/open_basedir_fopen.phpt b/tests/security/open_basedir_fopen.phpt
index 3e236af9d5..e0fee66f0c 100644
--- a/tests/security/open_basedir_fopen.phpt
+++ b/tests/security/open_basedir_fopen.phpt
@@ -83,4 +83,3 @@ resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
*** Finished testing open_basedir configuration [fopen] ***
-
diff --git a/tests/security/open_basedir_glob.phpt b/tests/security/open_basedir_glob.phpt
index 602e48dfc4..505025a717 100644
--- a/tests/security/open_basedir_glob.phpt
+++ b/tests/security/open_basedir_glob.phpt
@@ -49,4 +49,3 @@ array(1) {
string(%d) "%s/test/ok/../ok/ok.txt"
}
*** Finished testing open_basedir configuration [glob] ***
-
diff --git a/tests/security/open_basedir_glob_variation.phpt b/tests/security/open_basedir_glob_variation.phpt
index 52c354f90b..4aebc0b35e 100644
--- a/tests/security/open_basedir_glob_variation.phpt
+++ b/tests/security/open_basedir_glob_variation.phpt
@@ -23,4 +23,3 @@ array(1) {
[0]=>
string(12) "../globtest1"
}
-
diff --git a/tests/security/open_basedir_is_dir.phpt b/tests/security/open_basedir_is_dir.phpt
index e4ad620d74..5c8967a9f4 100644
--- a/tests/security/open_basedir_is_dir.phpt
+++ b/tests/security/open_basedir_is_dir.phpt
@@ -52,4 +52,3 @@ bool(false)
bool(false)
bool(false)
*** Finished testing open_basedir configuration [is_dir] ***
-
diff --git a/tests/security/open_basedir_is_file.phpt b/tests/security/open_basedir_is_file.phpt
index 51ef0a2d1f..a3303599b5 100644
--- a/tests/security/open_basedir_is_file.phpt
+++ b/tests/security/open_basedir_is_file.phpt
@@ -52,4 +52,3 @@ bool(true)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [is_file] ***
-
diff --git a/tests/security/open_basedir_is_link.phpt b/tests/security/open_basedir_is_link.phpt
index 5d12148d85..61485029f4 100644
--- a/tests/security/open_basedir_is_link.phpt
+++ b/tests/security/open_basedir_is_link.phpt
@@ -52,4 +52,3 @@ bool(false)
bool(false)
bool(false)
*** Finished testing open_basedir configuration [is_link] ***
-
diff --git a/tests/security/open_basedir_is_readable.phpt b/tests/security/open_basedir_is_readable.phpt
index 951a19ac76..9a269b5c0b 100644
--- a/tests/security/open_basedir_is_readable.phpt
+++ b/tests/security/open_basedir_is_readable.phpt
@@ -52,4 +52,3 @@ bool(true)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [is_readable] ***
-
diff --git a/tests/security/open_basedir_is_writable.phpt b/tests/security/open_basedir_is_writable.phpt
index 25ce1c63a4..d2b70614cd 100644
--- a/tests/security/open_basedir_is_writable.phpt
+++ b/tests/security/open_basedir_is_writable.phpt
@@ -52,4 +52,3 @@ bool(true)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [is_writable] ***
-
diff --git a/tests/security/open_basedir_link.phpt b/tests/security/open_basedir_link.phpt
index 57506d599b..9f68f1eac3 100644
--- a/tests/security/open_basedir_link.phpt
+++ b/tests/security/open_basedir_link.phpt
@@ -75,4 +75,3 @@ bool(false)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [link] ***
-
diff --git a/tests/security/open_basedir_linkinfo.phpt b/tests/security/open_basedir_linkinfo.phpt
index 5a532f8455..aaadbabfa0 100644
--- a/tests/security/open_basedir_linkinfo.phpt
+++ b/tests/security/open_basedir_linkinfo.phpt
@@ -63,4 +63,3 @@ bool(false)
int(%d)
bool(true)
*** Finished testing open_basedir configuration [linkinfo] ***
-
diff --git a/tests/security/open_basedir_lstat.phpt b/tests/security/open_basedir_lstat.phpt
index 35e5a22019..8cd037dbd3 100644
--- a/tests/security/open_basedir_lstat.phpt
+++ b/tests/security/open_basedir_lstat.phpt
@@ -52,4 +52,3 @@ bool(true)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [lstat] ***
-
diff --git a/tests/security/open_basedir_opendir.phpt b/tests/security/open_basedir_opendir.phpt
index fc3111e361..6b88e13080 100644
--- a/tests/security/open_basedir_opendir.phpt
+++ b/tests/security/open_basedir_opendir.phpt
@@ -70,4 +70,3 @@ resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
*** Finished testing open_basedir configuration [opendir] ***
-
diff --git a/tests/security/open_basedir_parse_ini_file.phpt b/tests/security/open_basedir_parse_ini_file.phpt
index 31ad1e5982..e6aa8b6418 100644
--- a/tests/security/open_basedir_parse_ini_file.phpt
+++ b/tests/security/open_basedir_parse_ini_file.phpt
@@ -72,4 +72,3 @@ Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is n
Warning: parse_ini_file(%stest): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 12
bool(false)
*** Finished testing open_basedir configuration [parse_ini_file] ***
-
diff --git a/tests/security/open_basedir_readlink.phpt b/tests/security/open_basedir_readlink.phpt
index a2d892909d..00d2e8c61f 100644
--- a/tests/security/open_basedir_readlink.phpt
+++ b/tests/security/open_basedir_readlink.phpt
@@ -70,4 +70,3 @@ bool(false)
Warning: readlink(): open_basedir restriction in effect. File(%s/test/ok/symlink.txt) is not within the allowed path(s): (.) in %s on line %d
bool(false)
*** Finished testing open_basedir configuration [readlink] ***
-
diff --git a/tests/security/open_basedir_realpath.phpt b/tests/security/open_basedir_realpath.phpt
index 9f56cd8005..bce664ad9c 100644
--- a/tests/security/open_basedir_realpath.phpt
+++ b/tests/security/open_basedir_realpath.phpt
@@ -58,4 +58,3 @@ string(%d) "%s\test\ok\ok.txt"
string(%d) "%s\test\ok\ok.txt"
string(%d) "%s\test\ok\ok.txt"
*** Finished testing open_basedir configuration [realpath] ***
-
diff --git a/tests/security/open_basedir_rename.phpt b/tests/security/open_basedir_rename.phpt
index 2747093342..8d977ed8d1 100644
--- a/tests/security/open_basedir_rename.phpt
+++ b/tests/security/open_basedir_rename.phpt
@@ -44,4 +44,3 @@ bool(false)
Warning: rename(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
bool(false)
*** Finished testing open_basedir configuration [rename] ***
-
diff --git a/tests/security/open_basedir_rmdir.phpt b/tests/security/open_basedir_rmdir.phpt
index c1d4b6b14b..378aae1442 100644
--- a/tests/security/open_basedir_rmdir.phpt
+++ b/tests/security/open_basedir_rmdir.phpt
@@ -44,4 +44,3 @@ bool(false)
Warning: rmdir(): open_basedir restriction in effect. File(%s/test/bad) is not within the allowed path(s): (.) in %s on line %d
bool(false)
*** Finished testing open_basedir configuration [rmdir] ***
-
diff --git a/tests/security/open_basedir_scandir.phpt b/tests/security/open_basedir_scandir.phpt
index 3ef9b153f4..46ea790610 100644
--- a/tests/security/open_basedir_scandir.phpt
+++ b/tests/security/open_basedir_scandir.phpt
@@ -107,4 +107,3 @@ array(3) {
string(6) "ok.txt"
}
*** Finished testing open_basedir configuration [scandir] ***
-
diff --git a/tests/security/open_basedir_stat.phpt b/tests/security/open_basedir_stat.phpt
index b80b854d6c..2ad67d67d5 100644
--- a/tests/security/open_basedir_stat.phpt
+++ b/tests/security/open_basedir_stat.phpt
@@ -52,4 +52,3 @@ bool(true)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [stat] ***
-
diff --git a/tests/security/open_basedir_symlink.phpt b/tests/security/open_basedir_symlink.phpt
index ae431df2ca..1e5871f98a 100644
--- a/tests/security/open_basedir_symlink.phpt
+++ b/tests/security/open_basedir_symlink.phpt
@@ -84,4 +84,3 @@ bool(true)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [symlink] ***
-
diff --git a/tests/security/open_basedir_tempnam.phpt b/tests/security/open_basedir_tempnam.phpt
index fd63e2978c..b444164efd 100644
--- a/tests/security/open_basedir_tempnam.phpt
+++ b/tests/security/open_basedir_tempnam.phpt
@@ -72,4 +72,3 @@ bool(true)
string(%d) "%s"
bool(true)
*** Finished testing open_basedir configuration [tempnam] ***
-
diff --git a/tests/security/open_basedir_touch.phpt b/tests/security/open_basedir_touch.phpt
index 3a8aee8219..f1cc88c79c 100644
--- a/tests/security/open_basedir_touch.phpt
+++ b/tests/security/open_basedir_touch.phpt
@@ -67,4 +67,3 @@ bool(true)
bool(true)
bool(true)
*** Finished testing open_basedir configuration [touch] ***
-
diff --git a/tests/security/open_basedir_unlink.phpt b/tests/security/open_basedir_unlink.phpt
index aeedac9130..a5b3a55b5f 100644
--- a/tests/security/open_basedir_unlink.phpt
+++ b/tests/security/open_basedir_unlink.phpt
@@ -44,4 +44,3 @@ bool(false)
Warning: unlink(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
bool(false)
*** Finished testing open_basedir configuration [unlink] ***
-
diff --git a/tests/strings/offsets_chaining_1.phpt b/tests/strings/offsets_chaining_1.phpt
index 040a0970a9..0c3c0074b1 100644
--- a/tests/strings/offsets_chaining_1.phpt
+++ b/tests/strings/offsets_chaining_1.phpt
@@ -9,4 +9,3 @@ var_dump($string[0][0][0][0]);
?>
--EXPECT--
string(1) "f"
-
diff --git a/tests/strings/offsets_chaining_2.phpt b/tests/strings/offsets_chaining_2.phpt
index a7dbdcd9df..bbc170a6e6 100644
--- a/tests/strings/offsets_chaining_2.phpt
+++ b/tests/strings/offsets_chaining_2.phpt
@@ -9,4 +9,3 @@ var_dump($string{0}{0}[0][0]);
?>
--EXPECT--
string(1) "f"
-
diff --git a/tests/strings/offsets_chaining_3.phpt b/tests/strings/offsets_chaining_3.phpt
index 2d43451cb1..fc11b8d797 100644
--- a/tests/strings/offsets_chaining_3.phpt
+++ b/tests/strings/offsets_chaining_3.phpt
@@ -9,4 +9,3 @@ var_dump(isset($string[0][0][0][0]));
?>
--EXPECT--
bool(true)
-
diff --git a/tests/strings/offsets_chaining_4.phpt b/tests/strings/offsets_chaining_4.phpt
index f612c40671..d1f3de26af 100644
--- a/tests/strings/offsets_chaining_4.phpt
+++ b/tests/strings/offsets_chaining_4.phpt
@@ -9,4 +9,3 @@ var_dump(isset($string{0}{0}[0][0]));
?>
--EXPECT--
bool(true)
-
diff --git a/tests/strings/offsets_general.phpt b/tests/strings/offsets_general.phpt
index 9d69ea2bf5..4ec6aa5b86 100644
--- a/tests/strings/offsets_general.phpt
+++ b/tests/strings/offsets_general.phpt
@@ -35,4 +35,3 @@ bool(true)
Warning: Illegal string offset 'foo' in %s line %d
string(1) "f"
bool(false)
-