From d679f02295ea079338f029b7f5f4cb65b37f190c Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Mon, 15 Oct 2018 04:33:09 +0200 Subject: [PATCH] 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-' ' characters plus a terminating '' 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 --- Zend/tests/033.phpt | 1 - Zend/tests/abstract-static.phpt | 1 - Zend/tests/add_006.phpt | 1 - Zend/tests/add_007.phpt | 1 - Zend/tests/anon/001.phpt | 2 -- Zend/tests/anon/002.phpt | 1 - Zend/tests/anon/003.phpt | 1 - Zend/tests/anon/006.phpt | 1 - Zend/tests/anon/007.phpt | 1 - Zend/tests/assert/expect_013.phpt | 2 +- Zend/tests/assert/expect_014.phpt | 2 +- Zend/tests/bug26010.phpt | 1 - Zend/tests/bug26696.phpt | 2 +- Zend/tests/bug29896.phpt | 1 - Zend/tests/bug29944.phpt | 1 - Zend/tests/bug30162.phpt | 2 +- Zend/tests/bug30519.phpt | 1 - Zend/tests/bug32596.phpt | 1 - Zend/tests/bug33318.phpt | 2 +- Zend/tests/bug33558.phpt | 1 - Zend/tests/bug34062.phpt | 1 - Zend/tests/bug34064.phpt | 1 - Zend/tests/bug34199.phpt | 1 - Zend/tests/bug34879.phpt | 2 +- Zend/tests/bug36071.phpt | 2 +- Zend/tests/bug37138.phpt | 1 - Zend/tests/bug37707.phpt | 1 - Zend/tests/bug38808.phpt | 2 +- Zend/tests/bug41401.phpt | 2 +- Zend/tests/bug42143.phpt | 1 - Zend/tests/bug42818.phpt | 1 - Zend/tests/bug42820.phpt | 1 - Zend/tests/bug43183.phpt | 2 +- Zend/tests/bug43200.phpt | 1 - Zend/tests/bug45180.phpt | 2 +- Zend/tests/bug45862.phpt | 1 - Zend/tests/bug46811.phpt | 1 - Zend/tests/bug47109.phpt | 1 - Zend/tests/bug48228.phpt | 1 - Zend/tests/bug48408.phpt | 1 - Zend/tests/bug50394.phpt | 1 - Zend/tests/bug51176.phpt | 2 +- Zend/tests/bug52237.phpt | 1 - Zend/tests/bug52361.phpt | 1 - Zend/tests/bug53971.phpt | 2 -- Zend/tests/bug54265.phpt | 1 - Zend/tests/bug60536_001.phpt | 1 - Zend/tests/bug60738_variation.phpt | 1 - Zend/tests/bug60833.phpt | 1 - Zend/tests/bug61970_1.phpt | 1 - Zend/tests/bug61970_2.phpt | 1 - Zend/tests/bug62441.phpt | 1 - Zend/tests/bug63111.phpt | 1 - Zend/tests/bug63462.phpt | 2 -- Zend/tests/bug63468.phpt | 1 - Zend/tests/bug63762.phpt | 1 - Zend/tests/bug64417.phpt | 1 - Zend/tests/bug64660.phpt | 1 - Zend/tests/bug65419.phpt | 2 +- Zend/tests/bug67436/bug67436.phpt | 3 --- Zend/tests/bug67436/bug67436_nohandler.phpt | 1 - Zend/tests/bug68446.phpt | 1 - Zend/tests/bug69092.2.phpt | 2 +- Zend/tests/bug69092.phpt | 2 +- Zend/tests/bug69315.phpt | 1 - Zend/tests/bug69537.phpt | 1 - Zend/tests/bug69732.phpt | 1 - Zend/tests/bug69825.phpt | 1 - Zend/tests/bug69832.phpt | 1 - Zend/tests/bug69889.phpt | 1 - Zend/tests/bug69957.phpt | 1 - Zend/tests/bug70083.phpt | 2 -- Zend/tests/bug71428.1.phpt | 1 - Zend/tests/bug71428.2.phpt | 1 - Zend/tests/bug71428.3.phpt | 1 - Zend/tests/bug71539_6.phpt | 2 +- Zend/tests/bug71572.phpt | 2 +- Zend/tests/bug72038.phpt | 2 -- Zend/tests/bug72057.phpt | 2 -- Zend/tests/bug72119.phpt | 1 - Zend/tests/bug73998.phpt | 1 - Zend/tests/bug74657.phpt | 1 - Zend/tests/bug75290.phpt | 1 - Zend/tests/bug75420.2.phpt | 1 - Zend/tests/call_static.phpt | 1 - Zend/tests/class_alias_004.phpt | 2 +- Zend/tests/closure_012.phpt | 1 - Zend/tests/closure_022.phpt | 1 - Zend/tests/closure_023.phpt | 1 - Zend/tests/closure_024.phpt | 2 +- Zend/tests/closure_031.phpt | 1 - Zend/tests/closure_032.phpt | 1 - Zend/tests/closure_036.phpt | 2 +- Zend/tests/closure_037.phpt | 2 +- Zend/tests/closure_041.phpt | 1 - Zend/tests/closure_043.phpt | 1 - Zend/tests/closure_044.phpt | 1 - Zend/tests/closure_045.phpt | 1 - Zend/tests/closure_046.phpt | 1 - Zend/tests/closure_049.phpt | 1 - Zend/tests/closure_050.phpt | 2 -- Zend/tests/closure_051.phpt | 2 -- Zend/tests/closure_052.phpt | 2 -- Zend/tests/closure_053.phpt | 2 -- Zend/tests/closure_054.phpt | 2 -- Zend/tests/closure_055.phpt | 2 -- Zend/tests/closure_056.phpt | 2 -- Zend/tests/closure_bug66622.phpt | 2 -- .../closures/closure_from_callable_basic.phpt | 1 - .../closures/closure_from_callable_error.phpt | 1 - Zend/tests/concat_001.phpt | 1 - Zend/tests/concat_002.phpt | 1 - Zend/tests/const_dereference_002.phpt | 1 - Zend/tests/constant_arrays.phpt | 1 - ...nstant_expressions_coalesce_empty_dim.phpt | 1 - Zend/tests/constant_expressions_dynamic.phpt | 1 - ...nt_expressions_self_referencing_array.phpt | 1 - ...debug_backtrace_with_include_and_this.phpt | 1 - Zend/tests/declare_006.phpt | 1 - Zend/tests/errmsg_018.phpt | 1 - Zend/tests/exception_003.phpt | 1 - Zend/tests/flexible-heredoc-error1.phpt | 2 +- Zend/tests/flexible-heredoc-error10.phpt | 2 +- Zend/tests/flexible-heredoc-error11.phpt | 2 +- Zend/tests/flexible-heredoc-error12.phpt | 2 +- Zend/tests/flexible-heredoc-error13.phpt | 2 +- Zend/tests/flexible-heredoc-error2.phpt | 2 +- Zend/tests/flexible-heredoc-error3.phpt | 2 +- Zend/tests/flexible-heredoc-error4.phpt | 2 +- Zend/tests/flexible-heredoc-error5.phpt | 2 +- Zend/tests/flexible-heredoc-error6.phpt | 2 +- Zend/tests/flexible-heredoc-error7.phpt | 3 +-- Zend/tests/flexible-heredoc-error8.phpt | 2 +- Zend/tests/flexible-heredoc-error9.phpt | 2 +- Zend/tests/flexible-heredoc-nowdoc.phpt | 2 +- Zend/tests/flexible-nowdoc-error1.phpt | 2 +- Zend/tests/flexible-nowdoc-error2.phpt | 2 +- Zend/tests/flexible-nowdoc-error3.phpt | 2 +- Zend/tests/flexible-nowdoc-error4.phpt | 2 +- Zend/tests/flexible-nowdoc-error5.phpt | 2 +- Zend/tests/flexible-nowdoc-error6.phpt | 2 +- Zend/tests/flexible-nowdoc-error7.phpt | 3 +-- Zend/tests/flexible-nowdoc-error8.phpt | 2 +- Zend/tests/foreach_012.phpt | 2 +- Zend/tests/foreach_015.phpt | 2 +- .../argument_count_correct.phpt | 2 +- .../argument_count_correct_strict.phpt | 2 +- .../argument_count_incorrect_internal.phpt | 2 +- ...ument_count_incorrect_internal_strict.phpt | 2 +- .../argument_count_incorrect_userland.phpt | 2 +- Zend/tests/function_arguments_001.phpt | 1 - Zend/tests/function_arguments_002.phpt | 1 - Zend/tests/function_exists_error.phpt | 1 - Zend/tests/function_exists_variation1.phpt | 2 +- Zend/tests/gc_038.phpt | 1 - .../basic_yield_from_exception_handling.phpt | 1 - Zend/tests/generators/bug71013.phpt | 1 - Zend/tests/generators/bug71441.phpt | 1 - Zend/tests/generators/bug71601.phpt | 1 - ...n_ref_generator_iterated_by_ref_error.phpt | 1 - .../generators/generator_closure_unused.phpt | 2 +- .../generator_return_without_value.phpt | 2 +- .../generator_throwing_in_foreach.phpt | 1 - .../generator_with_arg_unpacking.phpt | 2 +- ...multiple_yield_from_on_same_generator.phpt | 1 - .../generators/recursive_yield_from.phpt | 1 - Zend/tests/generators/throw_rethrow.phpt | 1 - .../generators/yield_from_backtrace.phpt | 1 - .../generators/yield_from_multi_tree.phpt | 1 - .../yield_from_multi_tree_exception.phpt | 1 - .../generators/yield_unary_precedence.phpt | 2 -- Zend/tests/grammar/regression_001.phpt | 2 -- Zend/tests/grammar/regression_002.phpt | 1 - Zend/tests/grammar/regression_004.phpt | 1 - Zend/tests/grammar/regression_005.phpt | 1 - Zend/tests/grammar/regression_006.phpt | 1 - Zend/tests/grammar/regression_007.phpt | 1 - Zend/tests/grammar/regression_008.phpt | 3 --- Zend/tests/grammar/regression_009.phpt | 2 -- Zend/tests/grammar/regression_010.phpt | 2 -- Zend/tests/grammar/regression_012.phpt | 1 - Zend/tests/grammar/regression_013.phpt | 1 - Zend/tests/grammar/semi_reserved_001.phpt | 1 - Zend/tests/grammar/semi_reserved_002.phpt | 1 - Zend/tests/grammar/semi_reserved_004.phpt | 1 - Zend/tests/grammar/semi_reserved_005.phpt | 1 - Zend/tests/grammar/semi_reserved_006.phpt | 1 - Zend/tests/grammar/semi_reserved_007.phpt | 3 +-- Zend/tests/grammar/semi_reserved_008.phpt | 1 - Zend/tests/grammar/semi_reserved_009.phpt | 1 - Zend/tests/grammar/semi_reserved_010.phpt | 1 - Zend/tests/halt_compiler1.phpt | 2 +- Zend/tests/halt_compiler2.phpt | 2 +- Zend/tests/halt_compiler3.phpt | 2 +- Zend/tests/halt_compiler4.phpt | 2 +- Zend/tests/indirect_call_array_003.phpt | 1 - Zend/tests/int_special_values.phpt | 2 +- Zend/tests/int_static_prop_name.phpt | 1 - Zend/tests/list_keyed_undefined.phpt | 1 - Zend/tests/lsb_006.phpt | 1 - Zend/tests/lsb_007.phpt | 1 - Zend/tests/lsb_008.phpt | 1 - Zend/tests/lsb_009.phpt | 1 - ...methods-on-non-objects-call-user-func.phpt | 1 - Zend/tests/methods-on-non-objects-catch.phpt | 1 - Zend/tests/methods-on-non-objects.phpt | 1 - .../multibyte/multibyte_encoding_006.phpt | Bin 629 -> 628 bytes Zend/tests/nested_method_and_function.phpt | 2 +- Zend/tests/ns_004.phpt | 2 +- Zend/tests/ns_011.phpt | 1 - Zend/tests/ns_012.phpt | 1 - Zend/tests/ns_015.phpt | 1 - Zend/tests/ns_017.phpt | 2 +- Zend/tests/ns_026.phpt | 2 +- Zend/tests/ns_038.phpt | 1 - Zend/tests/ns_041.phpt | 1 - Zend/tests/ns_053.phpt | 1 - Zend/tests/ns_057.phpt | 2 +- Zend/tests/ns_068.phpt | 1 - Zend/tests/ns_080.phpt | 2 +- Zend/tests/ns_082.phpt | 2 +- Zend/tests/ns_085.phpt | 2 +- Zend/tests/ns_086.phpt | 2 +- Zend/tests/ns_089.phpt | 1 - Zend/tests/ns_090.phpt | 1 - Zend/tests/ns_091.phpt | 3 +-- Zend/tests/ns_092.phpt | 1 - Zend/tests/ns_093.phpt | 5 +---- Zend/tests/ns_094.phpt | 1 - Zend/tests/ns_095.phpt | 1 - Zend/tests/ns_trailing_comma_error_01.phpt | 2 +- Zend/tests/ns_trailing_comma_error_02.phpt | 2 +- Zend/tests/ns_trailing_comma_error_03.phpt | 2 +- Zend/tests/ns_trailing_comma_error_04.phpt | 2 +- Zend/tests/ns_trailing_comma_error_05.phpt | 2 +- Zend/tests/ns_trailing_comma_error_06.phpt | 2 +- Zend/tests/ns_trailing_comma_error_07.phpt | 2 +- Zend/tests/ns_trailing_comma_error_08.phpt | 2 +- Zend/tests/nullable_types/array.phpt | 2 -- ...contravariant_nullable_param_succeeds.phpt | 3 --- .../contravariant_nullable_return_fails.phpt | 3 --- .../covariant_nullable_param_fails.phpt | 3 --- .../covariant_nullable_return_succeds.phpt | 3 --- Zend/tests/nullable_types/float.phpt | 2 -- Zend/tests/nullable_types/int.phpt | 2 -- .../invariant_param_and_return_succeeds.phpt | 3 --- ..._parameters_do_not_have_default_value.phpt | 3 --- Zend/tests/nullable_types/string.phpt | 2 -- Zend/tests/numeric_string_errors.phpt | 1 - Zend/tests/numeric_string_errors_assign.phpt | 1 - ...sing_return_type_inheritance_in_class.phpt | 3 +-- ..._return_type_inheritance_in_interface.phpt | 1 - .../object_types/return_type_in_class.phpt | 1 - .../object_types/return_type_in_function.phpt | 3 +-- .../return_type_inheritance_in_class.phpt | 1 - .../return_type_inheritance_in_interface.phpt | 1 - .../object_types/return_type_reflection.phpt | 3 +-- .../type_hint_in_class_method.phpt | 3 +-- .../object_types/type_hint_in_function.phpt | 3 +-- .../object_types/type_hint_reflection.phpt | 3 +-- Zend/tests/objects_024.phpt | 1 - Zend/tests/objects_027.phpt | 2 -- Zend/tests/offset_string.phpt | 2 +- .../parent_class_name_without_parent.phpt | 1 - Zend/tests/result_unused.phpt | 1 - Zend/tests/return_types/001.phpt | 2 -- Zend/tests/return_types/002.phpt | 2 -- Zend/tests/return_types/003.phpt | 2 -- Zend/tests/return_types/004.phpt | 2 -- Zend/tests/return_types/005.phpt | 2 -- Zend/tests/return_types/006.phpt | 2 -- Zend/tests/return_types/007.phpt | 2 -- Zend/tests/return_types/008.phpt | 2 -- Zend/tests/return_types/009.phpt | 2 -- Zend/tests/return_types/010.phpt | 2 -- Zend/tests/return_types/011.phpt | 2 -- Zend/tests/return_types/012.phpt | 2 -- Zend/tests/return_types/013.phpt | 2 -- Zend/tests/return_types/014.phpt | 2 -- Zend/tests/return_types/015.phpt | 2 -- Zend/tests/return_types/016.phpt | 2 -- Zend/tests/return_types/017.phpt | 2 -- Zend/tests/return_types/018.phpt | 2 -- Zend/tests/return_types/019.phpt | 2 -- Zend/tests/return_types/020.phpt | 2 -- Zend/tests/return_types/021.phpt | 2 -- Zend/tests/return_types/022.phpt | 2 -- Zend/tests/return_types/023.phpt | 2 -- Zend/tests/return_types/024.phpt | 2 -- Zend/tests/return_types/025.phpt | 2 -- Zend/tests/return_types/026.phpt | 1 - Zend/tests/return_types/027.phpt | 1 - Zend/tests/return_types/031.phpt | 2 +- Zend/tests/return_types/generators001.phpt | 2 -- Zend/tests/return_types/generators002.phpt | 2 -- Zend/tests/return_types/generators003.phpt | 2 -- Zend/tests/return_types/generators004.phpt | 2 -- Zend/tests/return_types/generators005.phpt | 2 -- Zend/tests/return_types/inheritance001.phpt | 2 -- Zend/tests/return_types/inheritance002.phpt | 2 -- Zend/tests/return_types/inheritance003.phpt | 2 -- Zend/tests/return_types/inheritance004.phpt | 2 -- Zend/tests/return_types/inheritance005.phpt | 2 -- Zend/tests/return_types/inheritance006.phpt | 3 --- Zend/tests/return_types/inheritance007.phpt | 3 --- Zend/tests/return_types/inheritance008.phpt | 3 --- Zend/tests/return_types/inheritance009.phpt | 3 --- .../return_reference_separation.phpt | 3 +-- Zend/tests/return_types/rfc001.phpt | 2 -- Zend/tests/return_types/rfc002.phpt | 2 -- Zend/tests/return_types/rfc003.phpt | 2 -- Zend/tests/return_types/rfc004.phpt | 2 -- Zend/tests/self_in_eval.phpt | 1 - Zend/tests/temporary_cleaning_016.phpt | 1 - Zend/tests/this_in_eval.phpt | 1 - Zend/tests/throwable_001.phpt | 1 - Zend/tests/throwable_002.phpt | 1 - Zend/tests/throwable_003.phpt | 1 - Zend/tests/traits/bug55554a.phpt | 1 - Zend/tests/traits/bug55554b.phpt | 3 --- Zend/tests/traits/bug55554c.phpt | 2 -- Zend/tests/traits/bug55554d.phpt | 3 --- Zend/tests/traits/bug55554e.phpt | 4 +--- Zend/tests/traits/bug55554f.phpt | 4 +--- Zend/tests/traits/bug55554g.phpt | 4 +--- Zend/tests/traits/bug60153.phpt | 1 - Zend/tests/traits/bug60165a.phpt | 1 - Zend/tests/traits/bug60165b.phpt | 1 - Zend/tests/traits/bug60165c.phpt | 1 - Zend/tests/traits/bug60165d.phpt | 1 - Zend/tests/traits/bug60173.phpt | 1 - Zend/tests/traits/bug60217a.phpt | 1 - Zend/tests/traits/bug60217b.phpt | 1 - Zend/tests/traits/bug60217c.phpt | 1 - Zend/tests/traits/bug60369.phpt | 2 +- Zend/tests/traits/bug60717.phpt | 1 - Zend/tests/traits/bug65576a.phpt | 2 -- Zend/tests/traits/bug65576b.phpt | 2 -- Zend/tests/traits/bug76700.phpt | 1 - Zend/tests/traits/bug76773.phpt | 1 - .../tests/traits/bugs/abstract-methods01.phpt | 2 +- .../tests/traits/bugs/abstract-methods02.phpt | 2 +- .../tests/traits/bugs/abstract-methods03.phpt | 2 +- .../tests/traits/bugs/abstract-methods04.phpt | 2 +- Zend/tests/traits/bugs/alias-semantics.phpt | 2 +- Zend/tests/traits/bugs/alias-semantics02.phpt | 2 +- Zend/tests/traits/bugs/missing-trait.phpt | 2 +- .../bugs/overridding-conflicting-methods.phpt | 2 +- ...ding-conflicting-property-initializer.phpt | 2 +- Zend/tests/traits/conflict001.phpt | 2 +- Zend/tests/traits/conflict002.phpt | 2 +- Zend/tests/traits/conflict003.phpt | 2 +- Zend/tests/traits/flattening001.phpt | 2 +- Zend/tests/traits/flattening002.phpt | 2 +- Zend/tests/traits/flattening003.phpt | 2 +- Zend/tests/traits/inheritance001.phpt | 2 +- Zend/tests/traits/inheritance002.phpt | 2 +- Zend/tests/traits/language002.phpt | 2 +- Zend/tests/traits/language003.phpt | 2 +- Zend/tests/traits/language004.phpt | 2 +- Zend/tests/traits/language005.phpt | 2 +- Zend/tests/traits/language006.phpt | 2 +- Zend/tests/traits/language007.phpt | 2 +- Zend/tests/traits/language008a.phpt | 2 +- Zend/tests/traits/language008b.phpt | 2 +- Zend/tests/traits/language009.phpt | 2 +- Zend/tests/traits/language010.phpt | 2 +- Zend/tests/traits/property009.phpt | 1 - Zend/tests/traits/static_001.phpt | 2 +- Zend/tests/traits/static_002.phpt | 2 +- Zend/tests/traits/static_003.phpt | 2 +- Zend/tests/traits/static_004.phpt | 2 +- .../traits/static_forward_static_call.phpt | 2 +- .../tests/traits/static_get_called_class.phpt | 2 +- Zend/tests/traits/trait_constant_002.phpt | 2 +- Zend/tests/try/bug72629.phpt | 1 - Zend/tests/try/bug74444.phpt | 1 - Zend/tests/try/try_finally_012.phpt | 1 - Zend/tests/try/try_finally_022.phpt | 1 - Zend/tests/try/try_multicatch_006.phpt | 1 - Zend/tests/try/try_multicatch_007.phpt | 1 - .../tests/type_declarations/callable_001.phpt | 1 - .../tests/type_declarations/callable_002.phpt | 1 - .../tests/type_declarations/callable_003.phpt | 1 - ...inexistent_class_hint_with_scalar_arg.phpt | 1 - .../tests/type_declarations/iterable_001.phpt | 1 - .../tests/type_declarations/iterable_002.phpt | 1 - .../tests/type_declarations/iterable_004.phpt | 1 - .../tests/type_declarations/iterable_005.phpt | 1 - .../tests/type_declarations/scalar_basic.phpt | 1 - .../scalar_float_with_invalid_default.phpt | 1 - ...alar_strict_declaration_placement_005.phpt | 2 +- ...alar_strict_declaration_placement_006.phpt | 2 +- ...alar_strict_declaration_placement_007.phpt | 2 +- ...alar_strict_declaration_placement_008.phpt | 2 +- .../type_declarations/strict_call_weak.phpt | 1 - .../strict_call_weak_explicit.phpt | 1 - .../varSyntax/constClassMemberAccess.phpt | 2 +- Zend/tests/zend_signed_multiply-64bit-2.phpt | 1 - ext/bcmath/tests/bcadd_error1.phpt | 2 +- ext/bcmath/tests/bcadd_variation001.phpt | 2 +- ext/bcmath/tests/bccomp_variation001.phpt | 2 +- ext/bcmath/tests/bccomp_variation002.phpt | 2 +- ext/bcmath/tests/bcmod_error2.phpt | 2 +- ext/bcmath/tests/bcmul_error1.phpt | 2 +- ext/bcmath/tests/bcpow_error3.phpt | 2 +- ext/bcmath/tests/bcpow_variation001.phpt | 2 +- ext/bcmath/tests/bcpowmod.phpt | 2 +- ext/bcmath/tests/bcscale_variation001.phpt | 2 +- ext/bcmath/tests/bcscale_variation002.phpt | 2 +- ext/bcmath/tests/bcsqrt_error2.phpt | 2 +- ext/bcmath/tests/bcsqrt_variation001.phpt | 2 +- ext/bcmath/tests/bcsub_error1.phpt | 2 +- ext/bz2/tests/bug51997.phpt | 1 - ext/bz2/tests/bug72613.phpt | 2 +- ext/bz2/tests/with_files.phpt | 1 - ext/bz2/tests/with_strings.phpt | 1 - ext/calendar/tests/bug53574_1.phpt | 1 - ext/calendar/tests/bug53574_2.phpt | 1 - ext/calendar/tests/bug55797_1.phpt | 1 - ext/calendar/tests/bug55797_2.phpt | 1 - .../tests/cal_days_in_month_error1.phpt | 2 +- ext/calendar/tests/cal_from_jd_error1.phpt | 2 +- ext/calendar/tests/cal_to_jd_error1.phpt | 2 +- ext/calendar/tests/gregoriantojd.phpt | 2 +- ext/calendar/tests/jddayofweek.phpt | 1 - ext/calendar/tests/jdtofrench.phpt | 2 +- ext/calendar/tests/jdtogregorian.phpt | 2 +- ext/calendar/tests/jdtojewish.phpt | 2 +- ext/calendar/tests/jdtojulian.phpt | 2 +- ext/calendar/tests/jdtounix_error1.phpt | 2 +- ext/calendar/tests/jewishtojd.phpt | 2 +- ext/calendar/tests/juliantojd.phpt | 2 +- ext/calendar/tests/unixtojd_error1.phpt | 2 +- ext/com_dotnet/tests/bug39606.phpt | 2 +- ext/curl/tests/bug48203.phpt | 1 - ext/curl/tests/curl_CURLOPT_READDATA.phpt | 1 - ext/curl/tests/curl_basic_011.phpt | 1 - ext/curl/tests/curl_basic_012.phpt | 2 +- ext/curl/tests/curl_basic_013.phpt | 2 +- ext/curl/tests/curl_file_serialize.phpt | 1 - ext/curl/tests/curl_setopt_array_basic.phpt | 1 - ext/curl/tests/curl_setopt_basic002.phpt | 1 - ext/curl/tests/curl_share_close_basic001.phpt | 2 +- ext/date/tests/DateTimeZone_clone_basic1.phpt | 2 -- .../tests/DateTimeZone_compare_basic1.phpt | 2 +- .../tests/DateTimeZone_extends_basic1.phpt | 2 +- .../tests/DateTimeZone_getName_basic1.phpt | 2 +- .../tests/DateTimeZone_getOffset_basic1.phpt | 2 +- .../tests/DateTimeZone_getOffset_error.phpt | 2 +- .../DateTimeZone_getTransitions_basic1.phpt | 2 +- .../DateTimeZone_getTransitions_error.phpt | 2 +- .../DateTimeZone_listIdentifiers_basic1.phpt | 2 +- ext/date/tests/DateTime_compare_basic1.phpt | 2 +- .../tests/DateTime_construct_variation2.phpt | 1 - ext/date/tests/DateTime_extends_basic2.phpt | 2 +- ext/date/tests/DateTime_format_basic1.phpt | 2 +- ext/date/tests/DateTime_getOffset_error.phpt | 1 - ext/date/tests/DateTime_modify_error.phpt | 1 - ext/date/tests/DateTime_setDate_basic1.phpt | 2 +- ext/date/tests/bug39782.phpt | 2 +- ext/date/tests/bug45543.phpt | 1 - ext/date/tests/bug48187.phpt | 2 +- ext/date/tests/bug48476.phpt | 2 -- ext/date/tests/bug50475.phpt | 2 +- ext/date/tests/bug52062.phpt | 2 +- ext/date/tests/bug52290.phpt | 2 +- ext/date/tests/bug62852.phpt | 1 - ext/date/tests/bug62852_var2.phpt | 1 - ext/date/tests/bug62852_var3.phpt | 1 - ext/date/tests/bug67118.phpt | 2 -- ext/date/tests/bug67253.phpt | 1 - ext/date/tests/bug68406.phpt | 1 - ext/date/tests/bug71525.phpt | 1 - ext/date/tests/bug71635.phpt | 2 +- ext/date/tests/checkdate_variation1.phpt | 1 - ext/date/tests/checkdate_variation2.phpt | 1 - ext/date/tests/date_add_basic2.phpt | 2 +- ext/date/tests/date_basic1.phpt | 1 - .../tests/date_create_from_format_basic.phpt | 2 +- .../tests/date_create_from_format_basic2.phpt | 2 +- .../tests/date_get_last_errors_basic.phpt | 2 +- ...date_interval_create_from_date_string.phpt | 2 +- ...reate_from_date_string_wrongparam_001.phpt | 2 +- .../tests/date_parse_from_format_basic.phpt | 2 +- ext/date/tests/date_sun_info_error.phpt | 2 +- ext/date/tests/date_sunrise_variation9.phpt | 2 +- ext/date/tests/date_timestamp_set.phpt | 2 +- .../tests/date_timestamp_set_nullparam.phpt | 2 +- .../tests/date_timestamp_set_nullparam2.phpt | 2 +- .../date_timestamp_set_wrongparam_001.phpt | 2 +- .../date_timestamp_set_wrongparam_002.phpt | 2 +- .../date_timestamp_set_wrongparam_003.phpt | 2 +- .../date_timestamp_set_wrongparam_004.phpt | 2 +- ext/date/tests/date_timezone_get_basic1.phpt | 2 +- ext/date/tests/date_timezone_set_basic1.phpt | 1 - .../tests/date_timezone_set_variation1.phpt | 1 - ext/date/tests/date_variation1.phpt | 1 - ext/date/tests/date_variation2.phpt | 1 - ext/date/tests/getdate_variation7.phpt | 2 +- ext/date/tests/gmdate_variation14.phpt | 2 +- ext/date/tests/idate_error.phpt | 1 - ext/date/tests/idate_variation3.phpt | 2 +- ext/date/tests/localtime_error.phpt | 1 - ext/date/tests/microtime_error.phpt | 3 +-- ext/date/tests/mktime-3.phpt | 2 +- ext/date/tests/mktime_basic1.phpt | 1 - ext/date/tests/mktime_variation1.phpt | 2 +- ext/date/tests/mktime_variation6.phpt | 1 - ext/date/tests/strftime_variation23.phpt | 2 +- ext/date/tests/strtotime-mysql-64bit.phpt | 1 - ext/date/tests/strtotime_basic2.phpt | 2 +- ext/date/tests/time_basic.phpt | 2 +- .../timezone_identifiers_list_basic1.phpt | 2 +- ...ne_identifiers_list_wrong_constructor.phpt | 2 +- ext/date/tests/timezone_location_get.phpt | 1 - .../tests/timezone_offset_get_basic1.phpt | 2 +- .../timezone_transitions_get_basic1.phpt | 2 +- ext/date/tests/timezone_version_get.phpt | 2 +- .../tests/timezone_version_get_basic1.phpt | 2 +- ext/dom/tests/DOMAttr_name_basic_001.phpt | 2 +- ext/dom/tests/DOMAttr_value_basic_001.phpt | 1 - .../DOMCharacterData_appendData_basic.phpt | 2 +- ...DOMCharacterData_appendData_error_001.phpt | 2 +- ...DOMCharacterData_deleteData_basic_001.phpt | 2 +- ...DOMCharacterData_deleteData_error_001.phpt | 2 +- ...DOMCharacterData_deleteData_error_002.phpt | 2 +- ...DOMCharacterData_insertData_error_001.phpt | 2 +- .../DOMCharacterData_length_error_001.phpt | 1 - ...OMCharacterData_replaceData_error_001.phpt | 2 +- ...CharacterData_substringData_basic_001.phpt | 2 +- .../tests/DOMComment_appendData_basic.phpt | 2 +- .../DOMComment_appendData_basic_Sullivan.phpt | 2 +- .../tests/DOMComment_insertData_error2.phpt | 2 +- .../tests/DOMComment_replaceData_error2.phpt | 2 +- ...MDocumentFragment_appendXML_error_001.phpt | 2 +- ...MDocumentFragment_appendXML_error_002.phpt | 2 +- ...MDocumentFragment_appendXML_error_003.phpt | 2 +- .../DOMDocumentType_entities_error_001.phpt | 2 +- ...DocumentType_internalSubset_error_001.phpt | 2 +- .../tests/DOMDocumentType_name_error_001.phpt | 2 +- .../DOMDocumentType_notations_error_001.phpt | 2 +- .../DOMDocumentType_publicId_basic_001.phpt | 2 +- .../DOMDocumentType_publicId_error_001.phpt | 2 +- .../DOMDocumentType_systemId_basic_001.phpt | 2 +- .../DOMDocumentType_systemId_error_001.phpt | 2 +- .../DOMDocument_createAttribute_basic.phpt | 1 - .../DOMDocument_createAttribute_error1.phpt | 1 - ...ent_createProcessingInstruction_basic.phpt | 1 - ...ent_createProcessingInstruction_error.phpt | 1 - ext/dom/tests/DOMDocument_encoding_basic.phpt | 1 - .../DOMDocument_implementationRead_basic.phpt | 1 - .../DOMDocument_preserveWhiteSpace_basic.phpt | 1 - .../DOMDocument_relaxNGValidate_error2.phpt | 1 - .../DOMDocument_resolveExternals_basic.phpt | 2 +- ext/dom/tests/DOMDocument_save_basic.phpt | 1 - ext/dom/tests/DOMDocument_savexml_basic.phpt | 3 +-- .../tests/DOMDocument_standalone_basic.phpt | 2 +- .../DOMDocument_validate_on_parse_basic.phpt | 1 - ...MDocument_validate_on_parse_variation.phpt | 1 - ext/dom/tests/DOMNode_cloneNode_basic.phpt | 1 - .../tests/DOMNode_hasChildNodes_basic.phpt | 2 +- ext/dom/tests/DOMNode_normalize_basic.phpt | 2 +- ext/dom/tests/DOMNode_removeChild_basic.phpt | 1 - ext/dom/tests/DOMText_appendData_basic.phpt | 2 +- ext/dom/tests/bug28721.phpt | 1 - ext/dom/tests/bug32615.phpt | 2 -- ext/dom/tests/bug37277.phpt | 2 -- ext/dom/tests/bug37456.phpt | 2 -- ext/dom/tests/bug42082.phpt | 1 - ext/dom/tests/bug44648.phpt | 2 +- ext/dom/tests/bug46185.phpt | 2 +- ext/dom/tests/bug47848.phpt | 2 +- ext/dom/tests/bug66502.phpt | 2 +- ext/dom/tests/bug73907.phpt | 2 +- ext/dom/tests/canonicalization.phpt | 1 - ext/dom/tests/dom004.phpt | 1 - ext/dom/tests/dom005.phpt | 1 - ext/dom/tests/dom007.phpt | 2 -- ext/dom/tests/dom_comment_basic.phpt | 2 -- ext/dom/tests/dom_comment_variation.phpt | 2 -- ext/dom/tests/domattributes.phpt | 2 -- ext/dom/tests/domchardata.phpt | 1 - .../domdocument_createcomment_error_001.phpt | 2 +- ...domdocument_createentityreference_001.phpt | 2 +- ...domdocument_createentityreference_002.phpt | 2 +- ext/dom/tests/domelement.phpt | 1 - ext/dom/tests/domxpath.phpt | 2 +- ext/dom/tests/node_textcontent.phpt | 1 - ext/dom/tests/regsiter_node_class.phpt | 1 - ext/enchant/tests/bug53070.phpt | 1 - ext/exif/tests/bug48378.phpt | 2 -- ext/exif/tests/bug54002.phpt | 2 +- ext/exif/tests/bug64739.phpt | 2 +- ext/exif/tests/bug68547.phpt | 2 +- ext/exif/tests/bug76423.phpt | 1 - ext/exif/tests/exif001.phpt | 2 +- ext/exif/tests/exif003.phpt | 2 +- ext/exif/tests/exif005.phpt | 2 +- ext/exif/tests/exif_imagetype_basic-mb.phpt | 2 +- ext/exif/tests/exif_imagetype_basic.phpt | 2 +- ext/exif/tests/exif_imagetype_error.phpt | 1 - ext/exif/tests/exif_read_data_0.phpt | 1 - ext/exif/tests/exif_read_data_streams.phpt | 2 +- ext/exif/tests/exif_read_exif_data_basic.phpt | 2 +- ext/exif/tests/exif_tagname_error.phpt | 1 - .../tests/exif_tagname_variation1-64bit.phpt | 1 - ext/exif/tests/exif_tagname_variation1.phpt | 1 - ext/exif/tests/exif_thumbnail_streams.phpt | 2 +- ext/fileinfo/tests/bug67516.phpt | 1 - ext/fileinfo/tests/bug67647-mb.phpt | 1 - ext/fileinfo/tests/bug67647.phpt | 1 - ext/fileinfo/tests/bug68398.phpt | 1 - ext/fileinfo/tests/bug69320.phpt | 1 - ext/fileinfo/tests/cve-2014-3538-mb.phpt | 2 +- ext/fileinfo/tests/cve-2014-3538.phpt | 2 +- ext/fileinfo/tests/finfo_extension_flag.phpt | 1 - ext/fileinfo/tests/finfo_open_002.phpt | 2 -- ext/filter/tests/bug42718-2.phpt | 1 - ext/filter/tests/bug67167.01.phpt | 3 --- ext/filter/tests/bug67167.02.phpt | 5 ----- ext/ftp/tests/006.phpt | 2 +- ext/ftp/tests/007.phpt | 2 +- ext/ftp/tests/ftp_alloc_basic1.phpt | 2 +- ext/ftp/tests/ftp_alloc_basic2.phpt | 2 +- ext/ftp/tests/ftp_exec_basic.phpt | 2 +- ext/ftp/tests/ftp_rawlist_basic2.phpt | 2 +- ext/ftp/tests/ftp_rmdir_basic.phpt | 2 +- ext/ftp/tests/ftp_ssl_connect_error.phpt | 1 - ext/gd/tests/bug38179.phpt | 1 - ext/gd/tests/bug38212-mb.phpt | 1 - ext/gd/tests/bug38212.phpt | 1 - ext/gd/tests/bug39286-mb.phpt | 1 - ext/gd/tests/bug39286.phpt | 1 - ext/gd/tests/bug39780.phpt | 1 - ext/gd/tests/bug39780_extern.phpt | 2 +- ext/gd/tests/bug42434.phpt | 2 +- ext/gd/tests/bug45799.phpt | 1 - ext/gd/tests/bug49600.phpt | 2 +- ext/gd/tests/bug66356.phpt | 2 +- ext/gd/tests/bug70976.phpt | 2 +- ext/gd/tests/bug71912-mb.phpt | 1 - ext/gd/tests/bug71912.phpt | 1 - ext/gd/tests/bug71952.phpt | 2 +- ext/gd/tests/bug72227.phpt | 2 +- ext/gd/tests/bug72298.phpt | 2 +- ext/gd/tests/bug72512.phpt | 1 - ext/gd/tests/bug72697.phpt | 2 +- ext/gd/tests/bug72730.phpt | 2 +- ext/gd/tests/bug73869.phpt | 2 +- ext/gd/tests/crafted_gd2.phpt | 2 -- ext/gd/tests/imagealphablending_error1.phpt | 6 +----- ext/gd/tests/imagecolorallocate_basic.phpt | 2 +- ext/gd/tests/imagecolorallocate_error.phpt | 2 +- .../tests/imagecolorallocate_variation3.phpt | 2 +- .../tests/imagecolorallocatealpha_basic.phpt | 2 +- .../tests/imagecolorallocatealpha_error1.phpt | 2 +- .../tests/imagecolorallocatealpha_error2.phpt | 2 +- .../tests/imagecolorallocatealpha_error3.phpt | 2 +- .../tests/imagecolorallocatealpha_error4.phpt | 2 +- .../tests/imagecolorallocatealpha_error5.phpt | 2 +- .../tests/imagecolorresolvealpha_error3.phpt | 6 +----- ext/gd/tests/imagecolorstotal_basic.phpt | 2 +- ext/gd/tests/imagecreatetruecolor_error3.phpt | 2 +- ext/gd/tests/imagefilltoborder_error6.phpt | 2 -- ext/gd/tests/imageflip.phpt | 2 +- ext/gd/tests/imagegd2_nullbyte_injection.phpt | 1 - ext/gd/tests/imagegd_nullbyte_injection.phpt | 1 - ext/gd/tests/imagegif_nullbyte_injection.phpt | 1 - ext/gd/tests/imageistruecolor_basic.phpt | 2 +- ext/gd/tests/imageistruecolor_error1.phpt | 2 +- .../tests/imagejpeg_nullbyte_injection.phpt | 1 - ext/gd/tests/imagepng_nullbyte_injection.phpt | 1 - ext/gd/tests/imagerectangle_error2.phpt | 2 +- ext/gd/tests/imagesavealpha_error2.phpt | 6 +----- ext/gd/tests/imagesetthickness_error1.phpt | 2 +- ext/gd/tests/imagesetthickness_error2.phpt | 2 +- .../tests/imagetruecolortopalette_error1.phpt | 2 +- .../tests/imagetruecolortopalette_error2.phpt | 2 +- ext/gd/tests/imagettftext_charmap_order.phpt | 2 +- .../tests/imagewbmp_nullbyte_injection.phpt | 1 - ext/gd/tests/libgd00086.phpt | 1 - ext/gd/tests/libgd00094-mb.phpt | 1 - ext/gd/tests/libgd00094.phpt | 1 - ext/gd/tests/lines.phpt | 1 - ext/gettext/tests/44938.phpt | 1 - ext/gettext/tests/bug66267.phpt | 1 - ext/gettext/tests/gettext_basic-enus.phpt | 2 +- ...ettext_bind_textdomain_codeset-retval.phpt | 2 +- ...t_bind_textdomain_codeset-wrongparams.phpt | 2 +- .../gettext_bindtextdomain-emptydomain.phpt | 2 +- .../tests/gettext_bindtextdomain-path.phpt | 2 +- .../gettext_bindtextdomain-wrongparams.phpt | 2 +- .../tests/gettext_dcgettext-wrongparams.phpt | 2 +- ext/gettext/tests/gettext_dcgettext.phpt | 2 +- .../tests/gettext_dngettext-plural.phpt | 2 +- .../tests/gettext_dngettext-wrongparams.phpt | 2 +- .../tests/gettext_textdomain-retval.phpt | 3 +-- .../tests/gettext_textdomain-wrongparams.phpt | 2 +- ext/gmp/tests/gmp_export.phpt | 1 - ext/gmp/tests/gmp_import.phpt | 1 - ext/hash/tests/bug64745.phpt | 1 - ext/hash/tests/hash_hmac_algos.phpt | 1 - ext/hash/tests/haval.phpt | 1 - ext/hash/tests/md4.phpt | 2 -- ext/hash/tests/md5.phpt | 1 - ext/hash/tests/sha224.phpt | 1 - ext/hash/tests/sha256.phpt | 1 - ext/hash/tests/sha3.phpt | 1 - ext/hash/tests/tiger.phpt | 1 - ext/iconv/tests/eucjp2iso2022jp.phpt | 1 - ext/iconv/tests/eucjp2sjis.phpt | 1 - ext/iconv/tests/eucjp2utf8.phpt | 1 - .../iconv-charset-length-cve-2007-4840.phpt | 1 - ext/iconv/tests/iconv_basic.phpt | 2 +- ext/iconv/tests/iconv_get_encoding_error.phpt | 2 +- ext/iconv/tests/iconv_ini_encoding.phpt | 1 - ...e_decode-charset-length-cve-2007-4840.phpt | 1 - ext/iconv/tests/iconv_mime_decode.phpt | 1 - ..._headers-charset-length-cve-2007-4840.phpt | 1 - .../tests/iconv_mime_decode_headers.phpt | 1 - .../iconv_mime_decode_headers_variation1.phpt | 2 +- .../tests/iconv_mime_decode_variation1.phpt | 2 +- .../tests/iconv_mime_decode_variation3.phpt | 2 +- ...encoding-charset-length-cve-2007-4840.phpt | 1 - ext/iconv/tests/iconv_set_encoding_error.phpt | 2 +- .../tests/iconv_set_encoding_variation.phpt | 2 +- ...v_strlen-charset-length-cve-2007-4840.phpt | 1 - ext/iconv/tests/iconv_strlen_variation2.phpt | 3 +-- ...v_strpos-charset-length-cve-2007-4840.phpt | 1 - ext/iconv/tests/iconv_strpos_basic.phpt | 2 +- ext/iconv/tests/iconv_strpos_variation1.phpt | 2 +- ext/iconv/tests/iconv_strpos_variation2.phpt | 2 +- ext/iconv/tests/iconv_strpos_variation4.phpt | 1 - ext/iconv/tests/iconv_strpos_variation5.phpt | 3 +-- ..._strrpos-charset-length-cve-2007-4840.phpt | 1 - ext/iconv/tests/iconv_strrpos_basic.phpt | 1 - ext/iconv/tests/iconv_strrpos_error1.phpt | 2 +- ext/iconv/tests/iconv_strrpos_error2.phpt | 2 +- ext/iconv/tests/iconv_strrpos_variation1.phpt | 3 +-- ext/iconv/tests/iconv_strrpos_variation2.phpt | 3 +-- ext/iconv/tests/iconv_strrpos_variation3.phpt | 3 +-- ...v_substr-charset-length-cve-2007-4783.phpt | 1 - ext/iconv/tests/iconv_substr_error1.phpt | 1 - ext/iconv/tests/iconv_substr_error2.phpt | 1 - ext/imap/tests/bug31142_2.phpt | 2 +- ext/imap/tests/bug40854.phpt | 2 +- ext/imap/tests/imap_append_basic.phpt | 1 - ext/imap/tests/imap_body.phpt | 2 +- .../tests/imap_fetchheader_variation4.phpt | 2 +- ext/imap/tests/imap_getsubscribed_basic.phpt | 2 +- ext/imap/tests/imap_headerinfo_basic.phpt | 2 +- ext/imap/tests/imap_headers.phpt | 1 - ext/imap/tests/imap_list_basic.phpt | 2 +- ext/imap/tests/imap_lsub_basic.phpt | 2 +- ext/imap/tests/imap_mail_copy.phpt | 2 +- ext/imap/tests/imap_mail_copy_basic.phpt | 2 +- ext/imap/tests/imap_mail_move.phpt | 2 +- ext/imap/tests/imap_mail_move_basic.phpt | 2 +- ext/imap/tests/imap_num_msg_error.phpt | 1 - .../imap_rfc822_parse_headers_basic.phpt | 2 +- ext/imap/tests/imap_savebody_basic.phpt | 1 - ext/imap/tests/imap_undelete_basic.phpt | 2 +- ext/interbase/tests/005.phpt | 1 - ext/interbase/tests/006.phpt | 1 - ext/interbase/tests/bug46247.phpt | 1 - ext/intl/tests/breakiter___construct.phpt | 1 - .../tests/breakiter___construct_error.phpt | 1 - ext/intl/tests/breakiter_clone_basic.phpt | 1 - ...eakiter_createCodePointInstance_error.phpt | 2 -- ext/intl/tests/breakiter_current_basic.phpt | 2 +- ext/intl/tests/breakiter_factories_basic.phpt | 1 - ext/intl/tests/breakiter_factories_error.phpt | 3 --- ...ter_first_last_previous_current_error.phpt | 2 -- ext/intl/tests/breakiter_following_basic.phpt | 2 +- ..._following_preceding_isBoundary_error.phpt | 2 -- ext/intl/tests/breakiter_getLocale_error.phpt | 2 -- .../breakiter_getPartsIterator_error.phpt | 1 - ext/intl/tests/breakiter_getText_error.phpt | 2 -- .../tests/breakiter_isBoundary_basic.phpt | 2 +- ext/intl/tests/breakiter_next_error.phpt | 2 -- ext/intl/tests/breakiter_previous_basic.phpt | 2 +- ext/intl/tests/breakiter_setText_error.phpt | 2 -- ext/intl/tests/bug59597_32.phpt | 1 - ext/intl/tests/bug60192-compare.phpt | 1 - ext/intl/tests/bug60192-getlocale.phpt | 1 - ext/intl/tests/bug60192-getsortkey.phpt | 1 - ext/intl/tests/bug60192-sort.phpt | 2 -- ext/intl/tests/bug60192-sortwithsortkeys.phpt | 2 -- ext/intl/tests/bug62082.phpt | 1 - ext/intl/tests/bug67052-win32.phpt | 1 - ext/intl/tests/bug67052.phpt | 1 - ext/intl/tests/bug69374.phpt | 3 --- ext/intl/tests/bug69398.phpt | 3 --- ext/intl/tests/bug72061.phpt | 2 +- ext/intl/tests/bug72533.phpt | 2 +- ext/intl/tests/bug74230.phpt | 1 - ext/intl/tests/bug75317.phpt | 2 +- ext/intl/tests/calendar_add_error.phpt | 1 - .../tests/calendar_createInstance_basic.phpt | 1 - .../tests/calendar_createInstance_error.phpt | 2 -- ext/intl/tests/calendar_equals_error.phpt | 1 - .../tests/calendar_fieldDifference_error.phpt | 2 -- .../tests/calendar_fromDateTime_basic.phpt | 1 - .../tests/calendar_fromDateTime_error.phpt | 2 -- .../calendar_getAvailableLocales_error.phpt | 2 -- .../calendar_getDayOfWeekType_error.phpt | 2 -- .../tests/calendar_getErrorCode_error.phpt | 2 -- .../tests/calendar_getErrorMessage_error.phpt | 2 -- .../calendar_getFirstDayOfWeek_error.phpt | 2 -- ...endar_getKeywordValuesForLocale_error.phpt | 2 -- ext/intl/tests/calendar_getLocale_error.phpt | 2 -- ...endar_getMinimalDaysInFirstWeek_error.phpt | 2 -- ext/intl/tests/calendar_getNow_error.phpt | 2 -- ...tSkipped_RepeatedWallTimeOption_error.phpt | 2 -- .../tests/calendar_getTimeZone_error.phpt | 2 -- ext/intl/tests/calendar_getTime_error.phpt | 1 - ext/intl/tests/calendar_getType_error.phpt | 2 -- .../calendar_getWeekendTransition_error.phpt | 2 -- ..._Least_Greatest_Minimum_Maximum_error.phpt | 3 --- ...ar_get_getActualMaximum_Minumum_error.phpt | 1 - ...r_get_getActualMaximum_Minumum_error2.phpt | 1 - ...r_get_setRepeatedWallTimeOption_basic.phpt | 4 +--- ...ar_get_setSkippedWallTimeOption_basic.phpt | 4 +--- .../tests/calendar_inDaylightTime_error.phpt | 2 -- .../tests/calendar_isEquivalentTo_error.phpt | 1 - ext/intl/tests/calendar_isLenient_error.phpt | 2 -- ext/intl/tests/calendar_isSet_error.phpt | 2 -- ext/intl/tests/calendar_isWeekend_error.phpt | 1 - ext/intl/tests/calendar_roll_error.phpt | 1 - .../calendar_setFirstDayOfWeek_error.phpt | 2 -- ext/intl/tests/calendar_setLenient_error.phpt | 2 -- ...endar_setMinimalDaysInFirstWeek_error.phpt | 2 -- ...tSkipped_RepeatedWallTimeOption_error.phpt | 2 -- .../tests/calendar_setTimeZone_error.phpt | 1 - .../tests/calendar_setTimeZone_error2.phpt | 2 -- ext/intl/tests/calendar_setTime_error.phpt | 1 - ext/intl/tests/calendar_set_error.phpt | 1 - ext/intl/tests/calendar_toDateTime_basic.phpt | 2 +- ext/intl/tests/calendar_toDateTime_error.phpt | 2 -- .../tests/cpbi_getLastCodePoint_error.phpt | 2 -- .../dateformat___construct_bad_tz_cal.phpt | 1 - ext/intl/tests/dateformat_clone_bad_obj.phpt | 1 - .../dateformat_formatObject_calendar.phpt | 2 -- ...format_formatObject_calendar_variant2.phpt | 1 - ...format_formatObject_calendar_variant3.phpt | 1 - ...format_formatObject_calendar_variant4.phpt | 1 - ...format_formatObject_calendar_variant5.phpt | 1 - .../dateformat_formatObject_datetime.phpt | 2 -- ...format_formatObject_datetime_variant2.phpt | 1 - ...format_formatObject_datetime_variant3.phpt | 1 - ...format_formatObject_datetime_variant4.phpt | 1 - ...format_formatObject_datetime_variant5.phpt | 1 - .../tests/dateformat_formatObject_error.phpt | 3 --- .../dateformat_getCalendarObject_error.phpt | 1 - .../tests/dateformat_getTimeZone_error.phpt | 1 - .../tests/dateformat_get_set_pattern2.phpt | 1 - ext/intl/tests/dateformat_is_set_lenient.phpt | 1 - .../tests/dateformat_setTimeZone_error.phpt | 1 - .../tests/dateformat_set_timezone_id2.phpt | 1 - .../dateformat_timezone_arg_variations.phpt | 1 - .../dateformat_timezone_arg_variations2.phpt | 1 - .../dateformat_timezone_arg_variations3.phpt | 1 - .../dateformat_timezone_arg_variations4.phpt | 2 -- ext/intl/tests/formatter_clone_bad_obj.phpt | 1 - ext/intl/tests/formatter_get_set_symbol2.phpt | 1 - .../formatter_get_set_text_attribute.phpt | 2 -- ...formatter_get_set_text_attribute_var2.phpt | 2 -- ext/intl/tests/grapheme.phpt | 2 -- .../gregoriancalendar___construct_error.phpt | 1 - ...riancalendar_getGregorianChange_error.phpt | 1 - .../gregoriancalendar_isLeapYear_error.phpt | 1 - ...riancalendar_setGregorianChange_error.phpt | 1 - ext/intl/tests/locale_get_script.phpt | 1 - ext/intl/tests/msgfmt_clone_bad_obj.phpt | 1 - ext/intl/tests/msgfmt_format_error1.phpt | 1 - ext/intl/tests/msgfmt_format_error2.phpt | 2 -- ext/intl/tests/msgfmt_format_error3.phpt | 2 -- ext/intl/tests/msgfmt_format_error4.phpt | 2 -- ext/intl/tests/msgfmt_format_error5.phpt | 1 - ext/intl/tests/msgfmt_format_error6.phpt | 2 -- .../tests/msgfmt_format_mixed_params.phpt | 2 +- ext/intl/tests/msgfmt_setPattern_cache.phpt | 2 +- .../normalizer_get_raw_decomposition.phpt | 1 - ext/intl/tests/normalizer_normalize.phpt | 1 - .../tests/rbbiter_getRuleStatus_basic.phpt | 2 +- .../tests/timezone_IDforWindowsID_basic.phpt | 1 - .../tests/timezone_IDforWindowsID_basic2.phpt | 1 - .../timezone_countEquivalentIDs_error.phpt | 3 --- .../tests/timezone_createDefault_error.phpt | 3 --- .../timezone_createEnumeration_error.phpt | 3 --- ...one_createTimeZoneIDEnumeration_error.phpt | 2 -- .../tests/timezone_createTimeZone_error.phpt | 2 -- .../timezone_fromDateTimeZone_basic.phpt | 1 - .../timezone_fromDateTimeZone_error.phpt | 2 -- .../tests/timezone_getCanonicalID_error.phpt | 3 --- .../tests/timezone_getDSTSavings_error.phpt | 2 -- .../tests/timezone_getDisplayName_error.phpt | 2 -- .../tests/timezone_getEquivalentID_error.phpt | 2 -- .../tests/timezone_getErrorCode_error.phpt | 2 -- .../tests/timezone_getErrorMessage_error.phpt | 2 -- ext/intl/tests/timezone_getGMT_error.phpt | 3 --- ext/intl/tests/timezone_getID_error.phpt | 3 --- ext/intl/tests/timezone_getOffset_error.phpt | 2 -- .../tests/timezone_getRawOffset_error.phpt | 2 -- ext/intl/tests/timezone_getRegion_error.phpt | 4 ---- .../timezone_getTZDataVersion_error.phpt | 2 -- ext/intl/tests/timezone_getUnknown_basic.phpt | 2 +- ext/intl/tests/timezone_getUnknown_error.phpt | 2 -- .../tests/timezone_hasSameRules_error.phpt | 2 -- .../tests/timezone_toDateTimeZone_basic.phpt | 1 - .../tests/timezone_toDateTimeZone_error.phpt | 2 -- .../tests/timezone_useDaylightTime_error.phpt | 2 -- ext/intl/tests/timezone_windowsID_basic.phpt | 1 - ext/intl/tests/timezone_windowsID_basic2.phpt | 1 - ext/intl/tests/transliterator_clone.phpt | 1 - .../tests/transliterator_create_basic.phpt | 2 -- ...transliterator_create_from_rule_error.phpt | 1 - .../transliterator_create_inverse_error.phpt | 1 - .../transliterator_get_error_code_error.phpt | 1 - ...ransliterator_get_error_message_error.phpt | 1 - .../tests/transliterator_list_ids_error.phpt | 1 - ext/intl/tests/uconverter_enum.phpt | 1 - ext/intl/tests/uconverter_func_subst.phpt | 1 - ext/intl/tests/uconverter_oop_subst.phpt | 1 - ext/json/tests/bug72787.phpt | 1 - ext/json/tests/fail001.phpt | 1 - ext/json/tests/json_last_error_error.phpt | 1 - ext/json/tests/json_last_error_msg_error.phpt | 1 - ext/json/tests/serialize.phpt | 2 -- ext/ldap/tests/bug76248.phpt | 2 +- ext/ldap/tests/ldap_escape_all.phpt | 2 +- ext/ldap/tests/ldap_escape_both.phpt | 2 +- ext/ldap/tests/ldap_escape_dn.phpt | 2 +- ext/ldap/tests/ldap_escape_filter.phpt | 2 +- ext/ldap/tests/ldap_escape_ignore.phpt | 2 +- ...xml_set_external_entity_loader_error1.phpt | 1 - ...set_external_entity_loader_variation1.phpt | 1 - ...set_external_entity_loader_variation2.phpt | 1 - ext/mbstring/tests/bug20087.phpt | 1 - ext/mbstring/tests/bug43841.phpt | 2 -- ext/mbstring/tests/bug43994.phpt | 2 -- ext/mbstring/tests/bug43998.phpt | 1 - ext/mbstring/tests/bug45923.phpt | 2 +- ext/mbstring/tests/bug54494.phpt | 1 - ext/mbstring/tests/bug65045.phpt | 3 +-- ext/mbstring/tests/bug68846.phpt | 2 +- ext/mbstring/tests/bug72402.phpt | 2 +- ext/mbstring/tests/bug75944.phpt | 1 - ext/mbstring/tests/bug76532.phpt | 2 +- ext/mbstring/tests/casefold.phpt | 1 - ext/mbstring/tests/ini_encoding.phpt | 2 -- ext/mbstring/tests/ini_encoding2.phpt | 2 -- ext/mbstring/tests/mb_chr_ord.phpt | 1 - ext/mbstring/tests/mb_convert_encoding.phpt | 3 --- .../tests/mb_convert_encoding_variation1.phpt | 1 - ext/mbstring/tests/mb_convert_kana.phpt | 1 - ext/mbstring/tests/mb_convert_variables.phpt | 2 -- ext/mbstring/tests/mb_detect_encoding.phpt | 2 -- ext/mbstring/tests/mb_detect_order.phpt | 2 -- .../tests/mb_encode_mimeheader_basic.phpt | 3 +-- .../tests/mb_encode_mimeheader_basic2.phpt | 1 - .../tests/mb_encode_mimeheader_basic3.phpt | 1 - .../tests/mb_encode_mimeheader_indent.phpt | 2 -- .../mb_encode_mimeheader_variation1.phpt | 2 +- .../mb_encode_mimeheader_variation6.phpt | 1 - ext/mbstring/tests/mb_ereg.phpt | 3 +-- ext/mbstring/tests/mb_ereg_basic.phpt | 1 - ext/mbstring/tests/mb_ereg_match_basic.phpt | 1 - ext/mbstring/tests/mb_ereg_match_error1.phpt | 2 +- ext/mbstring/tests/mb_ereg_replace.phpt | 2 -- ext/mbstring/tests/mb_ereg_replace_basic.phpt | 2 +- .../tests/mb_ereg_replace_callback.phpt | 1 - .../mb_ereg_replace_named_subpatterns.phpt | 1 - .../tests/mb_ereg_replace_variation2.phpt | 2 +- .../tests/mb_ereg_replace_variation4.phpt | 2 +- ext/mbstring/tests/mb_ereg_search_pos.phpt | 2 -- ext/mbstring/tests/mb_ereg_search_setpos.phpt | 2 -- ext/mbstring/tests/mb_ereg_search_xxx.phpt | 1 - ext/mbstring/tests/mb_ereg_variation1.phpt | 1 - ext/mbstring/tests/mb_ereg_variation2.phpt | 1 - ext/mbstring/tests/mb_ereg_variation3.phpt | 1 - ext/mbstring/tests/mb_ereg_variation4.phpt | 2 +- ext/mbstring/tests/mb_ereg_variation5.phpt | 2 +- ext/mbstring/tests/mb_ereg_variation6.phpt | 2 +- ext/mbstring/tests/mb_ereg_variation7.phpt | 2 +- ext/mbstring/tests/mb_http_input.phpt | 2 -- ext/mbstring/tests/mb_http_output.phpt | 2 -- ext/mbstring/tests/mb_internal_encoding.phpt | 2 -- .../mb_internal_encoding_variation1.phpt | 1 - .../mb_internal_encoding_variation2.phpt | 1 - .../tests/mb_output_handler_euc_jp.phpt | 1 - .../tests/mb_output_handler_shift_jis.phpt | 1 - .../tests/mb_preferred_mime_name.phpt | 1 - .../tests/mb_regex_encoding_variation2.phpt | 2 +- ext/mbstring/tests/mb_regex_set_options.phpt | 1 - ext/mbstring/tests/mb_split.phpt | 2 -- ext/mbstring/tests/mb_strcut.phpt | 3 --- ext/mbstring/tests/mb_strimwidth.phpt | 1 - ext/mbstring/tests/mb_stripos_basic2.phpt | 1 - ext/mbstring/tests/mb_stripos_variation2.phpt | 1 - ext/mbstring/tests/mb_stripos_variation4.phpt | 1 - .../tests/mb_stripos_variation5_Bug45923.phpt | 1 - ext/mbstring/tests/mb_stristr_variation1.phpt | 1 - ext/mbstring/tests/mb_stristr_variation2.phpt | 1 - ext/mbstring/tests/mb_strlen.phpt | 4 ---- ext/mbstring/tests/mb_strlen_basic.phpt | 1 - ext/mbstring/tests/mb_strlen_variation2.phpt | 1 - ext/mbstring/tests/mb_strpos_basic.phpt | 2 +- ext/mbstring/tests/mb_strpos_variation4.phpt | 1 - ext/mbstring/tests/mb_strpos_variation5.phpt | 1 - ext/mbstring/tests/mb_strrchr_basic.phpt | 2 +- ext/mbstring/tests/mb_strrchr_variation6.phpt | 2 +- .../tests/mb_strrichr_variation5.phpt | 2 +- .../mb_strripos_variation3_Bug45923.phpt | 1 - .../tests/mb_strripos_variation4.phpt | 1 - .../mb_strripos_variation5_Bug45923.phpt | 2 -- ext/mbstring/tests/mb_strrpos_basic.phpt | 1 - ext/mbstring/tests/mb_strrpos_variation1.phpt | 1 - ext/mbstring/tests/mb_strrpos_variation2.phpt | 1 - ext/mbstring/tests/mb_strrpos_variation4.phpt | 1 - ext/mbstring/tests/mb_strstr_basic.phpt | 2 +- .../tests/mb_strtolower_variation1.phpt | 2 +- .../tests/mb_strtolower_variation3.phpt | 1 - .../tests/mb_strtolower_variation4.phpt | 3 +-- ext/mbstring/tests/mb_strtoupper_basic.phpt | 3 +-- ext/mbstring/tests/mb_strtoupper_error1.phpt | 1 - ext/mbstring/tests/mb_strtoupper_error2.phpt | 1 - .../tests/mb_strtoupper_variation1.phpt | 3 +-- .../tests/mb_strtoupper_variation2.phpt | 1 - .../tests/mb_strtoupper_variation3.phpt | 1 - .../tests/mb_strtoupper_variation4.phpt | 3 +-- ext/mbstring/tests/mb_strwidth.phpt | 1 - .../tests/mb_substitute_character_error.phpt | 1 - .../mb_substitute_character_variation1.phpt | 1 - ext/mbstring/tests/mb_substr.phpt | 3 --- .../tests/mb_substr_count_variation3.phpt | 2 +- .../tests/mb_substr_count_variation4.phpt | 2 +- ext/mbstring/tests/mb_substr_variation1.phpt | 1 - ext/mbstring/tests/mb_substr_variation2.phpt | 1 - ext/mbstring/tests/mb_substr_variation4.phpt | 2 +- ext/mbstring/tests/mb_substr_variation5.phpt | 2 +- ext/mbstring/tests/mb_substr_variation6.phpt | 2 +- ext/mbstring/tests/mb_substr_variation7.phpt | 2 +- ext/mbstring/tests/php_gr_jp_10830.phpt | 1 - ext/mbstring/tests/simpletest.phpt | 1 - ext/mysqli/tests/001.phpt | 2 +- ext/mysqli/tests/002.phpt | 2 +- ext/mysqli/tests/003.phpt | 2 +- ext/mysqli/tests/004.phpt | 2 +- ext/mysqli/tests/005.phpt | 2 +- ext/mysqli/tests/006.phpt | 2 +- ext/mysqli/tests/007.phpt | 2 +- ext/mysqli/tests/008.phpt | 2 +- ext/mysqli/tests/009.phpt | 2 +- ext/mysqli/tests/013.phpt | 2 +- ext/mysqli/tests/015.phpt | 2 +- ext/mysqli/tests/016.phpt | 2 +- ext/mysqli/tests/017.phpt | 2 +- ext/mysqli/tests/018.phpt | 2 +- ext/mysqli/tests/019.phpt | 2 +- ext/mysqli/tests/020.phpt | 2 +- ext/mysqli/tests/021.phpt | 2 +- ext/mysqli/tests/022.phpt | 2 +- ext/mysqli/tests/023.phpt | 2 +- ext/mysqli/tests/024.phpt | 2 +- ext/mysqli/tests/025.phpt | 2 +- ext/mysqli/tests/026.phpt | 2 +- ext/mysqli/tests/027.phpt | 2 +- ext/mysqli/tests/028.phpt | 2 +- ext/mysqli/tests/029.phpt | 2 +- ext/mysqli/tests/030.phpt | 2 +- ext/mysqli/tests/031.phpt | 2 +- ext/mysqli/tests/032.phpt | 2 +- ext/mysqli/tests/033.phpt | 2 +- ext/mysqli/tests/034.phpt | 2 +- ext/mysqli/tests/035.phpt | 2 +- ext/mysqli/tests/036.phpt | 2 +- ext/mysqli/tests/037.phpt | 2 +- ext/mysqli/tests/039.phpt | 2 +- ext/mysqli/tests/040.phpt | 2 +- ext/mysqli/tests/041.phpt | 2 +- ext/mysqli/tests/042.phpt | 2 +- ext/mysqli/tests/043.phpt | 2 +- ext/mysqli/tests/044.phpt | 2 +- ext/mysqli/tests/046.phpt | 2 +- ext/mysqli/tests/047.phpt | 2 +- ext/mysqli/tests/048.phpt | 2 +- ext/mysqli/tests/049.phpt | 2 +- ext/mysqli/tests/057.phpt | 2 +- ext/mysqli/tests/058.phpt | 2 +- ext/mysqli/tests/059.phpt | 2 +- ext/mysqli/tests/060.phpt | 2 +- ext/mysqli/tests/062.phpt | 2 +- ext/mysqli/tests/063.phpt | 2 +- ext/mysqli/tests/067.phpt | 2 +- ext/mysqli/tests/068.phpt | 2 +- ext/mysqli/tests/069.phpt | 2 +- ext/mysqli/tests/070.phpt | 2 +- ext/mysqli/tests/071.phpt | 2 +- ext/mysqli/tests/072.phpt | 2 +- ext/mysqli/tests/073.phpt | 2 +- ext/mysqli/tests/074.phpt | 2 +- ext/mysqli/tests/bug32490.phpt | 1 - ext/mysqli/tests/bug33263.phpt | 2 +- ext/mysqli/tests/bug35759.phpt | 2 +- ext/mysqli/tests/bug38710.phpt | 2 +- ext/mysqli/tests/bug42548.phpt | 2 +- ext/mysqli/tests/bug44897.phpt | 1 - ext/mysqli/tests/bug48909.phpt | 2 +- ext/mysqli/tests/bug49442.phpt | 2 +- ext/mysqli/tests/bug50772.phpt | 2 +- ext/mysqli/tests/bug52082.phpt | 2 +- ext/mysqli/tests/bug52891.phpt | 2 +- ext/mysqli/tests/bug53503.phpt | 2 +- ext/mysqli/tests/bug55283.phpt | 2 +- ext/mysqli/tests/bug55653.phpt | 2 +- ext/mysqli/tests/bug62046.phpt | 2 +- ext/mysqli/tests/bug66124.phpt | 2 +- ext/mysqli/tests/bug66762.phpt | 2 +- ext/mysqli/tests/bug70384.phpt | 2 +- ext/mysqli/tests/bug74737.phpt | 1 - ext/mysqli/tests/bug_mysql_49406.phpt | 2 +- ext/mysqli/tests/mysqli_auth_pam.phpt | 1 - .../tests/mysqli_begin_transaction.phpt | 2 +- .../tests/mysqli_change_user_insert_id.phpt | 2 +- ...ysqli_change_user_prepared_statements.phpt | 2 +- .../tests/mysqli_change_user_rollback.phpt | 2 +- .../mysqli_class_mysqli_result_interface.phpt | 2 +- .../mysqli_class_mysqli_stmt_interface.phpt | 2 +- .../tests/mysqli_class_mysqli_warning.phpt | 2 +- ext/mysqli/tests/mysqli_connect.phpt | 2 +- ext/mysqli/tests/mysqli_connect_errno.phpt | 2 +- ext/mysqli/tests/mysqli_connect_error.phpt | 2 +- .../tests/mysqli_connect_oo_defaults.phpt | 2 +- .../tests/mysqli_connect_oo_warnings.phpt | 2 +- ext/mysqli/tests/mysqli_connect_twice.phpt | 2 +- .../tests/mysqli_constants_categories.phpt | 2 +- ext/mysqli/tests/mysqli_debug_ini.phpt | 2 +- .../mysqli_disable_reads_from_master.phpt | 2 +- ext/mysqli/tests/mysqli_driver.phpt | 2 +- .../tests/mysqli_driver_unclonable.phpt | 2 +- ext/mysqli/tests/mysqli_embedded_connect.phpt | 2 +- .../mysqli_enable_reads_from_master.phpt | 2 +- ext/mysqli/tests/mysqli_expire_password.phpt | 1 - .../tests/mysqli_fetch_array_assoc.phpt | 2 +- .../tests/mysqli_fetch_array_many_rows.phpt | 2 +- .../tests/mysqli_fetch_assoc_no_alias.phpt | 2 +- .../mysqli_fetch_assoc_no_alias_utf8.phpt | 2 +- .../tests/mysqli_fetch_assoc_zerofill.phpt | 2 +- .../tests/mysqli_fetch_field_flags.phpt | 2 +- .../tests/mysqli_fetch_field_types.phpt | 2 +- ext/mysqli/tests/mysqli_fork.phpt | 2 +- ext/mysqli/tests/mysqli_get_client_info.phpt | 2 +- ...mysqli_get_client_stats_implicit_free.phpt | 2 +- .../tests/mysqli_get_client_stats_off.phpt | 2 +- .../tests/mysqli_get_client_stats_ps.phpt | 2 +- .../tests/mysqli_get_client_version.phpt | 2 +- .../mysqli_get_connection_stats_off.phpt | 2 +- ext/mysqli/tests/mysqli_get_host_info.phpt | 2 +- ext/mysqli/tests/mysqli_get_proto_info.phpt | 2 +- ext/mysqli/tests/mysqli_get_server_info.phpt | 2 +- .../tests/mysqli_get_server_version.phpt | 2 +- ext/mysqli/tests/mysqli_init.phpt | 2 +- .../tests/mysqli_insert_id_variation.phpt | 2 +- .../tests/mysqli_insert_packet_overflow.phpt | 2 +- ext/mysqli/tests/mysqli_kill.phpt | 2 +- ext/mysqli/tests/mysqli_last_insert_id.phpt | 2 +- ext/mysqli/tests/mysqli_multi_query.phpt | 1 - .../tests/mysqli_mysqlnd_read_timeout.phpt | 2 +- .../mysqli_mysqlnd_read_timeout_long.phpt | 2 +- .../mysqli_mysqlnd_read_timeout_zero.phpt | 2 +- ext/mysqli/tests/mysqli_no_reconnect.phpt | 2 +- ext/mysqli/tests/mysqli_open_bug74432.phpt | 1 - .../tests/mysqli_options_init_command.phpt | 2 +- .../mysqli_options_int_and_float_native.phpt | 2 +- ext/mysqli/tests/mysqli_pam_sha256.phpt | 2 +- .../mysqli_pam_sha256_public_key_ini.phpt | 3 +-- .../mysqli_pam_sha256_public_key_option.phpt | 2 +- ..._pam_sha256_public_key_option_invalid.phpt | 2 +- .../tests/mysqli_pconn_conn_multiple.phpt | 2 +- ext/mysqli/tests/mysqli_pconn_disabled.phpt | 2 +- ext/mysqli/tests/mysqli_pconn_kill.phpt | 2 +- ext/mysqli/tests/mysqli_pconn_limits.phpt | 2 +- ext/mysqli/tests/mysqli_pconn_max_links.phpt | 2 +- ext/mysqli/tests/mysqli_pconn_reuse.phpt | 2 +- ext/mysqli/tests/mysqli_pconn_twice.phpt | 2 +- ext/mysqli/tests/mysqli_pconnect.phpt | 2 +- ext/mysqli/tests/mysqli_phpinfo.phpt | 2 +- ext/mysqli/tests/mysqli_poll.phpt | 3 +-- ext/mysqli/tests/mysqli_poll_kill.phpt | 2 +- .../mysqli_poll_mixing_insert_select.phpt | 1 - .../tests/mysqli_prepare_no_object.phpt | 2 +- ext/mysqli/tests/mysqli_query_iterators.phpt | 2 +- .../tests/mysqli_query_stored_proc.phpt | 2 +- ...mysqli_real_escape_string_nobackslash.phpt | 2 +- .../tests/mysqli_release_savepoint.phpt | 2 +- ext/mysqli/tests/mysqli_report.phpt | 2 +- ext/mysqli/tests/mysqli_report_new.phpt | 3 +-- ext/mysqli/tests/mysqli_report_wo_ps.phpt | 2 +- .../tests/mysqli_result_unclonable.phpt | 2 +- ext/mysqli/tests/mysqli_savepoint.phpt | 1 - ext/mysqli/tests/mysqli_send_query.phpt | 2 +- .../tests/mysqli_stmt_attr_get_prefetch.phpt | 2 +- ext/mysqli/tests/mysqli_stmt_bind_limits.phpt | 2 +- ...stmt_bind_param_check_param_no_change.phpt | 2 +- .../mysqli_stmt_bind_param_type_juggling.phpt | 2 +- .../tests/mysqli_stmt_bind_result_bit.phpt | 2 +- .../mysqli_stmt_bind_result_zerofill.phpt | 2 +- .../tests/mysqli_stmt_datatype_change.phpt | 3 +-- .../mysqli_stmt_execute_stored_proc.phpt | 2 +- ..._stmt_execute_stored_proc_next_result.phpt | 2 +- .../mysqli_stmt_execute_stored_proc_out.phpt | 2 +- ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt | 2 +- ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt | 2 +- .../tests/mysqli_stmt_get_result_bit.phpt | 2 +- .../mysqli_stmt_get_result_field_count.phpt | 2 +- .../tests/mysqli_stmt_get_result_geom.phpt | 2 +- ext/mysqli/tests/mysqli_stmt_multires.phpt | 2 +- .../tests/mysqli_stmt_result_metadata.phpt | 1 - .../mysqli_stmt_result_metadata_sqltests.phpt | 2 +- ...t_send_long_data_packet_size_libmysql.phpt | 2 +- ...mt_send_long_data_packet_size_mysqlnd.phpt | 2 +- ext/mysqli/tests/mysqli_stmt_unclonable.phpt | 2 +- .../tests/mysqli_store_result_copy.phpt | 2 +- ext/mysqli/tests/mysqli_thread_safe.phpt | 2 +- ext/mysqli/tests/mysqli_unclonable.phpt | 2 +- .../tests/mysqli_warning_unclonable.phpt | 2 +- ext/oci8/tests/bind_number.phpt | 2 -- ext/oci8/tests/bug70700.phpt | 3 --- ext/oci8/tests/bug72524.phpt | 1 - ext/oci8/tests/conn_attr_2.phpt | 1 - ext/oci8/tests/db_op_1.phpt | 1 - ext/oci8/tests/db_op_2.phpt | 1 - ext/oci8/tests/define3.phpt | 1 - ext/oci8/tests/define4.phpt | 1 - ext/oci8/tests/define5.phpt | 1 - ext/oci8/tests/drcp_connect1.phpt | 1 - ext/oci8/tests/drcp_newconnect.phpt | 1 - ext/oci8/tests/drcp_privileged.phpt | 1 - ext/oci8/tests/drcp_scope3.phpt | 2 +- ext/oci8/tests/drcp_scope5.phpt | 2 +- ext/oci8/tests/edition_2.phpt | 1 - ext/oci8/tests/fetch_array.phpt | 1 - ext/oci8/tests/imp_res_get_cancel.phpt | 1 - ext/oci8/tests/imp_res_get_dbmsoutput.phpt | 1 - ext/oci8/tests/lob_038.phpt | 2 +- ext/oci8/tests/lob_041.phpt | 1 - ext/opcache/tests/log_verbosity_bug.phpt | 1 - ext/opcache/tests/optimize_func_calls.phpt | 1 - ext/opcache/tests/ssa_bug_007.phpt | 1 - ext/opcache/tests/ssa_bug_008.phpt | 1 - ext/opcache/tests/wrong_inlining_001.phpt | 2 +- ext/opcache/tests/zzz_basic_logging.phpt | 1 - ext/openssl/tests/001.phpt | 2 +- ext/openssl/tests/bug54992.phpt | 2 -- ext/openssl/tests/bug61124.phpt | 1 - ext/openssl/tests/bug61930.phpt | 1 - ext/openssl/tests/bug68265.phpt | 1 - ext/openssl/tests/bug68879.phpt | 1 - ext/openssl/tests/bug69215.phpt | 1 - ext/openssl/tests/bug71475.phpt | 1 - ext/openssl/tests/bug72333.phpt | 1 - ext/openssl/tests/bug74651.phpt | 2 +- ext/openssl/tests/bug74720_0.phpt | 1 - ext/openssl/tests/bug74720_1.phpt | 1 - ext/openssl/tests/bug74903.phpt | 1 - ext/openssl/tests/bug76296.phpt | 1 - ext/openssl/tests/openssl_csr_sign_basic.phpt | 1 - ext/openssl/tests/openssl_decrypt_error.phpt | 1 - ext/openssl/tests/openssl_encrypt_crash.phpt | 3 +-- .../tests/openssl_pkcs7_read_basic.phpt | 1 - ext/openssl/tests/openssl_pkey_new_error.phpt | 2 -- .../tests/openssl_public_encrypt_basic.phpt | 1 - .../openssl_random_pseudo_bytes_basic.phpt | 2 +- .../tests/openssl_x509_fingerprint_basic.phpt | 1 - .../tests/openssl_x509_read_basic.phpt | 1 - .../tests/stream_crypto_flags_002.phpt | 1 - .../tests/stream_crypto_flags_003.phpt | 1 - ext/pcre/tests/002.phpt | 1 - ext/pcre/tests/bug27103.phpt | 1 - ext/pcre/tests/bug52732.phpt | 2 +- ext/pcre/tests/bug73392.phpt | 1 - ext/pcre/tests/bug74183.phpt | 2 +- ext/pcre/tests/bug74873.phpt | 2 +- ext/pcre/tests/bug76850.phpt | 1 - ext/pcre/tests/bug76909.phpt | 1 - ext/pcre/tests/match_flags3.phpt | 1 - ext/pcre/tests/pcre.constants.phpt | 2 +- ext/pcre/tests/preg_grep_error.phpt | 2 +- ext/pcre/tests/preg_grep_error1.phpt | 3 +-- ext/pcre/tests/preg_grep_error2.phpt | 2 +- ext/pcre/tests/preg_last_error_error.phpt | 2 +- ext/pcre/tests/preg_match_all_error3.phpt | 1 - ext/pcre/tests/preg_match_basic.phpt | 3 --- ext/pcre/tests/preg_match_basic_002.phpt | 2 +- ext/pcre/tests/preg_match_basic_edit.phpt | 3 --- ext/pcre/tests/preg_match_error1.phpt | 1 - ext/pcre/tests/preg_match_error2.phpt | 3 +-- ext/pcre/tests/preg_quote_basic.phpt | 3 +-- ext/pcre/tests/preg_quote_error1.phpt | 2 +- ext/pcre/tests/preg_replace_basic.phpt | 1 - .../tests/preg_replace_callback_error1.phpt | 2 +- ext/pcre/tests/preg_replace_error1.phpt | 1 - ext/pcre/tests/preg_replace_error2.phpt | 1 - ext/pcre/tests/preg_split_error.phpt | 2 +- ext/pcre/tests/preg_split_error2.phpt | 2 +- ext/pdo/tests/bug_39656.phpt | 1 - ext/pdo/tests/bug_44173.phpt | 1 - ext/pdo/tests/bug_52098.phpt | 2 +- ext/pdo/tests/bug_64172.phpt | 2 +- ext/pdo/tests/pecl_bug_5772.phpt | 1 - ext/pdo/tests/pecl_bug_5809.phpt | 1 - ext/pdo_dblib/tests/bug_68957.phpt | 1 - ext/pdo_firebird/tests/bug_62024.phpt | 1 - ext/pdo_firebird/tests/bug_64037.phpt | 2 +- ext/pdo_firebird/tests/bug_73087.phpt | 2 +- ext/pdo_firebird/tests/bug_74462.phpt | 2 +- ext/pdo_firebird/tests/bug_76488.phpt | 2 +- ext/pdo_firebird/tests/bug_aaa.phpt | 2 +- ext/pdo_mysql/tests/bug66141.phpt | 2 +- ext/pdo_mysql/tests/bug68371.phpt | 1 - ext/pdo_mysql/tests/bug_39483.phpt | Bin 755 -> 754 bytes ext/pdo_mysql/tests/bug_41698.phpt | 2 +- ext/pdo_mysql/tests/bug_51670.phpt | 1 - ext/pdo_mysql/tests/bug_pecl_12925.phpt | 2 +- .../tests/pdo_mysql___construct_ini.phpt | 2 +- .../tests/pdo_mysql_attr_autocommit.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt | 2 +- .../tests/pdo_mysql_attr_client_version.phpt | 2 +- .../tests/pdo_mysql_attr_driver_name.phpt | 2 +- .../tests/pdo_mysql_attr_errmode.phpt | 2 +- .../tests/pdo_mysql_attr_max_buffer_size.phpt | 2 +- .../pdo_mysql_attr_multi_statements.phpt | 1 - .../tests/pdo_mysql_attr_oracle_nulls.phpt | 2 +- .../tests/pdo_mysql_attr_prefetch.phpt | 2 +- .../tests/pdo_mysql_attr_server_info.phpt | 2 +- .../tests/pdo_mysql_attr_server_version.phpt | 2 +- .../tests/pdo_mysql_attr_statement_class.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_bit.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_commit.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt | 2 +- .../tests/pdo_mysql_exec_select.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt | 2 +- .../pdo_mysql_prepare_native_column.phpt | 2 +- ...prepare_native_placeholder_everywhere.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_rollback.phpt | 2 +- .../tests/pdo_mysql_stmt_bindparam_types.phpt | 2 +- .../tests/pdo_mysql_stmt_blobfromsteam.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt | 2 +- .../tests/pdo_mysql_stmt_columncount.phpt | 2 +- .../pdo_mysql_stmt_fetch_non_select.phpt | 2 +- .../tests/pdo_mysql_stmt_multiquery.phpt | 2 +- .../tests/pdo_mysql_stmt_rowcount.phpt | 2 +- .../tests/pdo_mysql_stmt_unbuffered_2050.phpt | 2 +- .../tests/pdo_mysql_types_zerofill.phpt | 2 +- ext/pdo_mysql/tests/pecl_bug_5802.phpt | 2 +- ext/pdo_oci/tests/bug60994.phpt | 3 --- ext/pdo_oci/tests/bug_33707.phpt | 1 - .../tests/pdo_oci_attr_autocommit_1.phpt | 2 +- ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt | 2 +- ext/pdo_oci/tests/pdo_oci_stream_1.phpt | 2 +- ext/pdo_oci/tests/pdo_oci_templob_1.phpt | 1 - ext/pdo_oci/tests/pecl_bug_11345.phpt | 3 +-- ext/pdo_oci/tests/pecl_bug_6364.phpt | 1 - ext/pdo_odbc/tests/long_columns.phpt | 1 - ext/pdo_odbc/tests/max_columns.phpt | 1 - ext/pdo_pgsql/tests/bug36727.phpt | 2 +- ext/pdo_pgsql/tests/bug48764.phpt | 1 - ext/pdo_pgsql/tests/bug62479.phpt | 1 - ext/pdo_pgsql/tests/bug68371.phpt | 1 - ext/pdo_pgsql/tests/bug69344.phpt | 1 - ext/pdo_pgsql/tests/bug69362.phpt | 1 - ext/pdo_pgsql/tests/bug72294.phpt | 1 - ext/pdo_pgsql/tests/bug75402.phpt | 1 - ext/pdo_pgsql/tests/bug_33876.phpt | 3 --- ext/pdo_pgsql/tests/bug_49985.phpt | 1 - ext/pdo_pgsql/tests/copy_from.phpt | 1 - ext/pdo_pgsql/tests/copy_to.phpt | 1 - ext/pdo_sqlite/tests/bug33841.phpt | 1 - .../pdo_sqlite_statement_getattribute.phpt | 2 +- ext/pgsql/tests/10pg_convert.phpt | 2 +- ext/pgsql/tests/10pg_convert_9.phpt | 2 +- ext/pgsql/tests/12pg_insert.phpt | 2 +- ext/pgsql/tests/12pg_insert_9.phpt | 2 +- ext/pgsql/tests/13pg_select_9.phpt | 2 +- ext/pgsql/tests/14pg_update_9.phpt | 2 +- .../tests/31nb_async_query_prepared.phpt | 1 - ext/pgsql/tests/32nb_async_query.phpt | 1 - ext/pgsql/tests/bug47199.phpt | 2 +- ext/pgsql/tests/bug64609.phpt | 2 +- ext/pgsql/tests/bug72197.phpt | 1 - ext/pgsql/tests/pg_insert_001.phpt | 1 - ext/pgsql/tests/pg_insert_002.phpt | 3 +-- ext/phar/tests/002.phpt | 2 +- ext/phar/tests/020.phpt | 2 +- ext/phar/tests/021.phpt | 2 +- ext/phar/tests/032.phpt | 3 +-- ext/phar/tests/addfuncs.phpt | 2 +- ext/phar/tests/bug13786.phpt | 2 +- ext/phar/tests/bug46178.phpt | 2 +- ext/phar/tests/bug47085.phpt | 2 +- ext/phar/tests/bug48377.phpt | 2 +- ext/phar/tests/bug53872.phpt | 1 - ext/phar/tests/bug60164.phpt | 2 +- ext/phar/tests/bug65028.phpt | 1 - ext/phar/tests/bug69324.phpt | 2 +- ext/phar/tests/bug69720.phpt | 1 - ext/phar/tests/bug71354.phpt | 2 +- ext/phar/tests/bug71391.phpt | 2 +- ext/phar/tests/bug71488.phpt | 2 +- ext/phar/tests/bug72928.phpt | 2 +- ext/phar/tests/bug73035.phpt | 2 +- ext/phar/tests/bug73764.phpt | 2 +- ext/phar/tests/bug74383.phpt | 1 - .../tests/cache_list/copyonwrite1.phar.phpt | 2 +- .../tests/cache_list/copyonwrite10.phar.phpt | 2 +- .../tests/cache_list/copyonwrite11.phar.phpt | 2 +- .../tests/cache_list/copyonwrite12.phar.phpt | 2 +- .../tests/cache_list/copyonwrite13.phar.phpt | 2 +- .../tests/cache_list/copyonwrite14.phar.phpt | 2 +- .../tests/cache_list/copyonwrite15.phar.phpt | 2 +- .../tests/cache_list/copyonwrite16.phar.phpt | 2 +- .../tests/cache_list/copyonwrite17.phar.phpt | 2 +- .../tests/cache_list/copyonwrite18.phar.phpt | 2 +- .../tests/cache_list/copyonwrite19.phar.phpt | 2 +- .../tests/cache_list/copyonwrite2.phar.phpt | 2 +- .../tests/cache_list/copyonwrite20.phar.phpt | 2 +- .../tests/cache_list/copyonwrite21.phar.phpt | 2 +- .../tests/cache_list/copyonwrite22.phar.phpt | 2 +- .../tests/cache_list/copyonwrite23.phar.phpt | 2 +- .../tests/cache_list/copyonwrite24.phar.phpt | 2 +- .../tests/cache_list/copyonwrite25.phar.phpt | 2 +- .../tests/cache_list/copyonwrite3.phar.phpt | 2 +- .../tests/cache_list/copyonwrite4.phar.phpt | 2 +- ext/phar/tests/cache_list/copyonwrite4a.phpt | 2 +- .../tests/cache_list/copyonwrite5.phar.phpt | 2 +- .../tests/cache_list/copyonwrite7.phar.phpt | 2 +- .../tests/cache_list/copyonwrite8.phar.phpt | 2 +- .../tests/cache_list/copyonwrite9.phar.phpt | 2 +- .../tests/cache_list/frontcontroller11.phpt | 2 +- .../tests/cache_list/frontcontroller12.phpt | 2 +- .../tests/cache_list/frontcontroller13.phpt | 2 +- .../tests/cache_list/frontcontroller15.phpt | 1 - .../tests/cache_list/frontcontroller16.phpt | 1 - .../tests/cache_list/frontcontroller17.phpt | 1 - .../tests/cache_list/frontcontroller22.phpt | 2 +- .../tests/cache_list/frontcontroller23.phpt | 2 +- .../tests/cache_list/frontcontroller24.phpt | 2 +- .../tests/cache_list/frontcontroller25.phpt | 2 +- .../tests/cache_list/frontcontroller26.phpt | 2 +- .../tests/cache_list/frontcontroller27.phpt | 2 +- .../tests/cache_list/frontcontroller29.phpt | 2 +- .../tests/cache_list/frontcontroller30.phpt | 2 +- .../tests/cache_list/frontcontroller31.phpt | 2 +- .../tests/cache_list/frontcontroller33.phpt | 2 +- .../tests/cache_list/frontcontroller6.phpt | 2 +- .../tests/cache_list/frontcontroller8.phpt | 2 +- .../tests/cache_list/frontcontroller9.phpt | 2 +- ext/phar/tests/create_new_phar_b.phpt | 1 - ext/phar/tests/delete.phpt | 2 +- ext/phar/tests/delete_in_phar.phpt | 2 +- ext/phar/tests/dir.phpt | 2 +- ext/phar/tests/file_get_contents.phpt | 2 +- ext/phar/tests/fopen_edgecases.phpt | 2 +- ext/phar/tests/frontcontroller12.phpt | 2 +- ext/phar/tests/frontcontroller13.phpt | 2 +- ext/phar/tests/frontcontroller15.phpt | 1 - ext/phar/tests/frontcontroller16.phpt | 1 - ext/phar/tests/frontcontroller17.phpt | 1 - ext/phar/tests/frontcontroller22.phpt | 2 +- ext/phar/tests/frontcontroller23.phpt | 2 +- ext/phar/tests/frontcontroller24.phpt | 2 +- ext/phar/tests/frontcontroller25.phpt | 2 +- ext/phar/tests/frontcontroller26.phpt | 2 +- ext/phar/tests/frontcontroller27.phpt | 2 +- ext/phar/tests/frontcontroller29.phpt | 2 +- ext/phar/tests/frontcontroller30.phpt | 2 +- ext/phar/tests/frontcontroller31.phpt | 2 +- ext/phar/tests/frontcontroller33.phpt | 2 +- ext/phar/tests/frontcontroller6.phpt | 2 +- ext/phar/tests/frontcontroller8.phpt | 2 +- ext/phar/tests/frontcontroller9.phpt | 2 +- ext/phar/tests/include_path.phpt | 2 +- ext/phar/tests/include_path_advanced.phpt | 2 +- ext/phar/tests/invalid_alias.phpt | 2 +- ext/phar/tests/invalid_setstubalias.phpt | 2 +- ext/phar/tests/mkdir.phpt | 2 +- ext/phar/tests/open_for_write_existing_b.phpt | 1 - ext/phar/tests/open_for_write_existing_c.phpt | 1 - ext/phar/tests/open_for_write_newfile_b.phpt | 1 - ext/phar/tests/open_for_write_newfile_c.phpt | 1 - ext/phar/tests/opendir.phpt | 2 +- ext/phar/tests/phar_commitwrite.phpt | 2 +- ext/phar/tests/phar_create_in_cwd.phpt | 2 +- ext/phar/tests/phar_ctx_001.phpt | 2 +- ext/phar/tests/phar_gobyebye.phpt | 2 +- ext/phar/tests/phar_isvalidpharfilename.phpt | 1 - ext/phar/tests/phar_mount.phpt | 2 +- ext/phar/tests/pharfileinfo_chmod.phpt | 2 +- ext/phar/tests/pharfileinfo_compression.phpt | 2 +- ext/phar/tests/pharfileinfo_destruct.phpt | 2 +- ext/phar/tests/readfile.phpt | 2 +- ext/phar/tests/rename.phpt | 2 +- ext/phar/tests/security.phpt | 2 +- ext/phar/tests/stat.phpt | 2 +- ext/phar/tests/tar/create_new_phar_b.phpt | 1 - ext/phar/tests/tar/delete.phpt | 2 +- .../tests/tar/frontcontroller10.phar.phpt | 2 +- .../tests/tar/frontcontroller12.phar.phpt | 2 +- .../tests/tar/frontcontroller13.phar.phpt | 2 +- .../tests/tar/frontcontroller15.phar.phpt | 1 - .../tests/tar/frontcontroller16.phar.phpt | 1 - .../tests/tar/frontcontroller17.phar.phpt | 1 - ext/phar/tests/tar/frontcontroller6.phar.phpt | 2 +- ext/phar/tests/tar/frontcontroller8.phar.phpt | 2 +- ext/phar/tests/tar/links6.phpt | 2 +- .../tests/tar/open_for_write_existing_b.phpt | 1 - .../tests/tar/open_for_write_existing_c.phpt | 1 - .../tests/tar/open_for_write_newfile_b.phpt | 1 - .../tests/tar/open_for_write_newfile_c.phpt | 1 - ext/phar/tests/test_alias_unset.phpt | 2 +- ext/phar/tests/test_unset.phpt | 2 +- ext/phar/tests/webphar_compilefail.phpt | 2 +- ext/phar/tests/zip/create_new_phar_b.phpt | 1 - ext/phar/tests/zip/delete.phpt | 2 +- ext/phar/tests/zip/delete_in_phar.phpt | 2 +- .../tests/zip/frontcontroller10.phar.phpt | 2 +- .../tests/zip/frontcontroller12.phar.phpt | 2 +- .../tests/zip/frontcontroller13.phar.phpt | 2 +- .../tests/zip/frontcontroller15.phar.phpt | 1 - .../tests/zip/frontcontroller16.phar.phpt | 1 - .../tests/zip/frontcontroller17.phar.phpt | 1 - ext/phar/tests/zip/frontcontroller6.phar.phpt | 2 +- ext/phar/tests/zip/frontcontroller8.phar.phpt | 2 +- ext/phar/tests/zip/frontcontroller9.phar.phpt | 2 +- .../tests/zip/open_for_write_existing_b.phpt | 1 - .../tests/zip/open_for_write_existing_c.phpt | 1 - .../tests/zip/open_for_write_newfile_b.phpt | 1 - .../tests/zip/open_for_write_newfile_c.phpt | 1 - ext/phar/tests/zip/rename.phpt | 2 +- ext/phar/tests/zip/rename_dir.phpt | 2 +- ext/posix/tests/posix_getgrgid_basic.phpt | 1 - ext/posix/tests/posix_getgroups_basic.phpt | 2 +- ext/posix/tests/posix_getpgid_basic.phpt | 2 +- ext/posix/tests/posix_getpgrp_basic.phpt | 2 +- ext/posix/tests/posix_getpid_basic.phpt | 2 +- ext/posix/tests/posix_getppid_basic.phpt | 2 +- ext/posix/tests/posix_getpwuid_basic.phpt | 2 +- ext/posix/tests/posix_getrlimit_basic.phpt | 2 +- ext/posix/tests/posix_getsid_basic.phpt | 2 +- ext/posix/tests/posix_kill_basic.phpt | 1 - ext/posix/tests/posix_mknod_basic.phpt | 2 +- ext/posix/tests/posix_setegid_basic.phpt | 2 +- ext/posix/tests/posix_setgid_basic.phpt | 2 +- ext/posix/tests/posix_setgid_variation2.phpt | 1 - ext/posix/tests/posix_setgid_variation4.phpt | 1 - ext/posix/tests/posix_setgid_variation5.phpt | 1 - ext/posix/tests/posix_setgid_variation6.phpt | 2 +- ext/posix/tests/posix_setrlimit.phpt | 1 - ext/posix/tests/posix_uname_basic.phpt | 2 +- ext/readline/tests/readline_info_001.phpt | 2 +- ...eadline_read_history_open_basedir_001.phpt | 2 +- ...adline_write_history_open_basedir_001.phpt | 2 +- ext/recode/tests/001.phpt | 2 +- ext/reflection/tests/007.phpt | 1 - .../ReflectionClass_constructor_002.phpt | 3 +-- .../tests/ReflectionClass_export_basic1.phpt | 2 +- .../tests/ReflectionClass_export_basic2.phpt | 2 +- .../ReflectionClass_getConstant_error.phpt | 2 +- .../ReflectionClass_getDocComment_001.phpt | 4 +--- .../tests/ReflectionClass_getMethod_002.phpt | 2 +- .../ReflectionClass_getNamespaceName.phpt | 1 - .../tests/ReflectionClass_getParentClass.phpt | 1 - .../ReflectionClass_getProperties_003.phpt | 2 +- .../ReflectionClass_getProperty_002.phpt | 2 +- ...ctionClass_getStaticPropertyValue_002.phpt | 3 +-- .../ReflectionClass_hasConstant_001.phpt | 2 +- .../ReflectionClass_hasConstant_002.phpt | 2 +- .../tests/ReflectionClass_hasMethod_001.phpt | 2 +- .../ReflectionClass_hasProperty_001.phpt | 1 - .../ReflectionClass_isIterateable_001.phpt | 2 +- .../ReflectionClass_isSubclassOf_002.phpt | 3 +-- .../ReflectionClass_newInstanceArgs_002.phpt | 1 - ...ctionClass_setStaticPropertyValue_002.phpt | 3 +-- .../tests/ReflectionClass_toString_002.phpt | 4 +--- .../tests/ReflectionClass_toString_003.phpt | 2 -- .../tests/ReflectionFunction_001.phpt | 2 +- .../ReflectionFunction_getDocComment.001.phpt | 1 - .../ReflectionFunction_getExtension.phpt | 1 - .../ReflectionFunction_getExtensionName.phpt | 1 - .../ReflectionFunction_getFileName.001.phpt | 2 +- .../ReflectionFunction_getFileName.002.phpt | 1 - .../ReflectionFunction_getNamespaceName.phpt | 1 - .../tests/ReflectionMethod_basic1.phpt | 2 -- .../ReflectionMethod_constructor_error1.phpt | 1 - .../ReflectionMethod_constructor_error2.phpt | 1 - ...lectionMethod_getDeclaringClass_basic.phpt | 1 - .../ReflectionMethod_getDocComment_basic.phpt | 2 -- .../ReflectionObject___toString_basic1.phpt | 2 +- .../ReflectionObject___toString_basic2.phpt | 2 +- .../tests/ReflectionObject_export_basic1.phpt | 2 +- .../tests/ReflectionObject_export_basic2.phpt | 2 +- .../tests/ReflectionObject_export_basic3.phpt | 1 - .../tests/ReflectionObject_getName_basic.phpt | 2 -- .../ReflectionObject_isSubclassOf.002.phpt | 2 +- .../tests/ReflectionParameter_001.phpt | 2 +- .../tests/ReflectionParameter_002.phpt | 2 +- .../ReflectionParameter_export_error.phpt | 1 - .../ReflectionParameter_export_error3.phpt | 1 - .../tests/ReflectionProperty_basic1.phpt | 2 -- ...ectionProperty_constructor_variation1.phpt | 2 +- ...eflectionProperty_getDocComment_basic.phpt | 1 - ext/reflection/tests/ReflectionType_002.phpt | 2 -- ext/reflection/tests/bug46064_2.phpt | 2 +- ext/reflection/tests/bug67068.phpt | 2 +- ext/reflection/tests/traits004.phpt | 1 - ext/reflection/tests/traits005.phpt | 1 - ext/session/tests/001.phpt | 1 - ext/session/tests/003.phpt | 1 - ext/session/tests/005.phpt | 1 - ext/session/tests/009.phpt | 1 - ext/session/tests/016.phpt | 1 - ext/session/tests/019.phpt | 2 -- ext/session/tests/bug31454.phpt | 1 - ext/session/tests/bug42596.phpt | 1 - ext/session/tests/bug53141.phpt | 2 +- ext/session/tests/bug60634_error_1.phpt | 1 - ext/session/tests/bug60860.phpt | 1 - ext/session/tests/bug63379.phpt | 1 - ext/session/tests/bug63379_nodestroy.phpt | 1 - ext/session/tests/bug65475.phpt | 2 -- ext/session/tests/bug67972.phpt | 1 - ext/session/tests/bug70876.phpt | 2 +- ext/session/tests/bug71603.phpt | 1 - ext/session/tests/bug71974.phpt | 2 -- ext/session/tests/bug73100.phpt | 1 - ext/session/tests/bug74833.phpt | 1 - ext/session/tests/session_basic2.phpt | 2 -- ext/session/tests/session_basic4.phpt | 2 -- .../tests/session_cache_expire_basic.phpt | 1 - .../tests/session_cache_expire_error.phpt | 1 - .../session_cache_expire_variation1.phpt | 1 - .../session_cache_expire_variation2.phpt | 2 -- .../session_cache_expire_variation3.phpt | 1 - .../tests/session_cache_limiter_error.phpt | 1 - ext/session/tests/session_commit_basic.phpt | 1 - .../tests/session_commit_variation2.phpt | 1 - .../tests/session_commit_variation3.phpt | 1 - .../tests/session_commit_variation4.phpt | 1 - .../tests/session_commit_variation5.phpt | 1 - ext/session/tests/session_decode_basic.phpt | 1 - .../tests/session_decode_basic_serialize.phpt | 1 - .../tests/session_decode_variation1.phpt | 1 - .../tests/session_decode_variation2.phpt | 1 - .../tests/session_decode_variation4.phpt | 1 - ext/session/tests/session_destroy_error.phpt | 1 - .../tests/session_destroy_variation1.phpt | 1 - .../tests/session_destroy_variation2.phpt | 1 - .../tests/session_destroy_variation3.phpt | 1 - ext/session/tests/session_encode_basic.phpt | 1 - ext/session/tests/session_encode_error.phpt | 1 - .../tests/session_encode_serialize.phpt | 1 - ext/session/tests/session_gc_basic.phpt | 2 -- .../session_get_cookie_params_error.phpt | 1 - .../session_get_cookie_params_variation1.phpt | 1 - ext/session/tests/session_id_basic.phpt | 1 - ext/session/tests/session_id_basic2.phpt | 1 - ext/session/tests/session_id_error.phpt | 1 - ext/session/tests/session_id_error3.phpt | 1 - .../tests/session_module_name_variation4.phpt | 1 - ext/session/tests/session_name_basic.phpt | 1 - ext/session/tests/session_name_error.phpt | 2 +- .../tests/session_name_variation1.phpt | 1 - .../tests/session_name_variation2.phpt | 1 - .../tests/session_regenerate_id_basic.phpt | 1 - .../tests/session_regenerate_id_cookie.phpt | 1 - .../tests/session_regenerate_id_error.phpt | 1 - .../session_regenerate_id_variation1.phpt | 1 - .../tests/session_save_path_basic.phpt | 1 - .../tests/session_save_path_error.phpt | 1 - .../tests/session_save_path_variation5.phpt | 1 - .../session_set_save_handler_class_001.phpt | 1 - .../session_set_save_handler_class_002.phpt | 1 - .../session_set_save_handler_class_003.phpt | 1 - .../session_set_save_handler_class_004.phpt | 1 - .../session_set_save_handler_class_005.phpt | 2 -- .../session_set_save_handler_class_012.phpt | 1 - .../session_set_save_handler_class_013.phpt | 1 - .../session_set_save_handler_class_014.phpt | 2 -- .../session_set_save_handler_class_015.phpt | 1 - .../session_set_save_handler_class_016.phpt | 1 - .../session_set_save_handler_class_017.phpt | 1 - .../session_set_save_handler_class_018.phpt | 1 - .../tests/session_set_save_handler_error.phpt | 1 - .../session_set_save_handler_error2.phpt | 1 - .../session_set_save_handler_iface_001.phpt | 1 - .../session_set_save_handler_iface_002.phpt | 1 - .../session_set_save_handler_iface_003.phpt | 1 - .../session_set_save_handler_sid_001.phpt | 1 - .../session_set_save_handler_sid_002.phpt | 1 - .../session_set_save_handler_variation2.phpt | 1 - .../session_set_save_handler_variation4.phpt | 1 - .../tests/session_start_variation2.phpt | 1 - .../tests/session_start_variation4.phpt | 1 - .../tests/session_start_variation5.phpt | 1 - .../tests/session_start_variation6.phpt | 1 - .../tests/session_start_variation7.phpt | 1 - .../tests/session_start_variation8.phpt | 1 - ext/session/tests/session_unset_basic.phpt | 1 - .../tests/session_unset_variation1.phpt | 1 - .../tests/session_write_close_basic.phpt | 1 - .../tests/session_write_close_variation3.phpt | 1 - .../tests/session_write_close_variation4.phpt | 1 - ext/simplexml/tests/012.phpt | 1 - ext/simplexml/tests/018.phpt | 2 +- .../SimpleXMLElement_addAttribute_basic.phpt | 2 +- ..._addAttribute_required_attribute_name.phpt | 1 - ext/simplexml/tests/bug41175.phpt | 2 +- ext/simplexml/tests/bug42369.phpt | 2 +- ext/simplexml/tests/bug43221.phpt | 2 +- ext/simplexml/tests/bug44478.phpt | 2 +- ext/simplexml/tests/bug45553.phpt | 2 +- ext/simplexml/tests/bug46003.phpt | 2 +- ext/simplexml/tests/bug46047.phpt | 2 +- ext/simplexml/tests/bug62639.phpt | 2 +- ext/simplexml/tests/feature55218.phpt | 2 +- ext/simplexml/tests/profile09.phpt | 1 - ext/simplexml/tests/simplexml_load_file.phpt | 2 +- ext/simplexml/tests/sxe_003.phpt | 1 - ext/snmp/tests/bug72479.phpt | 2 +- ext/snmp/tests/generic_timeout_error.phpt | 1 - ext/snmp/tests/ipv6.phpt | 2 +- .../tests/snmp-object-setSecurity_error.phpt | 1 - ext/snmp/tests/snmp_get_quick_print.phpt | 1 - ext/soap/tests/bug70388.phpt | 2 +- ext/soap/tests/bugs/bug27722.phpt | 2 +- ext/soap/tests/bugs/bug29061.phpt | 2 +- ext/soap/tests/bugs/bug29109.phpt | 2 +- ext/soap/tests/bugs/bug42359.phpt | 1 - ext/soap/tests/bugs/bug42488.phpt | 2 +- ext/soap/tests/bugs/bug44686.phpt | 1 - ext/soap/tests/bugs/bug47273.phpt | 1 - ext/soap/tests/bugs/bug70469.phpt | 2 +- .../interop/Round2/Base/r2_base_003p.phpt | 2 +- .../interop/Round2/Base/r2_base_003s.phpt | 2 +- .../interop/Round2/Base/r2_base_003w.phpt | 2 +- ext/soap/tests/schema/schema008.phpt | 1 - ext/soap/tests/schema/schema068.phpt | 2 +- ext/soap/tests/server029.phpt | 2 +- ext/soap/tests/soap12/T27.phpt | 1 - ext/soap/tests/soap12/T28.phpt | 1 - ext/soap/tests/soap12/T31.phpt | 1 - ext/soap/tests/soap12/T40.phpt | 2 +- ext/soap/tests/soap12/T56.phpt | 1 - ext/soap/tests/soap12/T58.phpt | 1 - ext/sockets/tests/mcast_ipv4_send.phpt | 1 - ext/sockets/tests/mcast_ipv4_send_error.phpt | 1 - ext/sockets/tests/mcast_ipv6_recv.phpt | 1 - .../tests/mcast_ipv6_recv_limited.phpt | 1 - ext/sockets/tests/mcast_ipv6_send.phpt | 1 - ext/sockets/tests/socket_bind.phpt | 2 -- ext/sockets/tests/socket_bind_params.phpt | 1 - ext/sockets/tests/socket_close_params.phpt | 1 - .../tests/socket_cmsg_credentials.phpt | 2 -- ext/sockets/tests/socket_cmsg_rights.phpt | 1 - ext/sockets/tests/socket_connect_error.phpt | 1 - ext/sockets/tests/socket_connect_params.phpt | 1 - .../tests/socket_create_listen-nobind.phpt | 2 +- ext/sockets/tests/socket_create_params.phpt | 1 - ext/sockets/tests/socket_export_stream-1.phpt | 1 - ext/sockets/tests/socket_export_stream-2.phpt | 2 -- ext/sockets/tests/socket_export_stream-3.phpt | 1 - .../tests/socket_export_stream-4-win.phpt | 1 - ext/sockets/tests/socket_getpeername.phpt | 1 - ext/sockets/tests/socket_getsockname.phpt | 2 -- ext/sockets/tests/socket_import_stream-1.phpt | 1 - ext/sockets/tests/socket_import_stream-2.phpt | 2 -- ext/sockets/tests/socket_import_stream-3.phpt | 1 - .../tests/socket_import_stream-4-win.phpt | 1 - ext/sockets/tests/socket_listen_params.phpt | 1 - ext/sockets/tests/socket_read_params.phpt | 1 - ext/sockets/tests/socket_recvmsg.phpt | 1 - .../socket_sendrecvmsg_multi_msg-unix.phpt | 1 - .../tests/socket_sendrecvmsg_multi_msg.phpt | 2 -- .../socket_sentto_recvfrom_ipv4_udp.phpt | 1 - .../tests/socket_set_block-wrongparams.phpt | 1 - ext/sockets/tests/socket_set_nonblock.phpt | 2 -- .../tests/socket_set_option_bindtodevice.phpt | 1 - .../tests/socket_set_option_in6_pktinfo.phpt | 1 - .../tests/socket_set_option_rcvtimeo.phpt | 1 - .../tests/socket_set_option_seolinger.phpt | 1 - .../tests/socket_set_option_sndtimeo.phpt | 1 - ext/sockets/tests/socket_strerror.phpt | 1 - ext/sockets/tests/socket_write_params.phpt | 1 - ext/sockets/tests/wsaprotocol_info_0.phpt | 1 - ext/sodium/tests/crypto_secretstream.phpt | 1 - ext/sodium/tests/version.phpt | 1 - .../tests/CallbackFilterIteratorTest-002.phpt | 1 - .../DirectoryIterator_empty_constructor.phpt | 2 +- .../DirectoryIterator_getExtension_basic.phpt | 1 - .../DirectoryIterator_getInode_error.phpt | 1 - ...iveDirectoryIterator_getSubPath_basic.phpt | 1 - ext/spl/tests/SplArray_fromArray.phpt | 2 +- ...ublyLinkedList_add_missing_parameter1.phpt | 1 - ...ublyLinkedList_add_missing_parameter2.phpt | 1 - ...dList_count_param_SplDoublyLinkedList.phpt | 2 +- .../SplDoublyLinkedList_current_empty.phpt | 2 +- ...oublyLinkedList_getIteratorMode_error.phpt | 1 - ...nkedList_isEmpty_empty-with-parameter.phpt | 2 +- ...List_isEmpty_not-empty-with-parameter.phpt | 2 +- .../tests/SplDoublyLinkedList_lifoMode.phpt | 2 +- .../SplDoublyLinkedList_offsetGet_empty.phpt | 2 +- ...oublyLinkedList_offsetGet_param_array.phpt | 2 +- ...ublyLinkedList_offsetGet_param_string.phpt | 2 +- ...ist_offsetUnset_greater_than_elements.phpt | 2 -- .../tests/SplDoublyLinkedList_pop_params.phpt | 2 +- ...ublyLinkedList_push_missing_parameter.phpt | 1 - ...teratorMode_param_SplDoublyLinkedList.phpt | 2 +- ...yLinkedList_unshift_missing_parameter.phpt | 1 - ext/spl/tests/SplFileInfo_getGroup_error.phpt | 1 - ext/spl/tests/SplFileInfo_getInode_error.phpt | 1 - ext/spl/tests/SplFileInfo_getOwner_error.phpt | 1 - ext/spl/tests/SplFileInfo_getPerms_error.phpt | 1 - .../SplFileObject_fputcsv_variation1.phpt | 1 - .../SplFileObject_fputcsv_variation10.phpt | 1 - .../SplFileObject_fputcsv_variation11.phpt | 1 - .../SplFileObject_fputcsv_variation12.phpt | 1 - .../SplFileObject_fputcsv_variation5.phpt | 1 - .../SplFileObject_fputcsv_variation6.phpt | 1 - .../SplFileObject_fputcsv_variation7.phpt | 1 - .../SplFileObject_fputcsv_variation8.phpt | 1 - .../tests/SplFileObject_seek_error_001.phpt | 1 - .../SplFileObject_setCsvControl_basic.phpt | 1 - .../SplFileObject_setCsvControl_error001.phpt | 1 - .../SplFileObject_setCsvControl_error002.phpt | 1 - .../SplFileObject_setCsvControl_error003.phpt | 1 - ...FileObject_setCsvControl_variation001.phpt | 1 - .../SplFixedArray__construct_param_float.phpt | 2 +- .../SplFixedArray__construct_param_null.phpt | 2 +- .../SplFixedArray_count_checkParams.phpt | 1 - .../tests/SplFixedArray_count_param_int.phpt | 2 +- ...SplFixedArray_fromarray_param_boolean.phpt | 2 +- ext/spl/tests/SplFixedArray_key_setsize.phpt | 2 +- ...lFixedArray_setSize_filled_to_smaller.phpt | 2 +- ext/spl/tests/SplFixedArray_setsize_grow.phpt | 2 +- .../SplHeap_count_invalid_parameter.phpt | 1 - .../SplHeap_extract_invalid_parameter.phpt | 1 - .../SplHeap_insert_invalid_parameter.phpt | 1 - ext/spl/tests/SplHeap_isEmpty.phpt | 1 - .../SplHeap_isEmpty_invalid_parameter.phpt | 1 - ...bjectStorage_addAll_invalid_parameter.phpt | 1 - ...bjectStorage_attach_invalid_parameter.phpt | 1 - ...ectStorage_contains_invalid_parameter.phpt | 1 - ...plObjectStorage_current_empty_storage.phpt | 1 - ...bjectStorage_detach_invalid_parameter.phpt | 1 - ...plObjectStorage_getInfo_empty_storage.phpt | 1 - ext/spl/tests/SplObjectStorage_offsetGet.phpt | 1 - ...ctStorage_offsetGet_invalid_parameter.phpt | 1 - ...bjectStorage_offsetGet_missing_object.phpt | 1 - ...age_removeAllExcept_invalid_parameter.phpt | 1 - ...ctStorage_removeAll_invalid_parameter.phpt | 1 - ...plObjectStorage_setInfo_empty_storage.phpt | 1 - ...jectStorage_setInfo_invalid_parameter.phpt | 1 - ...torage_unserialize_invalid_parameter1.phpt | 1 - ...torage_unserialize_invalid_parameter2.phpt | 1 - .../SplObjectStorage_unserialize_nested.phpt | 2 -- ...iorityQueue_extract_invalid_parameter.phpt | 1 - ...riorityQueue_insert_invalid_parameter.phpt | 1 - ext/spl/tests/arrayObject_count_basic1.phpt | 2 +- .../arrayObject_exchangeArray_basic2.phpt | 2 +- .../tests/arrayObject_getFlags_basic1.phpt | 2 +- .../tests/arrayObject_getFlags_basic2.phpt | 2 +- ext/spl/tests/arrayObject_natsort_basic1.phpt | 1 - .../arrayObject_offsetExists_nullcheck.phpt | 2 +- ext/spl/tests/array_013.phpt | 2 +- ext/spl/tests/bug45622.phpt | 2 -- ext/spl/tests/bug45622b.phpt | 2 +- ext/spl/tests/bug48361.phpt | 1 - ext/spl/tests/bug52861.phpt | 1 - ext/spl/tests/bug53144.phpt | 2 +- ext/spl/tests/bug54291.phpt | 1 - ext/spl/tests/bug54304.phpt | 1 - ext/spl/tests/bug54384.phpt | 1 - ext/spl/tests/bug55701.phpt | 3 --- ext/spl/tests/bug61347.phpt | 2 -- ext/spl/tests/bug62904.phpt | 2 -- ext/spl/tests/bug64023.phpt | 1 - ext/spl/tests/bug64228.phpt | 1 - ext/spl/tests/bug66702.phpt | 2 -- ext/spl/tests/bug68128.phpt | 1 - ext/spl/tests/bug70068.phpt | 2 +- ext/spl/tests/bug70366.phpt | 2 +- ext/spl/tests/bug70573.phpt | 2 -- ext/spl/tests/bug70868.phpt | 1 - ext/spl/tests/bug71735.phpt | 2 +- ext/spl/tests/bug74478.phpt | 2 +- ext/spl/tests/countable_count_variation1.phpt | 2 +- ext/spl/tests/dit_001_noglob.phpt | 1 - ext/spl/tests/fileobject_005.phpt | 2 +- ext/spl/tests/heap_corruption.phpt | 2 +- ext/spl/tests/heap_current_variation_001.phpt | 2 +- ext/spl/tests/iterator_036.phpt | 1 - ext/spl/tests/iterator_070.phpt | 3 +-- ext/spl/tests/iterator_071.phpt | 2 +- ext/spl/tests/limititerator_seek.phpt | 2 -- ext/spl/tests/pqueue_compare_error.phpt | 1 - ...iteratoriterator_beginiteration_basic.phpt | 1 - ...veiteratoriterator_enditeration_basic.phpt | 1 - ...iteratoriterator_getsubiterator_basic.phpt | 1 - ...iteratoriterator_getsubiterator_error.phpt | 1 - ...atoriterator_getsubiterator_variation.phpt | 1 - ...iterator_getsubiterator_variation_002.phpt | 1 - ...iterator_getsubiterator_variation_003.phpt | 1 - ...iveiteratoriterator_nextelement_basic.phpt | 1 - ext/spl/tests/regexiterator_getpregflags.phpt | 2 +- .../regexiterator_setflags_exception.phpt | 2 +- ext/spl/tests/regexiterator_setpregflags.phpt | 2 +- .../regexiterator_setpregflags_exception.phpt | 2 +- ext/spl/tests/spl_autoload_013.phpt | 2 +- ext/spl/tests/spl_autoload_014.phpt | 2 +- ext/spl/tests/spl_autoload_bug48541.phpt | 2 +- ext/spl/tests/spl_classes.phpt | 1 - ext/spl/tests/spl_heap_isempty.phpt | 2 +- ..._heap_recoverfromcorruption_arguments.phpt | 2 -- .../spl_iterator_caching_count_basic.phpt | 2 +- .../spl_iterator_caching_count_error.phpt | 2 +- .../spl_iterator_caching_getcache_error.phpt | 2 +- ext/spl/tests/spl_minheap_compare_error.phpt | 1 - ext/spl/tests/spl_pq_top_basic.phpt | 2 +- ext/spl/tests/spl_pq_top_error_args.phpt | 2 +- ext/spl/tests/splpriorityqueue_extract.phpt | 2 -- .../splpriorityqueue_setextractflags.phpt | 2 -- ext/sqlite3/tests/bug53463.phpt | 2 +- ext/sqlite3/tests/bug68760.phpt | 1 - ext/sqlite3/tests/sqlite3_31_changes.phpt | 1 - ...qlite3_loadextension_with_wrong_param.phpt | 1 - .../array_change_key_case_variation1.phpt | 3 +-- .../array_change_key_case_variation2.phpt | 1 - .../array_change_key_case_variation3.phpt | 2 +- .../array_change_key_case_variation4.phpt | 3 +-- .../array_change_key_case_variation5.phpt | 3 +-- .../array_change_key_case_variation6.phpt | 3 +-- .../array_change_key_case_variation7.phpt | 2 -- .../array_change_key_case_variation8.phpt | 1 - ext/standard/tests/array/array_combine.phpt | 2 +- .../tests/array/array_count_values_error.phpt | 2 +- .../array/array_count_values_variation.phpt | 1 - .../tests/array/array_diff_assoc.phpt | 3 --- .../tests/array/array_diff_assoc_error.phpt | 2 +- .../array/array_diff_assoc_variation1.phpt | 3 +-- .../array/array_diff_assoc_variation2.phpt | 4 +--- .../array/array_diff_assoc_variation3.phpt | 1 - .../array/array_diff_assoc_variation4.phpt | 5 +---- .../array/array_diff_assoc_variation5.phpt | 1 - .../array/array_diff_assoc_variation6.phpt | 2 +- .../array/array_diff_assoc_variation7.phpt | 5 +---- .../array/array_diff_assoc_variation9.phpt | 2 +- .../tests/array/array_diff_error.phpt | 2 +- .../tests/array/array_diff_key_basic.phpt | 2 +- .../array/array_diff_key_variation1.phpt | 2 +- .../array/array_diff_key_variation3.phpt | 2 +- .../array/array_diff_key_variation4.phpt | 2 +- .../array/array_diff_key_variation5.phpt | 2 +- .../array/array_diff_key_variation6.phpt | 2 +- .../array/array_diff_key_variation7.phpt | 2 +- .../array/array_diff_key_variation8.phpt | 2 +- .../tests/array/array_diff_uassoc_basic.phpt | 2 +- .../array/array_diff_uassoc_variation14.phpt | 1 - .../array/array_diff_ukey_variation11.phpt | 2 +- .../tests/array/array_diff_variation2.phpt | 2 +- .../tests/array/array_diff_variation3.phpt | 2 +- .../tests/array/array_diff_variation4.phpt | 2 +- .../tests/array/array_diff_variation5.phpt | 2 +- .../tests/array/array_diff_variation6.phpt | 2 +- .../tests/array/array_diff_variation7.phpt | 4 +--- ext/standard/tests/array/array_fill_keys.phpt | 1 - .../array/array_fill_keys_variation1.phpt | 2 +- .../array/array_fill_keys_variation2.phpt | 2 +- .../array/array_fill_keys_variation3.phpt | 2 +- .../array/array_fill_keys_variation4.phpt | 2 +- .../array/array_intersect_assoc_basic.phpt | 2 +- .../array_intersect_assoc_variation10.phpt | 2 +- .../array_intersect_assoc_variation4.phpt | 2 +- .../array/array_intersect_key_basic.phpt | 2 +- .../array/array_intersect_uassoc_basic.phpt | 2 +- .../array_intersect_uassoc_variation1.phpt | 1 - .../array_intersect_uassoc_variation11.phpt | 2 +- .../array_intersect_uassoc_variation2.phpt | 1 - .../array_intersect_uassoc_variation3.phpt | 1 - .../array/array_intersect_ukey_error.phpt | 2 +- .../array_intersect_ukey_variation1.phpt | 2 +- .../array_intersect_ukey_variation10.phpt | 2 +- .../array_intersect_ukey_variation2.phpt | 2 +- .../array_intersect_ukey_variation3.phpt | 2 +- .../array_intersect_ukey_variation4.phpt | 2 +- .../array_intersect_ukey_variation5.phpt | 2 +- .../array_intersect_ukey_variation6.phpt | 2 +- .../array_intersect_ukey_variation7.phpt | 2 +- .../array_intersect_ukey_variation8.phpt | 2 +- .../array_intersect_ukey_variation9.phpt | 2 +- .../tests/array/array_key_exists_basic.phpt | 2 +- .../tests/array/array_key_exists_error.phpt | 3 +-- .../tests/array/array_key_exists_object1.phpt | 1 - .../tests/array/array_key_exists_object2.phpt | 1 - .../array/array_key_exists_variation1.phpt | 3 +-- .../array/array_key_exists_variation2.phpt | 1 - .../array/array_key_exists_variation3.phpt | 3 +-- .../array/array_key_exists_variation4.phpt | 1 - .../array/array_key_exists_variation5.phpt | 3 +-- .../array/array_key_exists_variation6.phpt | 3 +-- .../array/array_key_exists_variation7.phpt | 3 +-- .../array/array_key_exists_variation8.phpt | 3 +-- .../tests/array/array_map_variation1.phpt | 3 +-- .../tests/array/array_map_variation19.phpt | 2 +- .../tests/array/array_map_variation2.phpt | 1 - .../tests/array/array_merge_basic.phpt | 3 +-- .../tests/array/array_merge_variation1.phpt | 1 - .../tests/array/array_merge_variation10.phpt | 3 +-- .../tests/array/array_merge_variation3.phpt | 3 +-- .../tests/array/array_merge_variation4.phpt | 2 +- .../tests/array/array_merge_variation5.phpt | 3 +-- .../tests/array/array_merge_variation6.phpt | 3 +-- .../tests/array/array_merge_variation7.phpt | 3 +-- .../tests/array/array_merge_variation8.phpt | 3 +-- .../tests/array/array_merge_variation9.phpt | 1 - .../tests/array/array_multisort_basic1.phpt | 2 +- .../tests/array/array_multisort_basic2.phpt | 2 +- .../tests/array/array_multisort_error.phpt | 2 +- .../array/array_multisort_variation1.phpt | 2 +- .../tests/array/array_next_error1.phpt | 3 +-- .../tests/array/array_next_error2.phpt | 3 +-- .../tests/array/array_product_variation1.phpt | 2 +- .../tests/array/array_product_variation3.phpt | 2 +- .../tests/array/array_push_basic.phpt | 3 +-- .../tests/array/array_push_error2.phpt | 3 +-- .../tests/array/array_push_variation2.phpt | 2 +- .../tests/array/array_push_variation3.phpt | 2 +- .../tests/array/array_push_variation5.phpt | 1 - .../tests/array/array_push_variation6.phpt | 1 - .../tests/array/array_rand_basic1.phpt | 1 - .../tests/array/array_rand_basic2.phpt | 1 - .../tests/array/array_rand_error.phpt | 1 - .../tests/array/array_rand_variation1.phpt | 1 - .../tests/array/array_rand_variation2.phpt | 1 - .../tests/array/array_rand_variation3.phpt | 1 - .../tests/array/array_rand_variation4.phpt | 1 - .../tests/array/array_rand_variation5.phpt | 1 - .../tests/array/array_rand_variation6.phpt | 1 - .../tests/array/array_reduce_variation2.phpt | 2 +- .../tests/array/array_reduce_variation3.phpt | 2 +- .../tests/array/array_shift_basic.phpt | 2 +- .../tests/array/array_shift_error.phpt | 2 +- .../tests/array/array_shift_variation1.phpt | 2 +- .../tests/array/array_shift_variation2.phpt | 2 +- .../tests/array/array_shift_variation3.phpt | 2 +- .../tests/array/array_shift_variation4.phpt | 2 +- .../tests/array/array_shift_variation6.phpt | 2 +- .../tests/array/array_shift_variation7.phpt | 2 +- .../tests/array/array_shift_variation8.phpt | 2 +- .../tests/array/array_shuffle_basic.phpt | 2 +- .../tests/array/array_slice_basic.phpt | 3 +-- .../tests/array/array_slice_error.phpt | 2 +- .../tests/array/array_slice_variation1.phpt | 1 - .../tests/array/array_slice_variation10.phpt | 3 +-- .../tests/array/array_slice_variation11.phpt | 3 +-- .../tests/array/array_slice_variation2.phpt | 3 +-- .../tests/array/array_slice_variation3.phpt | 3 +-- .../tests/array/array_slice_variation4.phpt | 3 +-- .../tests/array/array_slice_variation5.phpt | 3 +-- .../tests/array/array_slice_variation6.phpt | 1 - .../tests/array/array_slice_variation7.phpt | 3 +-- .../tests/array/array_slice_variation8.phpt | 3 +-- .../tests/array/array_slice_variation9.phpt | 1 - .../tests/array/array_splice_errors.phpt | 1 - .../tests/array/array_splice_variation2.phpt | 1 - .../tests/array/array_splice_variation3.phpt | 1 - .../tests/array/array_udiff_assoc_error.phpt | 2 +- .../array/array_udiff_uassoc_variation1.phpt | 2 +- .../array_uintersect_assoc_variation4.phpt | 2 +- .../tests/array/array_unshift_basic2.phpt | 2 +- .../tests/array/array_values_basic.phpt | 3 +-- .../tests/array/array_values_error.phpt | 2 -- .../tests/array/array_values_variation1.phpt | 3 +-- .../tests/array/array_values_variation2.phpt | 3 +-- .../tests/array/array_values_variation3.phpt | 3 +-- .../tests/array/array_values_variation4.phpt | 1 - .../tests/array/array_values_variation5.phpt | 3 +-- .../tests/array/array_values_variation6.phpt | 1 - .../tests/array/array_values_variation7.phpt | 3 +-- ext/standard/tests/array/arsort_basic.phpt | 2 +- ext/standard/tests/array/arsort_error.phpt | 2 +- ext/standard/tests/array/arsort_object1.phpt | 2 +- ext/standard/tests/array/arsort_object2.phpt | 2 +- .../tests/array/arsort_variation1.phpt | 2 +- .../tests/array/arsort_variation10.phpt | 2 +- .../tests/array/arsort_variation4.phpt | 2 +- .../tests/array/arsort_variation6.phpt | 2 +- .../tests/array/arsort_variation8.phpt | 2 +- ext/standard/tests/array/asort_basic.phpt | 2 +- ext/standard/tests/array/bug23581.phpt | 1 - ext/standard/tests/array/bug31158.phpt | 1 - ext/standard/tests/array/bug35821.phpt | 1 - ext/standard/tests/array/bug41686.phpt | 2 +- ext/standard/tests/array/bug42850.phpt | 1 - ext/standard/tests/array/bug44181.phpt | 1 - ext/standard/tests/array/bug44182.phpt | 1 - ext/standard/tests/array/bug71603.phpt | 1 - ext/standard/tests/array/bug72116.phpt | 1 - ext/standard/tests/array/count_basic.phpt | 2 +- ext/standard/tests/array/count_error.phpt | 2 +- .../tests/array/count_variation1.phpt | 2 +- ext/standard/tests/array/each.phpt | Bin 9680 -> 9679 bytes ext/standard/tests/array/each_error.phpt | 2 -- ext/standard/tests/array/each_variation1.phpt | 1 - ext/standard/tests/array/each_variation2.phpt | 1 - ext/standard/tests/array/each_variation3.phpt | 1 - ext/standard/tests/array/each_variation4.phpt | 1 - ext/standard/tests/array/each_variation5.phpt | 1 - ext/standard/tests/array/each_variation6.phpt | 1 - ext/standard/tests/array/end_64bit.phpt | 2 -- ext/standard/tests/array/extract_error.phpt | 1 - ext/standard/tests/array/extract_safety.phpt | 3 +-- .../tests/array/extract_variation1.phpt | 1 - .../tests/array/extract_variation8.phpt | 1 - .../tests/array/key_exists_variation2.phpt | 1 - ext/standard/tests/array/krsort_basic.phpt | 2 +- .../tests/array/krsort_variation11.phpt | 2 +- ext/standard/tests/array/ksort_basic.phpt | 2 +- ext/standard/tests/array/max_basic.phpt | 1 - ext/standard/tests/array/max_variation1.phpt | 1 - ext/standard/tests/array/max_variation2.phpt | 1 - ext/standard/tests/array/min_basic.phpt | 1 - ext/standard/tests/array/min_variation1.phpt | 1 - ext/standard/tests/array/min_variation2.phpt | 1 - .../tests/array/natcasesort_error.phpt | 2 +- .../tests/array/natcasesort_object1.phpt | 3 +-- .../tests/array/natcasesort_object2.phpt | 3 +-- .../tests/array/natcasesort_variation1.phpt | 1 - .../tests/array/natcasesort_variation10.phpt | 1 - .../tests/array/natcasesort_variation11.phpt | 3 +-- .../tests/array/natcasesort_variation2.phpt | 1 - .../tests/array/natcasesort_variation3.phpt | 1 - .../tests/array/natcasesort_variation5.phpt | 2 +- .../tests/array/natcasesort_variation6.phpt | 2 +- .../tests/array/natcasesort_variation8.phpt | 2 +- .../tests/array/natcasesort_variation9.phpt | Bin 1770 -> 1769 bytes ext/standard/tests/array/natsort_basic.phpt | 1 - ext/standard/tests/array/prev_error3.phpt | 3 +-- ext/standard/tests/array/rsort_basic.phpt | 3 +-- ext/standard/tests/array/rsort_error.phpt | 3 +-- ext/standard/tests/array/rsort_object1.phpt | 3 +-- ext/standard/tests/array/rsort_object2.phpt | 3 +-- .../tests/array/rsort_variation1.phpt | 3 +-- .../tests/array/rsort_variation10.phpt | 3 +-- .../tests/array/rsort_variation2.phpt | 1 - .../tests/array/rsort_variation3.phpt | 3 +-- .../tests/array/rsort_variation5.phpt | 1 - .../tests/array/rsort_variation6.phpt | 3 +-- .../tests/array/rsort_variation7.phpt | 3 +-- .../tests/array/rsort_variation8.phpt | 3 +-- ext/standard/tests/array/shuffle_basic1.phpt | 1 - ext/standard/tests/array/shuffle_basic2.phpt | 1 - ext/standard/tests/array/shuffle_error.phpt | 1 - .../tests/array/shuffle_variation1.phpt | 1 - .../tests/array/shuffle_variation2.phpt | 1 - .../tests/array/shuffle_variation3.phpt | 1 - .../tests/array/shuffle_variation4.phpt | 1 - .../tests/array/shuffle_variation5.phpt | 1 - ext/standard/tests/array/sort_basic.phpt | 2 +- ext/standard/tests/array/uksort_basic.phpt | 2 +- ext/standard/tests/array/usort_error1.phpt | 2 +- ext/standard/tests/array/usort_error2.phpt | 2 +- ext/standard/tests/array/usort_object1.phpt | 2 +- ext/standard/tests/array/usort_object2.phpt | 2 +- .../tests/array/usort_variation1.phpt | 2 +- .../tests/array/usort_variation2.phpt | 2 +- .../tests/array/usort_variation5.phpt | 2 +- .../tests/array/usort_variation8.phpt | 2 +- ext/standard/tests/assert/assert04.phpt | 1 - ext/standard/tests/assert/assert_basic4.phpt | 1 - ext/standard/tests/assert/assert_basic6.phpt | 1 - .../tests/assert/assert_variation.phpt | 1 - ext/standard/tests/bug75220.phpt | 2 +- .../class_exists_variation_003.phpt | 2 +- .../class_object/get_class_error_001.phpt | 2 +- .../get_class_methods_basic_001.phpt | 2 +- .../get_class_methods_basic_002.phpt | 2 +- .../get_class_methods_basic_003.phpt | 2 +- .../get_class_methods_error_001.phpt | 2 +- .../get_class_methods_variation_001.phpt | 2 +- .../get_class_methods_variation_002.phpt | 2 +- .../class_object/get_class_variation_002.phpt | 2 +- .../class_object/get_class_vars_error.phpt | 2 +- .../get_declared_classes_basic_001.phpt | 2 +- .../get_declared_interfaces_basic_001.phpt | 2 +- .../get_declared_traits_basic_001.phpt | 2 +- .../get_object_vars_basic_001.phpt | 3 +-- .../get_object_vars_basic_002.phpt | 3 +-- .../get_object_vars_error_001.phpt | 2 +- .../get_object_vars_variation_001.phpt | 2 +- .../get_object_vars_variation_002.phpt | 2 +- .../get_object_vars_variation_003.phpt | 2 +- .../get_parent_class_error_001.phpt | 2 +- .../get_parent_class_variation_001.phpt | 2 +- .../class_object/interface_exists_error.phpt | 2 +- .../interface_exists_variation1.phpt | 2 +- .../tests/class_object/is_a_error_001.phpt | 1 - .../is_subclass_of_variation_003.phpt | 2 +- .../class_object/method_exists_basic_001.phpt | 3 +-- .../class_object/method_exists_basic_002.phpt | 2 +- .../method_exists_variation_003.phpt | 2 +- .../class_object/property_exists_error.phpt | 2 +- .../trait_class_exists_variation_003.phpt | 2 +- .../tests/crypt/bcrypt_invalid_cost.phpt | 2 +- .../crypt/des_fallback_invalid_salt.phpt | 2 +- ext/standard/tests/dir/bug73877.phpt | 1 - ext/standard/tests/dir/dir_variation2.phpt | 2 +- ext/standard/tests/dir/dir_variation7.phpt | 2 +- .../tests/dir/opendir_variation5.phpt | 1 - .../tests/directory/bug74589_utf8.phpt | 1 - ext/standard/tests/file/001-win32-mb.phpt | 1 - ext/standard/tests/file/001-win32.phpt | 1 - ext/standard/tests/file/005_error.phpt | 1 - ext/standard/tests/file/007_variation2.phpt | 2 +- ext/standard/tests/file/007_variation4.phpt | 2 +- ext/standard/tests/file/bug38450_2.phpt | 1 - ext/standard/tests/file/bug39863.phpt | 1 - ext/standard/tests/file/bug41874_1.phpt | 2 +- ext/standard/tests/file/bug41874_2.phpt | 2 +- ext/standard/tests/file/bug41874_3.phpt | 2 +- ext/standard/tests/file/bug51094.phpt | 1 - ext/standard/tests/file/bug61961.phpt | 2 +- ext/standard/tests/file/bug63512.phpt | 1 - ext/standard/tests/file/bug69442.phpt | 2 -- ext/standard/tests/file/chmod_variation3.phpt | 1 - ext/standard/tests/file/chmod_variation4.phpt | 1 - ext/standard/tests/file/copy_basic.phpt | 3 --- ext/standard/tests/file/copy_error.phpt | 2 -- ext/standard/tests/file/copy_variation1.phpt | 2 -- ext/standard/tests/file/copy_variation10.phpt | 2 -- ext/standard/tests/file/copy_variation11.phpt | 2 -- .../tests/file/copy_variation12-win32.phpt | 2 -- ext/standard/tests/file/copy_variation12.phpt | 3 --- ext/standard/tests/file/copy_variation13.phpt | 2 -- ext/standard/tests/file/copy_variation14.phpt | 2 -- ext/standard/tests/file/copy_variation15.phpt | 2 -- .../tests/file/copy_variation16-win32.phpt | 1 - ext/standard/tests/file/copy_variation16.phpt | 1 - ext/standard/tests/file/copy_variation17.phpt | 2 -- ext/standard/tests/file/copy_variation18.phpt | 2 -- .../tests/file/copy_variation2-win32-mb.phpt | 2 -- .../tests/file/copy_variation2-win32.phpt | 2 -- ext/standard/tests/file/copy_variation2.phpt | 2 -- .../tests/file/copy_variation3-win32.phpt | 2 -- ext/standard/tests/file/copy_variation3.phpt | 2 -- ext/standard/tests/file/copy_variation4.phpt | Bin 4961 -> 4959 bytes .../tests/file/copy_variation5-win32.phpt | 2 -- ext/standard/tests/file/copy_variation5.phpt | 2 -- .../tests/file/copy_variation6-win32.phpt | 1 - ext/standard/tests/file/copy_variation6.phpt | 1 - ext/standard/tests/file/copy_variation7.phpt | 3 --- ext/standard/tests/file/copy_variation9.phpt | 1 - .../file/directory_wrapper_fstat_basic.phpt | 2 +- ext/standard/tests/file/dirname_basic.phpt | 1 - ext/standard/tests/file/dirname_error.phpt | 1 - .../tests/file/dirname_variation1.phpt | 1 - .../tests/file/disk_free_space_basic.phpt | 2 -- .../file/disk_free_space_error-win32.phpt | 1 - .../tests/file/disk_free_space_error.phpt | 1 - .../tests/file/disk_free_space_variation.phpt | 3 --- .../tests/file/disk_total_space_basic.phpt | 1 - .../file/disk_total_space_error-win32.phpt | 1 - .../tests/file/disk_total_space_error.phpt | 1 - .../file/disk_total_space_variation.phpt | 3 --- ext/standard/tests/file/fflush_basic.phpt | 2 -- ext/standard/tests/file/fflush_error.phpt | 3 --- .../file/fflush_variation1-win32-mb.phpt | 2 -- .../tests/file/fflush_variation1-win32.phpt | 2 -- .../tests/file/fflush_variation1.phpt | 2 -- .../tests/file/fflush_variation2.phpt | 1 - .../tests/file/fflush_variation3.phpt | 1 - .../tests/file/fflush_variation4.phpt | 1 - ext/standard/tests/file/fgetc_basic.phpt | 2 +- ext/standard/tests/file/fgetc_variation4.phpt | 2 +- .../tests/file/fgetcsv_variation11.phpt | 2 +- .../tests/file/fgetcsv_variation13.phpt | 1 - .../tests/file/fgetcsv_variation20.phpt | 2 +- ext/standard/tests/file/fgets_basic.phpt | 2 +- ext/standard/tests/file/fgets_error.phpt | 1 - ext/standard/tests/file/fgets_variation2.phpt | 1 - ext/standard/tests/file/fgets_variation3.phpt | 2 +- ext/standard/tests/file/fgets_variation4.phpt | 2 +- ext/standard/tests/file/fgets_variation5.phpt | 2 +- ext/standard/tests/file/fgets_variation6.phpt | 2 +- ext/standard/tests/file/file_basic.phpt | 1 - ext/standard/tests/file/file_error.phpt | 1 - .../tests/file/file_exists_error.phpt | 1 - .../tests/file/file_exists_variation1.phpt | 3 +-- ...contents_file_put_contents_variation1.phpt | 1 - ...contents_file_put_contents_variation2.phpt | 1 - .../file/file_get_contents_variation4.phpt | 2 +- .../file_get_contents_variation7-win32.phpt | 2 +- .../file/file_get_contents_variation9.phpt | 1 - .../file/file_put_contents_variation3.phpt | 2 +- .../file/file_put_contents_variation8.phpt | Bin 2384 -> 2383 bytes ext/standard/tests/file/file_variation.phpt | 2 -- .../tests/file/file_variation8-win32.phpt | 2 +- ext/standard/tests/file/file_variation8.phpt | 2 +- ext/standard/tests/file/file_variation9.phpt | 2 +- ext/standard/tests/file/filegroup_basic.phpt | 2 -- ext/standard/tests/file/filegroup_error.phpt | 2 -- .../tests/file/filegroup_variation1.phpt | 1 - .../tests/file/filegroup_variation2.phpt | 1 - ext/standard/tests/file/fileinode_error.phpt | 1 - .../tests/file/fileinode_variation.phpt | 1 - .../tests/file/fileinode_variation1.phpt | 1 - .../tests/file/fileinode_variation2.phpt | 1 - ext/standard/tests/file/fileowner_basic.phpt | 3 --- ext/standard/tests/file/fileowner_error.phpt | 2 -- .../tests/file/fileowner_variation1.phpt | 1 - .../tests/file/fileowner_variation2.phpt | 1 - .../tests/file/fileperms_variation1.phpt | 1 - .../tests/file/fileperms_variation2.phpt | 1 - ext/standard/tests/file/filesize_basic.phpt | 1 - ext/standard/tests/file/filesize_error.phpt | 1 - .../tests/file/filesize_variation1.phpt | 1 - .../tests/file/fopen_variation10-win32.phpt | 1 - .../tests/file/fopen_variation11-win32.phpt | 1 - .../tests/file/fopen_variation14-win32.phpt | 1 - .../tests/file/fopen_variation14.phpt | 2 +- .../tests/file/fopen_variation15-win32.phpt | 1 - .../tests/file/fopen_variation15.phpt | 2 +- ext/standard/tests/file/fopen_variation5.phpt | 2 -- ext/standard/tests/file/fopen_variation8.phpt | 2 -- .../tests/file/fpassthru_variation1.phpt | 1 - ext/standard/tests/file/fputcsv_002.phpt | 1 - ext/standard/tests/file/fputcsv_error.phpt | 1 - .../tests/file/fputcsv_variation1.phpt | 1 - .../tests/file/fputcsv_variation10.phpt | 1 - .../tests/file/fputcsv_variation11.phpt | 1 - .../tests/file/fputcsv_variation12.phpt | 1 - .../tests/file/fputcsv_variation13.phpt | 1 - .../tests/file/fputcsv_variation14.phpt | 1 - .../tests/file/fputcsv_variation2.phpt | 1 - .../tests/file/fputcsv_variation3.phpt | 1 - .../tests/file/fputcsv_variation4.phpt | 1 - .../tests/file/fputcsv_variation5.phpt | 1 - .../tests/file/fputcsv_variation6.phpt | 1 - .../tests/file/fputcsv_variation7.phpt | 1 - .../tests/file/fputcsv_variation8.phpt | 1 - .../tests/file/fputcsv_variation9.phpt | 1 - .../tests/file/fread_fwrite_basic.phpt | 2 +- ext/standard/tests/file/fread_variation1.phpt | 2 +- .../tests/file/fread_variation3-win32.phpt | 2 +- ext/standard/tests/file/fread_variation3.phpt | 2 +- .../tests/file/fread_variation4-win32.phpt | 2 +- ext/standard/tests/file/fread_variation4.phpt | 2 +- ext/standard/tests/file/fscanf_error.phpt | 1 - .../tests/file/fscanf_variation1.phpt | 1 - .../tests/file/fscanf_variation10.phpt | 1 - .../tests/file/fscanf_variation11.phpt | 1 - .../tests/file/fscanf_variation12.phpt | 1 - .../tests/file/fscanf_variation13.phpt | 1 - .../tests/file/fscanf_variation14.phpt | 1 - .../tests/file/fscanf_variation15.phpt | 1 - .../tests/file/fscanf_variation16.phpt | 1 - .../tests/file/fscanf_variation17.phpt | 1 - .../tests/file/fscanf_variation18.phpt | 1 - .../tests/file/fscanf_variation19.phpt | 1 - .../tests/file/fscanf_variation2.phpt | 1 - .../tests/file/fscanf_variation20.phpt | 1 - .../tests/file/fscanf_variation21.phpt | 1 - .../tests/file/fscanf_variation22.phpt | 1 - .../tests/file/fscanf_variation23.phpt | 1 - .../tests/file/fscanf_variation24.phpt | 1 - .../tests/file/fscanf_variation25.phpt | 1 - .../tests/file/fscanf_variation26.phpt | 1 - .../tests/file/fscanf_variation27.phpt | 1 - .../tests/file/fscanf_variation29.phpt | 1 - .../tests/file/fscanf_variation3.phpt | 1 - .../tests/file/fscanf_variation30.phpt | 1 - .../tests/file/fscanf_variation31.phpt | 1 - .../tests/file/fscanf_variation32.phpt | 1 - .../tests/file/fscanf_variation33.phpt | 1 - .../tests/file/fscanf_variation34.phpt | 1 - .../tests/file/fscanf_variation35.phpt | 1 - .../tests/file/fscanf_variation36.phpt | 1 - .../tests/file/fscanf_variation37.phpt | 1 - .../tests/file/fscanf_variation38.phpt | 1 - .../tests/file/fscanf_variation39.phpt | 1 - .../tests/file/fscanf_variation4.phpt | 1 - .../tests/file/fscanf_variation40.phpt | 1 - .../tests/file/fscanf_variation41.phpt | 1 - .../tests/file/fscanf_variation42.phpt | 1 - .../tests/file/fscanf_variation43.phpt | 1 - .../tests/file/fscanf_variation44.phpt | 1 - .../tests/file/fscanf_variation45.phpt | 1 - .../tests/file/fscanf_variation46.phpt | 1 - .../tests/file/fscanf_variation47.phpt | 1 - .../tests/file/fscanf_variation49.phpt | 1 - .../tests/file/fscanf_variation5.phpt | 1 - .../tests/file/fscanf_variation50.phpt | 1 - .../tests/file/fscanf_variation51.phpt | 1 - .../tests/file/fscanf_variation52.phpt | 1 - .../tests/file/fscanf_variation53.phpt | 1 - .../tests/file/fscanf_variation54.phpt | 1 - .../tests/file/fscanf_variation55.phpt | 1 - .../tests/file/fscanf_variation6.phpt | 1 - .../tests/file/fscanf_variation7.phpt | 1 - .../tests/file/fscanf_variation8.phpt | 1 - .../tests/file/fscanf_variation9.phpt | 1 - .../fseek_ftell_rewind_basic2-win32-mb.phpt | 1 - .../file/fseek_ftell_rewind_basic2-win32.phpt | 1 - ext/standard/tests/file/fseek_variation1.phpt | 1 - ext/standard/tests/file/fseek_variation2.phpt | 1 - ext/standard/tests/file/fstat_basic.phpt | 2 +- ext/standard/tests/file/fstat_error.phpt | 3 +-- ext/standard/tests/file/fstat_variation1.phpt | 3 +-- ext/standard/tests/file/fstat_variation2.phpt | 3 +-- ext/standard/tests/file/fstat_variation3.phpt | 3 +-- ext/standard/tests/file/fstat_variation4.phpt | 3 +-- ext/standard/tests/file/fstat_variation5.phpt | 3 +-- ext/standard/tests/file/fstat_variation6.phpt | 2 +- ext/standard/tests/file/fstat_variation7.phpt | 3 +-- ext/standard/tests/file/fstat_variation8.phpt | 2 +- .../tests/file/fwrite_basic-win32-mb.phpt | 2 +- .../tests/file/fwrite_basic-win32.phpt | 2 +- ext/standard/tests/file/fwrite_basic.phpt | 2 +- ext/standard/tests/file/fwrite_error.phpt | 1 - .../tests/file/fwrite_variation5.phpt | 1 - .../tests/file/include_userstream_003.phpt | 2 +- ext/standard/tests/file/is_dir_basic.phpt | 1 - ext/standard/tests/file/is_dir_error.phpt | 1 - .../tests/file/is_dir_variation3.phpt | 1 - .../tests/file/is_executable_variation3.phpt | 1 - ext/standard/tests/file/is_file_error.phpt | 1 - .../tests/file/is_file_variation2.phpt | 1 - .../tests/file/is_file_variation3.phpt | 1 - .../tests/file/is_readable_variation3.phpt | 1 - .../tests/file/is_uploaded_file_basic.phpt | 1 - .../tests/file/is_writable_variation3.phpt | 1 - .../tests/file/lstat_stat_variation1.phpt | 1 - .../tests/file/lstat_stat_variation10.phpt | 1 - .../tests/file/lstat_stat_variation11.phpt | 1 - .../tests/file/lstat_stat_variation12.phpt | 1 - .../tests/file/lstat_stat_variation13.phpt | 1 - .../tests/file/lstat_stat_variation14.phpt | 1 - .../tests/file/lstat_stat_variation15.phpt | 1 - .../tests/file/lstat_stat_variation16.phpt | 1 - .../tests/file/lstat_stat_variation17.phpt | 1 - .../tests/file/lstat_stat_variation18.phpt | 1 - .../tests/file/lstat_stat_variation19.phpt | 1 - .../tests/file/lstat_stat_variation2.phpt | 1 - .../tests/file/lstat_stat_variation20.phpt | 1 - .../tests/file/lstat_stat_variation21.phpt | 1 - .../tests/file/lstat_stat_variation4.phpt | 1 - .../tests/file/lstat_stat_variation5.phpt | 1 - .../tests/file/lstat_stat_variation6.phpt | 1 - .../tests/file/lstat_stat_variation7.phpt | 1 - .../tests/file/lstat_stat_variation9.phpt | 1 - ext/standard/tests/file/mkdir_variation4.phpt | 2 +- .../tests/file/move_uploaded_file_basic.phpt | 1 - .../tests/file/parse_ini_file_variation4.phpt | 1 - .../tests/file/parse_ini_file_variation5.phpt | 1 - .../parse_ini_file_variation6-win32-mb.phpt | 2 +- .../file/parse_ini_file_variation6-win32.phpt | 2 +- .../tests/file/parse_ini_file_variation6.phpt | 2 +- ext/standard/tests/file/pathinfo_basic1.phpt | 1 - ext/standard/tests/file/pathinfo_basic2.phpt | 1 - .../tests/file/pathinfo_variation3.phpt | 2 +- .../tests/file/pclose_variation1.phpt | 1 - .../tests/file/php_fd_wrapper_04.phpt | 1 - .../file/popen_pclose_basic-win32-mb.phpt | 2 -- .../tests/file/popen_pclose_basic-win32.phpt | 2 -- .../tests/file/popen_pclose_basic.phpt | 2 -- .../tests/file/popen_pclose_error-sunos.phpt | 1 - .../file/popen_pclose_error-win32-debug.phpt | 2 -- .../tests/file/popen_pclose_error-win32.phpt | 2 -- .../tests/file/popen_pclose_error.phpt | 1 - .../file/readfile_variation8-win32-mb.phpt | 2 +- .../tests/file/readfile_variation8-win32.phpt | 2 +- .../tests/file/readfile_variation9.phpt | 2 +- .../tests/file/readlink_variation1.phpt | 1 - .../tests/file/realpath_variation2.phpt | 2 +- .../tests/file/rename_variation-win32.phpt | 1 - .../tests/file/rename_variation1-win32.phpt | 1 - .../tests/file/rename_variation11-win32.phpt | 2 +- .../tests/file/rename_variation12-win32.phpt | 2 +- .../tests/file/rename_variation2-win32.phpt | 1 - .../tests/file/rename_variation3-win32.phpt | 1 - .../tests/file/rename_variation8-win32.phpt | 1 - .../tests/file/rename_variation8.phpt | 1 - .../tests/file/rename_variation9.phpt | 1 - .../tests/file/rmdir_variation3-win32.phpt | 2 +- ext/standard/tests/file/rmdir_variation3.phpt | 2 +- .../tests/file/stat_basic-win32-mb.phpt | 1 - ext/standard/tests/file/stat_basic-win32.phpt | 1 - ext/standard/tests/file/stat_error-win32.phpt | 1 - .../tests/file/stat_variation1-win32-mb.phpt | 2 -- .../tests/file/stat_variation1-win32.phpt | 2 -- .../tests/file/stat_variation2-win32.phpt | 2 -- .../tests/file/stat_variation3-win32.phpt | 3 --- .../tests/file/stat_variation4-win32.phpt | 2 -- .../tests/file/stat_variation5-win32.phpt | 3 --- .../tests/file/stat_variation6-win32.phpt | 3 --- .../tests/file/stat_variation7-win32.phpt | 2 -- .../tests/file/stat_variation8-win32.phpt | 2 -- .../tests/file/stream_rfc2397_001.phpt | 2 +- .../tests/file/stream_rfc2397_004.phpt | 2 +- .../tests/file/stream_rfc2397_005.phpt | 2 +- .../symlink_link_linkinfo_is_link_error2.phpt | 1 - .../tests/file/tempnam_variation3.phpt | 1 - .../tests/file/tempnam_variation7-win32.phpt | 1 - .../tests/file/tempnam_variation7.phpt | 1 - ext/standard/tests/file/touch.phpt | 1 - .../tests/file/touch_basic-win32-mb.phpt | 1 - .../tests/file/touch_basic-win32.phpt | 1 - ext/standard/tests/file/touch_error.phpt | 1 - ext/standard/tests/file/touch_variation1.phpt | 2 +- .../tests/file/touch_variation3-win32-mb.phpt | 1 - .../tests/file/touch_variation3-win32.phpt | 1 - ext/standard/tests/file/touch_variation3.phpt | 1 - .../tests/file/touch_variation4-win32.phpt | 1 - ext/standard/tests/file/touch_variation4.phpt | 1 - .../tests/file/touch_variation5-win32.phpt | 1 - ext/standard/tests/file/touch_variation5.phpt | 1 - .../tests/file/touch_variation6-win32.phpt | 1 - ext/standard/tests/file/umask_variation3.phpt | 1 - .../tests/file/unlink_variation1.phpt | 2 +- .../tests/file/unlink_variation10.phpt | 2 +- ext/standard/tests/file/userstreams_006.phpt | 1 - ext/standard/tests/file/userstreams_007.phpt | 2 +- ext/standard/tests/file/userwrapper.phpt | 1 - .../tests/file/windows_links/bug48746.phpt | 2 -- .../tests/file/windows_links/bug48746_1.phpt | 2 -- .../tests/file/windows_links/bug48746_2.phpt | 2 -- .../tests/file/windows_links/bug48746_3.phpt | 2 -- .../tests/file/windows_links/bug73962.phpt | 1 - .../tests/file/windows_links/bug76335.phpt | 1 - .../file/windows_mb_path/bug75063_cp1251.phpt | 2 -- .../file/windows_mb_path/bug75063_utf8.phpt | 2 -- .../file/windows_mb_path/recursive_it.phpt | 1 - .../windows_mb_path/test_cwd_mb_names.phpt | 5 ----- .../test_long_path_bug30730.phpt | 1 - .../test_long_path_bug70943.phpt | 1 - .../windows_mb_path/test_rename_mb_names.phpt | 5 ----- ext/standard/tests/general_functions/005.phpt | 1 - ext/standard/tests/general_functions/008.phpt | 2 +- .../tests/general_functions/bug31190.phpt | 1 - .../tests/general_functions/bug43293_1.phpt | 1 - .../tests/general_functions/bug43293_2.phpt | 1 - .../tests/general_functions/bug43293_3.phpt | 1 - .../tests/general_functions/bug44461.phpt | 2 +- .../tests/general_functions/bug47857.phpt | 1 - .../tests/general_functions/bug49847.phpt | 1 - .../tests/general_functions/bug60227_1.phpt | 1 - .../tests/general_functions/bug60227_2.phpt | 1 - .../tests/general_functions/bug69646.phpt | 1 - .../general_functions/debug_zval_dump_e.phpt | 1 - .../general_functions/debug_zval_dump_v.phpt | 1 - .../general_functions/dl-cve-2007-4887.phpt | 1 - .../escapeshellarg_basic-win32.phpt | 2 +- .../escapeshellarg_basic.phpt | 2 +- .../escapeshellarg_variation1-win32.phpt | 2 +- .../general_functions/floatval_basic.phpt | 2 +- .../general_functions/floatval_error.phpt | 2 +- .../floatval_variation1.phpt | 1 - .../get_defined_constants_basic.phpt | 2 +- .../get_defined_constants_error.phpt | 2 +- .../get_defined_vars_basic.phpt | 2 +- .../get_include_path_basic.phpt | 2 +- .../general_functions/get_included_files.phpt | 2 +- .../get_loaded_extensions_basic.phpt | 2 +- .../get_loaded_extensions_error.phpt | 2 +- .../get_resource_type_error.phpt | 2 +- .../get_resource_type_variation1.phpt | 2 +- .../general_functions/getmypid_basic.phpt | 2 +- .../tests/general_functions/getopt_002.phpt | 2 -- .../tests/general_functions/getopt_003.phpt | 2 -- .../tests/general_functions/getopt_004.phpt | 2 -- .../tests/general_functions/getopt_005.phpt | 2 -- .../general_functions/is_resource_error.phpt | 2 +- .../tests/general_functions/isset_basic1.phpt | 2 +- .../tests/general_functions/isset_basic2.phpt | 2 +- .../output_add_rewrite_var_basic1.phpt | 1 - .../output_add_rewrite_var_basic2.phpt | 1 - .../output_add_rewrite_var_basic3.phpt | 1 - .../output_add_rewrite_var_basic4.phpt | 1 - .../general_functions/php_uname_error.phpt | 2 +- .../php_uname_variation1.phpt | 2 +- .../general_functions/print_r_64bit.phpt | 1 - .../general_functions/sys_getloadavg.phpt | 1 - .../tests/general_functions/uniqid_error.phpt | 2 +- .../tests/general_functions/var_dump.phpt | 1 - .../general_functions/var_dump_64bit.phpt | 1 - .../general_functions/var_export_basic2.phpt | 2 +- .../general_functions/var_export_basic4.phpt | 2 +- .../general_functions/var_export_error2.phpt | 1 - .../general_functions/var_export_error3.phpt | 1 - ext/standard/tests/http/bug47021.phpt | 1 - ext/standard/tests/http/bug60570.phpt | 2 -- .../tests/http/http_response_header_04.phpt | 1 - .../tests/http/http_response_header_05.phpt | 1 - ext/standard/tests/image/bug72278.phpt | 1 - .../tests/image/getimagesize_basic.phpt | 2 +- .../tests/image/getimagesize_error1.phpt | 2 +- .../tests/image/getimagesize_tif_mm.phpt | 2 +- .../tests/image/getimagesize_variation1.phpt | 2 +- .../tests/image/getimagesize_variation2.phpt | 2 +- .../tests/image/getimagesize_variation3.phpt | 2 +- .../tests/image/getimagesize_variation4.phpt | 2 +- .../image/getimagesize_variation_003.phpt | 2 +- .../tests/image/getimagesizefromstring1.phpt | 1 - .../image/image_type_to_mime_type_error.phpt | 2 +- ext/standard/tests/math/abs_basic.phpt | 2 +- ext/standard/tests/math/atan2_variation1.phpt | 2 +- ext/standard/tests/math/atan2_variation2.phpt | 2 +- .../tests/math/base_convert_basic.phpt | 1 - .../tests/math/base_convert_error.phpt | 2 +- .../tests/math/base_convert_variation2.phpt | 2 +- .../tests/math/base_convert_variation3.phpt | 2 +- ext/standard/tests/math/bindec_error.phpt | 2 +- .../tests/math/bindec_variation1.phpt | 2 +- .../tests/math/bindec_variation1_64bit.phpt | 2 +- ext/standard/tests/math/bug30695.phpt | 1 - ext/standard/tests/math/constants.phpt | 1 - ext/standard/tests/math/decbin_basic.phpt | 1 - ext/standard/tests/math/decbin_error.phpt | 1 - .../tests/math/decbin_variation1.phpt | 2 +- .../tests/math/decbin_variation1_64bit.phpt | 2 +- ext/standard/tests/math/dechex_error.phpt | 2 +- .../tests/math/dechex_variation1.phpt | 2 +- .../tests/math/dechex_variation1_64bit.phpt | 2 +- .../tests/math/decoct_variation1_64bit.phpt | 2 +- ext/standard/tests/math/exp_basic.phpt | 1 - ext/standard/tests/math/exp_error.phpt | 1 - ext/standard/tests/math/expm1_variation1.phpt | 2 +- ext/standard/tests/math/floor_error.phpt | 2 +- ext/standard/tests/math/fmod_basic.phpt | 1 - ext/standard/tests/math/fmod_error.phpt | 1 - ext/standard/tests/math/getrandmax_basic.phpt | 2 +- .../tests/math/hexdec_basic_64bit.phpt | 2 +- ext/standard/tests/math/hexdec_error.phpt | 2 +- .../tests/math/hexdec_variation1.phpt | 2 +- .../tests/math/hexdec_variation1_64bit.phpt | 2 +- ext/standard/tests/math/hypot_basic.phpt | 2 +- ext/standard/tests/math/hypot_error.phpt | 2 +- ext/standard/tests/math/hypot_variation1.phpt | 2 +- ext/standard/tests/math/hypot_variation2.phpt | 2 +- ext/standard/tests/math/intdiv_64bit.phpt | 2 +- ext/standard/tests/math/is_finite_basic.phpt | 2 -- ext/standard/tests/math/is_finite_error.phpt | 2 -- .../tests/math/is_infinite_basic.phpt | 3 --- .../tests/math/is_infinite_error.phpt | 1 - ext/standard/tests/math/is_nan_basic.phpt | 4 ---- ext/standard/tests/math/is_nan_error.phpt | 5 ----- ext/standard/tests/math/lcg_value_basic.phpt | 2 -- ext/standard/tests/math/log1p_error.phpt | 2 +- ext/standard/tests/math/log1p_variation1.phpt | 2 +- ext/standard/tests/math/log_basic.phpt | 1 - ext/standard/tests/math/log_variation1.phpt | 2 +- ext/standard/tests/math/log_variation2.phpt | 2 +- .../tests/math/mt_getrandmax_basic.phpt | 2 +- .../tests/math/mt_getrandmax_error.phpt | 2 +- ext/standard/tests/math/mt_rand_error.phpt | 2 -- ext/standard/tests/math/mt_srand_basic.phpt | 2 +- ext/standard/tests/math/mt_srand_error.phpt | 3 --- ext/standard/tests/math/octdec_basic.phpt | 2 +- ext/standard/tests/math/octdec_error.phpt | 2 +- ext/standard/tests/math/pow-operator.phpt | 1 - ext/standard/tests/math/pow.phpt | 1 - ext/standard/tests/math/pow_basic.phpt | 2 +- ext/standard/tests/math/pow_basic2.phpt | 3 +-- ext/standard/tests/math/pow_error.phpt | 3 --- ext/standard/tests/math/rand_basic.phpt | 1 - ext/standard/tests/math/rand_error.phpt | 1 - ext/standard/tests/math/round_variation2.phpt | 2 +- .../tests/math/tan_basiclong_64bit.phpt | 1 - .../tests/network/gethostbyname_basic003.phpt | 2 +- .../tests/network/gethostbynamel_basic1.phpt | 2 +- ext/standard/tests/network/long2ip_error.phpt | 2 +- .../tests/network/setcookie_error.phpt | 1 - .../tests/network/socket_bug74429.phpt | 1 - .../password/password_bcrypt_errors.phpt | 2 -- .../password/password_deprecated_salts.phpt | 1 - .../password/password_get_info_argon2.phpt | 2 +- .../tests/password/password_hash.phpt | 2 +- .../tests/password/password_hash_argon2.phpt | 2 +- .../password/password_hash_error_argon2.phpt | 2 +- .../password_needs_rehash_argon2.phpt | 2 +- .../password/password_verify_argon2.phpt | 2 +- .../tests/password/password_verify_error.phpt | 1 - ext/standard/tests/serialize/bug65806.phpt | 1 - ext/standard/tests/serialize/bug69210.phpt | 2 +- ext/standard/tests/serialize/bug71311.phpt | 2 -- .../serialize/serialization_arrays_002.phpt | 2 -- .../serialize/serialization_arrays_003.phpt | 4 +--- .../serialize/serialization_objects_001.phpt | Bin 2429 -> 2428 bytes .../serialize/serialization_objects_004.phpt | 2 +- .../serialize/serialization_objects_008.phpt | 3 +-- .../serialize/serialization_objects_009.phpt | 2 +- .../serialize/serialization_objects_010.phpt | 2 +- .../serialize/serialization_objects_011.phpt | 2 +- .../serialize/serialization_objects_012.phpt | 4 +--- .../serialize/serialization_objects_013.phpt | 1 - .../serialize/serialization_objects_014.phpt | 1 - .../serialization_precision_001.phpt | 2 +- .../serialization_precision_002.phpt | 2 +- .../serialization_resources_001.phpt | 2 +- .../tests/serialize/unserializeS.phpt | 1 - .../tests/serialize/unserialize_classes.phpt | 1 - .../serialize/unserialize_error_001.phpt | 1 - .../serialize/unserialize_subclasses.phpt | 1 - ext/standard/tests/streams/bug44712.phpt | 1 - ext/standard/tests/streams/bug53903.phpt | 1 - ext/standard/tests/streams/bug54946.phpt | 1 - ext/standard/tests/streams/bug60455_03.phpt | 2 -- ext/standard/tests/streams/bug60817.phpt | 1 - ext/standard/tests/streams/bug64433.phpt | 2 -- ext/standard/tests/streams/bug67626.phpt | 2 +- ext/standard/tests/streams/bug68948.phpt | 1 - ext/standard/tests/streams/bug70198.phpt | 1 - ext/standard/tests/streams/bug72075.phpt | 1 - ext/standard/tests/streams/bug72534.phpt | 1 - .../tests/streams/proc_open_bug51800.phpt | 1 - .../streams/proc_open_bug51800_right.phpt | 1 - .../streams/proc_open_bug51800_right2.phpt | 1 - .../tests/streams/proc_open_bug60120.phpt | 1 - .../tests/streams/proc_open_bug64438.phpt | 1 - .../streams/stream_resolve_include_path.phpt | 1 - .../tests/streams/stream_set_chunk_size.phpt | 1 - .../tests/streams/user-stream-error.phpt | 1 - .../streams/user_streams_consumed_bug.phpt | 1 - .../tests/strings/add-and-stripcslashes.phpt | 3 --- .../tests/strings/basename_invalid_path.phpt | 1 - .../strings/basename_invalid_path_win.phpt | 1 - .../tests/strings/basename_variation.phpt | 1 - .../tests/strings/bin2hex_variation1.phpt | 2 +- ext/standard/tests/strings/bug20261.phpt | 1 - ext/standard/tests/strings/bug23650.phpt | 1 - ext/standard/tests/strings/bug25671.phpt | 1 - ext/standard/tests/strings/bug37244.phpt | 1 - ext/standard/tests/strings/bug45166.phpt | 2 +- ext/standard/tests/strings/bug61038.phpt | 1 - ext/standard/tests/strings/bug61116.phpt | 3 --- ext/standard/tests/strings/bug65230.phpt | 1 - ext/standard/tests/strings/bug67252.phpt | 1 - ext/standard/tests/strings/bug68996.phpt | 1 - ext/standard/tests/strings/bug73058.phpt | 1 - .../tests/strings/chop_variation4.phpt | Bin 1835 -> 1836 bytes .../tests/strings/chunk_split_variation3.phpt | 2 +- .../tests/strings/chunk_split_variation6.phpt | 2 +- .../convert_cyr_string_variation1.phpt | 2 +- .../tests/strings/crc32_variation1.phpt | 3 +-- ext/standard/tests/strings/crypt_sha256.phpt | 1 - ext/standard/tests/strings/crypt_sha512.phpt | 1 - ext/standard/tests/strings/dirname_basic.phpt | 1 - .../tests/strings/dirname_variation.phpt | 2 +- ext/standard/tests/strings/explode_error.phpt | 2 +- .../tests/strings/explode_variation3.phpt | 2 +- .../tests/strings/explode_variation5.phpt | 2 +- .../tests/strings/explode_variation6.phpt | 2 +- .../get_html_translation_table_basic7.phpt | 2 +- .../get_html_translation_table_basic9.phpt | 2 +- .../tests/strings/html_entity_decode1.phpt | 2 +- .../tests/strings/html_entity_decode2.phpt | 2 +- .../strings/html_entity_decode_cp866.phpt | 2 -- .../html_entity_decode_iso8859-15.phpt | 2 -- .../strings/html_entity_decode_iso8859-5.phpt | 2 -- .../strings/html_entity_decode_koi8-r.phpt | 2 -- .../strings/html_entity_decode_macroman.phpt | 2 -- .../strings/html_entity_decode_win1251.phpt | 2 -- .../strings/html_entity_decode_win1252.phpt | 2 -- .../tests/strings/htmlentities24.phpt | 2 -- .../tests/strings/htmlentities_html5.phpt | 2 +- .../tests/strings/htmlspecialchars.phpt | 1 - .../tests/strings/htmlspecialchars_basic.phpt | 2 +- .../htmlspecialchars_decode_variation1.phpt | 2 +- .../htmlspecialchars_decode_variation3.phpt | 2 +- .../htmlspecialchars_decode_variation5.phpt | 2 +- .../tests/strings/join_variation1.phpt | 2 +- ext/standard/tests/strings/ltrim_error.phpt | 2 +- .../tests/strings/ltrim_variation1.phpt | 2 +- .../tests/strings/ltrim_variation2.phpt | 2 +- ext/standard/tests/strings/md5_basic2.phpt | 2 +- ext/standard/tests/strings/md5_error.phpt | 2 +- ext/standard/tests/strings/md5_file.phpt | Bin 2847 -> 2846 bytes .../tests/strings/money_format_basic1.phpt | 1 - .../tests/strings/nl_langinfo_basic.phpt | 2 +- ext/standard/tests/strings/pack_A.phpt | 1 - .../tests/strings/parse_str_error1.phpt | 2 +- .../tests/strings/print_variation1.phpt | 2 +- ext/standard/tests/strings/printf_basic3.phpt | 2 +- ext/standard/tests/strings/printf_basic5.phpt | 2 +- ext/standard/tests/strings/printf_basic9.phpt | 2 +- ext/standard/tests/strings/printf_error.phpt | 2 +- .../tests/strings/quotemeta_basic.phpt | 2 +- .../tests/strings/quotemeta_error.phpt | 2 +- ext/standard/tests/strings/rtrim_basic.phpt | 2 +- ext/standard/tests/strings/sha1_basic.phpt | 2 +- .../tests/strings/sprintf_variation1.phpt | 2 +- .../tests/strings/sprintf_variation12.phpt | 2 +- .../tests/strings/sprintf_variation13.phpt | 2 +- .../tests/strings/sprintf_variation14.phpt | 2 +- .../tests/strings/sprintf_variation15.phpt | Bin 7411 -> 7412 bytes .../tests/strings/sprintf_variation18.phpt | 2 +- .../tests/strings/sprintf_variation2.phpt | 2 +- .../tests/strings/sprintf_variation20.phpt | 2 +- .../tests/strings/sprintf_variation22.phpt | Bin 2512 -> 2513 bytes .../tests/strings/sprintf_variation24.phpt | Bin 3457 -> 3458 bytes .../tests/strings/sprintf_variation25.phpt | Bin 4650 -> 4651 bytes .../tests/strings/sprintf_variation26.phpt | Bin 1692 -> 1693 bytes .../tests/strings/sprintf_variation27.phpt | Bin 2686 -> 2687 bytes .../tests/strings/sprintf_variation31.phpt | 2 +- .../tests/strings/sprintf_variation32.phpt | 2 +- .../tests/strings/sprintf_variation33.phpt | 2 +- .../tests/strings/sprintf_variation37.phpt | 2 +- .../tests/strings/sprintf_variation38.phpt | 2 +- .../tests/strings/sprintf_variation39.phpt | 2 +- .../tests/strings/sprintf_variation43.phpt | 2 +- .../tests/strings/sprintf_variation45.phpt | 2 +- .../tests/strings/sprintf_variation47.phpt | 2 +- .../tests/strings/sprintf_variation49.phpt | 2 +- .../tests/strings/sprintf_variation50.phpt | 2 +- .../tests/strings/sprintf_variation51.phpt | 2 +- .../tests/strings/sprintf_variation53.phpt | 2 +- .../tests/strings/sprintf_variation6.phpt | 2 +- .../tests/strings/sprintf_variation7.phpt | 2 +- .../tests/strings/sprintf_variation8.phpt | 2 +- .../tests/strings/sprintf_variation9.phpt | 2 +- ext/standard/tests/strings/sscanf_basic4.phpt | 2 +- ext/standard/tests/strings/sscanf_basic8.phpt | 2 +- ext/standard/tests/strings/sscanf_error.phpt | 2 +- .../tests/strings/sscanf_variation1.phpt | 2 +- .../tests/strings/sscanf_variation2.phpt | 2 +- .../strings/str_replace_array_refs2.phpt | 1 - .../tests/strings/str_replace_error.phpt | 2 +- .../tests/strings/str_replace_variation2.phpt | Bin 12674 -> 12675 bytes .../tests/strings/str_rot13_basic.phpt | 2 +- .../tests/strings/str_rot13_error.phpt | 2 +- ext/standard/tests/strings/str_shuffle.phpt | 2 +- .../tests/strings/str_shuffle_basic.phpt | 2 +- .../tests/strings/str_shuffle_error.phpt | 2 +- .../tests/strings/str_shuffle_variation1.phpt | 2 +- .../tests/strings/str_split_variation5.phpt | 2 +- .../tests/strings/strcspn_variation1.phpt | 2 +- .../tests/strings/strcspn_variation10.phpt | 2 +- .../tests/strings/strcspn_variation11.phpt | 2 +- .../tests/strings/strcspn_variation12.phpt | 2 +- .../tests/strings/strcspn_variation2.phpt | 2 +- .../tests/strings/strcspn_variation3.phpt | 2 +- .../tests/strings/strcspn_variation7.phpt | 2 +- .../tests/strings/strcspn_variation8.phpt | 2 +- .../tests/strings/strip_tags_variation1.phpt | 2 +- .../tests/strings/strip_tags_variation3.phpt | 2 +- .../tests/strings/strip_tags_variation5.phpt | 2 +- .../tests/strings/stripcslashes_basic.phpt | 1 - .../tests/strings/stripslashes_basic.phpt | Bin 2032 -> 2033 bytes .../tests/strings/strnatcasecmp_error.phpt | 2 +- .../tests/strings/strnatcmp_basic.phpt | 2 +- .../tests/strings/strnatcmp_leftalign.phpt | 1 - .../tests/strings/strrchr_variation1.phpt | Bin 4853 -> 4854 bytes .../tests/strings/strrchr_variation10.phpt | 2 +- .../tests/strings/strrchr_variation11.phpt | 2 +- .../tests/strings/strrchr_variation12.phpt | Bin 1764 -> 1765 bytes .../tests/strings/strrchr_variation2.phpt | 2 +- .../tests/strings/strrchr_variation8.phpt | 2 +- ext/standard/tests/strings/strripos.phpt | 1 - .../tests/strings/strripos_variation1.phpt | 2 +- .../tests/strings/strripos_variation2.phpt | 2 +- .../tests/strings/strrpos_variation1.phpt | 2 +- .../tests/strings/strrpos_variation10.phpt | 2 +- .../tests/strings/strrpos_variation11.phpt | 2 +- .../tests/strings/strrpos_variation2.phpt | 2 +- .../tests/strings/strrpos_variation3.phpt | 2 +- .../tests/strings/strrpos_variation4.phpt | 2 +- .../tests/strings/strrpos_variation5.phpt | 2 +- .../tests/strings/strrpos_variation6.phpt | 2 +- .../tests/strings/strrpos_variation7.phpt | 2 +- .../tests/strings/strrpos_variation8.phpt | 2 +- ext/standard/tests/strings/strspn_basic.phpt | 2 +- .../tests/strings/strspn_variation1.phpt | 2 +- .../tests/strings/strspn_variation10.phpt | 2 +- .../tests/strings/strspn_variation11.phpt | 2 +- .../tests/strings/strspn_variation12.phpt | 2 +- .../tests/strings/strspn_variation2.phpt | 2 +- .../tests/strings/strspn_variation3.phpt | 2 +- .../tests/strings/strspn_variation4.phpt | 2 +- .../tests/strings/strspn_variation5.phpt | Bin 2413 -> 2414 bytes .../tests/strings/strspn_variation7.phpt | 2 +- .../tests/strings/strspn_variation8.phpt | 2 +- ext/standard/tests/strings/strstr.phpt | Bin 11492 -> 11493 bytes ext/standard/tests/strings/strtr.phpt | 2 +- .../tests/strings/strtr_variation3.phpt | 2 +- ext/standard/tests/strings/strval_basic.phpt | 2 +- ext/standard/tests/strings/strval_error.phpt | 2 +- .../tests/strings/strval_variation1.phpt | 2 +- .../tests/strings/strval_variation2.phpt | 2 +- .../tests/strings/substr_replace.phpt | 1 - ext/standard/tests/strings/trim.phpt | 1 - ext/standard/tests/strings/trim1.phpt | Bin 2046 -> 2045 bytes ext/standard/tests/strings/trim_error.phpt | 2 +- .../tests/strings/trim_variation1.phpt | 2 +- .../tests/strings/trim_variation2.phpt | 2 +- ext/standard/tests/strings/unpack.phpt | 2 +- .../tests/strings/unpack_bug68225.phpt | 1 - ext/standard/tests/strings/unpack_offset.phpt | 1 - ext/standard/tests/strings/url_t.phpt | 1 - .../tests/strings/utf8_decode_error.phpt | 1 - .../tests/strings/utf8_decode_variation1.phpt | 1 - .../tests/strings/utf8_encode_error.phpt | 1 - .../tests/strings/utf8_encode_variation1.phpt | 1 - .../tests/strings/vfprintf_basic2.phpt | 2 -- .../tests/strings/vfprintf_basic3.phpt | 1 - .../tests/strings/vfprintf_basic4.phpt | 1 - .../tests/strings/vfprintf_basic5.phpt | 2 -- .../tests/strings/vfprintf_basic6.phpt | 1 - .../tests/strings/vfprintf_basic7.phpt | 2 -- .../tests/strings/vfprintf_variation16.phpt | 2 +- .../tests/strings/vfprintf_variation21.phpt | 1 - .../tests/strings/vfprintf_variation3.phpt | 1 - .../tests/strings/vfprintf_variation4.phpt | 2 +- .../tests/strings/vfprintf_variation5.phpt | 1 - .../tests/strings/vprintf_basic1.phpt | 1 - .../tests/strings/vsprintf_variation10.phpt | Bin 2771 -> 2772 bytes .../tests/strings/vsprintf_variation11.phpt | 1 - .../strings/vsprintf_variation11_64bit.phpt | 1 - .../tests/strings/vsprintf_variation13.phpt | 1 - .../strings/vsprintf_variation13_64bit.phpt | 1 - .../tests/strings/vsprintf_variation2.phpt | 2 +- .../tests/strings/vsprintf_variation3.phpt | 1 - .../tests/strings/vsprintf_variation5.phpt | 1 - .../tests/strings/vsprintf_variation7.phpt | Bin 2234 -> 2233 bytes .../tests/strings/vsprintf_variation8.phpt | 2 +- .../tests/strings/vsprintf_variation9.phpt | Bin 1702 -> 1701 bytes ext/standard/tests/strings/wordwrap.phpt | 1 - .../tests/strings/wordwrap_variation1.phpt | 2 +- ext/standard/tests/time/strptime_basic.phpt | 1 - ext/standard/tests/time/strptime_error.phpt | 1 - ext/standard/tests/time/strptime_parts.phpt | 1 - .../tests/url/base64_decode_basic_001.phpt | 2 +- .../tests/url/base64_decode_basic_002.phpt | 2 +- .../url/base64_decode_variation_001.phpt | 2 +- .../url/base64_decode_variation_002.phpt | 2 +- .../tests/url/base64_encode_error_001.phpt | 2 +- ext/standard/tests/url/bug53248.phpt | 2 +- ext/standard/tests/url/bug74780.phpt | 2 +- .../tests/url/get_headers_error_001.phpt | 3 --- .../tests/url/get_headers_error_002.phpt | 1 - .../tests/url/get_headers_error_003.phpt | 3 --- .../tests/url/parse_url_basic_001.phpt | 1 - .../tests/url/parse_url_basic_010.phpt | 2 +- .../tests/url/parse_url_error_001.phpt | 2 +- .../tests/url/parse_url_error_002.phpt | 2 +- .../tests/url/parse_url_relative_scheme.phpt | 1 - .../tests/url/parse_url_unterminated.phpt | 1 - .../tests/url/parse_url_variation_001.phpt | 2 +- .../url/parse_url_variation_002_32bit.phpt | 2 +- .../url/parse_url_variation_002_64bit.phpt | 2 +- .../tests/url/rawurldecode_variation_001.phpt | 2 +- .../tests/url/rawurlencode_error_001.phpt | 2 +- .../tests/url/rawurlencode_variation_001.phpt | 2 +- .../tests/url/urldecode_error_001.phpt | 2 +- .../tests/url/urldecode_variation_001.phpt | 2 +- .../tests/url/urlencode_error_001.phpt | 2 +- .../tests/url/urlencode_variation_001.phpt | 2 +- .../tests/versioning/php_sapi_name.phpt | 1 - .../tests/versioning/version_compare.phpt | 2 +- ext/sysvshm/tests/005.phpt | 1 - ext/sysvshm/tests/006.phpt | 1 - ext/sysvshm/tests/007.phpt | 2 -- ext/sysvshm/tests/shutdown_crash_0.phpt | 2 -- ext/tidy/tests/002.phpt | 2 +- ext/tidy/tests/005-mb.phpt | 2 +- ext/tidy/tests/005.phpt | 2 +- ext/tidy/tests/006.phpt | 2 +- ext/tidy/tests/008.phpt | 2 +- ext/tidy/tests/009.phpt | 2 +- ext/tidy/tests/011.phpt | 2 +- ext/tidy/tests/014.phpt | 2 +- ext/tidy/tests/015.phpt | 2 +- ext/tidy/tests/017.phpt | 2 +- ext/tidy/tests/tidy_error.phpt | 1 - .../tests/token_get_all_TOKEN_PARSE_001.phpt | 2 +- ext/tokenizer/tests/token_get_all_basic.phpt | 2 +- ext/tokenizer/tests/token_get_all_error.phpt | 2 +- ext/wddx/tests/bug45901.phpt | 3 +-- ext/wddx/tests/bug70661.phpt | 2 +- ext/wddx/tests/bug70741.phpt | 3 +-- ext/wddx/tests/bug72750.phpt | 2 +- ext/wddx/tests/bug72790.phpt | 2 +- ext/wddx/tests/bug72799.phpt | 2 +- ext/wddx/tests/bug72860.phpt | 2 +- ext/wddx/tests/bug73065.phpt | 2 +- ext/wddx/tests/bug73331.phpt | 2 -- ext/wddx/tests/bug74145.phpt | 2 +- ext/xml/tests/bug72099.phpt | 2 +- ext/xml/tests/xml_error_string_error.phpt | 1 - .../tests/xml_error_string_variation1.phpt | 2 -- .../xml_get_current_byte_index_error.phpt | 1 - ...xml_get_current_byte_index_variation1.phpt | 1 - .../xml_get_current_column_number_error.phpt | 1 - ..._get_current_column_number_variation1.phpt | 1 - .../xml_get_current_line_number_error.phpt | 1 - ...ml_get_current_line_number_variation1.phpt | 1 - ext/xml/tests/xml_get_error_code_error.phpt | 1 - .../tests/xml_get_error_code_variation1.phpt | 1 - ext/xml/tests/xml_parse_error.phpt | 1 - .../tests/xml_parse_into_struct_error.phpt | 1 - .../xml_parse_into_struct_variation.phpt | 2 +- .../xml_parse_into_struct_variation1.phpt | 1 - ext/xml/tests/xml_parse_variation1.phpt | 1 - ext/xml/tests/xml_parser_create_ns_error.phpt | 2 +- .../tests/xml_parser_create_variation1.phpt | 2 +- ext/xml/tests/xml_parser_free_error.phpt | 1 - ext/xml/tests/xml_parser_free_variation1.phpt | 1 - .../tests/xml_parser_get_option_error.phpt | 1 - .../xml_parser_get_option_variation1.phpt | 1 - .../xml_parser_get_option_variation2.phpt | 1 - .../tests/xml_parser_set_option_error.phpt | 1 - .../xml_parser_set_option_variation1.phpt | 1 - .../xml_parser_set_option_variation2.phpt | 1 - .../xml_set_character_data_handler_error.phpt | 1 - ...set_character_data_handler_variation1.phpt | 1 - .../tests/xml_set_default_handler_error.phpt | 1 - .../xml_set_default_handler_variation1.phpt | 1 - .../tests/xml_set_element_handler_error.phpt | 1 - .../xml_set_element_handler_variation1.phpt | 1 - ..._set_end_namespace_decl_handler_error.phpt | 1 - ...end_namespace_decl_handler_variation1.phpt | 1 - ...set_external_entity_ref_handler_error.phpt | 1 - ...xternal_entity_ref_handler_variation1.phpt | 1 - .../xml_set_notation_decl_handler_error.phpt | 1 - ..._set_notation_decl_handler_variation1.phpt | 1 - ext/xml/tests/xml_set_object_error.phpt | 1 - ext/xml/tests/xml_set_object_variation1.phpt | 1 - ext/xml/tests/xml_set_object_variation2.phpt | 1 - ..._processing_instruction_handler_basic.phpt | 2 +- ..._processing_instruction_handler_error.phpt | 1 - ...essing_instruction_handler_variation1.phpt | 1 - ...et_start_namespace_decl_handler_basic.phpt | 1 - ...et_start_namespace_decl_handler_error.phpt | 1 - ...art_namespace_decl_handler_variation1.phpt | 1 - ...et_unparsed_entity_decl_handler_error.phpt | 1 - ...parsed_entity_decl_handler_variation1.phpt | 1 - ext/xmlreader/tests/002.phpt | 1 - ext/xmlreader/tests/expand.phpt | 2 +- ext/xmlreader/tests/expand_error.phpt | 2 +- ext/xmlrpc/tests/003.phpt | 3 +-- ext/xmlrpc/tests/004.phpt | 3 +-- ext/xmlrpc/tests/005.phpt | 6 +----- ext/xmlrpc/tests/006.phpt | 6 +----- ext/xmlrpc/tests/007.phpt | 6 +----- ext/xmlwriter/tests/bug48204.phpt | 1 - .../tests/xmlwriter_open_uri_error_001.phpt | 1 - .../tests/xmlwriter_open_uri_error_002.phpt | 1 - .../tests/xmlwriter_open_uri_error_003.phpt | 1 - .../tests/xmlwriter_open_uri_error_004.phpt | 1 - .../tests/xmlwriter_open_uri_error_005.phpt | 1 - ...xmlwriter_set_indent_string_error_001.phpt | 1 - ...mlwriter_write_attribute_ns_basic_001.phpt | 1 - ...mlwriter_write_attribute_ns_error_001.phpt | 1 - .../tests/xmlwriter_write_dtd_error_001.phpt | 1 - ext/xsl/tests/bug26384.phpt | 1 - ext/xsl/tests/bug54446.phpt | 3 --- ext/xsl/tests/bug54446_with_ini.phpt | 1 - ext/xsl/tests/xslt001.phpt | 2 -- ext/xsl/tests/xslt002.phpt | 2 -- ext/xsl/tests/xslt003.phpt | 2 -- ext/xsl/tests/xslt004.phpt | 2 -- ext/xsl/tests/xslt005.phpt | 2 -- ext/xsl/tests/xslt006.phpt | 2 -- ext/xsl/tests/xslt007.phpt | 2 -- ext/xsl/tests/xslt008-mb.phpt | 2 -- ext/xsl/tests/xslt008.phpt | 2 -- ext/xsl/tests/xslt009.phpt | 2 -- ext/xsl/tests/xslt010.phpt | 1 - ext/xsl/tests/xslt010_gt10129.phpt | 1 - ext/xsl/tests/xslt011.phpt | 2 -- ext/xsl/tests/xslt012.phpt | 2 -- .../tests/xsltprocessor_hasExsltSupport.phpt | 2 +- ...cessor_hasExsltSupport_wrongparam_001.phpt | 2 +- ...ocessor_registerPHPFunctions-allfuncs.phpt | 1 - .../tests/xsltprocessor_transformToDoc.phpt | 2 +- ...sltprocessor_transformToDoc_nullparam.phpt | 2 +- ...ocessor_transformToDoc_wrongparam_001.phpt | 2 +- ...ocessor_transformToDoc_wrongparam_003.phpt | 2 +- ...ocessor_transformToDoc_wrongparam_004.phpt | 2 +- .../tests/xsltprocessor_transformToURI.phpt | 2 +- ...sltprocessor_transformToURI_nullparam.phpt | 2 +- ...ocessor_transformToURI_wrongparam_001.phpt | 2 +- ...ocessor_transformToURI_wrongparam_002.phpt | 2 +- ...ocessor_transformToURI_wrongparam_003.phpt | 2 +- ...ocessor_transformToURI_wrongparam_004.phpt | 2 +- .../tests/xsltprocessor_transformToXML.phpt | 2 +- ...ocessor_transformToXML_wrongparam_001.phpt | 2 +- ...ocessor_transformToXML_wrongparam_003.phpt | 2 +- ...ocessor_transformToXML_wrongparam_004.phpt | 2 +- ext/zip/tests/bug47667.phpt | 1 - ext/zip/tests/bug49072.phpt | 1 - ext/zip/tests/bug53603.phpt | 3 --- ext/zip/tests/bug8009.phpt | 1 - ext/zip/tests/bug8700.phpt | 1 - ext/zip/tests/oo_getstatusstring.phpt | 1 - ext/zip/tests/oo_properties.phpt | 1 - .../tests/zip_entry_compressionmethod.phpt | 1 - ext/zlib/tests/005.phpt | 1 - ext/zlib/tests/deflate_add_block_v123.phpt | 1 - ext/zlib/tests/deflate_add_error.phpt | 1 - ext/zlib/tests/deflate_init_error.phpt | 1 - ext/zlib/tests/gzclose_error.phpt | 3 +-- ext/zlib/tests/gzeof_basic.phpt | 2 +- ext/zlib/tests/gzeof_error.phpt | 3 +-- ext/zlib/tests/gzfile_error.phpt | 3 +-- ext/zlib/tests/gzfile_variation1.phpt | 1 - ext/zlib/tests/gzfile_variation10.phpt | 2 +- ext/zlib/tests/gzfile_variation12.phpt | 2 +- ext/zlib/tests/gzfile_variation13.phpt | 2 +- ext/zlib/tests/gzfile_variation14.phpt | 3 +-- ext/zlib/tests/gzfile_variation15.phpt | 1 - ext/zlib/tests/gzfile_variation2.phpt | 3 +-- ext/zlib/tests/gzfile_variation3.phpt | 2 +- ext/zlib/tests/gzfile_variation5.phpt | 2 +- ext/zlib/tests/gzfile_variation7.phpt | 1 - ext/zlib/tests/gzfile_variation8.phpt | 3 +-- ext/zlib/tests/gzfile_variation9.phpt | 2 +- ext/zlib/tests/gzgetc_error.phpt | 3 +-- ext/zlib/tests/gzgets_basic.phpt | 2 +- ext/zlib/tests/gzgets_error.phpt | 3 +-- ext/zlib/tests/gzinflate_error1.phpt | 2 +- ext/zlib/tests/gzinflate_length.phpt | 1 - ext/zlib/tests/gzopen_variation1.phpt | 1 - ext/zlib/tests/gzopen_variation4.phpt | 1 - ext/zlib/tests/gzopen_variation7.phpt | 2 +- ext/zlib/tests/gzopen_variation9.phpt | 2 +- ext/zlib/tests/gzpassthru_basic.phpt | 2 +- ext/zlib/tests/gzpassthru_error.phpt | 3 +-- ext/zlib/tests/gzputs_basic.phpt | 2 +- ext/zlib/tests/gzread_basic.phpt | 2 +- ext/zlib/tests/gzread_error.phpt | 3 +-- ext/zlib/tests/gzread_error2.phpt | 2 +- ext/zlib/tests/gzread_variation1.phpt | 2 +- ext/zlib/tests/gzrewind_basic.phpt | 2 +- ext/zlib/tests/gzrewind_basic2.phpt | 2 +- ext/zlib/tests/gzrewind_error.phpt | 2 +- ext/zlib/tests/gzrewind_variation1.phpt | 2 +- ext/zlib/tests/gzseek_basic.phpt | 2 +- ext/zlib/tests/gzseek_error.phpt | 3 +-- ext/zlib/tests/gzseek_variation2.phpt | 2 +- ext/zlib/tests/gzseek_variation3.phpt | 2 +- ext/zlib/tests/gzseek_variation6.phpt | 2 +- ext/zlib/tests/gztell_basic.phpt | 2 +- ext/zlib/tests/gztell_error.phpt | 3 +-- ext/zlib/tests/gzuncompress_basic1.phpt | 2 +- ext/zlib/tests/gzwrite_basic.phpt | 2 +- ext/zlib/tests/gzwrite_error.phpt | 3 +-- ext/zlib/tests/gzwrite_error2.phpt | 2 +- ext/zlib/tests/gzwrite_variation1.phpt | 2 +- ext/zlib/tests/inflate_add_error.phpt | 1 - ext/zlib/tests/inflate_init_error.phpt | 1 - ext/zlib/tests/ob_001.phpt | 1 - ext/zlib/tests/ob_002.phpt | 1 - ext/zlib/tests/ob_004.phpt | 1 - ext/zlib/tests/readgzfile_error.phpt | 3 +-- ext/zlib/tests/readgzfile_variation1.phpt | 1 - ext/zlib/tests/readgzfile_variation10.phpt | 2 +- ext/zlib/tests/readgzfile_variation12.phpt | 2 +- ext/zlib/tests/readgzfile_variation13.phpt | 2 +- ext/zlib/tests/readgzfile_variation14.phpt | 1 - ext/zlib/tests/readgzfile_variation15.phpt | 1 - ext/zlib/tests/readgzfile_variation2.phpt | 3 +-- ext/zlib/tests/readgzfile_variation3.phpt | 2 +- ext/zlib/tests/readgzfile_variation8.phpt | 3 +-- ext/zlib/tests/readgzfile_variation9.phpt | 2 +- ext/zlib/tests/zlib_scheme_copy_basic.phpt | 2 +- .../tests/zlib_scheme_copy_variation1.phpt | 2 +- .../tests/zlib_scheme_copy_variation2.phpt | 2 +- ext/zlib/tests/zlib_scheme_dir_basic.phpt | 2 +- ext/zlib/tests/zlib_scheme_file_basic.phpt | 2 +- .../zlib_scheme_file_get_contents_basic.phpt | 2 +- .../zlib_scheme_file_put_contents_basic.phpt | 2 +- .../zlib_scheme_file_read_file_basic.phpt | 2 +- ext/zlib/tests/zlib_scheme_fopen_basic.phpt | 2 +- .../tests/zlib_scheme_fopen_variation1.phpt | 2 +- ext/zlib/tests/zlib_scheme_rename_basic.phpt | 3 +-- ext/zlib/tests/zlib_scheme_stat_basic.phpt | 3 +-- ext/zlib/tests/zlib_scheme_stat_basic2.phpt | 2 +- ext/zlib/tests/zlib_scheme_unlink_basic.phpt | 3 +-- ext/zlib/tests/zlib_wrapper_fflush_basic.phpt | 2 +- ext/zlib/tests/zlib_wrapper_flock_basic.phpt | 2 +- ext/zlib/tests/zlib_wrapper_fstat_basic.phpt | 2 +- .../tests/zlib_wrapper_ftruncate_basic.phpt | 3 +-- .../tests/zlib_wrapper_meta_data_basic.phpt | 2 +- sapi/cli/tests/020.phpt | 1 - sapi/cli/tests/bug66830.phpt | 1 - sapi/cli/tests/bug67429.phpt | 1 - sapi/cli/tests/bug67741.phpt | 2 +- sapi/cli/tests/php_cli_server_013.phpt | 2 -- sapi/cli/tests/php_cli_server_014.phpt | 1 - sapi/fpm/tests/log-bwd-msg-with-nl.phpt | 2 +- sapi/fpm/tests/log-bwd-multiple-msgs.phpt | 2 +- sapi/fpm/tests/pool-apparmor-basic.phpt | 2 +- sapi/fpm/tests/pool-prefix.phpt | 2 +- sapi/fpm/tests/proc-user-ignored.phpt | 2 +- sapi/fpm/tests/socket-uds-acl.phpt | 2 +- sapi/phpdbg/tests/breakpoints_001.phpt | 1 - sapi/phpdbg/tests/breakpoints_002.phpt | 1 - sapi/phpdbg/tests/breakpoints_003.phpt | 1 - sapi/phpdbg/tests/breakpoints_005.phpt | 1 - sapi/phpdbg/tests/breakpoints_006.phpt | 1 - sapi/phpdbg/tests/breakpoints_007.phpt | 1 - sapi/phpdbg/tests/breakpoints_008.phpt | 1 - sapi/phpdbg/tests/include_once.phpt | 1 - sapi/phpdbg/tests/phpdbg_oplog_001.phpt | 1 - sapi/tests/test001.phpt | 2 +- sapi/tests/test002.phpt | 2 +- sapi/tests/test003.phpt | 2 +- sapi/tests/test004.phpt | 2 +- sapi/tests/test006.phpt | 1 - sapi/tests/test007.phpt | 1 - tests/basic/bug20539.phpt | 1 - tests/classes/__call_003.phpt | 1 - tests/classes/abstract_derived.phpt | 1 - tests/classes/abstract_final.phpt | 1 - tests/classes/abstract_inherit.phpt | 1 - tests/classes/abstract_redeclare.phpt | 1 - tests/classes/array_access_012.phpt | 1 - tests/classes/autoload_018.phpt | 1 - tests/classes/class_example.phpt | 1 - tests/classes/constants_basic_001.phpt | 1 - tests/classes/constants_basic_002.phpt | 1 - tests/classes/constants_basic_004.phpt | 1 - tests/classes/constants_basic_005.phpt | 1 - tests/classes/constants_error_001.phpt | 1 - tests/classes/constants_error_003.phpt | 1 - tests/classes/constants_error_006.phpt | 1 - tests/classes/constants_error_007.phpt | 1 - tests/classes/constants_scope_001.phpt | 1 - tests/classes/constants_visibility_006.phpt | 1 - .../constants_visibility_error_003.phpt | 2 -- .../constants_visibility_error_004.phpt | 2 -- tests/classes/factory_and_singleton_006.phpt | 1 - tests/classes/final_abstract.phpt | 1 - tests/classes/implicit_instantiation_001.phpt | 2 -- tests/classes/inheritance_003.phpt | 1 - tests/classes/inheritance_004.phpt | 1 - .../interface_constant_inheritance_001.phpt | 1 - .../interface_constant_inheritance_002.phpt | 1 - .../interface_constant_inheritance_003.phpt | 1 - .../interface_constant_inheritance_005.phpt | 2 +- .../interface_constant_inheritance_006.phpt | 1 - .../interface_constant_inheritance_007.phpt | 1 - tests/classes/interface_method.phpt | 1 - tests/classes/interface_method_final.phpt | 1 - tests/classes/interface_method_private.phpt | 1 - tests/classes/interface_optional_arg.phpt | 1 - tests/classes/interfaces_001.phpt | 1 - tests/classes/interfaces_002.phpt | 1 - tests/classes/interfaces_003.phpt | 1 - ...erty_override_protectedStatic_private.phpt | 2 -- ...verride_protectedStatic_privateStatic.phpt | 2 -- ...ty_override_protectedStatic_protected.phpt | 2 -- ...perty_override_protectedStatic_public.phpt | 2 -- ...override_protectedStatic_publicStatic.phpt | 1 - .../property_override_protected_private.phpt | 1 - ...erty_override_protected_privateStatic.phpt | 1 - ...ty_override_protected_protectedStatic.phpt | 1 - ...perty_override_protected_publicStatic.phpt | 1 - ...roperty_override_publicStatic_private.phpt | 2 -- ...y_override_publicStatic_privateStatic.phpt | 2 -- ...perty_override_publicStatic_protected.phpt | 2 -- ...override_publicStatic_protectedStatic.phpt | 2 -- ...property_override_publicStatic_public.phpt | 2 -- .../property_override_public_private.phpt | 2 -- ...roperty_override_public_privateStatic.phpt | 1 - .../property_override_public_protected.phpt | 2 -- ...perty_override_public_protectedStatic.phpt | 1 - ...property_override_public_publicStatic.phpt | 1 - .../classes/static_properties_003_error1.phpt | 1 - .../classes/static_properties_003_error2.phpt | 1 - .../classes/static_properties_003_error3.phpt | 1 - .../classes/static_properties_003_error4.phpt | 1 - tests/classes/tostring_004.phpt | 1 - tests/classes/type_hinting_001.phpt | 1 - tests/classes/unset_properties.phpt | 1 - tests/func/003.phpt | 1 - tests/func/004.phpt | 1 - tests/func/005.phpt | 1 - tests/func/ini_alter.phpt | 1 - tests/lang/028.phpt | 1 - tests/lang/032.phpt | 1 - tests/lang/bug21094.phpt | 1 - tests/lang/bug22690.phpt | 1 - tests/lang/bug24054.phpt | 1 - tests/lang/bug24573.phpt | 1 - tests/lang/bug28800.phpt | 2 -- tests/lang/bug43958.phpt | 1 - tests/lang/bug44827.phpt | 1 - tests/lang/bug71897.phpt | 1 - tests/lang/compare_objects_basic1.phpt | 1 - tests/lang/compare_objects_basic2.phpt | 1 - tests/lang/each_binary_safety.phpt | 1 - .../lang/engine_assignExecutionOrder_001.phpt | 2 -- tests/lang/foreachLoop.002.phpt | 1 - tests/lang/foreachLoop.003.phpt | 1 - tests/lang/foreachLoop.009.phpt | 2 -- tests/lang/foreachLoop.011.phpt | 1 - tests/lang/foreachLoop.012.phpt | 1 - tests/lang/foreachLoop.013.phpt | 1 - tests/lang/foreachLoop.015.phpt | 1 - tests/lang/foreachLoop.016.phpt | 1 - tests/lang/foreachLoopObjects.001.phpt | 2 -- tests/lang/foreachLoopObjects.005.phpt | 1 - tests/lang/foreach_with_references_001.phpt | 1 - tests/lang/func_get_arg_variation.phpt | 1 - tests/lang/func_get_args.002.phpt | 1 - tests/lang/func_get_args.004.phpt | 1 - tests/lang/func_num_args.003.phpt | 1 - tests/lang/func_num_args.004.phpt | 2 -- .../operators/bitwiseOr_basiclong_64bit.phpt | 1 - .../operators/bitwiseXor_basiclong_64bit.phpt | 1 - .../lang/operators/nan-comparison-false.phpt | 1 - .../operator_identical_recusion-01.phpt | 2 +- tests/lang/passByReference_003.phpt | 1 - tests/lang/passByReference_005.phpt | 1 - tests/lang/passByReference_006.phpt | 1 - tests/lang/passByReference_008.phpt | 2 -- tests/lang/passByReference_010.phpt | 2 -- tests/lang/returnByReference.002.phpt | 1 - tests/lang/returnByReference.003.phpt | 1 - tests/lang/returnByReference.004.phpt | 1 - tests/lang/returnByReference.005.phpt | 1 - tests/lang/returnByReference.007.phpt | 1 - tests/lang/returnByReference.008.phpt | 1 - tests/lang/returnByReference.009.phpt | 1 - tests/lang/static_basic_001.phpt | 1 - tests/lang/string/unicode_escape.phpt | 2 -- tests/lang/string/unicode_escape_legacy.phpt | 1 - .../string/unicode_escape_surrogates.phpt | 1 - tests/lang/string_decimals_001.phpt | 1 - tests/lang/type_hints_001.phpt | 1 - tests/lang/type_hints_002.phpt | 1 - tests/lang/type_hints_003.phpt | 1 - tests/output/bug60768.phpt | 1 - tests/output/bug65593.phpt | 1 - tests/output/ob_end_clean_basic_001.phpt | 2 -- tests/output/ob_end_clean_error_001.phpt | 1 - tests/output/ob_get_clean_error_001.phpt | 1 - tests/output/ob_get_length_error_001.phpt | 1 - tests/output/ob_start_basic_004.phpt | 1 - tests/run-test/bug75042-3.phpt | 2 +- tests/security/open_basedir_001.phpt | 1 - tests/security/open_basedir_chdir.phpt | 1 - tests/security/open_basedir_chmod.phpt | 1 - tests/security/open_basedir_copy.phpt | 1 - .../open_basedir_copy_variation1.phpt | 1 - tests/security/open_basedir_dir.phpt | 1 - tests/security/open_basedir_error_log.phpt | 1 - .../open_basedir_error_log_variation.phpt | 1 - tests/security/open_basedir_file.phpt | 1 - tests/security/open_basedir_file_exists.phpt | 1 - .../open_basedir_file_put_contents.phpt | 1 - tests/security/open_basedir_fileatime.phpt | 1 - tests/security/open_basedir_filectime.phpt | 1 - tests/security/open_basedir_filegroup.phpt | 1 - tests/security/open_basedir_fileinode.phpt | 1 - tests/security/open_basedir_filemtime.phpt | 1 - tests/security/open_basedir_fileowner.phpt | 1 - tests/security/open_basedir_fileperms.phpt | 1 - tests/security/open_basedir_filesize.phpt | 1 - tests/security/open_basedir_filetype.phpt | 1 - tests/security/open_basedir_fopen.phpt | 1 - tests/security/open_basedir_glob.phpt | 1 - .../security/open_basedir_glob_variation.phpt | 1 - tests/security/open_basedir_is_dir.phpt | 1 - tests/security/open_basedir_is_file.phpt | 1 - tests/security/open_basedir_is_link.phpt | 1 - tests/security/open_basedir_is_readable.phpt | 1 - tests/security/open_basedir_is_writable.phpt | 1 - tests/security/open_basedir_link.phpt | 1 - tests/security/open_basedir_linkinfo.phpt | 1 - tests/security/open_basedir_lstat.phpt | 1 - tests/security/open_basedir_opendir.phpt | 1 - .../security/open_basedir_parse_ini_file.phpt | 1 - tests/security/open_basedir_readlink.phpt | 1 - tests/security/open_basedir_realpath.phpt | 1 - tests/security/open_basedir_rename.phpt | 1 - tests/security/open_basedir_rmdir.phpt | 1 - tests/security/open_basedir_scandir.phpt | 1 - tests/security/open_basedir_stat.phpt | 1 - tests/security/open_basedir_symlink.phpt | 1 - tests/security/open_basedir_tempnam.phpt | 1 - tests/security/open_basedir_touch.phpt | 1 - tests/security/open_basedir_unlink.phpt | 1 - tests/strings/offsets_chaining_1.phpt | 1 - tests/strings/offsets_chaining_2.phpt | 1 - tests/strings/offsets_chaining_3.phpt | 1 - tests/strings/offsets_chaining_4.phpt | 1 - tests/strings/offsets_general.phpt | 1 - 3401 files changed, 1530 insertions(+), 4009 deletions(-) diff --git a/Zend/tests/033.phpt b/Zend/tests/033.phpt index b506f9172e3..a76a322ccf3 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 1742d4b408c..2f9bc9a1fd8 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 c1124e026cb..2e7f76b4eef 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 6d9af8a9f52..3b24a1c99ca 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 75589550a81..65ba15148b6 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 fdb8915267e..80a91eed78d 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 ac023f43a54..7c95e866324 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 2b8888c497a..0be1c33317d 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 59d24417609..dbc86c593ed 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 cf8fa1cd02b..b5d037fea6e 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 7cf4fb19311..def99402ec5 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 a3c41faefc6..9761700bb89 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 62ceacda58d..14083dfb9f5 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 1e2eb0b067e..35a92d459c6 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 6c0cf1ec7a6..41a8159d52e 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 9cd3e9d5247..55d26a3e3a3 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 7d70cba0717..f633d114453 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 287495d1506..40bd70382b3 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 74ac9552bc0..3b795887576 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 9c87fc6017f..5c00ad7ca68 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 bcb4ad8c64c..f1c0e477a94 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 1b61f347750..83c69028032 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 3012d808fa9..d9b8e43c399 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 606142bde7e..6c422ca2681 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 31179ea3f9c..945118fef37 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 e39ad199a14..4a084d4bb1b 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 1964958526b..ac2dfb8777d 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 0fc4bfecdc1..487a569b6d1 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 50d2109cac4..096091e439c 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 8a73d41bf8e..87c48f08595 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 4ebe9cc35d2..b37ce13fd17 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 921f0090a90..a53ed1af687 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 a8ca698e9f5..88641e862ac 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 7a995aab3e4..35b96b1ba18 100644 --- a/Zend/tests/bug43200.phpt +++ b/Zend/tests/bug43200.phpt @@ -48,4 +48,3 @@ Class [ class x extends c implements a, b ] { } } } - diff --git a/Zend/tests/bug45180.phpt b/Zend/tests/bug45180.phpt index f1ca4342725..285543aaf08 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 f70c14234cd..734a498eba0 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 06e10d78fa0..88a9001e471 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 4d157345b23..0b86a2bcd37 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 9be02aa4d8e..d91ded28be4 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 7ae32a5d48b..3315f409628 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 4e6c9761dd8..60b9d34582e 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 272ba1286f7..c5185cc5fa6 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 47d39f8e9d0..44f8f3f6882 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 4159ac0b8cc..74ed8a8d173 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 a1e66cc51e4..60e9c3d81fc 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 43db028a2aa..417e1b55645 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 37a5a6d8138..0847b81d40e 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 f9e2e734586..cf2ea607a08 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 deb6c0f6916..fee6d013620 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 978884adba7..15dc7813852 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 56203f76853..d1e11e94070 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 fba76cb2907..581c0dad683 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 3ac4618aeaa..077e350bc22 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 6e60d12d435..45c9507bbac 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 00b5a41c901..02c3c06c172 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 8de177dcf83..d848b74f55c 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 f3ef740b43e..9b192f31b5f 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 e2b89da1cdd..f8611ae9d9d 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 c10a518376b..0472f64de7b 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 2bd06a07459..0ef339dc47b 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-- 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 088761e00b6..74ea394f5d8 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 994699e5def..9648966691b 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 b3f4bff1752..d19116c5985 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 1963d7be02e..d80954b16f2 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 71dac4298f8..296e3bb9c6c 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 3151c350815..e2c79b9afe9 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 06dd5389dd9..f5571627fe9 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 1349dee5ae1..18bd9cc5d79 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 2617c7b24d4..5ad88d94bca 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 8aae7c16f7e..dd555ab407a 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 d578f9c8d27..01b024e7786 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 0391ea23270..6b20eabb396 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 e4d3a22f670..2e9a52d3d02 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 9a98ba77602..9fc15fc8c54 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 558e87c56e2..78fff6e70d1 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 2bf4f6b1e08..d6905385955 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 4a823ec72f0..4eb16246a12 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 1e32af4c187..9ce82268c16 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 e1a129bbc25..406efe3efc8 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 064381ada05..7afac3cd5b4 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 41813269d16..72d1e599243 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 41e28ce58b7..4c84bde7bd6 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 416af065c6d..3b28e621d2c 100644 --- a/Zend/tests/bug75290.phpt +++ b/Zend/tests/bug75290.phpt @@ -23,4 +23,3 @@ object(Closure)#2 (1) { string(10) "" } } - diff --git a/Zend/tests/bug75420.2.phpt b/Zend/tests/bug75420.2.phpt index 3e7a63ffed7..994327d195c 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 c37bc722303..355a1570f3f 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 f99152c96ac..ea3501ed57f 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 7e1b7a27937..bae8f568789 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 b1ffebc0b44..8977e963dfa 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 634fb6dd505..a91d357c062 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 68fd29c6875..39f0062fecc 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 241ddb42cd5..042bf8c1457 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 412a923a38c..601db15989b 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 f71188cd08e..9123a1ba471 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 cabd99bfaca..1257d6bc7e8 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 a7e9eab4828..33cf03b14ce 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 92b96575b52..2390aa153b2 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 b8da50049af..c71204b1308 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 c309e3c533a..2b994766783 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 4e2542b7c02..ef8aff4bbce 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 684b33d5640..c5ed917f165 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-- foo()); - --EXPECT-- string(1) "B" diff --git a/Zend/tests/closure_051.phpt b/Zend/tests/closure_051.phpt index 78b28d74a33..ab514123c0c 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-- foo()); - --EXPECT-- string(1) "A" diff --git a/Zend/tests/closure_054.phpt b/Zend/tests/closure_054.phpt index b2f87d1d610..87c46d7a199 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-- foo()); - --EXPECT-- string(1) "A" diff --git a/Zend/tests/closure_055.phpt b/Zend/tests/closure_055.phpt index 047d72a89bd..2dc1d47103c 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-- ===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 d9db90bcad0..c6e4a7e0bb8 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 805478a0cf6..1e657954a92 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 4ec4f1fb322..c9f749518d9 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 ff895197557..1320029baa0 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 9e099e33fcf..06d911328c5 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 56ee43b7898..b69637c98d4 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 686dcc1d11a..79f8c772e37 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 c584b5d5034..daa72506418 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 7cc868105a2..5d58279eb50 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 af86c5b1654..6d41c0d7d66 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 b803499e503..fd34c8031e9 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 813246c5dd5..b8efa94be0c 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 dc56d4f8ed4..237386834b2 100644 --- a/Zend/tests/flexible-heredoc-error1.phpt +++ b/Zend/tests/flexible-heredoc-error1.phpt @@ -11,4 +11,4 @@ echo << --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 6b7fe9ee777..51be4562f16 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 3e71cbd684d..cd952a73f26 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 022c0811aa3..05b71b36b27 100644 --- a/Zend/tests/flexible-heredoc-error12.phpt +++ b/Zend/tests/flexible-heredoc-error12.phpt @@ -10,4 +10,4 @@ echo << --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 f26b04e4602..46d6371b21f 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 28e4d74a103..ad410d6b2ab 100644 --- a/Zend/tests/flexible-heredoc-error2.phpt +++ b/Zend/tests/flexible-heredoc-error2.phpt @@ -11,4 +11,4 @@ echo << --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 751f6b7926a..e0303f1924e 100644 --- a/Zend/tests/flexible-heredoc-error3.phpt +++ b/Zend/tests/flexible-heredoc-error3.phpt @@ -11,4 +11,4 @@ echo << --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 4542b015b84..db3454c9c0a 100644 --- a/Zend/tests/flexible-heredoc-error4.phpt +++ b/Zend/tests/flexible-heredoc-error4.phpt @@ -11,4 +11,4 @@ echo << --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 fdd6e5c950a..79102d76a41 100644 --- a/Zend/tests/flexible-heredoc-error5.phpt +++ b/Zend/tests/flexible-heredoc-error5.phpt @@ -8,4 +8,4 @@ echo << --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 c2daa72207a..42fb36ddc9b 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 << has been deliberately elided. --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 70777f26d1c..c98cc996c5b 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 9f4e19a34b0..15d42a5be98 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 5c086d2abd6..95627c09373 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 e6bd544341d..0cc73304640 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 c50dd4fa4a2..8d888df9ba7 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 650a9a94f72..f8155656fc5 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 7579c10b729..08c8fde79b2 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 e4f9ded844a..4c4dc7f0784 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 d2cdc86713f..d68dab85b62 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. --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 5e5538cd4d3..517e0ac9431 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 adc8085f348..b7482b66a02 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 44a87b8ba8a..9c73b93520c 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 bfce61f0c90..feed8b5964d 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 9d8d8bb7dbe..a8ba71c0bfb 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 33748649dae..8775bece880 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 97faa4eb5c1..94525c85b72 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 8e3d34d31da..14f71afc0e8 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 1b5b7bd908c..c9e5a6ec4ab 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 8ce8a928859..f07ac53148b 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 fc26f1e80ed..bd74e2f7625 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 7bb7b7a08eb..737025ae2da 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 c696f6486d9..6b622847cd1 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 6ede86e3baf..1b7bdd7935a 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 3a103888b05..14395d2402e 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 e3f21692e75..09da2a50779 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 4ea1b6505ca..e7fc2647be2 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 9acf8f9d936..6466c4c2e96 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 dfea5aa78d5..c507ebeb9cf 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 44a867404f9..a407b019208 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 edf0bafd319..316fc490df2 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 f56a3256847..52dbea89b2b 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 dbf2c948eab..2fc1e0a5913 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 f9e3f78f48b..8fbc6743b83 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 18781e75519..e5d79723e7f 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 91ae80e9092..9bec1381496 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 2bdeedba7d9..4ff2e4e41f5 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 9357168c80f..54eb0feb5f9 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 727e11cc457..657b36b8535 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 06bce25d709..52ca62d6ba8 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 edb32032ea5..f032fc882da 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 7704375d6ef..ad83ee717d9 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 036ffa7445d..072148ca567 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 d75670c7ecc..b691ccaef94 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 e4259649ebf..57ae5107224 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 6b14c33081b..45fc81bcb81 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 90b864f79b8..e5e65e3a85d 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 3b4925afa6f..817f337a5c8 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 0379dd26e3c..9f5b3e16f1e 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 3abb3a25072..68b35d3f220 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 6a7dc79b74b..4aa0f27e5e4 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 b3889b0bae0..5a625a608b8 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 53308286339..2cf7709b15c 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 8205435a5f6..634ba512855 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 b1d6daeb9d1..64e55a8e2ac 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 c10f96b6de0..fe478323f8a 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 05830f80ede..98ff4ee8f03 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 ad92fcfddc6..951db73b854 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 4987b29b2ca..77b3696f228 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 0ced2142cde..da8ac6cae94 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 6ee16f79b98..7bd7410c73b 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 43e532ce7dc..53a4fc76f9e 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 f1dde491f65..b4b713ff645 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 e1a50b6ecba..eedb9ab2c02 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 bfdfc420529..cb47bb6d0a8 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 a18e3b4d206..3d1939c5ac4 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 84cd22a9957..b10b7424630 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 607f8efeb43..c28e815be03 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 b700e2df943..79f906bd7e3 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 d8d41817c8b..9b1686391bd 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 f76b7d43a09..027aa64c203 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 083ae75e499..a52d3a722a6 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 13002c94a38..0fd93fcecca 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 b87b434fe440b1bd422b57e5fec7e3d20dae85e5..d518c29e3ebd8d9aa719ed7c8b393101492f5225 100644 GIT binary patch delta 11 Scmey$@`Yu?H^#}|8S4NexCNpB delta 11 Scmeyu@|9)7H^#|d8S4Qfu?3+3 diff --git a/Zend/tests/nested_method_and_function.phpt b/Zend/tests/nested_method_and_function.phpt index 3fa1b18da14..c63c601eafa 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 44b618cd708..f04f662e0ab 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 9ee6888a651..7aa6270a1ca 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 034f124924d..210cba9065f 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 ae2c8183455..405d3e45185 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 888d8e5ef43..d48afd5f012 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 b8f8c3f83d6..530e1352307 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 9cef33d82b3..f514de77c9c 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 e1f0ba3a972..bd9dfbd093f 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 bc5ab12cdbb..dd3ff766933 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 639687ee0a5..6c7a72f86e6 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 b6dc258fd3a..09075f6c766 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 9c81c0d4c87..ce0ac07e7f7 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 3220974047d..7fa770576e9 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 377da6a8dcf..7755d809e33 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 00657f6bde7..ed4b8a238ce 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 bb83ae73617..71c6b74a9bd 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 8511f1c8039..166828c8cba 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 5732e7e50e6..ee979025d25 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 21a1dd916a1..5618080022f 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 6e0b9379630..4452a6e175e 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 f33bf560a91..a809437a1bd 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 2e1c0e229eb..521926330de 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 6ada1f7bf21..1b226036cfe 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 c9d0d92deee..c2123a85f5a 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 9d10c47dcce..a07720becc7 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 d04b1af2728..09d7ebf3492 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 1d43e8fe323..d748747a03f 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 2f2738e2046..8d8b759a5a9 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 c60dd6a4b00..e925a60de8c 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 b23446301dd..b3804aeb764 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 7b0a2ed4d5a..6ee89b39628 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 f4d1e315fc8..a618ed20736 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-- 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 c9be479ead3..fe6ebc56543 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-- 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 3050feed53c..95442b96b4b 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-- --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 31cc8a36311..b13a7ec7178 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 138ae1f5b50..023ae586340 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 af9032949c3..eb0e98b6355 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 bef0421f8d4..c4c1dc05160 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 5597e27b3fb..dc7e0463fdd 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 9ecf3cab1cf..a7316136fb7 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 eec1ba260be..4c8f6c08aff 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 29dd54428b8..bcb918287d1 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 4ea5216c4ec..f8814e4bbbe 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 3e923983d7d..39e075efdb9 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 c0dcde39398..6a4f27d8c94 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 cbdb1cc2026..50659f16045 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 1a13f2de0a1..6ee7d5a4911 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 f7cb81bb20d..3ad48e74121 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 622aefeab05..033b5ad4ec9 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 0db744d089b..12892e84154 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 13bf93f4dfc..2b87a562f6a 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-- 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 359b25a28df..a4fcea1d25e 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-- foo()); - --EXPECTF-- object(qux)#%d (%d) { } diff --git a/Zend/tests/return_types/008.phpt b/Zend/tests/return_types/008.phpt index 47343d05640..f2e01299de2 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-- 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 b83703ede56..7eda8ce27bc 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-- bar()); - --EXPECT-- object(Closure)#2 (2) { ["static"]=> diff --git a/Zend/tests/return_types/013.phpt b/Zend/tests/return_types/013.phpt index 673a8f9dbcd..5b2c06748d9 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-- 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 3974eb67fab..655c5a9cc6d 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-- values()); - --EXPECTF-- object(Collections\Vector)#%d (%d) { } diff --git a/Zend/tests/return_types/016.phpt b/Zend/tests/return_types/016.phpt index f3636751c1a..cf31d96e6b8 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-- 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 d44b26fc042..d45cb55d453 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-- foo([])); - --EXPECTF-- object(EmptyIterator)#%d (%d) { } diff --git a/Zend/tests/return_types/018.phpt b/Zend/tests/return_types/018.phpt index 6c243ac756f..2512c6cf498 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-- 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 5693e95c7ea..f08c5275129 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 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 91ee2f8ce4b..6d0b71b23ba 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 f2ac88a7ad7..9f89d71102f 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-- 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 74aa8016382..4e9aa07f421 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-- getIterator()); - --EXPECTF-- object(Generator)#%d (%d) { } diff --git a/Zend/tests/return_types/inheritance001.phpt b/Zend/tests/return_types/inheritance001.phpt index 8e0523eb704..5e154d04822 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-- diff --git a/Zend/tests/return_types/return_reference_separation.phpt b/Zend/tests/return_types/return_reference_separation.phpt index cbf3ed5fd34..0151e5ec317 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-- 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 10fd82bea59..f51969c6c5f 100644 --- a/Zend/tests/throwable_002.phpt +++ b/Zend/tests/throwable_002.phpt @@ -7,7 +7,6 @@ Aaron Piotrowski 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 19626a31865..3e65027c798 100644 --- a/Zend/tests/throwable_003.phpt +++ b/Zend/tests/throwable_003.phpt @@ -7,5 +7,4 @@ Aaron Piotrowski 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 b92a81f54f1..dd844ba6612 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 cf2eadf2f84..65ecb7adafa 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 ff6f37d3c23..420689259ec 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 10f2e2952dc..88564a83c10 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 5db508fc853..ed1c324831a 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 31f5f534c5d..d7d4fc007d9 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 662140cec0a..d7de8216b01 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 8f01e72c2d6..5dcc78a8782 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 245bb94e97a..6bc3352e21c 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 7b4855a646f..ac3f070bd83 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 d72491f0305..9a8458d65d5 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 26ac927a817..6b4a09d059d 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 f525a66aeee..d4683a9921f 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 da0d06cd253..20132370c15 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 8b2b64e5348..b349cf2c540 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 baa4314a61a..401444e978f 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 bfc1ee303f8..77a70672321 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 d4bf7ea6dea..d38b1c0c24c 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 d5a86578ab0..51d24638088 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 857c582d804..c13ce8c2e14 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 5b746d56719..a9797f3c9e2 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 2601d1cddaf..683952025da 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 5b90ae0f3d9..23cdef3a89f 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 626df3d6eb8..73bb65d179e 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 44746578e01..b871bc8e4ba 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 5cfc7d7d510..d15bdd9473c 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 a940ab09427..eec2de1affb 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 5ce117ea76c..bcd75d9cf91 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 1cdd4f1cc64..d8ede9dfa72 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 9425b9215bc..1029dee6346 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 b289651a9b7..5c54f0027a2 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 dfc9456853c..11dababdb5d 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 a723639ee91..1327de1458e 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 577f5c73c37..e274063a6f1 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 eed429111e6..db72182bb3f 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 abae314d1fa..810681072bc 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 276d117bb82..0b4d87a295f 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 90cad90c46f..60c5fcfc0b8 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 0bcaca9f071..31c63a0f25b 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 ac29e2a1240..2f336b8b8b8 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 2b97a0a150c..9525b65b3a5 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 a582c3cd9d0..76959d011dc 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 84b14c34203..762c1e4ac5d 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 e2f77580a31..2ed2fa9c21d 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 5ab676853f2..67cb7f86c2d 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 65a792faac1..2d87de92e82 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 c1a0d2629f2..e40ff592822 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 998fde8e615..06725321959 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 ac3ab2e29ec..cd518f43e20 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 0b5918c614a..1b05382c0d2 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 5953c008d58..326481c779b 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 64ebf6bf14d..5c1a92a8060 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 01953cf7243..7417083f69c 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 3c3f3809088..ca02a85e804 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 9cda8aee1d1..9ba53bf08a8 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 bd7a6037124..b1d8fa3d1e1 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 ece3f61f9d3..ebd75094e61 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 2d596c78f8f..034a63b3061 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 838d12ef031..74e0c9d46fb 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 32fec7ab292..a099ed3d6be 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 51f6a264195..ff10dead42f 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 e4505f1b243..440e06593c1 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 aa073b05920..40784108a05 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 0466288d59a..3113bedcf03 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 01b69457555..35564ff1afe 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 b5e722cae3b..3489c32d37a 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 2f6c881017d..8aec0c009f6 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 b9e81194367..b6755c49b9b 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 74f6d83f1e6..b9e02e40cd3 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 47e79fa6b37..58b3f67f400 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 9c0584b51a6..39dede3b5c3 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 16e7875ff97..1253f48c16b 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 7bc2fda2b9b..fd7f96ab95d 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 b213bb11dd2..88b21be0820 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 7337ee4379a..e0644482cb3 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 deb7a8c976e..9afef254a99 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 87a09af96c2..b5ddc9f0d35 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 d064161480c..d8dc93bc1ed 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 e909ee01410..e083d586e62 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 41d871abb32..6df485b5c93 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 9c61a22bc39..aa8ee47db6c 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 c7d526eec74..17a4bc7944e 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 4d80a280b02..4bd828cda31 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 f8ca5b9da59..9eff0dd33aa 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 c451a281ffe..cb65712f06b 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 bac49c8e920..714615d7d15 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 ec366336c2a..8d67b989713 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 4b937a180bd..d661c66b146 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 049374ba409..df55f15ae5a 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 6b1f30e5770..5f0fa8a93bc 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 1e6dd372a5e..51c6767bd47 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 117756f1d16..11df405beaa 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 c52e2f3cf5e..d7ce2e5c88e 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 67d1efc2eac..1f3d284c132 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 51c020e785e..1600652ac18 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 c53deacc5f3..6a8e513e7da 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 82547e6ae07..049e0655546 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 74bb2bab8bf..443a0713dd3 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 f1e71bf3ede..2b6813a9ea0 100644 --- a/ext/bz2/tests/with_strings.phpt +++ b/ext/bz2/tests/with_strings.phpt @@ -22,6 +22,5 @@ $tests = << string(0) "" } - diff --git a/ext/calendar/tests/bug53574_2.phpt b/ext/calendar/tests/bug53574_2.phpt index 1ac4834cd5d..fd7288a0796 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 ffd617dfb77..4a8ecfa663b 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 4e4e9a4da9c..6559c936a58 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 c413a8163a9..aeb304e8ec0 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 1d2cf39c07e..c4873815acd 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 9bee0658a5f..deb5e80e1d2 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 1a3d0f17124..aeecb3af514 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 c5647804bbf..0f3ca8a3f8b 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 27944091e30..2601d14a073 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 b882d5f08d7..e8bf4a49aaa 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 78efd2a3e44..d6971c0663e 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 2f8f4aa937a..f4082e76ecf 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 a4648451aaa..5d4ea38834d 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 a9a2ff0e3dc..2dd03816196 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 c9ba3955d0a..2f65d84f36b 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 b19bcd6d167..89be28c7921 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 cc8f00f425d..27479f9cfb7 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 11855235c5d..5973d8a390b 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 25bd0e9b49f..eebf4a0c03f 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 d6b3964c38f..cbbc1f59eda 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 *** 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 05a4854e3ad..6cc5d599e2c 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 *** 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 69f0721fdab..8aff6fc7070 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 *** 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 d8eefb355d8..e2f2d14ffff 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 d858241b78d..0ad8fc7eee4 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 7a11493ed20..72754d989a9 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 8addd5de4e1..eec1bde0996 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 a40efc7411e..5f527202cd6 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 130b6fa7544..790bb6cf7f0 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 3922454865b..462cb155d23 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 ad59c8d9a1e..c226aa39bb6 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 8c4e4094987..ce1c04336ec 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 58b852e44b0..c2e6e4eed74 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 a88a34bf2de..ee88321fcae 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 e1d0a294200..f50a77ddb99 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 4421964d710..26a0c2fca20 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 7119f0f8dc2..0d3f15360d8 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 625b24df2d8..2e39f32715b 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 e6720c57972..364fd555146 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 354911875c1..883f9a7a8e0 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 508ac7b9407..2cf65f19794 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 5f0df798846..2562324fd73 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 e74799928cc..e3c9c587acf 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 99abdd7bc84..99aaeaf380b 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 8e36e6287cd..42a97ab20c9 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 e3af51d7678..6dc0f8b56ad 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 2daa5948718..1335025c76b 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 454e86c6b5a..3cb5e89d5a6 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 bc528e21d7b..cbcccf84b90 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 735df6ad18c..c202c0e0cc0 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 a1b5190281d..77c92ce55fd 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 9d742d93636..afec265d50e 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 bef8d4ec6b2..5dbc1efa3f3 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 4884d77bac1..332142856e4 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 c7d38956ff3..c18cdebeb1f 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 a6a41c10785..f2181d10069 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 d0c99e4f848..9a9d10342dc 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 8c5ae25db3e..422dee60e4a 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 a29212b1ae0..8913963de03 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 2474ca9e535..8f555314bd7 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 5beef23f450..a54c63658ee 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 2b94ac34e7f..088bdce6d5a 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 592692b5a7f..823a4ccbebb 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 2b220a7275a..61c553ddd43 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 5e83a5272f0..26e470a7d8a 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 1333f747ebd..abf2b354c6e 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 15db956553f..fa675fa2fe6 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 644949a2e81..717dfabe217 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 8d572479f30..0b27757309b 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 fb71d522280..75794cc632a 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 d17ffcd9858..09eeac0d763 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 04cde83346c..27b105c9980 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 ee4477e907b..c22dc3011aa 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 43fec3796a6..a7af0572f31 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 1f436d6c2f4..8fe38ff5391 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 149033660db..bd2a71172a6 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 a9aab110e20..3a6d304561c 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 7e0f32a6ca6..9e8e92cde86 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 b38354dae0e..bfab43eda63 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 4fc44c66676..549993b5322 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 0a3b9d41896..533d0d3d7c8 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 10a9f887934..77dc8223961 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 a6ef3b6fb9d..e24f3e6d84e 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 86350f4e7ab..5b6c48fca50 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 b9a83549235..ff277ecd6a7 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 7e5a9eb103a..9b6bc567e01 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 0224c3538e1..4c9dee85f77 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 201456b8c08..699416d3826 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 4347826aa01..ce1a203a202 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 b2cf13da792..955c05f55cf 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 59e336d9a5b..da4dd1836a9 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 cf3617039c1..82f42634a16 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 d1adf052e9f..22f079702ae 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 38e7f15dff1..c511d626e9d 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 f90e66da87a..5f9bcd552e1 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 7b93e9dac2a..0ff2f0120c5 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 f38ae7f86e0..b6b0ca43b84 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 5b8493ba116..39c71ab1dbd 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 93f7ed6d75b..a74bf7fd73f 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 90fc4bb9a35..c7e197af85b 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 3189e350741..2fd44a430d4 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 2c75de7ebc7..c6e88e7bb39 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 ba0ac00715b..f008486b1f6 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 --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 29ca8c585eb..44e0324ff3a 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 ca174d7926e..9898a406c56 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 e479c1e8b8c..9b37b4443a1 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><&" -<&"]]> \ No newline at end of file +<&"]]> diff --git a/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt b/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt index 4126f99141e..cf38004d85c 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 c91071f364e..787c5a7cfba 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 3fa7fba2db5..3726202d10d 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 4795f8176c9..2faa02eb582 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 813a0be52a5..55038e369a7 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 31a17c6186f..dd38ae2c366 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 45d25dd859f..fb3e66b4f82 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 8b924f04d53..be58fabd4bf 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 e1540f97c41..a5c21f0ad30 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-- - \ No newline at end of file + diff --git a/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt b/ext/dom/tests/DOMComment_appendData_basic_Sullivan.phpt index ae06d8a87c8..4d39ea46952 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><&" - \ No newline at end of file + diff --git a/ext/dom/tests/DOMComment_insertData_error2.phpt b/ext/dom/tests/DOMComment_insertData_error2.phpt index 0ead9624b84..73911cc3687 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 7dc8f1e9b91..fbf59d76dc7 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 6ffe510b0d0..e0d9dfa6f5e 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 7603a017413..b6ce9dcb653 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('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 8735ae6ecf1..45ef2bc6e92 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 73655b06d32..4d047a00580 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 c1f7d9b4de4..58259147778 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 d2426e88f8a..026ea2393af 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 e4d1c3c8eeb..a18f47f3f1c 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 49a7eecbf3d..18f069ae167 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 275bb65e3ec..df6c2bd9087 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 56f7ddda972..e689351ddaa 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 a4aadd7070e..e302fcc7f17 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 4e00fbb8d88..2a9d5a1d019 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-- - diff --git a/ext/dom/tests/DOMDocument_createAttribute_error1.phpt b/ext/dom/tests/DOMDocument_createAttribute_error1.phpt index 745873aca90..9a1cba48132 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 9f45f125d56..1c42f23b865 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-- - diff --git a/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt b/ext/dom/tests/DOMDocument_createProcessingInstruction_error.phpt index a0c12b1fe71..e660b93e7f6 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 9fc099bfe21..6ac405da698 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 17daddf38b3..9482780b213 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 a772bc85698..17430d07704 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 0f26e57d0cb..3eb6bec21df 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 ccada3fe996..f228a18c1ee 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 e477a1758d1..bcad72dce5f 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 09cc9950497..a0978ebb82d 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 2316a3897d4..4a79ea6c3f1 100644 --- a/ext/dom/tests/DOMDocument_standalone_basic.phpt +++ b/ext/dom/tests/DOMDocument_standalone_basic.phpt @@ -45,4 +45,4 @@ string(136) " foo " -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 a95b0a30437..449fffb4eeb 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 4dfafa267d7..cdf36319b37 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 be8f491922c..538ba968f40 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 8d1c10efec0..cccfff9a65e 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 7e15c47f13d..624466051d4 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 92cb79d128a..a4b3917d297 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 0eea699a768..1472a955ea4 100644 --- a/ext/dom/tests/DOMText_appendData_basic.phpt +++ b/ext/dom/tests/DOMText_appendData_basic.phpt @@ -37,4 +37,4 @@ Text Content: data><&" data><&" ===DONE=== - \ No newline at end of file + diff --git a/ext/dom/tests/bug28721.phpt b/ext/dom/tests/bug28721.phpt index 818e62973ec..941c8eb8790 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 c6f2b5bf864..7850f064ee0 100644 --- a/ext/dom/tests/bug32615.phpt +++ b/ext/dom/tests/bug32615.phpt @@ -72,7 +72,6 @@ echo $dom->saveXML(); ?> --EXPECT-- - @@ -81,4 +80,3 @@ echo $dom->saveXML(); - diff --git a/ext/dom/tests/bug37277.phpt b/ext/dom/tests/bug37277.phpt index 112b9f46559..f40df6e7a39 100644 --- a/ext/dom/tests/bug37277.phpt +++ b/ext/dom/tests/bug37277.phpt @@ -19,7 +19,5 @@ print $dom2->saveXML(); ?> --EXPECT-- - - diff --git a/ext/dom/tests/bug37456.phpt b/ext/dom/tests/bug37456.phpt index 5f0fc287783..d5a833413e6 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 9708937ff79..498d8f03464 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 4ff7ac389cb..657f193dbde 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 - \ No newline at end of file + diff --git a/ext/dom/tests/bug46185.phpt b/ext/dom/tests/bug46185.phpt index 927a6e59e63..eaff4136a21 100644 --- a/ext/dom/tests/bug46185.phpt +++ b/ext/dom/tests/bug46185.phpt @@ -20,4 +20,4 @@ echo $aDOM->saveXML(); ?> --EXPECT-- - \ No newline at end of file + diff --git a/ext/dom/tests/bug47848.phpt b/ext/dom/tests/bug47848.phpt index e484e9c5dda..b9f72d3069c 100644 --- a/ext/dom/tests/bug47848.phpt +++ b/ext/dom/tests/bug47848.phpt @@ -22,4 +22,4 @@ echo $aDOM->saveXML(); ?> --EXPECT-- - \ No newline at end of file + diff --git a/ext/dom/tests/bug66502.phpt b/ext/dom/tests/bug66502.phpt index 5b35b41e939..62ca4424d7f 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 346d8135bb1..597736665d4 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 8908aba55d6..350d3034bff 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-- - diff --git a/ext/dom/tests/dom004.phpt b/ext/dom/tests/dom004.phpt index 5b65f24ba10..3a9295feb30 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-- diff --git a/ext/dom/tests/dom005.phpt b/ext/dom/tests/dom005.phpt index 0aceb881bf3..d7e828cc328 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",'

','

'),array("DOCTYPE html",'',''),$xml); } - --EXPECT-- --- save as XML diff --git a/ext/dom/tests/dom007.phpt b/ext/dom/tests/dom007.phpt index 5d12aa344d7..b0062e8e4ac 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 ecabe733343..e9d0f89bf89 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 d44babdeaaa..8982f34abe6 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 9097a887e9f..a9663f1543f 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 - diff --git a/ext/dom/tests/domchardata.phpt b/ext/dom/tests/domchardata.phpt index 6baff6d148c..52bfef2fd21 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 24104a1a0b6..e73e1f163a7 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 9a43599914e..481b47225b4 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 90754100ddb..f9813628908 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 bc69af602c3..43a6e986035 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 e63c96ba935..da91142ef55 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 288278412f3..d346bfba38b 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) "
<p>hello world &trade;</p>
" - diff --git a/ext/dom/tests/regsiter_node_class.phpt b/ext/dom/tests/regsiter_node_class.phpt index 311433b12c3..1511a1e5072 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 2183960716d..b35f19c7db0 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 a66aba3a51c..cd2e48a0d47 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 8f85339190a..031afad072c 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 185d39c1d50..d47f8849a2c 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 894c76806d8..f16eaa94592 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 4c8cd45dc97..f917074410f 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 8fac4286ca6..543a9bd4f54 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 d0a1b7b3ba0..daaf77d83ad 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 e34e3a04217..b472aa826fb 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 936e25777a9..a37090da41e 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 1248d39add1..d04c1f7c506 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 59c9b8d12c7..3627ad969d8 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 3208046b03d..79e92f488c6 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 59353e7f819..492540b424c 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 ddf847de05c..b2799909d34 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 2408ad5ce8b..e4f1a8c0c6c 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 f603aecd86a..9a141243622 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 b63b8a1b014..3ebbdd33fe2 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 6895a10017e..2f3434caff8 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 48cd25277e7..d4f72877e28 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 b8c82db793a..3887d49cea1 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 ff8856ef532..46824156499 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 504df2b042a..a761a755c1c 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 4078649edf3..388afc3ff6f 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 62d8e43d9b4..a29729f1f31 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 d6bc9c68c8a..7014629f372 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 fdecef31ee1..23485582983 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 3a3891d72c8..744773b5501 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 ed210681d36..82e77574568 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 91889f1980b..a9591d3d56b 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-- - --FILE-- - --FILE-- --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 b9e4253fe85..41911e33969 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 4a1f63e3885..dbf7ce331f3 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 1d936434297..9ea9bd2865c 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 6626cb4bedd..84063db05f9 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 f139696c7f2..85fcf76f799 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 07becd0703d..84eda6c343e 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 905865f28ff..266e470de0a 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 7548008a620..1459bb000d4 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 d926fac38ef..87390cb489b 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 9171fb7f06f..4fe4769a7be 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 964cf6953bc..7bf9f56cb03 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 79ed4f2cf4c..65c3859c6ac 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 eb9e8293fd9..8f5205d9366 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 a28f940b76e..34fafa94231 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 1f767f6f972..1fb84f28bdf 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 fc4a60439f8..7dbfb1b40e1 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 2cef56cc324..b4f5c9b78b6 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 5714e107cef..d0bf3a89c23 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 9cb792126d4..ed4665f439a 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 8d574e0559b..6aed9e93617 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 6252be7d0eb..fb1b5bde94c 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 512aa8b4c1a..a3aa491cbe9 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 3f9e219fc36..e9331ec6006 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 d243bd2f14b..97bd3bdf885 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 a15252ea41c..403354d1e21 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 3cc10a42018..16b2edc7a18 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 7bcbc4e68b7..3fb7c2e0042 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 6d49f32b071..4f7607b5dda 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 - --FILE-- - --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 426350782e3..e0e9adf852b 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 b584e18634c..c2ed9446d6e 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 cc17bafe0dc..8552f976c79 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 536e2cf842f..e7b5807bbcb 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 bba92624229..793c02d106d 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 018f243dc4e..fffd0557c65 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 b6afa80e8d3..11d483db955 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 6003bf18b4f..093d9cda555 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 5c36b9757d3..2cf5054a0ea 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 735b4c97dbd..586e1f8461b 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 - --FILE-- - --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 32c175664fb..9ae79d22249 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 3982e8aceb7..932cad5ea22 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 03ac65be9cf..421c5932ee3 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 8a439075f24..7f0d2f366ac 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 278a4a80239..2370d5036ef 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 1ef93549195..25e54fe36c6 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 44b1be144fa..26cddf3400d 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 d43052db7dd..fa323897ba7 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 8b3033c39b8..ab0a9fe6530 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 4a45fa3c47b..3d495847913 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 9a5b7c39ea6..56ba6462e42 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 dd84ff414ad..4e2e665bda1 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 1a7083d5267..356d6474695 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 - --FILE-- - --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 112f9df8637..f54270afbc1 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 5052472f7ed..7e7d6a7c22a 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 2c3dd0d4297..3418449c018 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 6486a929f23..f2cddbcb92f 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 221e6b851a0..850ca806b6a 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 54a57496058..1d3e4604447 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 4c909343cad..7756b34d5a4 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 c18b4fd3d16..8a14ceba1e2 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 d06afc47294..f658fc64cf7 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 2c999695e91..dda8497222d 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 f2d594aa5c1..f92f7c1deac 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 de16b65d9e5..17d7d58d397 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 207739b3f8d..12ef33ab05b 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 15107fe0f97..822e412d83c 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 0361f45e918..2feb2b2c281 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 0ebe66e9fd8..d8b8794e5a2 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 8bc1854e041..97c9fbb39c5 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 97939a469d9..1c9fb26194f 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 372a95740d0..c5e8f026228 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 c74194db2d6..cdf185600d2 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 0417c0ed52c..86548117fdd 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 4bcf0930b02..787b0b3af3b 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 35f23b0d53c..57955560466 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 9d6c8ec5157..e563e7b210b 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 fbc8901cfcd..52449ecf0af 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 b7ae6600edd..a9e93144834 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 2bed29e6dd5..b5706b057ea 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 76efff48b39..b4240ac7cb6 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 --EXPECT-- 1b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c1b2842 - diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt index a9951258153..1323ac1b30c 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 38cfdd37b89..d859122ef1b 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 03b3574d6e4..b05bd560d74 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 1c57cfbeff5..cc0c288d554 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 0526fce2a56..c1460514403 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 2d02b1c55a4..5d2a2090fe1 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 d4ed01d9568..d2e7f5713f8 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 24d1794f3fd..c5b76f3ce9e 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 48d664d6002..f08d17754be 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 71431f7bcef..6a16009ca35 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 5973ca0640b..ae10b0dc9e6 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 f76593bda28..e169b4ead53 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 cb20eea7d10..9d62320b034 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 e6abca5df15..40c87001e44 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 4176bf9165c..1a3179afea9 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 906f46bc315..62020063d84 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 348cfb12656..23f0b6f2eae 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 be5afdc93b2..c8a736cfc0e 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 4cb858f0db0..0b378cb5030 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 8aa3ce42a52..70f887ee270 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 1eb8f7b21b7..0d395adcaa7 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 798fe7f85cf..de7f52d22a8 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 5a97c2a5acb..55c3f628894 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 7ada6fbb91a..1daedd146de 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 948cc67c77f..f1492798001 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 bf2a5d9efa8..504af12bd78 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 b9a18209335..7068f0fffe5 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 16b7a9def82..1ec096c1631 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 573c2ea517f..51d99ddca66 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 297a7589d38..59e26a4a184 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 35e5056e0f3..86af94ae592 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 c27e60d1dd0..135c636718b 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 61c01dc0d09..e0c277b59c4 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 0bc0661026d..6214aa298ad 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 c9eed598b3c..004c054963d 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 0ff231401af..73b1947e0d6 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 e46268533d1..06b0c1d4a4b 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 1c75a944267..77747c8d8a7 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 ad45f4d39da..67c63077f49 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 63617686b1d..cfe526844bc 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 afee066f4a3..4334b62e8e7 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 4a1136c07ba..60c04d406ea 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 436cd5c3a34..edd899c9216 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 7775ec0c3ee..0f7149917ec 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 fc6d7e56a27..c2aae5b1765 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 05cb128a61e..2171403cd1e 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 0456e23c087..7d8e4895576 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 bd04308a440..f33f4963fa5 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 2ca498dc9a8..69fb23f55bf 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 07eb69bf685..ee17fb39b97 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 23c35739963..0c03d0033d2 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 60e30ae21bb..1ec02600d7c 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 b460adceaf4..9a9acfd092d 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 cf360045ed6..b3ced2337b2 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 ffd153b5f1b..f682ff66f00 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 10089e28a64..d957b1182d3 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 4cba340d840..595c6b283a8 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 d838f81217a..e8b7d341278 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 90228e128f6..13adc53b031 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 2ce6da76977..1f3e679f476 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 5c902638a3f..4d05792c0e9 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 2fd48f66508..4f3a912a150 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 2ab681228e5..da37ffea781 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 30798d99a33..c139a2c3b42 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 ee53c068e9d..56ed60ffcf4 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 9e37a31e612..f318743948e 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 12a55e7e0ff..b7565405785 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 91e9919c15e..d66b4bb69f0 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 1f416630a0d..f0920dca8c6 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 0472ed4a444..eb4664308c9 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 c3343af57c0..c844ffcb6c8 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 a7a73a08d82..c94a8433f1b 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 928a235a83f..cd8b6791712 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 ce9728023ab..096b57558f1 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 c4155e9ab5e..ef5ce3fc042 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 0d0f07e768c..21cc279eeea 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 c452d0de6dc..530d5eecba7 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 e7d7c1dc1d1..9ee58123c84 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 dab1252afda..279462e7896 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 5bc6497bea4..2c276245622 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 7f0c4cba51a..6cdfd9f5a94 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 67882552896..ee7c49547ef 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 152feedc394..3c95eeeaac6 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 782c32c11cc..6c3d6d5b901 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 1a182afdd94..1faf08c2871 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 70ef6ae39a8..685b0582bce 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 cbd96052643..62a7c02f0b7 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 ad2cbc356ec..017551821d3 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 8ef590c974d..00a68e620b1 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 bf655bee793..5cb9fa1c634 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 bdfe8c27cb3..4c585a6018b 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 d09df444522..4f3fc351cb1 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 1863b7815c9..0c7e471454c 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 2fbf7196f92..1074159687b 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 e9edc468e59..3aee500fea2 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 9d83f378094..46fe17d9cdf 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 97b7d9c0c19..fd999fbbbf4 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 5250bc064ee..cc52449d943 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 4d623f711f9..ca2dc4a9f23 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 44874742179..717c435be73 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 01ba795bdca..008e1b756e6 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 b2c7e5b46c5..a1190e5ce04 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 31991bb591a..712e2108518 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 3ecdc13d2f2..06aa679c5ae 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 5941b9ada06..ea7e85db4c1 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 359b8169977..61eaea97dc0 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 b5f32d5768a..c124151893d 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 122a0663fc0..d61c9d5a252 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 999c050b9f5..6c6f67f9539 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 989fb8b7cdc..d7d20ed6cd9 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 f7026e07195..37e3816fefc 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 2528f362c95..59ad43647cd 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-- - ==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 f7a004f2a25..94f540abb1f 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-- - ==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 6ed1f48c3cf..6644f477ea1 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 e7f8765fef6..c7e30fd6456 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 26fb95c173b..263d82bb376 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 53b244879fb..7e5b2beaa6b 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 71fca1d5024..c1f8180fa33 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 c476bfb62ad..27160ee8ca5 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 82cc3f245d3..a22c3b28427 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 3091d9a3302..b2a6f25d5d6 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 bf7584ade1f..48d18bf28dc 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 bc216772cc7..776cb8b8250 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 9ed6238d347..dee773d377e 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 aa1eaba209e..767aafa95a1 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 3d45933ee77..d3fa46c5919 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 929f7427aaa..5827ad41ec4 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 d38487dabf4..b7ffd313217 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 27a74674bd1..584bd28f65e 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 78bd216629b..505a076ca3c 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 d10ad42623b..255a1f484de 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 5e12b96ae81..f9791004f3c 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 b2b08f362d4..11f0fe0137a 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 688ccc31bfc..7d308df6b01 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 03125241480..33d2c8bfbf1 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 70a8adc9136..141ea9c806c 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 d68b1f5fcba..c8fd0535d80 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 a2cba4c76bc..279a132478a 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 567a7eb8497..67aee949476 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 5ee72446f16..7ddacfa25a9 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 6ae6dfedd36..3c233eeb95c 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 22b0f6adbe4..d3b671f3243 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 24e21b50d8a..bfcc951b73c 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 d2ad66c829f..d5a7833ded5 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 4ac5555d88a..d2ab92d86a2 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 1db8828ab3f..b741906ad6d 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-- --FILE-- - --FILE-- - ==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 f4524cea43f..3d22f7d03d1 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 77d7caae3a4..5379ab2d5b7 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 53ee8205403..c50a6a81086 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 f8aaf2bd4ab..fe8841200ac 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 be6b1221ced..967c33e2329 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 f90aae011f8..53a715e6a7c 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 95e0648c33d..201a4f68723 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 0535da477ba..dea3c2d36ff 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 f1306094c4a..260e33a350b 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 6b476edaabb..6c5896daa47 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 30dedbb3451..bef69db8771 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 76c5cbc6521..a1cfb593d75 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 125dc15cc14..9da5aaf4188 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 74833eb14ab..0dd27802b5f 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 6a794fdb120..1ddbade97b8 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 48321094d1d..69105a6b045 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 da4880a97b6..1b460b65e19 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 00b8542ed18..69ab9f37cae 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 98eebd7e645..5cbe9a121bf 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 5f4d006178d..96b1f39b0b7 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 9e14fbc5779..c828b43abbd 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 aefed90e97e..8a6998a35bb 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 3a94e095e21..36ccf0b147f 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 995eee6f2e7..90d057c50d3 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 6e393cdd087..63caa7d4728 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 70a2bce9125..5f8c25ec2fb 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 80eedbfba5f..a9c4d32ee45 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 f8e3d333259..e2cb3291966 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 d7d865c7a70..800fc9a021c 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 4d8f4bc3e3b..3087f49cbe8 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 07248982193..f2f2e021b9c 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 e1e7cb9333a..ea92e28d955 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 d428b530524..5edfaeaf6b6 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 2be821a67ee..553223ee4ca 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 10e2621ae4a..c846b0b20e5 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 031882277e6..f50e59f97c1 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 b29ca677017..684d946b1ef 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 26526dc72ec..9df04f08c14 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 61143ca4902..8d30f8840fb 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 f22ca4eefdf..facb8fe8cfc 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 a6d704c0354..f5b06b07576 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 2f7cfcfe2af..6b8ce7d5c89 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 15afb765e4a..ca478a10d13 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 a08c506cee8..4d0ffeb96fb 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 632fa5e85a5..d66716e552f 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 1015ef4ddc6..dc7df51cca2 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 9d08bbbde00..7a9e1e1ca7d 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 258b8807b70..eab4573a360 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 041255be9f4..7d5f50206a4 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 d96bd488ee9..57773c256b0 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 0e9b4a8bd6a..4ec73a96a6a 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 76981a4a917..831bc3df1ab 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 f36e28494ac..d00e78fd3a0 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 d3f9471671c..c6ab2eefe58 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 370dc45b6c5..e91d5f5ba9e 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 528eaad7db7..94a1ac198ca 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 23d569b8982..3253b0f7933 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 4de032dbd6e..171687aae89 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 7ec6cd0a5a5..d1549ec1b68 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 ca3de096da5..1a1e80ba68c 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 d65fea99045..e700d2b172a 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 a6129ea271a..ec8282447ac 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 d1066a89204..fa651387f1a 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 67e02c9d754..09b6c231947 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 12168f3ccaa..09121ff49b2 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 d21d95f8d0a..3cfc0078dfd 100644 --- a/ext/intl/tests/uconverter_oop_subst.phpt +++ b/ext/intl/tests/uconverter_oop_subst.phpt @@ -16,7 +16,6 @@ foreach(array('?','','') 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 c9820faa9fa..2b0a49121a9 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 47c2e654871..21dd42f8c3e 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 9b520ed9a7e..e733b328544 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 1a5f9d1bda8..719e9fc50c9 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 159c9f214f2..1aa90750da1 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 21bb4fa31d5..3a0b2a456b3 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 a79be004ffe..d5f4950c60a 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 2169c0ad2e7..424a4575aff 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 fbcb0545ae4..d80e02dee73 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 e4540a452d3..d156f56c87a 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 ab56aa2d0e9..73260690d0f 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 7f1adde613e..40b31ea85d3 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 95819270434..d65f77e9f8d 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 b6251bea6d0..e51869cf47f 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 842c1092b83..fc5e589bd21 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 753842cac4c..01ae2a7525b 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 e9a11d054e3..5825a4901a8 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 da5e599da00..72ea62a7fc1 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 41ffd70924e..aad4b0de4f0 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 3d7206c3eec..d2bdc9cbd2a 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 002c5ed1744..8535a95d955 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 1b43e3d11b0..c0a7c267fd1 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 fc9eb077b99..b3fd8464b8e 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 cb66d4e2301..dc11ea244d9 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 e61e403dbff..321af919478 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 002269b680a..2138aff255b 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 b9809b2bfe8..4d65c3c5d98 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 f0f62dab07b..f3728486aec 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 f2d42fa682b..72a4220e8ba 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 13faa9d12db..06f10c291ec 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 50e7076a13c..e29b9c063ee 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 b3bffb61d83..b83923756de 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 PHPUG WΓΌrzburg diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt index bc1c320c3db..e4d02a2269b 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 d50330849c3..4972e9c3e0a 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 8c6ee3eb5e9..664ffd7bda2 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 3c98cba81ff..1352088ccdb 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-- - --FILE-- - --FILE-- - --FILE-- - --EXPECT-- *** Testing mb_encode_mimeheader() : usage variations *** diff --git a/ext/mbstring/tests/mb_ereg.phpt b/ext/mbstring/tests/mb_ereg.phpt index faf6ea65e40..ff507adc079 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 021200dfdef..b13f012b7b9 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 a67acc3c596..59ff022dc28 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 d483b6609dd..35fdc6339bb 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 9413da82b94..26838341fe1 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 ac30149099c..3627468371b 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 1e15dcc433d..7c152e7b463 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('(?\w+) (?\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 1bf8a2714c7..66eece72608 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('(?\w+)', '-\k - --EXPECT-- _a_ _b_ _c_ _d_ _e_ diff --git a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt index e69e147e482..39bdf510200 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 c85f68aa064..deb8b2eb418 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 ae59c3e3d2d..e9c8aaafc75 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 2304529f564..5b76ad0d281 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 49182248f81..a2049df144b 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 b879de750e9..60baf8743e6 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 f6a93ebc832..ef528a71735 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 756e8761267..5264ad4fa66 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 fa32c2091f5..54efbfb3f81 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 0a7eb53d77b..24b12f25a77 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 5a2e746dd68..97e5e58906d 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 e35b9ef5cf2..e43d051d2ac 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 3a4916d7511..5ac57d3e42b 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 cb2ea21f773..da2c6407ce6 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 6ef4be23d90..d4bc8de048e 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 954f7aecc2a..c031569399f 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 216c789c54c..ba53c484014 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 dff5c977437..1e99229dffe 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 d4612d97751..01742d101ee 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 071c2b1ef29..1fa73421f69 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 baaab535d4e..0ef9eb4384d 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 26c8a998f8e..301df8f118f 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 f25ab1615c4..216beec1ccc 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 7c78ffe02f2..e6845db0250 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 f257604c6b6..8d23276f2f9 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 3038bb34501..23a8b6c5a24 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 b92aceecdbc..bb49022e0f1 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 e762bb4e713..b2109ee8e02 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 436ac90811f..cc05393a553 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 8f01425221d..15b4c864c80 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 5842a8c6fd7..2352e82beb8 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 512d76de043..0ab540b959e 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 421c4d984ba..2da54e6fe9e 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 93111271319..17c1e0c6e67 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 f55ec59f6ee..9965120e232 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 f9b8d9bcfdd..a9b168c5734 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 404af22c457..097c8dccb42 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 2d8b8009c06..f13780cf3b1 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 053a1cf7269..8b3108bf698 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 be28a5955c9..a6846cd1248 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 d542b54b3d3..ed0707e6bb0 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 195060be072..72ce6865a8a 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 11d289f52d3..fd8f6ae2265 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 bf035a412d4..d9df624bea5 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 cd6c111206b..9376443cf41 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 8a23321c026..85c951eb831 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 a7011dd278c..3e1f6c9703d 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 5a9068e606c..b7632020c5f 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 057fc299ced..004660ff1f9 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 bf918df1825..bd0bd58c441 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 05091b4752e..17bd8c7fe29 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 e8f48345fee..72601442fd0 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 c14d2f1b5c2..e475a7d2e6e 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 cf429265776..07c67635500 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 6331db27bae..3bf6e181034 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 d92b773ba4d..498f94fba41 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 de77f392250..3a40cb9bf30 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 0c4caf6fd1b..7b126e671b3 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 da439b4a205..25210078b80 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 4fe13683eac..29b93b638df 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 10df85ea279..f738876469f 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 94a0d8e368e..28b35ea9101 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 3b1e442724b..2324ed09394 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 c38e3adca4a..29d1d6e22e0 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 6e5ec9ef2bb..5fa4f25975d 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 5a72406b6b0..d65774ab609 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 f4a4643421e..c31af9b9ef0 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 a9be0686fa9..94231a46243 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 b1783c839f2..172ab962b06 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 da00d4b80a9..909393177ee 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 59e82ae07f1..3b8cb79cd12 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 b07b6f52bc2..18a223e70cf 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 ed09b2eecb0..f7a72aea05b 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 5a8dcae0c1c..1c98577454b 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 2e2089d4b2a..c526dfbdffa 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 349788eb92a..e19d4c31194 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 cbb1cccf960..e1f5be989f1 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 2043cc5d076..d60c52fbdeb 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 26b5763bb48..86c7fc2e57d 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 0ae09df842d..f36e524d11c 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 78079293484..906c0f027ba 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 421899d10a6..21fd278489e 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 de950b00f72..bad41056233 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 60170a727e0..b534f7d4557 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 ee2713672dc..7196ad48c69 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 d5466e22419..8b3c9609240 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 06f03c0cf1d..4688ff9f8a1 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 6512cd8b9ca..57016de4b84 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 2011ae630d6..d9cf52eddcf 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 81450d28451..fd8036fd1aa 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 2528519ebd9..17a8abce77e 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 893ca0dce38..5294a24883f 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 937d6241652..3b472f9513f 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 14b8dcbdba6..51b2b774bbe 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 69233d683e0..f4d985a7442 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 67e54d632c3..e8d38353740 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 936420649d2..cf59999eaf0 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 c4b17104392..e51aec3734a 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 9360b4f3d4d..8518b45a3eb 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 d6427e78150..27d8fb3fa54 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 7ed9ba7523a..2ac48964321 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 3fda5600804..1eae37e1a53 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 7b18e027b88..8e755b98461 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 b0d259c3f4a..919625c8cdd 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 03d5d5562cb..5826a9834e7 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 ae881e1d2d4..bde6460d97b 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 3e288835508..a860f30d815 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 ec67e476ca2..86ddd670691 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 2a324f7e405..e84dfc2a103 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 964e38330e1..daf79ebbe4e 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 3ddae3e4204..7dbbbb20a2d 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 1abc5e7bb69..8e4b8c3b2c0 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 064bb42bb3d..a89488fa58d 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 6f55d03716b..9328e0e282e 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 e91d8c26ef8..7128de8d380 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 00bb90724c3..dab3dfa78dc 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 0c75488dd69..e839e7e64e4 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 a05acb825b6..0632553143f 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 04d6c8a0153..9043dd7def0 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 fa02853a191..b10485d5a25 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 c4852ac91d3..b1d53142788 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 d5795bdee8d..e36993bb6bd 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 0d7899d177f..17160f78f11 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 c195173188e..29ed2fd94a8 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 b71d9b2e49a..6452d6ab781 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 6f457779781..48b719c6296 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 3aaef33c675..997469d39c6 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 90fae8b7c6d..86e54ffc93c 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 b790f628397..a10f11136be 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 3d877c0d9ca..4f9ef6f80d3 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 33c5dbbc56a..e9ca36fe49a 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 99c1380d95a..d6d7a7582b6 100644 --- a/ext/mysqli/tests/bug35759.phpt +++ b/ext/mysqli/tests/bug35759.phpt @@ -55,4 +55,4 @@ require_once('skipifconnectfailure.inc'); --CLEAN-- --EXPECT-- -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/bug38710.phpt b/ext/mysqli/tests/bug38710.phpt index b5baf194427..7a47003632b 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 ef0c831e4da..8624250eb1a 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 89853a3acf4..948e4aaee7b 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 94bf4236dc1..ef46c97c6a5 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 f20cbb1b118..d9093f0347f 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 6d0ee6c24c3..9f26135c602 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 815f79013a9..11157195ab7 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 7e4758887f1..22fcb735e33 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 a34b7a3416d..bb8d00109f4 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 6ea62065b9c..e7b16fdd13c 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 1caff1a27a8..80e654771c0 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 3ad913d9518..e996de361da 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 9cb5f457267..d5dec314cf5 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 cf1309e5a20..f5240bc926d 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 4e9ef3181e7..0f062f00350 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 3651ac23cde..e3aca90ea7c 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 7ed7b447bf2..74ea471702a 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 b5dfad77cd7..86c5c4809a9 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 57f05952389..b316ca9fe36 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 00fa9f0af66..d25e09b2f5b 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 577673f0b5f..1f3eacecebf 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 12370b18cc8..36adab22b07 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 68dd8341163..7367a5cd7c1 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 fd14154322f..8fc4583a4c9 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 62f01cac6aa..4d3c883e451 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 3ae00500177..66cd94bd540 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 c2d22ee8eaa..e596a1891ab 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 dca311ea939..d0c79d6c71f 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 a43b8da460f..cdc80497197 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 5ede44591e2..e5a1b0fc99b 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 97ca40c61cf..c5ba7493c13 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 28aaa582ada..6a90e3d3f0b 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 d644bf92047..de02d0ebd7d 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 9814c6e255f..268bd619cbf 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 02223809eec..9f70cb48991 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 e761d065324..2b82f91d65c 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 37891f55e68..d1a8730a06a 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 e23ddd1671b..17b4b37529a 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 272be79f8ce..853daf0cdf7 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 171a1a4010b..4701926d6c9 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 ccd94043a17..d372ef55741 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 e09e8b2cc3d..f86502704a9 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 22aee90c490..fdbf222df82 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 09ff9d193d7..551877e8002 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 f55a32b9519..45b009051b9 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 70464ffb513..31661bdda2b 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 5057d47fba8..24cfae7a9a5 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 ffb9e954cca..0e8642d35da 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 880ee321f04..9c889caf8f0 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 0b3d772d5c0..5d9b2aad949 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 d12957b1130..ea1055f8060 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 3cf7ac2cc25..dbf5e3004a1 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 549d9c8a72a..a91d84413c2 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 81b5ac1b4db..ada57f7d9f6 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 28313670ad3..b24ab11fbdf 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 d1eb116cb0c..3ea1b4a70d3 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 30b95748b3d..ddbf4e73bb6 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 47550dcc6e5..01e53d5fe85 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 12c858fbe45..16797aa94b3 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 2833f3fb18c..496e5e48fef 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 1059c3554f6..85eb90e65ac 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 996c401f749..d966eca05e5 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 7e4a7971584..28898b1dcb0 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 67a5ab6d5b9..7dbdc134eb7 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 85a36981b5d..7b69aff6173 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 a00ab15948f..df273c4f14f 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 465f9fee970..481f49eedf0 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 c1ed86d88dc..08139081c4e 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 a78dfca20f1..734adcf5c88 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 f0c0bdbc7ac..94acab84bb0 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 760da471dd9..b2639398378 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 70835739cf5..cd96c55ad5c 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 1461933015f..190158316b0 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 e2626240d82..73b2ebe95ce 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 9af480e003a..f1adcf49f55 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 7222212db0e..e8c592f9ff6 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 b60bb3662b5..f4be4c7c7bc 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 960c4a2635c..311d8ed21e6 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 99e51e7c5e9..4b610c3a9aa 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 6e210bd4c57..926f6b797c0 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 c821177eebb..ca2acd1369c 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 ac17c22b84d..3fb14d25d93 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 2ecd838592c..02913daa690 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 8a49ba3f82a..b9c66381f9b 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 84cd0f68b99..7c10d13df15 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 9d9ef64d916..bfe780a9cd1 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 b10706aa04a..0a1d22d7567 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 2577aa76ee4..81ca8c0faec 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 1df5cc87602..aad39cd94d4 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 47535f937ec..d4e43243fa2 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 ba4c564385d..bb9a77a0af2 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 3dcf4981b8a..889fda5fbd0 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 5cf5ca8e3bd..0717aaf73be 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 26657934070..d08ffa5e7d2 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 6164197a6c3..6eff412a1d7 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 5775b0eaec7..cb0d1169c88 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 7de2bfc21c0..d07985c2b7e 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 e05843e5b76..b48df9d410f 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 0daab8b11a8..0b1d41a1760 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 bc189dea3f7..b8f209ef79c 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 2e3df083b7c..72adfb04e7a 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 3818b6ccfd8..734d691c282 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 6d096531e80..11755b4aef9 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 957044cd674..3a1c004c2e7 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 f9ab2675026..6537b8d88b7 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 293761bb846..aed04962f22 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 8c7c799def2..6ab270b8f4c 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 49ca6f6bff9..495fcdce7d6 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 00bde682841..22eb7c9074a 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 87dd01223f0..c7109063e72 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 a717bee50da..8508150f981 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 9bfd7d69580..a2965b7362a 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 8564383bc93..23a8ad27a86 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 c53101a0961..8f4e13ef394 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 44c1f1bdcc5..7f858e02169 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 eeb74d90931..38048894aff 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 07acb041b5e..fa26a3a45e6 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 6576c15d902..18dddc90c7d 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 cdbccee1987..3f82b8a8925 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 2f6a87ba425..15b93dd209a 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 f4471bf831b..a6bb1946c78 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 d3ae47d0b4d..1079ac374b9 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 4ae085b4d18..0fc5fedfa4e 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 5431a90f6a9..5633673406c 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 45ce8c7d5b5..b48ec513ed4 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-- - = 10)) { --INI-- oci8.privileged_connect = On --FILE-- - - --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 c965e5c4b71..fc4c3d8d936 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 eee21b557cb..eb1a6b38b45 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 84d9e34b310..9eab31cf898 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 f65dd3032bc..e12e0922b15 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 5cc515c4aff..f8cebc152e2 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 e8d84a93042..8605cb1988e 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 77b0f321838..6e74ba7f46e 100644 --- a/ext/openssl/tests/001.phpt +++ b/ext/openssl/tests/001.phpt @@ -74,4 +74,4 @@ OK! \ No newline at end of file +?> diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt index c07bbf8cba2..94ebf12aea3 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 9c7d0ac4831..e10334fabf4 100644 --- a/ext/openssl/tests/bug61124.phpt +++ b/ext/openssl/tests/bug61124.phpt @@ -6,7 +6,6 @@ if (!extension_loaded("openssl")) die("skip"); --FILE-- run($clientCode, $serverCode); ?> --EXPECTF-- resource(%d) of type (stream) - diff --git a/ext/openssl/tests/bug68879.phpt b/ext/openssl/tests/bug68879.phpt index 8cf9044c93f..1f135ee50ab 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 ab9eec67703..7cd1df12db2 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 659544297bf..5df8ac27c64 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 e478e3b9257..7fc79846a1c 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 f86394bdd5f..b4e50a04215 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 b6b4b35d62a..f85d83860c4 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 eb0d1f5c564..231a083b762 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 7a20b8693d9..41f0416fee8 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 59a73b7d7b5..41e3b9984e0 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 4a8e9dd67fe..57c9e75c0ee 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 eab67f403cf..be40f8080f3 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 b88782b0b2d..cf2d7f823ad 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 052779dc0a7..64c7c2c130f 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 0316c5d7a1a..c7dc193d53e 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 e9d47c26b07..69650a65d91 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 68c11dde2c0..5727de90a20 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 f47255ac1b4..ceaafc2234c 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 72a62f70790..062c6bf1cb6 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 379736dd81a..5992612018d 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 fd6746daa09..51a8dec1236 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 42b63c7d1b5..d4780447bce 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 163dc9f1ea6..0264228aee4 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 8cfa20420fc..2ca969d3bf2 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 2b432543b8b..90606c9e05c 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 9085763d80b..53c209a64eb 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 9b64dae926f..ebcf0b34187 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 89a64f9f783..3e07ab7aa85 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 3e8435588dc..5109bed3a70 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 84deb0b80c5..695f0c1e81b 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 ad012e7e699..5abc6c72c2c 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 f2afdb9d26b..8cc3ffe6693 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 ae2eb128ba0..fcc36e7d910 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 aa4dae98a04..720940800fd 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 c75e2f86c10..105d5ab1c25 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 6c1422b61a9..6559b22d2eb 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 939773f62e7..a0015f129e0 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 19c85c0cce7..bca8f3e3c5b 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 d4339a89553..e06bb4005cb 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 ba0aea49126..42bb5abd270 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 f44b1d0f724..cb0917a2287 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 2697a801556..bdcd933428a 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 a02c836707a..6f885f0509a 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 9c2eba47d82..266bd0eebdf 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 add24fbc82d..313064eab8c 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 04eef25e3d9..8e20108b885 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 79f4c60d69b..8c826587ea4 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 960b286c919..45fe6459e6e 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 e08182177f1..030f757d0a0 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 9ee54916bb2..eacb693918c 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 f13abaa5d50..ecb76127d64 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 d30a8e462f7..00fd94ec760 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 e8949fe597b..266ff6a33bd 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 e38c8947e20..1b5dbb3bd25 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 bb412812e5c..f9d3f75ea71 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 47ff461bb3e..d500fd498b0 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 e046879c22a..3676a2f3e5a 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 f7b53e57a34..ae57199d4dc 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 3ed18db0f13..97dee2b5565 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 52033decca3..8c1290c05c9 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 028d3cb805a..d4f885dbd88 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 821d59afd20..a4a504f5d9d 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 5c382dfe0ef..bddf08e9f23 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 cac93c9668e..77ddc3183e5 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 c493b8c03fbee5fab554557177f531d0d7224a47..559cad65bae94df5648e37f126f47d64da9cca7a 100644 GIT binary patch delta 11 Scmey&`iXTz8`I==rW^ntrv$J7 delta 11 Scmeyw`k8e@8`I=grd$9Ypaib~ diff --git a/ext/pdo_mysql/tests/bug_41698.phpt b/ext/pdo_mysql/tests/bug_41698.phpt index b2dee60d74e..637a0910b1b 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 ddfd139d942..b2a12199914 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 1d9558bf660..a893fb81b74 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 8c8922f20bf..e24f66c09d2 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 925290e7343..95e6ff9875e 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 a39fff5c816..6c39467b12c 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 464d2b422dc..19831da979e 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 d852af01fd1..708e3a2efc5 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 ce6a1ecd267..4db50f074f9 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 115103df753..c9aa5aaac42 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 b812bf7bb54..b10e82afcb8 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 cc8dab5a14c..3a937c7dee5 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 456a7961313..41dcf06f40a 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 f7c6d0b2d00..9c3087384b8 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 1d65e4486ca..0a50c8d46a8 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 6955e0a173c..e280ded2945 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 4cb5c642590..f27e3d8c780 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 f3cd530f2f4..2219ae8ed48 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 db38c6904f4..a974f29df9d 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 2dc00e012b7..8afd07bef0a 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 d0e0ffcba71..f8900a0ef3a 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 6a7de2c22a3..9303a3119da 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 57a4529ac22..8a942d0d327 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 0187858f8b8..442e710e740 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 79a036ca8f2..108975bcf8f 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 95d7754ca5a..c23ef4b2fd6 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 9b02489251b..2dedf359586 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 3e25f85b7ac..bec8b70cafe 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 dd9c47bc37f..69e0d35e17b 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 d996dbc3b6a..255cd383a6f 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 9eb31f524c2..d2a23162725 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 e93bf78a137..1e89c8900cd 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 4c4148d5bb1..1dc203fa9e5 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 50d5864d8fb..1d8c5293786 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 397d2e7b9fa..b7cbf78ee73 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 a238f4a4d31..890ecb47c76 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 1ac9fa45cbe..0692a08bdf7 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 298d59ed0d5..0c02a01e536 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 b9c4612b8f2..7c104b20bad 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 9f17e9f61b5..68bec157eb2 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 d79b6b72cea..0dddd4f7e58 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 8a633f547c0..31f691d7ef1 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 925665e42bd..e8ed6ee62d8 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 fda63c47cb6..3f72b354c14 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 301fa764ca2..6fb89840054 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 34d14db6cc1..d5f8e49f961 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 a40e453d8d4..cfe29cd7c37 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 efe4ece4e6b..389240f8e16 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 636b22f52e8..350708b97df 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 d274e0608cb..d8e5d25b0ad 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 e986af85789..3db58d5fcc4 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 484a6f5765c..46c462417bb 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 8fc5bbf9476..065bf80984b 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 15c4275d80c..31a76c9a63a 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 e1d7df82a0a..be5a4297bdc 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 552038069c3..15eea01229a 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 93aab166796..4ddce526bdd 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 d472af770e1..97a28ec5d3c 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 6b7e36560ed..ba1d6f949ab 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 adc2756e25c..f00cab76646 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 827c96250db..a8395315c65 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 9fd0dd1e3b9..c03060a87e5 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 b84e25b8d39..275afc55e1d 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 3b3ccb7462c..d5e661e5e01 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 9f1b516b9dc..e3e802b7a2c 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 d82ae798e8a..f485e596f9f 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 7858a60eeac..8ef1591db50 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 622630c0572..1fcc4b0d590 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 72fac7648ef..e31ec8e0191 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 6b6cc3ec67a..bf9c16978bf 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 626d4d0f82c..ecb13c4ee9e 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 329f525b27a..0dcee55b8f7 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 a7cf0cb2d27..41cb9be716d 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 289fc39c959..1c2b4b1abef 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 3e3278b9f8b..010136f779a 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 5e5d759c623..0878482d0a2 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 4312bff1a08..ab10736a8a2 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 572d1eb9aa7..8ed0697bff4 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 9dab6214856..1496ae1c331 100644 --- a/ext/phar/tests/bug46178.phpt +++ b/ext/phar/tests/bug46178.phpt @@ -17,4 +17,4 @@ $phar->addEmptyDir('long/path'); --CLEAN-- --EXPECT-- -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/bug47085.phpt b/ext/phar/tests/bug47085.phpt index 9aaaed0670f..5c2504f6755 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 6282a1565e3..f466ea45323 100644 --- a/ext/phar/tests/bug48377.phpt +++ b/ext/phar/tests/bug48377.phpt @@ -26,4 +26,4 @@ try { --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 a3745a20cb1..ada60055f92 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 8fd5de51468..83883b6ee51 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 d62f3c2b72f..7d24ead69d7 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 70e3f972e78..7768ffbd666 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 286d3cbdbe0..c0f76c7a0e3 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 43230f15204..91cc9b0111d 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 6965aaaa30f..f442116191e 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 22d2bf098fe..53f1304343b 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 8e6a95418cf..1277e887110 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 5928428abc7..ffdd36c52e5 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 cab314a7317..baff0832654 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 abe50831fca..92ea892b880 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 90b0a8fe464..dd6b45f9a25 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 660776af054..7502988ed2c 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(); ?> " -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 eae6a8e26e8..e75473d463d 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 40b544191d1..b197f6501b2 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 bbb3ab5aa97..84f7cfefca3 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 9e10b31591b..a4ad2bcb29b 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 a74439ddebe..6ab97b50cf3 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 5e8744e9f3d..670d510e5cd 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 57412401b6c..7e2719ae7bc 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 751194b330a..6269466b9cf 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 e70b0dfa765..b67f5d73245 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 8d21c813a4e..f28871f1588 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 aa0c9653ee6..843ed517098 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 6b32520f2da..978847cf063 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 141f9c9ad79..45cc8bd4a85 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 c6025fd125f..4cc10803f9f 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 3bf0e11c3d1..0dd8f632d51 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 13cae01e85a..41b6382f052 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) " -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 255f16abfae..87a29196a84 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 6d798f9f8a2..8b78e62c9cd 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 c81d0cfbd97..9d2f9105dac 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 d142a5d7428..fc639c316f1 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 <?php function hio(){} - diff --git a/ext/phar/tests/cache_list/frontcontroller16.phpt b/ext/phar/tests/cache_list/frontcontroller16.phpt index 10bebdccef1..0664c039d54 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 35d3ae4e9cf..05ad328167e 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 82a8389ad5f..f0d659b4c3e 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 3da9631dfb1..4de4d7dd1c0 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 cd7c990c29d..23ecdc904b7 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 3ec1d52d54a..6fe6aee714c 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 b7d12701075..bf1b96494e8 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-- -

404 - File Not Found

- \ No newline at end of file + diff --git a/ext/phar/tests/cache_list/frontcontroller8.phpt b/ext/phar/tests/cache_list/frontcontroller8.phpt index e04f9e5a3af..fc85ef8fa5a 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

404 - File Not Found

- \ No newline at end of file + diff --git a/ext/phar/tests/cache_list/frontcontroller9.phpt b/ext/phar/tests/cache_list/frontcontroller9.phpt index 1a8b9168ccf..631bb30ef0e 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 <?php function hio(){} - \ No newline at end of file + diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt index 39fc31e27b2..91e22270c65 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-- --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 1d985090645..46a4e238172 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 d28f136f77b..c7f8e824033 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 a8f9d3f889b..5740d60f87d 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 fcc9d646559..24d6e487231 100644 --- a/ext/phar/tests/file_get_contents.phpt +++ b/ext/phar/tests/file_get_contents.phpt @@ -27,4 +27,4 @@ include $fname; --CLEAN-- --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 4c28ff31a11..7af8451f8f9 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 bad71d0ac5b..a7b1a892d6c 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 7d018a141a0..99b769d4063 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 370098014d1..16b64c0e9e6 100644 --- a/ext/phar/tests/frontcontroller15.phpt +++ b/ext/phar/tests/frontcontroller15.phpt @@ -17,4 +17,3 @@ Content-type: text/html; charset=UTF-8 <?php function hio(){} - diff --git a/ext/phar/tests/frontcontroller16.phpt b/ext/phar/tests/frontcontroller16.phpt index 712af40bf3e..1355d0042ad 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 233e2e2a490..a735eb42cfb 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 827c5688c78..b4821643969 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 24464c9beb4..441eb701c2c 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 69cd9f92b66..e7d5dce9091 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 1ef91175501..c2995ed4378 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 e66dd2036ba..20a7d883514 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-- -

404 - File Not Found

- \ No newline at end of file + diff --git a/ext/phar/tests/frontcontroller8.phpt b/ext/phar/tests/frontcontroller8.phpt index 77d33dac38b..b22f14a03a6 100644 --- a/ext/phar/tests/frontcontroller8.phpt +++ b/ext/phar/tests/frontcontroller8.phpt @@ -18,4 +18,4 @@ Status: 404 Not Found

404 - File Not Found

- \ No newline at end of file + diff --git a/ext/phar/tests/frontcontroller9.phpt b/ext/phar/tests/frontcontroller9.phpt index d47a2898e60..c5918791720 100644 --- a/ext/phar/tests/frontcontroller9.phpt +++ b/ext/phar/tests/frontcontroller9.phpt @@ -16,4 +16,4 @@ Content-type: text/html; charset=UTF-8 <?php function hio(){} - \ No newline at end of file + diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt index 5f9462c2609..4041ae2c208 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 6feee422b4c..c4603ba28b4 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 dc0c71ed119..97ebe0fe1aa 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 04cb779ddb2..86fa6e7f787 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 527d77547cb..ca8de30860e 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 e253f12493c..d91318533ed 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-- --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 be56d9952ac..eb0c27bf648 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-- --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 28c9dda9066..2918d49dadb 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-- --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 efa0da877f6..8275c02baa7 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-- --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 ca6e391b06f..0bde7dbff70 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 86578754d97..8d7068f19a9 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 78dd1b39e76..0e0903d1dd3 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 197c7628d88..f8f349a3804 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 608e9507689..93e153bdf2c 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 da07bec2876..a59f498b959 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 80f8cda3894..73bd489a2dd 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 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 551776194ee..9f5480be4f7 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 23e7042fa47..dc3917d2dfb 100644 --- a/ext/phar/tests/pharfileinfo_destruct.phpt +++ b/ext/phar/tests/pharfileinfo_destruct.phpt @@ -22,4 +22,4 @@ unset($b); --CLEAN-- --EXPECT-- -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/readfile.phpt b/ext/phar/tests/readfile.phpt index 60fdad1792c..63e80eb0e33 100644 --- a/ext/phar/tests/readfile.phpt +++ b/ext/phar/tests/readfile.phpt @@ -27,4 +27,4 @@ include $fname; --CLEAN-- --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 c73c98ec816..cfcedc70002 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 f2944da413a..6d26da0b25b 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 184aa6d2ecb..c397b3e4a05 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 371e47d93b7..48738a4313c 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-- --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 32b2b1e28b3..3395fa54d19 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 23ce6f37e25..211b02c51c3 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

403 - File Access Denied

- \ No newline at end of file + diff --git a/ext/phar/tests/tar/frontcontroller12.phar.phpt b/ext/phar/tests/tar/frontcontroller12.phar.phpt index 53804e476a6..cbb928ff77e 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 7fc0676aeaf..107961a70fb 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 2147121dbe2..eaaa62c56a9 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 <?php function hio(){} - diff --git a/ext/phar/tests/tar/frontcontroller16.phar.phpt b/ext/phar/tests/tar/frontcontroller16.phar.phpt index caa0c3119dd..a74d99f248e 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 17d04baf309..0fc0adfdddd 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 b811f00f75d..0b35b975b63 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

404 - File Not Found

- \ No newline at end of file + diff --git a/ext/phar/tests/tar/frontcontroller8.phar.phpt b/ext/phar/tests/tar/frontcontroller8.phar.phpt index a180e2010ae..bfa713afdeb 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

404 - File Not Found

- \ No newline at end of file + diff --git a/ext/phar/tests/tar/links6.phpt b/ext/phar/tests/tar/links6.phpt index 95fd8fb7010..e26b8379f74 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 a6759d8e920..95cba596f9a 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-- --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 9e778e9279d..9e73f1e8997 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-- --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 f31878e3efc..c274e4c2c7a 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-- --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 815d41c2746..b5078426fe2 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-- --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 0127d8bba21..de13acc3155 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 3da537c13cb..ae84823bc54 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 ab5532d6be3..7d89509f77b 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 5fda5b4fdf7..c0cb2569255 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-- --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 06078b3a39c..bd2ce5fffa0 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 f01280013f0..b6f2dbb5150 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 5bbe9e1affb..ca4f55bcffd 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

403 - File Access Denied

- \ No newline at end of file + diff --git a/ext/phar/tests/zip/frontcontroller12.phar.phpt b/ext/phar/tests/zip/frontcontroller12.phar.phpt index a74a0d5d32a..b0caca91ac8 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 4ed1dc86706..18a1c1fd2f8 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 f6cd29a3c53..f6468ee5210 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 <?php function hio(){} - diff --git a/ext/phar/tests/zip/frontcontroller16.phar.phpt b/ext/phar/tests/zip/frontcontroller16.phar.phpt index d3f457bea6d..890eb5d0e2a 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 5d526536874..d6ccdc6dfcd 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 63f7c62e88d..8188caf7c95 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

404 - File Not Found

- \ No newline at end of file + diff --git a/ext/phar/tests/zip/frontcontroller8.phar.phpt b/ext/phar/tests/zip/frontcontroller8.phar.phpt index d4c3a3f9ea0..15a898a53cd 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

404 - File Not Found

- \ No newline at end of file + diff --git a/ext/phar/tests/zip/frontcontroller9.phar.phpt b/ext/phar/tests/zip/frontcontroller9.phar.phpt index 4f12c9cd430..bdbf0661948 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 <?php function hio(){} - \ No newline at end of file + 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 e77beaecefe..e8d5a70fb10 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-- --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 44c8f8bb30f..adcb50ff938 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-- --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 da2b18beb02..cb328ae3d7b 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-- --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 b94448b347f..86e33da7c96 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-- --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 9b1f5c98cda..10d73fd3d86 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 bb03c7fd66f..1885a7ce755 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 be717da64aa..61ec8ab0fcb 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 2d309e61d44..dd17fd447fb 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 500bc18cff8..57efab7c3fb 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 f460e347ce8..ceb78bb700b 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 40689583b58..a52895946dd 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 8d10afc4569..2fc4ff43ae6 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 16e0ae11523..a604ce36cf8 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 bace9fd5ee0..57870477f81 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 5bf362efd44..758ec6055da 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 fe9cf44692d..4ce50ca4974 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 e95aa301fd6..568d8d3dc6c 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 1fe6e8a0975..e1885c81f1c 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 bb41e22989d..d6194766770 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 fb578f80cae..5a1b5a13a1d 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 1c791e9b0a4..d85b5a900a8 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 baa4383dc32..ad9c79bd2ba 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 46174450d85..6be85e7a85c 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 fef2fa4c85d..32124ca432c 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 c48694579a8..49c2cf56091 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 68599c1d671..8f5d641d94b 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 6b8ecce3a91..5b562deaec8 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 bd7880bb9b2..4828a4147b0 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 c03b44a811d..62dc40a15f5 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åäö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 2b4f3df43f4..8babf242825 100644 --- a/ext/reflection/tests/007.phpt +++ b/ext/reflection/tests/007.phpt @@ -91,7 +91,6 @@ test('WithCtorWithArgs'); ===DONE=== --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 64c299592d1..c463bb72c1b 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 83c514adabb..abfa41f3d75 100644 --- a/ext/reflection/tests/ReflectionClass_export_basic1.phpt +++ b/ext/reflection/tests/ReflectionClass_export_basic1.phpt @@ -59,4 +59,4 @@ Class [ 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 b6644883ee7..5699529b3d2 100644 --- a/ext/reflection/tests/ReflectionClass_export_basic2.phpt +++ b/ext/reflection/tests/ReflectionClass_export_basic2.phpt @@ -51,4 +51,4 @@ Class [ 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 907d6d8b7a9..5260e719a33 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 31e0e8e58b9..9171a8dd256 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 f70e779e9f9..1eb084214b4 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 1c46e0656b7..dceb18f7c5a 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 46884ca2ba4..382948d3d37 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 229e8280565..fe3792a30f3 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 cf4aca51ea5..68522e097ae 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 36b4744d8c9..52fa378eb65 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 d26fad591d8..84e334ba19e 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 a0a76f024aa..14c847401d1 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 b9eb0135222..dec76febe16 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 a644b2e6414..a6c3753a78e 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 8a0098ad8d6..10a86d9136e 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 083b2771311..368ea7d7ec7 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 2754b4c8e31..bd27dfc1736 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 3244ec30b90..14e8382e410 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 e9aaa502c67..5395ae66b9d 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 [ class A ] { @@ %s 2-4 @@ -120,4 +118,4 @@ Class [ 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 ce5afb09ed6..1ce1fddf919 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 [ class A ] { @@ %s 2-4 diff --git a/ext/reflection/tests/ReflectionFunction_001.phpt b/ext/reflection/tests/ReflectionFunction_001.phpt index 7c592dc612b..6785e5d0b1a 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 2d5bb928b22..03cec2ee79f 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 18345892c77..4abc11d8a93 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 7553a50b346..254a182452c 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 5dbe7b54b72..d27fadec073 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 455935e3803..cd754185840 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 08b3dddabdf..0a6ac9f11d8 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 d403d2d2bea..8eb970babb8 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 f7beea67a6d..5c980536b9f 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 bb0543d098a..723ab00f84f 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 8e34d617316..d34c7f61a48 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 2544b0e7ec0..f999b728121 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 fefa220c9eb..43210ea6861 100644 --- a/ext/reflection/tests/ReflectionObject___toString_basic1.phpt +++ b/ext/reflection/tests/ReflectionObject___toString_basic1.phpt @@ -33,4 +33,4 @@ Object of class [ 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 332386afd32..970d07b4321 100644 --- a/ext/reflection/tests/ReflectionObject___toString_basic2.phpt +++ b/ext/reflection/tests/ReflectionObject___toString_basic2.phpt @@ -36,4 +36,4 @@ Object of class [ 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 f7dfef86708..2fbe6fd7797 100644 --- a/ext/reflection/tests/ReflectionObject_export_basic1.phpt +++ b/ext/reflection/tests/ReflectionObject_export_basic1.phpt @@ -33,4 +33,4 @@ Object of class [ 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 277f06eaf5e..652a5556cd9 100644 --- a/ext/reflection/tests/ReflectionObject_export_basic2.phpt +++ b/ext/reflection/tests/ReflectionObject_export_basic2.phpt @@ -36,4 +36,4 @@ Object of class [ 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 dfd3f2e8037..c4afc22d648 100644 --- a/ext/reflection/tests/ReflectionObject_export_basic3.phpt +++ b/ext/reflection/tests/ReflectionObject_export_basic3.phpt @@ -35,4 +35,3 @@ Object of class [ 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 db0cbfb08d4..68cea6a1cde 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 2fb8cb0870d..f05197ebafa 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 71dc69ca4e1..822da2fe9ac 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 349e6f0ca9c..571edac7a97 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 31acfe12aea..e3d2bac0fc0 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 4e71f55d453..f5223c35fed 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 63f9542015e..18eb71fa104 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 d744fc8995e..6f39f9db6ca 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 8491f325978..1dc7c9c7279 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 501dfc8d893..31d396f7735 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 6ac72bbd270..65afa836b7e 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 35c1b1674f4..3c363561d3c 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 ca0314d0dfb..d975a527267 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 4cfa6c04f03..fbc917eafce 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 eb04dc1147a..0643dce51fd 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 8725f06a69f..eae636593d8 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 3a95c9f8f6f..4046b3aebc2 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 9624df0ae83..10069c21d0e 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 5e20ca348b9..aa7ba1cebb9 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 58250070006..58462917690 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 89b70484771..24da588aa4f 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 3d11607b4cd..6902d124b4f 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 765d2727e4c..e240fec8a73 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 5ad8fcb02ab..c573b65e36b 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 f6f641d94eb..57156753fb3 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 06711727cfa..ed009c3ac6e 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 3e377f35b53..dbfedeaf056 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 fcf5e59b602..d55fd745947 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 92c3044ac59..e9ea7258e57 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 33e0323b9fc..ab21f7d0f3d 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 40032088fe8..ee0ecf0d266 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 388befdaf3b..e415bb5d4c6 100644 --- a/ext/session/tests/bug71974.phpt +++ b/ext/session/tests/bug71974.phpt @@ -19,5 +19,3 @@ session_start() abc --EXPECT-- abc - - diff --git a/ext/session/tests/bug73100.phpt b/ext/session/tests/bug73100.phpt index b53ebc07b4b..9334bbf16e3 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 fdd6054f8a2..fa167a1f3a1 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 1ae44167e8c..bafe3454eba 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 0a0f9749f8c..32525640e87 100644 --- a/ext/session/tests/session_basic4.phpt +++ b/ext/session/tests/session_basic4.phpt @@ -52,8 +52,6 @@ echo '
'; - - --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 078d69d837e..871e32a3174 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 4a335e7f677..5ae5d95637a 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 0884614a4da..1c6e5922b4d 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 586a6ec0238..b712266e80e 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 b9d29b4070e..492816f2762 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 b5bd42fdad2..42b2cb06946 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 1537af4abb7..473be005f93 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 c2ebc5235af..9de2fc12f73 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 94f11d4f121..38f7f885d31 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 9a6b929ca24..6c91e6578a0 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 8b3535ba951..cc7f6f333ef 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 2cb3f1c9624..2c615831171 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 f9426c7ff78..43c30b9d58b 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 d9a498d2e98..70c8ada5bcc 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 a3cca07866c..6b3a7325fc3 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 9f9d6b36376..f239a86ab99 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 a03face43d9..4c1a293be27 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 bb3de056c04..2863ba63b3f 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 daaa5801400..9e0913c9af6 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 f53d0420bdb..2f8a37aa8a6 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 de2a9c97ee8..d0f37a3b29f 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 54693963f1d..bbd26f92f77 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 a5b147e5043..7844e223817 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 86e9156ce6f..483134061e8 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 0cf54efb029..d5b987fb579 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 85b05e34c2f..13dc94442c8 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 7c3e465cb2e..487b5d7a376 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 5b6acb12517..7a19696e611 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 651092c01be..7a323bc3c1e 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 a3d17504b4d..12fe5c2814e 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 132b94d658b..00e6975045b 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 3d373ed5e0a..5fb435b2bf7 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 2d1f656b1d3..641d8b6b93f 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 901a472e3c9..82e5278783e 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 eb22248e18c..3111ceb00f1 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 7121500db1a..49a7e301d43 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 d366d36e8d3..9558beb814f 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 a9a66c17e60..b3def66b539 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 a5670341afc..484a7d001b1 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 08acf5a3f5d..4db8effdaa1 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 809f0a73209..1df2c76cce7 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 1dd86f8afa9..5d93a573b22 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 94ab5f8247a..ea8fc81d748 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 fe343766735..29b1d270c61 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 b6b179913a6..ba0311b96b9 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 71ebff2ecaf..eb1d8071aea 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 e788ad11979..bada7f52c5a 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 c901385edb3..b7bcc3fca65 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 c882e902049..28e49c9f98d 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 6f8839aad8b..0b647bcc59b 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 2fabf79fcd0..5fab0d4b227 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 4095813c9d8..eadfead304b 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 720541f3fcc..460552a6203 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 7ff06e38cb3..c0b2eb61bf1 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 2249d1e5a27..029d7dcba7f 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 4679f879013..fcd480f3543 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 bfc9e2fa82a..362ad90dd6b 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 0000c50add7..bc9f801a5eb 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 9e0ce336168..5a73d6d5f56 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 24ba5d7489a..4d297d98f76 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 8da4c589c6a..9542832684d 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 1e8a8f51c14..251b042d02a 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 d0903b2ffcb..3fb18d9bf8e 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 9af8d383081..59cbfab3269 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 9f6ffa59726..f14b2574e23 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 a8eeb25f83d..ca5cb85a107 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 3a9b2e24fee..60b1438e454 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 8e010f8182d..47119f99710 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 f37e1bf15f9..3706ebc26ec 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 bdd03191355..ba0a58f5a58 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 7c69dfd8f7b..1e3cbf06315 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 6b734d12bfd..c5f44caddbb 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 b200d14af18..72e3d2f55ac 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 aa6bd85a129..63311651a84 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 598aa3c17ab..b687b719881 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 diff --git a/ext/simplexml/tests/018.phpt b/ext/simplexml/tests/018.phpt index 41a6f8259ca..b6b07d4d395 100644 --- a/ext/simplexml/tests/018.phpt +++ b/ext/simplexml/tests/018.phpt @@ -62,4 +62,4 @@ echo "---Done---\n"; ----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 5cdb88e09ae..aedd5978b79 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 22ea4488e61..34e2e683195 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 testfest - diff --git a/ext/simplexml/tests/bug41175.phpt b/ext/simplexml/tests/bug41175.phpt index 432f217b16a..ae0204e05a8 100644 --- a/ext/simplexml/tests/bug41175.phpt +++ b/ext/simplexml/tests/bug41175.phpt @@ -15,4 +15,4 @@ echo $xml->asXML(); --EXPECT-- -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/simplexml/tests/bug42369.phpt b/ext/simplexml/tests/bug42369.phpt index e186770033c..f8e030526c7 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 53b6efdccdd..bac22775970 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 value ===DONE=== - \ No newline at end of file + diff --git a/ext/simplexml/tests/bug44478.phpt b/ext/simplexml/tests/bug44478.phpt index 377754f792e..34630593f81 100644 --- a/ext/simplexml/tests/bug44478.phpt +++ b/ext/simplexml/tests/bug44478.phpt @@ -26,4 +26,4 @@ a & b a &#38; ba & b ===DONE=== - \ No newline at end of file + diff --git a/ext/simplexml/tests/bug45553.phpt b/ext/simplexml/tests/bug45553.phpt index 66344985563..9147fdaba17 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 e21a4ce7421..1a67c6e9eed 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 59d14b09c07..921da30bd19 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 4a4e157b76f..8d161836c3d 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 c5b09b4fb86..5aac70ea2ad 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 714572df1ef..627ad20b8f5 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 db4f3d115a1..91543979f41 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 583242a61e9..f3a2e5c5bcf 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 c4bb621e66a..c941ca73aea 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 adcc3a7299a..98966c4f42f 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 1cda76565c5..9cf83e00bd6 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 3fd14f2a5c3..94a3f77205f 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 bc842aba4f9..81d10cf0552 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 49a8efc0fff..6c0d1081ded 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 d6d933b503e..3619fb12a39 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 0ded544b94f..42e4ed517b2 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 f16b4c58518..acbc7d4cd18 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 94738fff34c..42ad8b8a066 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 4069c9f6be4..e7edc79f9ef 100644 --- a/ext/soap/tests/bugs/bug42488.phpt +++ b/ext/soap/tests/bugs/bug42488.phpt @@ -19,4 +19,4 @@ $soap->handle($request); ?> --EXPECT-- -SOAP-ENV:ServerSOAP-ERROR: Encoding: string 'stuff\x93...' is not a valid utf-8 string \ No newline at end of file +SOAP-ENV:ServerSOAP-ERROR: Encoding: string 'stuff\x93...' is not a valid utf-8 string diff --git a/ext/soap/tests/bugs/bug44686.phpt b/ext/soap/tests/bugs/bug44686.phpt index cff97999c67..89a06a1b08b 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 85abf432da0..c23bb5a5929 100644 --- a/ext/soap/tests/bugs/bug47273.phpt +++ b/ext/soap/tests/bugs/bug47273.phpt @@ -47,4 +47,3 @@ try { Test #1 exception with some special chars: ΓƒΒ„ΓƒΒŸΓƒΒΆ SenderTest #2 exception with some special chars: ΓƒΒ„ΓƒΒŸΓƒΒΆ - diff --git a/ext/soap/tests/bugs/bug70469.phpt b/ext/soap/tests/bugs/bug70469.phpt index ca3ab80950d..1186cc003f4 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 8aadcbb6f79..fb900e8b11f 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"; -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 e215ec1b07c..d4c41cd21f0 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"; -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 7dbaa23ab22..154d57d1047 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"; -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 1c4005f6904..7d8a440dd9c 100644 --- a/ext/soap/tests/schema/schema008.phpt +++ b/ext/soap/tests/schema/schema008.phpt @@ -24,4 +24,3 @@ echo "ok"; 123 int(123) ok - diff --git a/ext/soap/tests/schema/schema068.phpt b/ext/soap/tests/schema/schema068.phpt index 88fdac334fd..5ab63be097a 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 b65b23fd063..f5b28699a53 100644 --- a/ext/soap/tests/server029.phpt +++ b/ext/soap/tests/server029.phpt @@ -52,4 +52,4 @@ INPUT: Hello World -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 63711139942..81db8ee5bc9 100644 --- a/ext/soap/tests/soap12/T27.phpt +++ b/ext/soap/tests/soap12/T27.phpt @@ -26,4 +26,3 @@ include "soap12-test.inc"; --EXPECT-- env:ReceiverSOAP-ERROR: Encoding: Violation of encoding rules - diff --git a/ext/soap/tests/soap12/T28.phpt b/ext/soap/tests/soap12/T28.phpt index 6118b478d8a..751df133dbd 100644 --- a/ext/soap/tests/soap12/T28.phpt +++ b/ext/soap/tests/soap12/T28.phpt @@ -19,4 +19,3 @@ include "soap12-test.inc"; --EXPECT-- env:SenderencodingStyle cannot be specified on the Body - diff --git a/ext/soap/tests/soap12/T31.phpt b/ext/soap/tests/soap12/T31.phpt index 04f0353bf0f..f00e25a59af 100644 --- a/ext/soap/tests/soap12/T31.phpt +++ b/ext/soap/tests/soap12/T31.phpt @@ -19,4 +19,3 @@ include "soap12-test.inc"; ok - diff --git a/ext/soap/tests/soap12/T40.phpt b/ext/soap/tests/soap12/T40.phpt index 27b4a21c478..332e5768dd1 100644 --- a/ext/soap/tests/soap12/T40.phpt +++ b/ext/soap/tests/soap12/T40.phpt @@ -23,4 +23,4 @@ include "soap12-test.inc"; --EXPECT-- -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 ca134270a38..7a773a8a3ec 100644 --- a/ext/soap/tests/soap12/T56.phpt +++ b/ext/soap/tests/soap12/T56.phpt @@ -31,4 +31,3 @@ include "soap12-test.inc"; --EXPECT-- env:ReceiverSOAP-ERROR: Encoding: Unresolved reference '#data-2' - diff --git a/ext/soap/tests/soap12/T58.phpt b/ext/soap/tests/soap12/T58.phpt index 1c3e8ba7f59..aa539854864 100644 --- a/ext/soap/tests/soap12/T58.phpt +++ b/ext/soap/tests/soap12/T58.phpt @@ -25,4 +25,3 @@ include "soap12-test.inc"; --EXPECT-- env:ReceiverSOAP-ERROR: Encoding: Violation of encoding rules - diff --git a/ext/sockets/tests/mcast_ipv4_send.phpt b/ext/sockets/tests/mcast_ipv4_send.phpt index 0dd858f297c..58395aed267 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 5cd3d8e7d76..0929c79bdd3 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 6ff97b60d51..83fc5064c7c 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-- - --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 29af2a2d455..23b8c58b0dd 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 91cc85195ea..c15059907b3 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 6fa2517db2e..09266e6cbd9 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'); --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 90ae26e0735..bd7e5bfd43b 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 f1f76fa4b9d..2f121cdb53f 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 498e0a277cf..f8f560b60bd 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-- - --EXPECTF-- bool(true) diff --git a/ext/sockets/tests/socket_getsockname.phpt b/ext/sockets/tests/socket_getsockname.phpt index f3f392130c6..9039acc555a 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 222fca5e2de..925966312da 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-- --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 52dc1bebced..acf1d2f35d3 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 a2204112b36..4265e025358 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 fb9a311b174..5082e74f8f5 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 750b22dabf0..70867e755a0 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-- - --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 05d718ce63f..fe0afd7c513 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 c44f58e793c..8ee5218cb06 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 57d8656e871..a27d4075db0 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 36606b4eeda..4d171fc70a4 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 3be634341b0..1b4fb5570db 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 033e37742d9..aef56e5a84b 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 9991de53ed3..5a1a5a89ffc 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 19550d11e9f..2750b320803 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 ef92a0c98af..1ccac32fd8d 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 f13345ea070..e9495d7a44a 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 216a40bd6a8..6a05aa0aa20 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 d0753fc33e4..cf964258926 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 e356e2a0175..157449c5cdb 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 b6a07f6be9b..42bfa358474 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 f6bc266cb1d..4d8c1394b6b 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 1144f5f8dcc..143d2755a81 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 12cfe40008b..4af0d0b7043 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 c9c319316fd..ac87bf1979b 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 60203eb4a07..463f1a104df 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 558504b38be..4f80525f750 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 cb43bee1ce5..b9810fc2149 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 a05ba68f7ab..18456244bd0 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 5e3d8e9ee27..c88a72a25c9 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 86a84567a86..faa009daf4f 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 36c47fef2e1..d776d69223c 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 b2bc4445502..b6debb109bd 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 a387439d161..43ce18c5c5b 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 687fcad78c9..2512e23e782 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-- 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 057751c2eb4..26fb3a9b8d6 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 9d6c4505d8f..a9903943349 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 18afa034bb1..adc631407c2 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 79492e0e9c2..60dea49a104 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 c2b98037354..3bee5a982bc 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 073744aa004..d160b742980 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 4b70c2635b7..632a0533457 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 f5583a81951..879edefddfa 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 57f5681517e..d23808b5ab2 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 ede8e594133..ab78d21b80f 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 c4bc9f112d9..b530cf61cfe 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 4b9e930c7c0..002a7075a64 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 842bb563d1c..1f177df19f3 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 0f9b8ce366f..d42b455820e 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 64f32187ac9..f7cbd72b765 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 bcf44b098e6..4de5bcdd4d2 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 b2630606e8e..c7f47108683 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 f582a4a8949..384fed5d231 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 bcfd9c4dd61..6452212ee7c 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 8b1f54d5a42..927172a8dc8 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 7aaf8a3fe62..c6da6b3d489 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 670a1095eb7..f570289e6c1 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 4685c20b297..919c72021aa 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 5cbe2e80cea..5cb12feee71 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 108bb2db69c..0cb4d06fdde 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 2f77e8a4497..5c8f526d660 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 97e48115fb3..091c4650e22 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 a4607476087..80df45120f4 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 418d1ac37cd..317059c1523 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 727790eabd7..e8b122ec10e 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 ba039763960..d3c9f76589a 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 86c6b6370e5..f2bec5a66f7 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 c3f79c6882b..89d2570661a 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 021aff423f9..f98a69cadfe 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 91f010930c8..3401439d976 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 80e5e100b43..a6e68854da3 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 90ee41b212d..0f219239493 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 65fa69147af..4807f28c0b3 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 3122616802e..6b4a8f798f3 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 e6c4de88c19..8ea88ddbd31 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 e73f6b1bd69..676cbf22262 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 185d31fa498..7561bc0765c 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 72b032c4ad0..fa2c7aabe90 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 d94f0304980..fe5b63d07ef 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 6bd0de6330f..a1c6f938b2a 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 c8c3cd1030f..e074951c9e9 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 52f8f9b8e6d..939fd5d52d7 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 c8254e74c69..8eef31382d6 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 be2bb331b44..8ea0b6656e0 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 e96a82a7a1a..daf415049c9 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 7dda782b931..79b75ae4a07 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 7d7b5893567..08314fd74ce 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 b0643d5754f..41e1527f933 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 c7f1b3a7af4..1f037e90735 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 b9445d41193..612a753680a 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 651c240303d..db44322d674 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 478dd2b5623..1bd1d0b6e88 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 e20e9918d7b..160601aefba 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 6533819b688..3aad7bf6f75 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 1638000f09b..e2a7b905d54 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 879d6103019..bf0ab8242e3 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 44b05abba1e..61c62c7b3f0 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 30a3261c4ef..1213a1e1bc6 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 8fb86e8204d..f228f968dc3 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 c0119c4360e..b15a3723d47 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 32cbe486a05..143c26e1537 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 a1ce7edff38..a9dae2e7363 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 7d4e832d9b2..28713700d17 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 cb091858ae5..f893b245277 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 36585a56093..966f1db44e3 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 2c177f95129..cb984452798 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 3f30dd2b233..fd7b1b628bb 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 3e4df51abe5..f1260afa027 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 ff41dd49318..5ac7f8b2fb8 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 96b2fa808f8..dc949da8fa6 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 c9aa584ae2b..da4cc2d3895 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 b93e48876d7..add2ca9a94b 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 a253927d1db..724576d3bc0 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 92568028c4a..1134b5d6ddd 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 c3846484664..3609db53ee1 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 642887d0c4e..0a993993297 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 f1104c881b9..00deac36b8b 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 781614abcc2..7b012e77107 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 6b85681de53..47e8d008c08 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 eb6df2b88e4..f67eb428c3a 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 a4ff7a214c8..74d393b677d 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 fadd88185a4..681e3275235 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 930499bef5c..9f48f6ee142 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 a59a49bee86..3336cd0a396 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 610be2a5696..99b47bb4372 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 c9476e0e56f..0eea8b28fa4 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 0355401f278..b7c3cf67023 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 5d1c958d92f..7cbfa165fb1 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 760082f6bda..068ace9d8c2 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 83d2caa2a86..dc1551113ab 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 aac4e65bb86..a898a03f801 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 ff188403914..7a4dbc2e33e 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 0bf4f198f36..b5508f73e45 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 9c4d8eaecb1..6dd7c068c79 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 44108c746d4..7cf771db6f4 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 ffccdca7fdf..7db7a63973e 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 c84af67d2b0..5750e72af19 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 44d4d857f25..c956ccd92fd 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 a68fcb7e604..782fe8d07e5 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 9937a7f42c0..4936270d3b5 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 9d897c497dd..a47c86eff83 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 2729c7fa870..fb016f47378 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 823c809f825..126d394f297 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 b11eb7b5409..4d9c90f86b9 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 70aa2be30bb..68d92dcf38b 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 2ea4bd819b5..9db726df43e 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 7120a6cd118..d7e5cbb5a14 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 14e0af51cbe..b9a88fc8ef2 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 a0e5969034a..8e26c6c7b8f 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 eee7bb2f737..c3af4dd8f1c 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 97d86f375e0..0326dbb03cb 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 3d907811c19..70715cf9357 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 901926ebd71..7eb97ee013a 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 1c16497bce5..4a63d1108b8 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 5138b876630..8b1c3dca080 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 450d8bc0ce3..14626deb86e 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 4dd28d9a396..b0b90bd926d 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 83a642dc3e1..726b0eb5539 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 aa4c77fe3a5..52017177ccf 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 a86af304726..e39fb1cafec 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 182927fa269..383993c38c1 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 cd62ae1db70..0f1268dd485 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 4b82cf6b878..6024225fb1b 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 34d4ff85b91..28eb54929e7 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 c66c2a47189..5e0deb1b6d5 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 3eb92b49d41..00f13c8a5b7 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-- - --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 c5e95ad3934..a57f10fce0f 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 36d31b078be..959ddd54280 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 d0f70580ff9..8cb05f8562c 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-- - $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 0039770269b..e761a91d925 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 b8894e5d7e7..2ea2c461c62 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 99bfd6638e6..0d3caf6c710 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-- - - --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 bbb59144965..1ef4f732485 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 67c1b6fcc45..25be6e1c55d 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 40d02d47852..0249e2c27d7 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 179b07259a7..3e689a0e8f3 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 cf8ae6db9bc..36741dba33c 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 80755540f5b..c7171dc4405 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 0885cfeacfe..f5017ba63b6 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 a081571930c..7f00c4b3ab5 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 3b255b8b19e..02cf2c9e678 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 1a08d78f162..349ebbbc6e9 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 419b916fd89..45d386807b4 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 f8fc5a4b4b7..eff559e03ac 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 074be3bae8c..c759189aa01 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 a501246fa0a..5f8183b88d5 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 879a3b8aae3..b7c842f21b7 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 d79686ed6f9..3b02c21b36c 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 be0340b9f10..8737e7c6603 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 085831c020a..3c141216c70 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 37b819895ab..f4368ade6c0 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 b4d51680ea4..12adde72e72 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 234aa6ef696..0af38c7bde8 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 de62bf4b30b..4a7aef39d2f 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 6d37a916bae..84cc928cbc3 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 086a10df2ac..bd89416d9d8 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 6161d9cf0a9..17e48b4ba06 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 4f15ff48d15..5e6137d0896 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 911380c25cb..df3cbfbcd78 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 c24a4c1b082..4cf9a596c26 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 1a2d57ec3d8..a0e84278921 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 064def0f5a2..887ad12d9a6 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 c880f7a057e..fe9a17983f4 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 4830baaf10c..d482e9ffcc7 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 e18417aa02f..42e53101dcd 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 793ec3d2523..5d1eba819a8 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 c91a07fc3c9..86850094b88 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 7156bf5404d..ca70e5e78a0 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 0688004fba2..82b43628e36 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 d99059e52d1..c897c51e4c8 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 38e2e761347..35c0d4a2e62 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 17b98bb81e0..e56d6195d0d 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 6e578414571..9384c48a46f 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 6f18ba56945..4f069c0ae89 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 c686899aad3..122d1e4767b 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 6b9a802af13..f6dddb9e835 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 46982b74901..09df218c0fb 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 1691cc5fa1b..410ed7fa506 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 cec69df3dc8..14453cd9340 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 2b4897730ca..c9c16335919 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 b989160db78..c6e8ba78066 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 0b0dff3c44b..b1e30330025 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 0517d4c24e6..867b4d98486 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 cbbfb5f789a..1f651a2c3a3 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 53899c675ab..2e72ed7ed04 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 bcf0adfdfc4..a801acdd348 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 493291bc9c3..09133f6e4d0 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 b44f86b97e1..1d98b0eefb6 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 cd09be7ba69..cb89ce41d89 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 1f4d2f56794..b842c8243c0 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 b24aa07bc40..b7d22e0825b 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 749faab6ae1..f78fb744be0 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 6cec33a532d..0335fe473ba 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 37596f4f009..123c08ece1a 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 89121dd0d0f..b8444ffb091 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 b995625861b..f061520d1db 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 a409e286177..18e0ce20007 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 1d549c56477..8483a00339b 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 7812bb766e4..0e52a99f380 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 38b9142c09d..40699b33397 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 9872ac676b9..b23a96ea9c0 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 cb2b4a4c0ce..20e90be4152 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 0e5e3df6841..e7af3b352fd 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 7dcb5c12b5c..3e78b78ac08 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 5e84548d7ed..9a33a270f1d 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 a591347e30b..124c78106a0 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 d4f16666ef0..d4f10e90e5f 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 b8f2013dc3d..98c23e4d267 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 cd3f24afff7..a325879e45d 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 d4e7148aba7..697eaccaf21 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 c50683b7804..3ab60136bea 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 e61d54ee827..f0884639a53 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 74ec7717085..ddb258ab8ab 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 650dd70c604..b3611d21596 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 c0057268c24..97b9aff1407 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 46d265aa990..935ea11f5df 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 4ff93c8652b..15eacc90e67 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 2ffae12178d..c82f81584aa 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 438f2d08841..7aaf48f99f0 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 b2e566d12d3..1182d1aeea6 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 6c656ef55e5..e4631977d71 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 27f16200037..89fd1ec0868 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 7c4043e4640..30eb7d78010 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 d60630eb324..ce0bedb3627 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 853ceb946bc..e8f24199c6a 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 099af89a9f9..01bd6d79d64 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 014240f6bb3..0f73c65facc 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 c44124df056..108060f9b1f 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 0e1aed52d6b..5734da4fb9c 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 7f5d618e749..9e37cbb2045 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 65d2c72dac0..6bd8370f13c 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 4ccf9478d67..dc2d2ff700b 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 6b271e0e48c..45466adc42f 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 7217a11a91a..38f2341d2b0 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 a48d9078965..64114050a79 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 0bfa2e030e2..397a38c9161 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 8c32685d393..d4d2bafa7bf 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 94acd08a96d..ff3156a0cce 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 ccb83ccf57d..7b6d712a1f4 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 6a836dc1ee1..4f62a822049 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 bb63e9f6e57..93805ac026f 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 da8a00e83fa..a76d68e6e06 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 de2c3b4d281..6cec0bc4bac 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 c640ac7bd21..6591e113afd 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 49e717f8553..5f127fd2eba 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 e88939e6043..86bde4ae3ca 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 1cd546e63c9..e9c1e10d299 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 99c30e09d7b..20fb376567e 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 4abd1afe82f..ff203ec6221 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 18148fbff27..135a1ed0db2 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 42692918d10..3cdd7237705 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 9c1a7c86abb..b5a55ca1443 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 ae7c3b9586c..eb66d1eb68f 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 3bb26102b41..4496194b625 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 33883fa24d2..3024246a3d2 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 eae951027a0..6c4af71b29b 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 0a874d2927f..f1c8007be4b 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 40256185a12..d49f4008059 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 19d45ee54bc..0ee93e2a129 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 81e575494b6..5105168c1ea 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 905dc52ad42..7b409c3cded 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 8aa54f921d8..4fe8c9a9ccb 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 481e34bf63f..c7a2cb7e505 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 59187c7c7d5..941df4d875d 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 99866bb06bb..6ec1f4c92ca 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 4f63b6920ef..afd8bb8f491 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 5a24815697f..83f0f255cbb 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 75cee2de5b0..6a1edfd8b56 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 338c8524462..6e252bc88bd 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 1310590f561..d5547efe959 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 27ab476bd9c..67a0499aa34 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 d572e4cdaaa..fa939472b93 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 ff4704c4042..058a5077b1b 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 a8daa349d45..cddcb3c335b 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 96bf4694840..c0ae2bc88d9 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 06e1e388efc..5cede9a3fab 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 da7a9ec9072..d9e65bdde9a 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 be48ca85702..3b1ecb62788 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 4c41607d347..d293fdf175e 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 16063bbdfcf..e184db81056 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 3da73cb1a6c..92dda674eb0 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 47f3caafb8e..a77ddc42b3a 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 0c25be660cf..2fa8c0a136a 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 7951f69130d..182f6994a23 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 f5cff97e0b7..3b22c582db7 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 32d15edc6fc..8b26086a9df 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 5152f65445f..10406f71ff0 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 74e571160ea91fe69e26984d456275840d556424..4af2097a7df0a8797010b82bd811fabea9625664 100644 GIT binary patch delta 12 TcmccMecpRRKG)^~t^{cSCc6a( delta 12 TcmX@_eZhM}KG)_vu0&}7CbI - --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 a9e27cf3f9a..6b75d5e15cc 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 e3dff968ff0..34eeedc9a8e 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 8a0773f0b57..32342d6d787 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 7cddd3e5c3c..64fbb4a8d07 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 b06e344eb86..441882f9623 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 c36f9bb8810..de52ba59659 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 6b9e07ff745..0af5064e821 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 46b71a1466e..e8bcf8f5d8d 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 046ef5e2e26..bebbaa19882 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 0560e9e9c90..a1f1faa3030 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 a5e3a00eb6c..3e6a9ad3743 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 a6f82181d33..4a067624102 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 16b7e0ca4ca..f65fa0a5531 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 f16e438335d..32ca85c6ec5 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 66b213d8c9d..ff0469e7a33 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 c880810cb33..16c8ac9330b 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 44fa010c31a..6182b824b2f 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 a020d5e422d..15425e47a1d 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 f76770f40dd..8b6b9c4bb35 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 a9c31f615fe..de8f772b426 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 eff810e8696..3c2dc5338ff 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 9ae8691e1e5..377a407d720 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 ec733adaf95..fc116718f41 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 38efefc4a33..3eef4375880 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 778d265b850..98d6297a3f0 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 15fbfd911be..3cfb36e2a44 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 531f4ecfab7..365600edd77 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 a38dbedfe48..ce34db1246b 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 6376524d5b3..c3400f4d651 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 71559afa236..f2cbd171911 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 e87fb27a643..bbbefa799e2 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 48f347837cf..b0f7cbba507 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 7b806f39779052b0fa4f2afd8600786e3863039c..04b36f369537b6f4dacf9645e8de614749019034 100644 GIT binary patch delta 28 kcmaFG`;vD<5i_^0u4_bqt8<91F4yD img10.png [0] => img12.png ) - diff --git a/ext/standard/tests/array/prev_error3.phpt b/ext/standard/tests/array/prev_error3.phpt index 8f91507131e..6f0beaf1153 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 e838a9ce92e..2d752878410 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 247ec79cb25..a00ba044696 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 dbaf1751f00..7477276cd32 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 75a8fbb7abf..b47903b698c 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 ebc3991edde..5b83c89a29b 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 eb1326a546d..22fe18f4e09 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 b6b9c68bbef..d2b3e0e4234 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 dbd1a27820b..724764f48be 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 2821d212241..f3d7f69041c 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 71280710d03..29c5d3c09d5 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 f6f92c7ccde..51a0565cdb5 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 2cf8dc77f5c..8f1ee129c7a 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 e29dec92202..efcc21e9dfc 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 8977e349f95..3405eee2d70 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 27bf2609495..3c69972261d 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 9a580959e8d..3c0ab5051a9 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 b0394338ea7..470713227de 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 68dad4a4712..eb93106ab3f 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 2b5f80b71e8..3a29adf6180 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 e7a7db1be53..dd291f610ba 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 1f9c8f099fb..065889de115 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 f83c0329dad..ea6406a87bb 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 222b9c62a65..7681e9720b6 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 d0ccd362215..487f51982df 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 8fccc490472..18ca31890e7 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 3226741da4f..e0c41936d5a 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 18673f02459..14d740dd86d 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 fa5d463ade5..9e31b2fcbf2 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 b8660e1438c..2fd3f24ae16 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 ab3532e8a77..3296c4a36ab 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 7303dbb23fa..01002299586 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 e44c9a4c6d9..4e78cf9ec10 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 eb817db69b6..216c85c94bf 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 1ea52b0b9e2..023f6690c5a 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 0fdc6aa79a3..ca6c3ef4ea0 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 af6d50bef26..098c563c974 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 34814aecd4a..09c46dad2f4 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 b8742950365..843e9f1a536 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 e5e94e1c28c..8a11eba5896 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 a77f61819af..c7662f86053 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 9888c26ae02..ed3db7468d1 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 abc23952098..16a728e088f 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 e6e43056913..23416234f9b 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 ad7b6563824..89edadccc66 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 0399e6023a0..8815070ce5b 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 bede42a7622..78d27fa3a50 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 0fd665b250b..749ee69ab74 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 27962d6c56d..8ce2d2df561 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 51a68db2ef1..253ebd2be4e 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 9d9b67cb675..41a1758baaa 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 c25ded8bb2a..c6488fe5e60 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 edf6815083f..2a310227a53 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 8c7cabdc6ff..f2a05a5836e 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 5ad775ace32..10be39bb7f7 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 ed0644dce73..c38275fe4c1 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 5102220136c..68dec50ac41 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 312665267fa..1499e42d236 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 f265d0085cf..3aee5037a50 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 1f726786370..fd8f785bee5 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 909e2bc09af..9f080ad6997 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 2898dc7fda9..2368d1217e2 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 f9c8e7e2c4c..36b4a6e6922 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 5876cfa9bd4..d5835b0b874 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 e4564cbfa81..217a5c61f99 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 60880236d89..c971af9a267 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 03c36b175bb..94276a65738 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 7ef5ec631fb..a6a7368081d 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 bade168b4af..2fa6c90f027 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 df6320c00a2..f38b3caeead 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 ebf4a9ac241..11bfa0cb8ea 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 b5fc83caba0..bd8b90d4646 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 deba03c582e..126857da5c2 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 eb3be23f83e..e593270b12f 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 ee520940e44..3372c6cb83c 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 6ac22914dbd..e3ce551b3de 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 d456214c279..2adb9864f13 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 417974d3be4..4124a143f0a 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 318a2a3eb92..774de66bfe7 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 5e26b5a6361..5460203e056 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 c6ddef80660..ed14d87a677 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 bf76a749fd8..012fc01a3d2 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 05095c6f10c..01bd7dc6069 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 aa6ed93f500..fa62277bfb1 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 ff0279a367e..a2d83fe77e5 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 34c55d4cebd..92773592560 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 655eab306c9..d7063f429d3 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 13d2f1f6676..bc6f0dc8600 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 1eea8f65cc0..e0da9f66ee3 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 d23a27839ae..b23a262649f 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-- - --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 ad723370e42..2d6395167b3 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 aa1584b98a1..bb7ae44fe17 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-- - --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 289118240b5..a0daa2a574a 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-- - --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 aabaa4cd4ec..225351c6199 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-- - --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 4d39de3bb5c..ff74c5e42ca 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-- - --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 7f96fd050d7..a5f375b6c94 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-- - --CLEAN-- - --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 779f82b6f62..a831d845c75 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-- - --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 1c30d361a08..49251bb4953 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-- - --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 546cbbb2f2f..8f85f923d51 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-- - --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 6f8e9dd51d9..7872a2138e3 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 1ef9da1ae69..e231715b0bd 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 73ccc718407..970e3155c30 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-- - --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 cfd28b7e664..0e39ca6c673 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-- - --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 cb7c96fa0bb..50c91b19367 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-- - --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 029c6c5f8e9..3bde2e37de6 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-- - --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 681a00750cb..b3bd5e6a8ac 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-- - --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 259412f4603..28cbd7b1204 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-- - --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 999c7123850..cbbfd51ebc4 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-- - --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 f856d1665ab4eb7834856f8d228cc2c5c2c5d28d..3c3abea05a1ab00456237f73a3da4ae12e59f4e9 100644 GIT binary patch delta 16 YcmaE;c3*A7P4>yR*j+a(a5!=U07AhAeEw**xfeEayW4V079t-dH?_b diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt index 1245191806b..d26161a2263 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-- - --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 df13f4bd1a7..5a577508e76 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-- - --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 9d4fb9d9c9d..a65b63f3b04 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 2ce9bb30727..15de119035f 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 474d33bc492..8a0fae01e34 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-- - --CLEAN-- - --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 e2817aaef3c..c6cb3094332 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-- - --CLEAN-- - --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 27a1c0def68..acb0fdd717a 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 a62954c74f9..6433cde7029 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 e59079eac0c..6c6575d8965 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-- - - --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 b2cb79edfd5..52c46e77852 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 3fe54b53204..0d511b37a7f 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 de37851d267..2c8a940117d 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 4e94774a740..071fa607492 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-- - - --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 962c774637a..22a62ed1b0f 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-- - --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 8882f227eaf..4bb15429620 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-- - --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 32d66572089..19349b44421 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-- - --FILE-- - --FILE-- - --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 0cdfe5c1971..4a604fa56d4 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-- vbU|o?KPMv>020pv*8l(j diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt index 4eaffc330e8..bd4366b9458 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-- - --CLEAN-- - --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 3d96ffdaf0f..e32711cd5be 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 4b4a9aa00e2..a41f5b23826 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 966a9f43b76..809d61ba737 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 892121cc96b..462ab623672 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 9504766d9de..5f5cec47ed2 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 4961db19a67..c45bf3a5b22 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 447c189e044..90c7eb19e3b 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 05e4c16ef83..63ac59680e3 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-- - --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 efffb363347..967a541cc0a 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 e40175d1bd5..75873679ca8 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 83eeb6d5c07..131d43bfaa7 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 fdcedcac59f..1fd5203e502 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 f9b190bcf81..6b1778e74e7 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 5a11259b6b7..9cf0995035f 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 0060e66f554..9f721ff9211 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 d8d3aff27aa..6ee44159cee 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 451979e45b4..19b2e6507ef 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 00c2c82caae..8d8d36fe921 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 8c4c23fb30a..73c5d68e760 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 b62bedfe68b..f1e37fdda07 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 0dd3d23857c..52f69db746a 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 3dca66841f0..bad0a0b63cc 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 ec33e1f0bf3..b7e4e0a4cb1 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 b823709eace..221b6e62efa 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 655e2395b1a..2df9b1ce204 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 bcf26fd89bc..24105718d2e 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 7cc3d351c73..779ffcc0609 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 bad44ea0c3e..41e6f02998b 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 69fcadbfb6e..085d72d0a02 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 83e80adba2f..07ae930fbde 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 f1779656860..dbf4fe9625f 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 0518cb74352..04b321020cd 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 2cbbf517ede..f7c885dd31f 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 5cbaed0fdd0..a486f57367f 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 f184ffabf25..0169f715efd 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 02c7485d7ee..3d24d8502bb 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 49f6d81d104..d97cd12582a 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 5de601707c1..ac1d0ce19a4 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 789825de526..ecd8a6bd549 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 74c10852d88..e234f736f6e 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 c4c560971a1..ba14c54ba18 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 d930e55a71e..1b47d4ddd24 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 4066cadafe0..143f3bd1236 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 e450437cb32..44d6ebd697d 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 af5f5e23299..cd03ec21972 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 6c6ad7ec180..6de3bc571f4 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 aa5ad51ba4a..a77fc565173 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 fe351960dd1..db2a881d6cd 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-- - --FILE-- - --FILE-- 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 c3c15295ddb..5eab97ce18e 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 14b7b31c4be..658eb74c242 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 e2aa8658744..75e50589b39 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 59de1bbfc10..829f5ba0757 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 66da94f5523..1ea68382f74 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 6478b393776..208109fe214 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 01f6d361992..c720c6f25ad 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 5a55dceb9a8..a95d2dd807d 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 b493d4ec9c1..c738b1bcaad 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 e63e96c38f6..fa20f3c870d 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 be6b8e758ff..c9221593271 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 ebbfbd1ad70..e41d08c424f 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 cc0ead07f08..f4f691be353 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 7afa91216e5..ff1214c5270 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 470982d9b81..d7701a5d6af 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 c3d659b5644..7582a502a7c 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 60407676863..0a23e46d525 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-- - --CLEAN-- - --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 6a6d76f793e..ec703714176 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 3de5f1623ec..74fc7af5748 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 1907d390bea..1721935549b 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 6b79934760c..3cc7a4da9d6 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 ca5f3eaeeb7..68f526b5d02 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-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- var_name) ); echo "\n--- Done ---"; ?> - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- ")); echo "\n--- Done ---"; ?> - --CLEAN-- - --FILE-- - --FILE-- - --FILE-- - --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 b63dbeb7ead..8f87540395c 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-- - --FILE-- - --FILE-- - --FILE-- - --CLEAN-- - --CLEAN-- - --CLEAN-- - --CLEAN-- --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 0b3c66ad5c7..5f52f8b8e5c 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-- - --CLEAN-- --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 d30b8fd8d7e..496ccac7687 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-- --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 67589ea02af..2c8868b82d1 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-- - --CLEAN-- 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 40999fef47a..5bacb5e876a 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 4a5ffcd3326..9ed84f974ae 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 fa000db0086..42d1fad1e5b 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 9a87ac60a6d..25726881748 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 ff0b9d944b2..481d476f541 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 9fa8a81739a..0520055a900 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 3c9e429c77a..eaf4c46b1df 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 a3bea53c909..cebf6f6c956 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 8e2b8ca9bbc..a781ffae2f7 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 7cf338a9499..5eb6ad315ef 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 91dcbf46784..62816e1ec63 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 30298087b33..190d0f4b1ab 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 37fc45c2340..5761824ef3d 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 4c704ccacaf..7eb4aaa7e0b 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 fa4ff7f5cff..197078db3b2 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 843dbe0dc4c..68996ab6927 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 c27c13dfc42..c76e236566c 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 cfe0eb85628..bd58f93cf79 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 69ebd8d0a96..c434f4cc624 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 3f66f1802be..b3e52bb0989 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 717e73c7085..3b512a6f36e 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 6e3431943f4..d8bcc9ead4f 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-- ===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 b4a59d1afce..6028facfaaf 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 f0f5f40e70e..19c08a38c24 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 d41a215b688..930082bd632 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-- - - --FILE-- - ===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 53b6f40b19c..e897aaa07d6 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 6285e1a6ac2..bb50ffdebed 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 da87fe9f8bb..7279850c86e 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-- - - --FILE-- - ===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 027d124add7..fa90adf1b8d 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 f76c73572b4..1148f777f41 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 12776448b30..1a7917d47e4 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 34eb2f855ca..c1f618f2bd0 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 76a5956af0b..2cb511eaf4f 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 6cf6529820f..7fa00fc2b18 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 6fa73ee27ff..31dba0a6ec0 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 8bf04a39aa5..d19eca72487 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 112592d6edc..b7fbded2fc0 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 8efe222adac..748d15357c7 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 23bc8b19373..1c92aaaefad 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 b077c673192..4c897516c82 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 4f82039e2de..8d1947e1942 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 f637bfc2e95..b1dce294ab1 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 57115a2b721..263c9a6def4 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 7ee46ea9a28..b3a4c13502b 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 1efa72d9922..d7d1fc64e3d 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 f4e9439b140..aa264cce37a 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 71f4e0d1397..8ad628b4f08 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 178713abe97..3f6fca4076f 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 2aafa0684c1..0bb11e95c4a 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 ec982bd55be..1d9ca4a277c 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 b093ed1e0ca..c9eb22e2565 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 b809dc9d552..6e9494509a2 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 b777a2a44dd..2017bf697ad 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 e7e1ed5219e..e6d00a56a1b 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 8ce2323a394..c72a88de136 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 1728dea23f9..8bb782fc796 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 a010f7eba4f..fd8fce6e533 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 499581c05bc..b5f33e1830e 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 3f4d9cd5cf9..ec52ee927d4 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 3912ec87c7f..1bf65e70abb 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 fbb39b0e553..e1a51460651 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 193bd40f4db..ac0aafe27b6 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 fe43a025e9d..3fa1791eab5 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 f7168737cd0..b90f8a26e1c 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 fd3f5be6a0d..bdaf1eb46d9 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 5f0432b5946..925b19a2c0c 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 60bc61395fa..58b6f19f5c5 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
- --EXPECT-- Without session 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 94c79b8a146..6b0c4e85a9e 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
- --EXPECT-- Without session 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 a7a4a943785..9e35f967f07 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 - --EXPECT-- Without session 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 775b5902027..2dda4e7896d 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 - --EXPECT-- Without session diff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt index 2f671cd016c..392e1c930e3 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 4a478276570..d5b86c7b5c3 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 25776dd3baa..5447a94db8c 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-- - --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 388bc42599e..4a56234bec4 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 b12f5f579f0..f0da840c3b7 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) "lambda_2" 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 a7f61ec0636..a2476ef3f62 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) "lambda_2" 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 6dfb08f082b..29c3a138f92 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 cfdac8b2681..b99f4584a6e 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 57764e54d14..eedb757d200 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 a5acb37027f..38b5dbc28cc 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 6cdfda6a6b5..f3db3e1be23 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 7cdb6e3d415..2a2781ec28b 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 e8f22e00b14..2ed00b8fa82 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 27ba77adcc4..871ea9e37aa 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 d9f2a2b5311..6c5dfa87770 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 e4403a71203..dc2ec5e2e70 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 d72535c91c5..ade499b67e5 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 99c6e7c63b2..3e044e12be4 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 09679f53c76..3d3814414ec 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 c6bcf32e257..eec2301c40e 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 26d871150b1..f935a9f8837 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 f8ba898d7d3..ae73e279216 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 e46b9e97b47..c242234e97f 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 1e9dc59d450..6202b38e896 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 9a3e2d17c5b..b33c645508a 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 153aa80fe86..5c3f8ff8ea0 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 7f9be489e77..a2bc481ad26 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 120ac45eb55..45c0215ea35 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 9591411db3f..b5e34dfb8bf 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 c11a01b03f2..f27d0a66cf9 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 9051323eecb..23e74c621de 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 220105f2fbc..d4b96fb1f2b 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 8bd52332c4a..a6b96185c14 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 9efadf6e5c1..6041af19dcc 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 ab667126dae..7fe9db234a3 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 c515784ee2a..938b0e7fc86 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 deeb785f447..9492629e338 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 158c05b54af..b067030a484 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 38279c41ce8..4406c7a40a4 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 b6341cca76a..711f1733a2f 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 b2209ba3016..ccde29472b6 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 4c3fd6f8581..66bdc56ff64 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 ee51c134d5b..e77ea9922e9 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 404e9dfd825..ff88ec8c793 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 14a978b2b3f..8e76e15c2e4 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 973f74de0bd..6d90c9d8a81 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 21949f4a74f..6c8de64dddf 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 de51bc7e755..6d93b6eab6b 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 f33902e6a0f..d594feca074 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 c851a2632c5..875ae8dd056 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 42a6ad1a02e..4720ee46d20 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 4e52c192d8f..067b008f472 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 aec6b76a7b7..2168a31038f 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 7b65e5623a5..f65047ffafe 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 34b2e474d08..00b11d2b3dd 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 f70a48eeb2c..0ce9f6e39ab 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 107d3e40de3..c09dd51da50 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 b816cd58a08..ab815de4001 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 762bc587275..0fdfa253752 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 989e7d00aea..3b48b23123c 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 acc7f4ef988..df8367bdbb1 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 d0f5080619b..11db785ae45 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 e26563079e5..1c599df4d42 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 6df5c66da6e..4f903403117 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 5d6ad9d42c4..217f89f7ec4 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 3ff65483fed..49d2ce4ccfd 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 7749e4e4067..4e12d7e8167 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 16ef44c47d7..44304f24754 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 09d63be1289..230a66af3ad 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 b166c302ebe..2065fb9fba1 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 2d0a0b4bbc4..de97ee264bf 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 5874f63211c..06954d41738 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 4ea191e75c3..4e4612fdc03 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 29a30d088f6..3bc4200f2cc 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 fc6adb82ef7..f360d12aec2 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 87f5c3641df..625f3092c58 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 a3a34ab73b2..ec0c24254d9 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 0858a99e83b..569f3d6f213 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 7c72205639d..6b23f4e0294 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 5d94acc435a..61be4fdfe0f 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 620091e3134..66c65f4dea4 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 26bae7e0cf8..896acd7bcf1 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 abd4f26d8e2..3a719ada081 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 a1cb124767c..8dfb487639d 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 d00173eb489..5c473b6ebaa 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 f59a7823b4d..fbaab3c9afa 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 876f79b029b..83de20ac207 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 1bb5ec06ccb..e0358da735f 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 bdc97b07323..b62f09a69e7 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 2c6a6d3b219..6462126a0db 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 ceb2a843fdd..94fd2a01ff7 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 7003c368060..52cdf55a895 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 d9241d3de79..98fb64b8512 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 8c595468e17..2c955bb5be8 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 e8f7600b637..a0826080e62 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 971732cefac..c173401067d 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 7caf6e6c69e..b67fc5790e5 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 ebb27292ea2..47335c376a4 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 a2cbdfacbd8..184bac4ac62 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 c1968b2971b..070d61656ab 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 de85a1d27b5..9552be1dc92 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 f84df97286c..43db2926ecf 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 3e653fa04e4..7f680af4484 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 19fab95c643..cefb923f231 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 e9b6bf21da0..c06fe50e029 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 70267c5b0b1..4b9c8d8f5e0 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 fd78fdb5363..39212b6455b 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 ee89e9a1e21..18238d7b1e0 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 d887aba236c11b9dd873ddb22ed4c38ecf562966..cb50d5174b95b58aa96a8043404dccab7d5a4f67 100644 GIT binary patch delta 12 Ucmew>^hapJLYB>oSZ=cb04VeYs{jB1 delta 12 Ucmew(^jB!ZLYB=7SnjX@04VGQssI20 diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt index ed283411435..df949235406 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 484d38216d5..675911f3e1d 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 0c969df7cdd..74acc16ced6 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 60b9f23f314..32205209f7f 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 09b3046d051..a224a13d0c7 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 b834de3221f..b095ce97b95 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 1d4ec1c1ecb..3ff2d3cc11e 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 c1681df37da..fa15a577b01 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 b4a83effd89..4d17e943c23 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 59f09120c7a..fa731302414 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 233b31ba64f..1ec975e3f91 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 897208bb597..0f350f4247f 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 2a9d8a743c9..2e23ca1b71f 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 6773ec748c6..60a1e1c81fe 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 1f2384f72bc..3c199e32393 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 ba783fdefcf..a5a718351fd 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 3b61635d789..fd0b770f6b6 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 b51d593a939..f220e9afba9 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 131da852b73..4cfc3734084 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 2d4cf2682bf..1d5993e377e 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 67c66d61bc9..a7e4cf4931d 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 7a47456bdf7..79aaed55cb9 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 7ce9d7ad031..b745ec2a737 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 c96a8427931..f79a3d03c48 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 93dce603500..1a57fdd693a 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 38e1208a37b..5ffc90b6bd6 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 53cafd85551..a107875e3ef 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 efff8e71101..2753570fb1a 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 8e7c7df2c97..045d3f70db2 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 08cc7a2147a..d12833864ad 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 ac7c72036d9..454d7748c44 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 aea5cdd96ca..4109b5672e8 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 cd0ad072344..8c2ae9865bd 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 28321079930..5cc87e73607 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 ebfa1f095d5..57766324ab3 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 7c7e36edc53..79923f42db9 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 9211f1f7c25..573f8f014ae 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 3cb74c21edd..bd6435a4b0e 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 1da6c181137..0bcb18e6acf 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 2b8513879cb..d7bf15f4f43 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 163e905a4aa..3c03afb43df 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 01dc88843d8..7950231462e 100644 --- a/ext/standard/tests/strings/bug23650.phpt +++ b/ext/standard/tests/strings/bug23650.phpt @@ -28,4 +28,3 @@ echo strip_tags($str, ''); 4: 5:abc - def 6: - diff --git a/ext/standard/tests/strings/bug25671.phpt b/ext/standard/tests/strings/bug25671.phpt index ac647907042..ab26ddf772b 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 0718c8a4d3e..bd9628e877a 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 eb32e739e04..7140f762cac 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 7130804fa41..3c0831a0cbc 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 2bd9f2537f2..24dd0e27504 100644 --- a/ext/standard/tests/strings/bug61116.phpt +++ b/ext/standard/tests/strings/bug61116.phpt @@ -24,6 +24,3 @@ Function [ function get_html_translation_table ] { Parameter #2 [ $encoding ] } } - - - diff --git a/ext/standard/tests/strings/bug65230.phpt b/ext/standard/tests/strings/bug65230.phpt index 87f9ed44596..4363462934a 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 576524f1d28..eab2112afa3 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 ce11b3ee470..fea1371a32f 100644 --- a/ext/standard/tests/strings/bug68996.phpt +++ b/ext/standard/tests/strings/bug68996.phpt @@ -14,4 +14,3 @@ fopen("\xfc\x63", "r"); --EXPECTF--
Warning: : failed to open stream: No such file or directory in %sbug68996.php on line %d
- diff --git a/ext/standard/tests/strings/bug73058.phpt b/ext/standard/tests/strings/bug73058.phpt index f769616f565..3cd908b24ab 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 2d67ed06e1e723f16c264bad33ece5a258a89167..628c87cbceedf7ea0521fa679b167dde1689bbe8 100644 GIT binary patch delta 9 QcmZ3@w}x+nHajC101v?eVE_OC delta 7 OcmZ3(x0-K*Hah?d3j$UE diff --git a/ext/standard/tests/strings/chunk_split_variation3.phpt b/ext/standard/tests/strings/chunk_split_variation3.phpt index 408d8c8afb0..791535371f8 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 c3456a70c42..f7fcfb60f36 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 47174defefe..89cb6ccc4ba 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 1d6f33ec2e9..21d3fbe0dcf 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-- \n"; echo "Passes.";?> --EXPECT-- Passes. - diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt index ffbc5747de1..408a5a00c7d 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 9006b27619d..1fafffde3f9 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 71a2e4db2e5..314fd3e742d 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 e88b1b0c6bf..d86e1edb1f4 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 2addd0436dd..34c1cdffc32 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 754e55222ac..e5e6dd75d9f 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 14b6d401a25..730e69ba130 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 4e5c5afc14f..0f7a896e9fe 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt @@ -339,4 +339,4 @@ array(3) { ["<"]=> string(4) "<" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt index 6e144c0c510..595d8fd944a 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt @@ -92,4 +92,4 @@ array(3) { ["<"]=> string(4) "<" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/strings/html_entity_decode1.phpt b/ext/standard/tests/strings/html_entity_decode1.phpt index 5eabfc35a58..8d7a07784e0 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 b8a6e49eb32..1eb643bd0e9 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 18f6f3c90b8..685e0f66a6a 100644 --- a/ext/standard/tests/strings/html_entity_decode_cp866.phpt +++ b/ext/standard/tests/strings/html_entity_decode_cp866.phpt @@ -529,5 +529,3 @@ BLACK SQUARE: ■ => fe NO-BREAK SPACE:   => ff ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt index 09fd5df02b3..f41a5e16f55 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt @@ -401,5 +401,3 @@ LATIN SMALL LETTER THORN: þ => fe LATIN SMALL LETTER Y WITH DIAERESIS: ÿ => ff ÿ => ff - - diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt index 070ed536f4e..eb13827cee3 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt @@ -401,5 +401,3 @@ CYRILLIC SMALL LETTER SHORT U: ў => 2623783435453b CYRILLIC SMALL LETTER DZHE: џ => 2623783435463b ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt index e8523f6a096..adaa8563bd9 100644 --- a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt +++ b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt @@ -529,5 +529,3 @@ CYRILLIC CAPITAL LETTER CHE: Ч => fe CYRILLIC CAPITAL LETTER HARD SIGN: Ъ => ff ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_macroman.phpt b/ext/standard/tests/strings/html_entity_decode_macroman.phpt index 4f500dc4e7f..c4c9dd493b5 100644 --- a/ext/standard/tests/strings/html_entity_decode_macroman.phpt +++ b/ext/standard/tests/strings/html_entity_decode_macroman.phpt @@ -536,5 +536,3 @@ OGONEK: ˛ => fe CARON: ˇ => ff ÿ => d8 - - diff --git a/ext/standard/tests/strings/html_entity_decode_win1251.phpt b/ext/standard/tests/strings/html_entity_decode_win1251.phpt index e60d7074bf8..4b96f017742 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1251.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1251.phpt @@ -533,5 +533,3 @@ CYRILLIC SMALL LETTER YU: ю => fe CYRILLIC SMALL LETTER YA: я => ff ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_win1252.phpt b/ext/standard/tests/strings/html_entity_decode_win1252.phpt index 6163ef24aea..436b0d464a1 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1252.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1252.phpt @@ -165,5 +165,3 @@ LATIN SMALL LETTER Z WITH CARON: ž => 9e LATIN CAPITAL LETTER Y WITH DIAERESIS: Ÿ => 9f Ÿ => Ÿ - - diff --git a/ext/standard/tests/strings/htmlentities24.phpt b/ext/standard/tests/strings/htmlentities24.phpt index 51271bdddf4..5a023df7011 100644 --- a/ext/standard/tests/strings/htmlentities24.phpt +++ b/ext/standard/tests/strings/htmlentities24.phpt @@ -43,7 +43,6 @@ var_dump( htmlentities("\x84\x91",ENT_QUOTES, 'cp1252', "test1") ); echo "Done\n"; ?> - --EXPECTF-- *** Retrieving htmlentities for 256 characters *** string(12) "636872283029" @@ -328,4 +327,3 @@ Warning: htmlentities() expects at least 1 parameter, 0 given in %s on line %d NULL string(14) "„‘" Done - diff --git a/ext/standard/tests/strings/htmlentities_html5.phpt b/ext/standard/tests/strings/htmlentities_html5.phpt index 427ba0bc354..4a91012bd79 100644 --- a/ext/standard/tests/strings/htmlentities_html5.phpt +++ b/ext/standard/tests/strings/htmlentities_html5.phpt @@ -1621,4 +1621,4 @@ foreach ($mpcent as $i) { ⫆̸ U+02AC6 U+00338 ⫋︀ U+02ACB U+0FE00 ⫌︀ U+02ACC U+0FE00 -⫽οΈ€ U+02AFD U+0FE00 \ No newline at end of file +⫽οΈ€ U+02AFD U+0FE00 diff --git a/ext/standard/tests/strings/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt index 2c886b9af7b..8506c73e72c 100644 --- a/ext/standard/tests/strings/htmlspecialchars.phpt +++ b/ext/standard/tests/strings/htmlspecialchars.phpt @@ -328,4 +328,3 @@ Warning: htmlspecialchars() expects at least 1 parameter, 0 given in %s on line NULL string(10) "<br>" Done - diff --git a/ext/standard/tests/strings/htmlspecialchars_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_basic.phpt index 44396b0e2bb..4ac7733702b 100644 --- a/ext/standard/tests/strings/htmlspecialchars_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_basic.phpt @@ -94,4 +94,4 @@ Test 27: "300 < 400" Try with double decode TRUE Test 28: &quot;&amp;xyz&gt;abc&quot; Test 29: &quot;&amp;123&lt;456&quot; -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt index 4b4af9c63f4..35719186e4c 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 96a32351b47..de96c04db41 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) "< This's a string with quotes: "strings in double quote" & 'strings in single quote' " this\line is 'single quoted' /with\slashes " -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 8aa9479e5cc..b07f21acf63 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 1755df9edd9..e298fec6ae4 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 4d6e413672c..694d9fea181 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 48b76e9be7f..f476b9b7938 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 40254843a12..5dc260e8a14 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 73bcc33becd..e72fd400770 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 dbdbdcb2a54..138df1b8bd1 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 8e917767813488253ec68de9ae230f1c2d0241c3..3e996eccd37737ee691486ff5c3cb8c0f495b1da 100644 GIT binary patch delta 7 OcmbO)HcxDW95(<8sRBa) delta 9 QcmbOyHeYOm95*8u01r6=P5=M^ diff --git a/ext/standard/tests/strings/money_format_basic1.phpt b/ext/standard/tests/strings/money_format_basic1.phpt index 61fd816dae4..dc9b167ebf6 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 82fd6c0f955..c9404790653 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 59fc22e1222..b5a7b97fc3c 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 dcc3888e7ec..9683a7d901b 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 101d567749a..19a28678f27 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 2fd6050da26..711327cd6da 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 3cdcc1abf41..e7bebd6df76 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 cff579de03c..cb9513d9751 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 bce0c4d0d7d..a88390bc04c 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 37081b3cf11..d2694db6b6a 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 76efe085ca1..a4284eca55d 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 dbbd6c61548..9946f90c6ee 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 00b764f4162..0761fe4cfdb 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 f7bb9dec00e..bf77e3bc06d 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 b0fc221a0b4..6657ff9cca6 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 de40856c365..10900c14386 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 7ee6f4a66ef..49f4d5f12ab 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 308bb7ebccfb64ec96fa927f3550d95bbf98cd83..d908d40632e0d401af360bc38359b647a40588d3 100644 GIT binary patch delta 9 Qcmext`NeX>XBkE=02%rOBme*a delta 7 Ocmexj`Pp*AXBhwyz62Qn diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index 009b45ef31c..2bf9322c831 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 967949a09ca..1bab5dc8624 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 016e6c5bf18..a110311127e 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 0280a6a0e88ab5e7b75c308cb16a5c76be91a75f..e12da7f75fe3fbd5fd683b4ba58e10b8fc1acbfa 100644 GIT binary patch delta 9 Qcmca0d{KDA1x`jT02J{9TmS$7 delta 7 Ocmca8d_j1_1x^4CMFUX) diff --git a/ext/standard/tests/strings/sprintf_variation24.phpt b/ext/standard/tests/strings/sprintf_variation24.phpt index b4e8f51e912c16c0ded5b7233248ee37e0e60ef6..e3324ce417849b77861e0137ab7be9aa83a9a860 100644 GIT binary patch delta 9 QcmZpaZj#>6$jitD01rU|g8%>k delta 7 OcmZpYZj|28$O`}pM*?^N diff --git a/ext/standard/tests/strings/sprintf_variation25.phpt b/ext/standard/tests/strings/sprintf_variation25.phpt index 1e81c7137a314b7d49f8260e079805058cec836b..195ec29ea1a5e901b392d7bc0bf50f1d194a66d9 100644 GIT binary patch delta 9 QcmZ3bvRY+>mJlNs01*NLl>h($ delta 7 OcmZ3jvPxxxmJk37b%7 delta 7 OcmbQsJBN3}95w(8E&`?i diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt index b660334741fe7b57d4255b63e983f61a60790c39..0dc39db05d8dbf1ed85e1393b9d4507c3c90c669 100644 GIT binary patch delta 9 Qcmew-@?T^_9Ty`P02Z19X#fBK delta 7 Ocmew_@=s(#9Txx()B|1s diff --git a/ext/standard/tests/strings/sprintf_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt index af285dab232..a9a43bd15f0 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 03caa63493a..2d4352e75bf 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 b629dbabfe6..54b2403f146 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 d474ee0e1ae..a76f7efd5c3 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 5a34280b95e..a48a77a6d5d 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 f9d9dbe222e..0d842af057b 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 ea34bc8813b..0c86b468f5f 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 5cdf9da9989..d6bf31c56b9 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 72212b62443..56ab7c5fc8d 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 31177ef5219..f3ab223a06f 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 d4f55d47e17..ccd8bf1bd47 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 0ee0c52c656..ab056b3f2f1 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 2993dd00f1f..b3a034c5a74 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 1bf35df284f..1480e45a0f2 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 a37280df136..e910bfb687b 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 73efcc05836..c20cfcc5888 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 f2564abd534..d0f9632c98f 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 8ed760afded..726bc08a103 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 bcec81eab4d..f4f237fec42 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 f2a3dcbfec4..ca967758abd 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 f5c4664526d..cb5cdc754ac 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 9d2904ff725..dede6e8d989 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 2050711493f..e12681e0799 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 b66fd8c9ec2..c2d1d4fe2b6 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 5cf7f7c0146023af7000d0718f69e83c8f58bc5b..cbb2e0e5ed48cc17b5ba75df24e5f72ed6ef060b 100644 GIT binary patch delta 9 QcmZolZcg6NWXQ+`028qTIsgCw delta 7 OcmZopZc5(JWC#EaNdqqc diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt index 109fdc51cca..7f5fc1405cc 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 2361c0abb5a..ee0ea4165e2 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 32f387287b0..878cb283dd3 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 348f1bb731d..350600891b6 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 8b83b5e2d03..46911407f0b 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 367a25af0a6..d5681392b51 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 2f3f5a2f460..81247bc0ab6 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 81bd018a8a5..89a4e5cc726 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 7f572283dbe..1ad369f5dd3 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 96926564b05..9acefd074ca 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 55b6b6e2e25..4495e7c26de 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 4935cf4b306..d7d25f2ec0e 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 a330c1111a7..745fe88b4c0 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 ada8681914f..1f53e20d6f5 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 6881b07e50e..10c42731e70 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 5c7fd642ade..cca444c0e0a 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 2117c1306ce..d6dc34a080a 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 de8f3aa9626..e6b19540e39 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) "This's a string with quotes: "strings in double quote"; 'strings in single quote'; this\line is single quoted /with\slashes " -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 24a23810d57..493e6691317 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 3286765b3a547c0e46720bff0b9f0b809a2dc998..3e0fb6f2ab9f9a7e3385a902b4a04b3bcb140166 100644 GIT binary patch delta 9 Qcmeys|B-*g2X;m-02ea@vH$=8 delta 7 Ocmey!|ABwQ2X+7t+XJTn diff --git a/ext/standard/tests/strings/strnatcasecmp_error.phpt b/ext/standard/tests/strings/strnatcasecmp_error.phpt index 2105904aac8..6a0fca76e9b 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 c80a8e062e5..734e5f57dab 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 fde2f164b96..d00b3b83f02 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 6b4627383608b5af5a41ddf3643e1e17202bf57b..5043128945e3160d9cfd431558895322dbbf969b 100644 GIT binary patch delta 9 QcmeyW`b~AiS0P3&02u58_y7O^ delta 7 OcmeyS`c-wqS0Mlq2m|c^ diff --git a/ext/standard/tests/strings/strrchr_variation10.phpt b/ext/standard/tests/strings/strrchr_variation10.phpt index 7b106a1c2aa..3b06b20be12 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 67939daba5e..108ba2e0f2b 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 7ec5b830baf0281f147f2f9d78b77f5f131d3da8..730811ea47295c8d749e2e240feabfdd0bbb8a51 100644 GIT binary patch delta 9 QcmaFD`;>RX6E;RJ02U+zi2wiq delta 7 OcmaFL`-FGH6E*-39s_;= diff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt index 4e428189389..ddce2c2ccbb 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 b1a2e8b33ea..6b49b698f43 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 924505f6c90..291ff78cd7a 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 5a8f7332bb1..59d7a646863 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 866a75dfc2b..7b47b787be9 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 4d23db75da7..fd236d04d4e 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 32980450b28..b9b24b9cb1b 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 7822b759e21..94c1b9d96db 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 2ab0aa76b9e..9c0a3207852 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 6599c7167c3..460f18cca53 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 1e07fd9b5b6..1d9184d787c 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 46a727516f5..6a7f37beeb1 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 cc961f75b0b..46f754dbc8e 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 8481191e7a9..54db4b372ea 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 fe4706ca24b..caf4928e24a 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 44eddff3cbb..cab4349677f 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 6b73b212eaa..db6e8f9a153 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 63071e33208..d8eb52aa6f4 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 bc21ce65234..ecbe6a4967a 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 8086c53f664..1c404c19140 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 b968ce1436d..1d31a1c8027 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 11a37c6f94e..76f11acc267 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 82da5380570..858a4fb6085 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 eccf5dff34bcc71d92ff5fc84ff151133beb0a9a..229fc1fbb6ca086dc3adf4e1e7d72d740ac8a4fa 100644 GIT binary patch delta 9 QcmaDW^iF6)E+-=w02L<#F#rGn delta 7 OcmaDS^j2s?E++sE(E}y` diff --git a/ext/standard/tests/strings/strspn_variation7.phpt b/ext/standard/tests/strings/strspn_variation7.phpt index 5b229dad3c8..bbfe5d48680 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 57e0f80ed61..0ff0000132a 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 3cff71936efbe709600c5c1ef9930e8de302969c..2908de7a27e9604a010f8a4e64d667454f2d359c 100644 GIT binary patch delta 9 QcmaD7`80CF6CFk_02;moM*si- delta 7 OcmaDF`6P0~6CD5&JOn%d diff --git a/ext/standard/tests/strings/strtr.phpt b/ext/standard/tests/strings/strtr.phpt index 80ed722b8e4..77666ced8c4 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 9feb2376454..5bec076e7e5 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 8140c1cdb12..65f1c98366b 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 94ed70263a1..37ecfd14d57 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 2eb665631e2..5918c286e27 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 947d47f20f2..3fa99f77186 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 27620de9644..852c014b502 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 a69f17c6d7a..44276284e19 100644 --- a/ext/standard/tests/strings/trim.phpt +++ b/ext/standard/tests/strings/trim.phpt @@ -22,6 +22,5 @@ $tests = << - --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 50e3e86ab78..127d3f594d2 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 6cb751f2a0c..6899766b0af 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 fe43c7faec3..3828414360e 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 9061c092fe4..838093cdb16 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 86924cd4387..4fa51c92de8 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 723cd2236c9..8c7046021b6 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 8f5b8862c29290a7c14539048d3bde6067ae2ad6..57ac54fda98d9e18eef64e04f8da3ccf770fa7f9 100644 GIT binary patch delta 12 UcmdlbxKnV$BeuF6(AJ)(S=d8(IUW delta 12 TcmZ3=yNq{(F6(9;)=EYI8&U(N diff --git a/ext/standard/tests/strings/wordwrap.phpt b/ext/standard/tests/strings/wordwrap.phpt index c1f3b05bda5..50531b5e93c 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 59462448c88..86f6fac482f 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 e9384fd9b93..f352e9d06a0 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-- - --FILE-- --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 ae464d971b0..05890642660 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 270c8350c09..cf8dee95fb5 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 a1bcdba99b4..17984534a74 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 81265eecc9a..c65305af2c9 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 0adbb06e520..7340d243234 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 065e0c79bac..8fecb9d8eba 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 c2740dedd9e..b527a67d1bb 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 6131f1a4576..5af4232e0cd 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 7c8952db71e..678e3a3d11d 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 00cdeab9a9c..c83e458085a 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 fe04ad4a09f..6c492e36f17 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 85fae69840d..70138ffe774 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 3d88dfc25cc..69ebe274b52 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 6428b96fcfc..40b96c775db 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 f8b3e61c378..9bfb8140dba 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 1dabc4bde9d..105eec68872 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 b009d7d53e9..44e8b613da8 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 fe538b7072c..617648b9e49 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 7e43ef73bfc..190590bc883 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 d74209d137a..9c5296f1c56 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 0747b32d66e..fefda8b2a54 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 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 9a2fc895f69..0a3d3422e82 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 d5418f3f262..b38aee02a12 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 86ac09d6c23..a165a8bfbfb 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 8509316fa13..0f2a02dfb57 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 cd06733a2c3..c6092c7b940 100644 --- a/ext/tidy/tests/002.phpt +++ b/ext/tidy/tests/002.phpt @@ -15,4 +15,4 @@ tidy_parse_string() - \ No newline at end of file + diff --git a/ext/tidy/tests/005-mb.phpt b/ext/tidy/tests/005-mb.phpt index 1e5f0214631..d19104ab299 100644 --- a/ext/tidy/tests/005-mb.phpt +++ b/ext/tidy/tests/005-mb.phpt @@ -15,4 +15,4 @@ tidy_parse_file() - \ No newline at end of file + diff --git a/ext/tidy/tests/005.phpt b/ext/tidy/tests/005.phpt index 144a5862d4f..ea4aab31251 100644 --- a/ext/tidy/tests/005.phpt +++ b/ext/tidy/tests/005.phpt @@ -15,4 +15,4 @@ tidy_parse_file() - \ No newline at end of file + diff --git a/ext/tidy/tests/006.phpt b/ext/tidy/tests/006.phpt index 3c00fb452eb..a36006f3462 100644 --- a/ext/tidy/tests/006.phpt +++ b/ext/tidy/tests/006.phpt @@ -13,4 +13,4 @@ line 1 column 1 - Warning: missing declaration line 1 column 7 - Error: is not recognized! line 1 column 7 - Warning: discarding unexpected line 1 column 17 - Warning: discarding unexpected -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 7c1c945ba0b..303a2f9d8a4 100644 --- a/ext/tidy/tests/008.phpt +++ b/ext/tidy/tests/008.phpt @@ -12,4 +12,4 @@ line 1 column 1 - Warning: missing declaration line 1 column 7 - Error: is not recognized! line 1 column 7 - Warning: discarding unexpected line 1 column 17 - Warning: discarding unexpected -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 d04a684e8e0..c2bbfb9760d 100644 --- a/ext/tidy/tests/009.phpt +++ b/ext/tidy/tests/009.phpt @@ -16,4 +16,4 @@ tidy_doc object overloading - \ No newline at end of file + diff --git a/ext/tidy/tests/011.phpt b/ext/tidy/tests/011.phpt index f664c50a3e2..56cb0aa8937 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 a2389f0b7e8..fd0d55b1fbe 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-- -testing \ No newline at end of file +testing diff --git a/ext/tidy/tests/015.phpt b/ext/tidy/tests/015.phpt index ae2e9d3b02f..5b8255c52b6 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-- -testing \ No newline at end of file +testing diff --git a/ext/tidy/tests/017.phpt b/ext/tidy/tests/017.phpt index 24597e1a4ad..d27a42fe84c 100644 --- a/ext/tidy/tests/017.phpt +++ b/ext/tidy/tests/017.phpt @@ -14,4 +14,4 @@ The Tidy Output Buffer Filter testing - \ No newline at end of file + diff --git a/ext/tidy/tests/tidy_error.phpt b/ext/tidy/tests/tidy_error.phpt index 5416da8669c..f8aae96ef64 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 3d2a37e64f1..3a08ae5df7e 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 2e3b1b46727..7d3b4ff4e76 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 35b5048b6be..495d539b943 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 e76e47eab72..67138560555 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
Variables
 -DONE \ No newline at end of file +DONE diff --git a/ext/wddx/tests/bug70661.phpt b/ext/wddx/tests/bug70661.phpt index 402f81f2769..b7fcb1b3b8d 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 ac890f9b953..061fa65ef81 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 ae77ff75dc5..b88a1e0a9ef 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 3b08e58cc68..08987868248 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 5861d5538f4..c117279c2c5 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 6385457e8ee..a35f993b07c 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 056d95ca543..d7c7868946d 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 7e4cda1ea11..13f3747d3e5 100644 --- a/ext/wddx/tests/bug73331.phpt +++ b/ext/wddx/tests/bug73331.phpt @@ -9,7 +9,5 @@ $wddx = "
@@ -44,4 +40,4 @@ echo $response; Is string - \ No newline at end of file + diff --git a/ext/xmlrpc/tests/006.phpt b/ext/xmlrpc/tests/006.phpt index f33932d5a21..d8eaa971f74 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 #PHPSP 2013-08-22 - --SKIPIF-- - --FILE-- #PHPSP 2013-08-22 - --SKIPIF-- - --FILE-- - 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 7f1cd0c640e..26fef24e7a0 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 diff --git a/ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt index 69a6a7f6cb6..e71dd6f6d1a 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 e415ec9b5a2..b6d2940ae6a 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 dc027fdebd7..2335319009b 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 4de826dce9d..92a71cad09b 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 ec5538a6489..70d44469288 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 diff --git a/ext/xsl/tests/xslt002.phpt b/ext/xsl/tests/xslt002.phpt index 5ce2eb9d571..deb86aa2156 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 bar diff --git a/ext/xsl/tests/xslt003.phpt b/ext/xsl/tests/xslt003.phpt index 60a8427d162..992e5c7cf0f 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 diff --git a/ext/xsl/tests/xslt004.phpt b/ext/xsl/tests/xslt004.phpt index e5432323c44..e2076032a9f 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 diff --git a/ext/xsl/tests/xslt005.phpt b/ext/xsl/tests/xslt005.phpt index 5492bf812b3..49027e1b167 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 diff --git a/ext/xsl/tests/xslt006.phpt b/ext/xsl/tests/xslt006.phpt index 2c0cfedb4e6..60ca1812e3f 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 diff --git a/ext/xsl/tests/xslt007.phpt b/ext/xsl/tests/xslt007.phpt index 486560b85b9..bb4d0ba6570 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 diff --git a/ext/xsl/tests/xslt008-mb.phpt b/ext/xsl/tests/xslt008-mb.phpt index e13b576588e..52940cecd33 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 diff --git a/ext/xsl/tests/xslt008.phpt b/ext/xsl/tests/xslt008.phpt index 438a566c8b2..4c72bf81c39 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 diff --git a/ext/xsl/tests/xslt009.phpt b/ext/xsl/tests/xslt009.phpt index 9d1110ddeb0..b4e8390985d 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() diff --git a/ext/xsl/tests/xslt010.phpt b/ext/xsl/tests/xslt010.phpt index a805e9fbaa3..aeedabc5139 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 a04f2899849..999ec807a30 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 2ca4e91fe92..92777b8a568 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 9fd3fbd1ef8..6cb3f5ec71c 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 diff --git a/ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt b/ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt index 74cd38951ed..ef3cae69011 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 d7f82a18b48..bdbdd5da58f 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 af9d633d1d6..f61b7abe893 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 ff4be47e3fe..8670511f356 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 f56cfa8158e..6f7980d0138 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 3591f026029..7f6ed55678f 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 a3aca78bd4f..2c4e56713bc 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 42aaf958781..bfcb9033a67 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 f2fe9bdb573..bfc80cb473d 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 891e6ca9f3d..cfbdb0d9836 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 25e3a27ce75..edae589907b 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 7bc2e057faa..df7d7716637 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 07892d11714..971b2caa240 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 e40dacb4b84..9c32511096a 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 c70200d1029..dac8c9ac1a4 100644 --- a/ext/xsl/tests/xsltprocessor_transformToXML.phpt +++ b/ext/xsl/tests/xsltprocessor_transformToXML.phpt @@ -58,4 +58,4 @@ string(135) " Joe -" \ 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 32e1a8095bd..4bd598a3c05 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 05cb7ebd9ec..599fa10068e 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 f8a5db63f7f..5cefb9c2b2f 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 6914b5b109b..e52f7470a86 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 2ad727d9050..731f015fc52 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 f8ff1b4d440..56d84ad3dee 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 a5c023288bd..61aaca77bdc 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 280097c9268..5a25af3a113 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 efd19e318ec..87462694acf 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 4fa38dd1005..bcd6f2fc280 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 966bdf1b347..0695256b773 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 24d272ece01..63336121830 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 786f8aed565..c103dcb07d7 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 e02cec3832f..060a0057797 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 e7166455a9f..340a3f1062e 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 3e1a035060b..8390e263f2b 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 4b2bb1aec9c..6ee8d8e181a 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 a495b9b646e..a7211d2a72f 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 cea150a86da..474f5365aac 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 131170b4b75..a2d307de989 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 81f844402bb..e5b3ea97414 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 be28f016815..e16a91822b9 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 f090ac38b8b..2920fc108cf 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 1d7ec544332..9176d3662a5 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 bcc29ec1028..02eb2df81ff 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 a866ba26c43..9021a90cd27 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 cf4520d412b..5871b34f787 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 6a874a57868..1627d2eb111 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 c9dd298269c..04fa2e666bf 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 9c9a29d4853..c4964141b0d 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 3675dcbef9f..6cb5a533311 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 2298fa358a0..98821181564 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 0e683d1b323..20d43e1eb34 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 10b5f0db29f..3b38e26dae8 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 92a5b8dcfdd..cbfe6155110 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 6e86d865ee7..cea2c5d6f22 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 bca48f39c99..270758911f3 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 bf374eee018..a00fd878fe1 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 911c7fd73cc..cc627374bfd 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 7359a98cfaa..b308316335a 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 8b3e9c11231..10ff6630b2a 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 39d5fef9088..06c348cc3d8 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 5f00a18626a..72173bb7b95 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 825902e7c0a..b41720c396a 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 3baf5247b9d..13129c2c565 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 07367fdf3eb..5b979934825 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 4aefe3f910f..d544d6d4c24 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 ba2ecae5b72..e415a0e105e 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 00c99801cc0..277d8a02ad1 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 d99e2d0a451..63ab9335ba2 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 b42a44ad0dd..8319a27181a 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 2f0b5ae4514..8ef4ef070d2 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 e6c43e7b3a0..0436ebb5c31 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 615dfe96a35..6063f42b4d4 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 02dc7ac825a..196f69361e7 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 bb5d9ed65b8..888adac3100 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 7d7e96d341f..3e33fcd3fc1 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 b563a334849..aad308d67b9 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 43bc6eb9ab7..3d593e466cc 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 05d877158bf..7d3700b8cfe 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 fca081171cf..c8aaacb0018 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 803e34a5cce..0cd0baa14e8 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 29a67861fd8..aa556ca5a4a 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 63c827e4e1a..3bc04a0b7c7 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 fb80573c1cf..58773e61d34 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 abf8ce34acf..a8de244d18b 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 3b7681b43a7..81622dc440a 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 ecbc150c895..b12c5afdbce 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 6d393423f72..083a801866a 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 5d9b639d29b..68ec906719e 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 323dca16ce3..004a07775a4 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 06486acdd04..82e7b07a5db 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 e7fe83ccc2a..718d6935fa7 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 23ba1dcf0cf..89b801e97b0 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 dbed5238afb..5a979490506 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 95c6f4cc43e..b82ecf62169 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 8afb16946ec..9b8c142781a 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 bd2a58382bb..fd4a1756750 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 d90058f8d20..50fdd62f062 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 ca1a42a85c5..179545ee44c 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 f410b6e4f1a..728275986d0 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 43e5d9b2fcb..02fae273bcb 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 80189f2de9b..41a2683f06b 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 f08183fd252..c2264159bb5 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 071fcd716ee..3882389b16a 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 2f36d1f6191..cadaeae5321 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 eb7fde37b4d..99ff70de792 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 8ec10ac463a..a282aa9c3b8 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 88057eb3e3c..670d67532d2 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 ee693de97a5..53bc70a4cf5 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 ab673700dc1..80c26bd62a4 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 d16e2a8adef..8081fc805bd 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 3aa25f9ddab..afa62f51f50 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 c706b2a7b74..d4e7214937d 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 ec1b67a64b2..f8b776ae33e 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 4c185be6893..4996d9e2c70 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 399d32c5f31..0bc6f4f3e0e 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 87fa6227ab4..1a2993acbf3 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 ac23e77f6a2..001cf62a383 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 b21b33627ef..a53dbb8a201 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 2e0b6ad6270..a047de6e314 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 df0981443f2..0861eeb6537 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 cfed0c55319..ec8957c8d14 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("/", $output), "\ fclose($fp); ?> --EXPECTF-- - HTTP/1.1 404 Not Found Host: %s Date: %s @@ -108,4 +107,3 @@ Content-Length: %d 404 Not Found

Not Found

The requested resource /main/foo/bar was not found on this server.

- diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt index 72103219254..11db82ce909 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 99385400b96..67a793f8a06 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 \ 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 a21e4722b3d..1517f4a5540 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt @@ -47,4 +47,4 @@ Done \ 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 733f42f3f5f..53245b7ea7d 100644 --- a/sapi/fpm/tests/pool-apparmor-basic.phpt +++ b/sapi/fpm/tests/pool-apparmor-basic.phpt @@ -60,4 +60,4 @@ Done \ No newline at end of file +?> diff --git a/sapi/fpm/tests/pool-prefix.phpt b/sapi/fpm/tests/pool-prefix.phpt index b32b37e13a6..d128c232879 100644 --- a/sapi/fpm/tests/pool-prefix.phpt +++ b/sapi/fpm/tests/pool-prefix.phpt @@ -51,4 +51,4 @@ Done \ 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 42a7dc2392b..e1902af11bd 100644 --- a/sapi/fpm/tests/proc-user-ignored.phpt +++ b/sapi/fpm/tests/proc-user-ignored.phpt @@ -43,4 +43,4 @@ Done \ 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 6423ae446ce..775d6561d40 100644 --- a/sapi/fpm/tests/socket-uds-acl.phpt +++ b/sapi/fpm/tests/socket-uds-acl.phpt @@ -84,4 +84,4 @@ Done \ No newline at end of file +?> diff --git a/sapi/phpdbg/tests/breakpoints_001.phpt b/sapi/phpdbg/tests/breakpoints_001.phpt index 17e7c65cbfd..28f11760c81 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 96c98194b15..93351321a87 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 12b2504487e..9a1f7cccc5b 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 653dab9fccc..31204058964 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 fa6f0cdc5b2..3e0e94541d4 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 f921c257c53..900ccee083d 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 cbe5042c2be..3aa7aa2595c 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 0a00e04cde4..b91f5e83a05 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 e4e558b9fac..5a5e9ba61c0 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 a964393fd91..318ab7a90f4 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 42ade3d96b5..4afd8e276f5 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 5cabe66b322..24abdbbf416 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 ef4377484ea..d1da1db6eda 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 d3cd74e7da7..c43fe493c39 100644 --- a/sapi/tests/test006.phpt +++ b/sapi/tests/test006.phpt @@ -43,7 +43,6 @@ Content-Type: application/octet-stream phpinfo(); ?> -----------------------------240723202011929-- - --FILE-- -----------------------------240723202011929-- - --FILE-- &string(7) "changed" } - diff --git a/tests/classes/abstract_derived.phpt b/tests/classes/abstract_derived.phpt index 21f8fd87885..a23205f9a50 100644 --- a/tests/classes/abstract_derived.phpt +++ b/tests/classes/abstract_derived.phpt @@ -14,5 +14,4 @@ class derived extends base { ===DONE=== --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 cdf61d17e7f..a82bfff227d 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 1acf19d7c09..8e9e118e082 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 8e09a3a12b2..5643cb7a618 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 1fe0b248658..ba3d6780f1d 100644 --- a/tests/classes/array_access_012.phpt +++ b/tests/classes/array_access_012.phpt @@ -30,7 +30,6 @@ $data['element'] = &$test; ===DONE=== --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 4a21fad3383..e83767d632c 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 b0e9cf8f6ef..7ee06157845 100644 --- a/tests/classes/class_example.phpt +++ b/tests/classes/class_example.phpt @@ -1,7 +1,6 @@ --TEST-- Classes general test --FILE-- - --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 006e5fbab90..def661ec456 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 e893768629d..c3df0747a4a 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 55d23f77b11..6d1ac8355d7 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 9bb5533d7e2..60ec7e66387 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 b56679b3881..fa7984f06e4 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 01839ba7ef8..b8f970a16fd 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 54b32e4ab2c..b26ae3906c4 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 650bcc22281..7adf3f86818 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 537c8eac0f2..a3317cca8a5 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 c385bbd300b..6f62069c2e2 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 fe37b0691f5..65bfbd3c2b9 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 5bc9433e326..b11c9f05d46 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 25c2cfc8101..229ae896b04 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 67be8c4dc9e..495a8a1e350 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 919e03126f2..bcbead1be74 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 d92ed830e80..7eb57b27708 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 046f3b1c5a7..9f5e76d297f 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 952dbaf7f4b..681de11cbfb 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 908ca7b4d68..b4902f73067 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 60bf222e854..1abb85751e8 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 125326b224f..7e303bb1520 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-- --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 74c86f1e504..e936b5a03a9 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 000b33fae4a..11f8bf648f2 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 9c0de6cfb0b..6fc97f55fb7 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 d8d801192f6..97b48aa03d4 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 fad961bf273..6cc899bf1dd 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 28680096c5b..97b5f7dde52 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 712f51cd3ce..1914825804d 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 72e6e8a0a26..126afb36a77 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 b6780586c4c..4706115724e 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 14daa455a6d..a0a68eebbda 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 a214af99943..7c398382289 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 9875dd59b80..b19185d5417 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 7193178d480..149107424c9 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 abac19a7936..e05b5f6f683 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 37865cc7d4a..59132bf6ce0 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 6fd2774c543..1e5d28680ca 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 3635b918dba..12b0c3fcaa9 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 a5eaaea7144..1b0fd0bdf15 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 00eb647d5df..c1f6f8ff1d8 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 f6ea7643c11..c6b6bf1b249 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 581d663b608..fe4df691ccb 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 bacdc9ffe10..41daac4503c 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 aa79a53595a..eb7f1d7b2c3 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 8d78713add2..2582305471b 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 94feea8a22e..bb6021454cd 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 68a57a8f89c..08a89568e4d 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 b428b4ff6ed..45ccff11b61 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 b9423639b0a..e8588a11609 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 6501689ddb5..6a4eafcd2a8 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 bfaa57e36f8..907f7bc306c 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 318dcbe0861..35356581f49 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 e19a7d92d5e..417542ddea9 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 1135009e217..8234af2e177 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 79c891a2234..6dbef573633 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 e19eda496b2..1ba45123c40 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 111e826f715..258e4d2db0f 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 0c2f2f07567..e455c3b4461 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 caa4c7e4302..abc98f752d8 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 ac3ae2a2c72..346185ba830 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 9d5444051bd..85ddcd34875 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 7bf87212c16..fd9a9bf0c73 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 4a088c35e8a..0e7456d3d2b 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 8bd2c306e1b..1b84cd6d0d8 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 bc88bcda0f8..c1fca9d633a 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 90bf1d8893a..d871cfd2a89 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 bd76921af65..5864b1dece0 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 e54fb2173e0..90eb9a0581f 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-- - --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 f5140b54e23..a70e3eee93e 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 5b92736e5dc..e0426e810f0 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 a62d5dbb3b2..3f20021a7bb 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 37b01633584..9bf2957e12c 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 1f57e0acdf1..b1048fa9a25 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 b308e9ff57e..4d7beeba4f2 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 e53130da002..acc197f86f3 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 876c8675122..ef5d030cd0b 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 01c44449a71..00deb5f1db4 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 93eeaadc6a7..7e8a40438ed 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 624d9ad10c4..8d6a4d5dc3b 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 eb52bb8c106..a1f7c33600a 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 83b20848fe2..741b6604c0d 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 ea78d99a2b7..f516893418c 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 bafd9539eaa..6e98c763b24 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 168f79d04e3..1520c31ed4f 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 aef61668a47..7924a85a683 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 960fd73e732..16d7dba40f3 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 a082617ea89..1ed750cca90 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 f7679b8b670..2c44405670e 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 3680e30e4d8..70a7605baef 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 8fe27407f1c..be002031d79 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 e3b0e21c5c6..dc32962d67a 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 f725092618e..9f5d275333f 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 4fd9a819a84..5042b72e4b5 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 431659a24a4..f996073c0f6 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 0880a8b7a55..67061048b35 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 b14ae69549d..44b5f7825bb 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 1b01bafae6d..63d4c709a30 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 d4465539738..1d7a390b156 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 4879c16f933..b38dfa0cb16 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 b39832b5d82..360df577c22 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 0d51a22158e..68662f53eb9 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 47da74d8ce2..302d2cf1313 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 0e9ac2cfc50..1092cee5332 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 9d3f40215e2..c5cac686694 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 cbd78a24967..09e525ad126 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 8313a66369a..2bd3ef62a29 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 65f1dc398df..f82a53fe753 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 bdd5b4e93e5..cd348ebfb27 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 d2c48a3ad79..f6b04dabff4 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 2527e8e84a7..4de7fbd69ff 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 2e40afa0761..d20c3b0c248 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 87942c2f6d7..6824857675d 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 09bacaa081d..821831ee50b 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 563e62c35a7..cbedc03297a 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 8e4318122bb..f7fcfd2c961 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 eff12042361..ba75c16de9d 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 76ec2b5ff05..0e46d1e40f5 100644 --- a/tests/run-test/bug75042-3.phpt +++ b/tests/run-test/bug75042-3.phpt @@ -5,4 +5,4 @@ nonexistentsharedmodule --FILE-- string(12) "../globtest1" } - diff --git a/tests/security/open_basedir_is_dir.phpt b/tests/security/open_basedir_is_dir.phpt index e4ad620d740..5c8967a9f45 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 51ef0a2d1f3..a3303599b55 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 5d12148d852..61485029f42 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 951a19ac76a..9a269b5c0b0 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 25ce1c63a4b..d2b70614cd1 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 57506d599b4..9f68f1eac3b 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 5a532f84559..aaadbabfa03 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 35e5a220197..8cd037dbd3d 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 fc3111e3618..6b88e13080c 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 31ad1e5982c..e6aa8b64183 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 a2d892909de..00d2e8c61f5 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 9f56cd8005d..bce664ad9cd 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 2747093342e..8d977ed8d16 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 c1d4b6b14bd..378aae14425 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 3ef9b153f44..46ea7906108 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 b80b854d6c0..2ad67d67d57 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 ae431df2cad..1e5871f98ab 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 fd63e2978cb..b444164efd8 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 3a8aee8219c..f1cc88c79ce 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 aeedac9130d..a5b3a55b5f1 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 040a0970a9f..0c3c0074b13 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 a7dbdcd9df0..bbc170a6e66 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 2d43451cb15..fc11b8d7979 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 f612c406713..d1f3de26af4 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 9d69ea2bf5f..4ec6aa5b86b 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) -