From a21edc52aa5717f6ac905eeecdf21b001bb02340 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Mon, 31 Jul 2023 23:41:10 +0100 Subject: [PATCH] Remove unnecessary parentheses around language constructs in mysqli --- ext/mysqli/tests/001.phpt | 4 +- ext/mysqli/tests/002.phpt | 6 +- ext/mysqli/tests/003.phpt | 6 +- ext/mysqli/tests/004.phpt | 6 +- ext/mysqli/tests/005.phpt | 6 +- ext/mysqli/tests/006.phpt | 6 +- ext/mysqli/tests/007.phpt | 6 +- ext/mysqli/tests/008.phpt | 6 +- ext/mysqli/tests/009.phpt | 6 +- ext/mysqli/tests/010.phpt | 6 +- ext/mysqli/tests/011.phpt | 6 +- ext/mysqli/tests/012.phpt | 6 +- ext/mysqli/tests/013.phpt | 6 +- ext/mysqli/tests/014.phpt | 6 +- ext/mysqli/tests/015.phpt | 6 +- ext/mysqli/tests/016.phpt | 4 +- ext/mysqli/tests/017.phpt | 4 +- ext/mysqli/tests/018.phpt | 4 +- ext/mysqli/tests/019.phpt | 6 +- ext/mysqli/tests/020.phpt | 6 +- ext/mysqli/tests/021.phpt | 6 +- ext/mysqli/tests/022.phpt | 6 +- ext/mysqli/tests/023.phpt | 6 +- ext/mysqli/tests/024.phpt | 6 +- ext/mysqli/tests/025.phpt | 6 +- ext/mysqli/tests/026.phpt | 6 +- ext/mysqli/tests/027.phpt | 4 +- ext/mysqli/tests/028.phpt | 4 +- ext/mysqli/tests/029.phpt | 6 +- ext/mysqli/tests/030.phpt | 4 +- ext/mysqli/tests/031.phpt | 4 +- ext/mysqli/tests/032.phpt | 6 +- ext/mysqli/tests/033.phpt | 4 +- ext/mysqli/tests/034.phpt | 4 +- ext/mysqli/tests/035.phpt | 4 +- ext/mysqli/tests/036.phpt | 6 +- ext/mysqli/tests/037.phpt | 6 +- ext/mysqli/tests/038.phpt | 6 +- ext/mysqli/tests/039.phpt | 4 +- ext/mysqli/tests/040.phpt | 6 +- ext/mysqli/tests/041.phpt | 6 +- ext/mysqli/tests/042.phpt | 6 +- ext/mysqli/tests/043.phpt | 6 +- ext/mysqli/tests/044.phpt | 4 +- ext/mysqli/tests/045.phpt | 2 +- ext/mysqli/tests/046.phpt | 6 +- ext/mysqli/tests/047.phpt | 6 +- ext/mysqli/tests/048.phpt | 6 +- ext/mysqli/tests/049.phpt | 4 +- ext/mysqli/tests/050.phpt | 4 +- ext/mysqli/tests/051.phpt | 4 +- ext/mysqli/tests/052.phpt | 4 +- ext/mysqli/tests/053.phpt | 4 +- ext/mysqli/tests/054.phpt | 4 +- ext/mysqli/tests/055.phpt | 4 +- ext/mysqli/tests/056.phpt | 4 +- ext/mysqli/tests/057.phpt | 6 +- ext/mysqli/tests/058.phpt | 6 +- ext/mysqli/tests/059.phpt | 6 +- ext/mysqli/tests/060.phpt | 6 +- ext/mysqli/tests/062.phpt | 4 +- ext/mysqli/tests/063.phpt | 4 +- ext/mysqli/tests/064.phpt | 4 +- ext/mysqli/tests/065.phpt | 4 +- ext/mysqli/tests/066.phpt | 6 +- ext/mysqli/tests/067.phpt | 6 +- ext/mysqli/tests/069.phpt | 4 +- ext/mysqli/tests/070.phpt | 4 +- ext/mysqli/tests/071.phpt | 4 +- ext/mysqli/tests/072.phpt | 4 +- ext/mysqli/tests/074.phpt | 4 +- ext/mysqli/tests/bug28817.phpt | 4 +- ext/mysqli/tests/bug29311.phpt | 4 +- ext/mysqli/tests/bug30967.phpt | 4 +- ext/mysqli/tests/bug31668.phpt | 4 +- ext/mysqli/tests/bug32405.phpt | 6 +- ext/mysqli/tests/bug33090.phpt | 4 +- ext/mysqli/tests/bug33263.phpt | 4 +- ext/mysqli/tests/bug33491.phpt | 4 +- ext/mysqli/tests/bug34785.phpt | 4 +- ext/mysqli/tests/bug34810.phpt | 6 +- ext/mysqli/tests/bug35103.phpt | 6 +- ext/mysqli/tests/bug35517.phpt | 6 +- ext/mysqli/tests/bug35759.phpt | 6 +- ext/mysqli/tests/bug36420.phpt | 4 +- ext/mysqli/tests/bug36745.phpt | 6 +- ext/mysqli/tests/bug36802.phpt | 2 +- ext/mysqli/tests/bug36949.phpt | 6 +- ext/mysqli/tests/bug37090.phpt | 4 +- ext/mysqli/tests/bug38710.phpt | 4 +- ext/mysqli/tests/bug39457.phpt | 4 +- ext/mysqli/tests/bug42378.phpt | 6 +- ext/mysqli/tests/bug42548.phpt | 2 +- ext/mysqli/tests/bug44897.phpt | 4 +- ext/mysqli/tests/bug45019.phpt | 6 +- ext/mysqli/tests/bug45289.phpt | 6 +- ext/mysqli/tests/bug46109.phpt | 4 +- ext/mysqli/tests/bug46614.phpt | 4 +- ext/mysqli/tests/bug47050.phpt | 4 +- ext/mysqli/tests/bug48909.phpt | 6 +- ext/mysqli/tests/bug49027.phpt | 6 +- ext/mysqli/tests/bug49442.phpt | 6 +- ext/mysqli/tests/bug50772.phpt | 4 +- ext/mysqli/tests/bug51605.phpt | 4 +- ext/mysqli/tests/bug51647.phpt | 4 +- ext/mysqli/tests/bug52082.phpt | 4 +- ext/mysqli/tests/bug52891.phpt | 6 +- ext/mysqli/tests/bug53503.phpt | 2 +- ext/mysqli/tests/bug54221.phpt | 4 +- ext/mysqli/tests/bug54674.phpt | 4 +- ext/mysqli/tests/bug55283.phpt | 4 +- ext/mysqli/tests/bug55582.phpt | 2 +- ext/mysqli/tests/bug55653.phpt | 4 +- ext/mysqli/tests/bug62046.phpt | 4 +- ext/mysqli/tests/bug62885.phpt | 2 +- ext/mysqli/tests/bug63398.phpt | 2 +- ext/mysqli/tests/bug64726.phpt | 2 +- ext/mysqli/tests/bug66043.phpt | 4 +- ext/mysqli/tests/bug66124.phpt | 4 +- ext/mysqli/tests/bug66762.phpt | 4 +- ext/mysqli/tests/bug67839.phpt | 6 +- ext/mysqli/tests/bug67983.phpt | 4 +- ext/mysqli/tests/bug68077.phpt | 4 +- ext/mysqli/tests/bug70384.phpt | 2 +- ext/mysqli/tests/bug70949.phpt | 4 +- ext/mysqli/tests/bug71863.phpt | 4 +- ext/mysqli/tests/bug72489.phpt | 6 +- ext/mysqli/tests/bug72701.phpt | 2 +- ext/mysqli/tests/bug73462.phpt | 4 +- ext/mysqli/tests/bug73800.phpt | 4 +- ext/mysqli/tests/bug73949.phpt | 4 +- ext/mysqli/tests/bug74021.phpt | 4 +- ext/mysqli/tests/bug74547.phpt | 4 +- ext/mysqli/tests/bug74779.phpt | 4 +- ext/mysqli/tests/bug74968.phpt | 4 +- ext/mysqli/tests/bug75018.phpt | 6 +- ext/mysqli/tests/bug75448.phpt | 2 +- ext/mysqli/tests/bug76386.phpt | 6 +- ext/mysqli/tests/bug77597.phpt | 6 +- ext/mysqli/tests/bug77935.phpt | 4 +- ext/mysqli/tests/bug77956.phpt | 4 +- ext/mysqli/tests/bug79084.phpt | 4 +- ext/mysqli/tests/bug79084_collision.phpt | 4 +- ext/mysqli/tests/bug79375.phpt | 6 +- ext/mysqli/tests/bug80837.phpt | 4 +- ext/mysqli/tests/bug_bits.phpt | 6 +- ext/mysqli/tests/bug_mysql_49406.phpt | 4 +- ext/mysqli/tests/gh7837.phpt | 4 +- ext/mysqli/tests/gh7932.phpt | 2 +- ext/mysqli/tests/gh8058.phpt | 2 +- ext/mysqli/tests/gh8068.phpt | 2 +- ext/mysqli/tests/gh8267.phpt | 4 +- ext/mysqli/tests/gh9590.phpt | 4 +- .../gracefull_fail_on_empty_result_set.phpt | 114 +++++++++--------- ext/mysqli/tests/mysqli_affected_rows.phpt | 6 +- ext/mysqli/tests/mysqli_affected_rows_oo.phpt | 6 +- ...file_overrides_local_infile_directory.phpt | 4 +- ext/mysqli/tests/mysqli_auth_pam.phpt | 8 +- ext/mysqli/tests/mysqli_autocommit.phpt | 4 +- ext/mysqli/tests/mysqli_autocommit_oo.phpt | 4 +- .../tests/mysqli_begin_transaction.phpt | 8 +- ext/mysqli/tests/mysqli_change_user.phpt | 4 +- .../tests/mysqli_change_user_get_lock.phpt | 8 +- .../tests/mysqli_change_user_insert_id.phpt | 2 +- .../mysqli_change_user_locks_temporary.phpt | 8 +- ext/mysqli/tests/mysqli_change_user_old.phpt | 4 +- ext/mysqli/tests/mysqli_change_user_oo.phpt | 2 +- ...ysqli_change_user_prepared_statements.phpt | 4 +- .../tests/mysqli_change_user_rollback.phpt | 2 +- ext/mysqli/tests/mysqli_character_set.phpt | 6 +- .../tests/mysqli_character_set_name.phpt | 4 +- .../tests/mysqli_character_set_name_oo.phpt | 4 +- .../tests/mysqli_class_mysqli_interface.phpt | 4 +- ...ysqli_class_mysqli_properties_no_conn.phpt | 6 +- .../mysqli_class_mysqli_result_interface.phpt | 6 +- .../mysqli_class_mysqli_stmt_interface.phpt | 6 +- ext/mysqli/tests/mysqli_close.phpt | 4 +- ext/mysqli/tests/mysqli_close_oo.phpt | 4 +- ext/mysqli/tests/mysqli_commit.phpt | 4 +- ext/mysqli/tests/mysqli_commit_oo.phpt | 2 +- ext/mysqli/tests/mysqli_connect.phpt | 4 +- ext/mysqli/tests/mysqli_connect_errno.phpt | 4 +- ext/mysqli/tests/mysqli_connect_error.phpt | 4 +- ext/mysqli/tests/mysqli_connect_oo.phpt | 4 +- .../tests/mysqli_connect_oo_defaults.phpt | 4 +- ext/mysqli/tests/mysqli_connect_twice.phpt | 4 +- ext/mysqli/tests/mysqli_data_seek.phpt | 8 +- ext/mysqli/tests/mysqli_data_seek_oo.phpt | 8 +- ext/mysqli/tests/mysqli_debug.phpt | 8 +- ext/mysqli/tests/mysqli_debug_append.phpt | 8 +- .../tests/mysqli_debug_control_string.phpt | 6 +- ext/mysqli/tests/mysqli_debug_ini.phpt | 2 +- .../mysqli_debug_mysqlnd_control_string.phpt | 8 +- .../tests/mysqli_debug_mysqlnd_only.phpt | 2 +- ext/mysqli/tests/mysqli_driver.phpt | 4 +- ext/mysqli/tests/mysqli_dump_debug_info.phpt | 4 +- .../tests/mysqli_dump_debug_info_oo.phpt | 4 +- ext/mysqli/tests/mysqli_errno.phpt | 4 +- ext/mysqli/tests/mysqli_errno_oo.phpt | 4 +- ext/mysqli/tests/mysqli_error.phpt | 4 +- ext/mysqli/tests/mysqli_error_oo.phpt | 4 +- ext/mysqli/tests/mysqli_error_unicode.phpt | 4 +- ext/mysqli/tests/mysqli_execute_query.phpt | 2 +- ext/mysqli/tests/mysqli_expire_password.phpt | 8 +- ext/mysqli/tests/mysqli_explain_metadata.phpt | 2 +- ext/mysqli/tests/mysqli_fetch_all.phpt | 8 +- ext/mysqli/tests/mysqli_fetch_all_oo.phpt | 8 +- ext/mysqli/tests/mysqli_fetch_array.phpt | 6 +- .../tests/mysqli_fetch_array_assoc.phpt | 6 +- .../tests/mysqli_fetch_array_large.phpt | 6 +- .../tests/mysqli_fetch_array_many_rows.phpt | 6 +- ext/mysqli/tests/mysqli_fetch_array_oo.phpt | 8 +- ext/mysqli/tests/mysqli_fetch_assoc.phpt | 8 +- ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt | 2 +- .../tests/mysqli_fetch_assoc_no_alias.phpt | 4 +- .../mysqli_fetch_assoc_no_alias_utf8.phpt | 4 +- ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt | 8 +- .../tests/mysqli_fetch_assoc_zerofill.phpt | 8 +- ext/mysqli/tests/mysqli_fetch_column.phpt | 4 +- ext/mysqli/tests/mysqli_fetch_field.phpt | 8 +- .../tests/mysqli_fetch_field_direct.phpt | 8 +- .../tests/mysqli_fetch_field_direct_oo.phpt | 8 +- .../tests/mysqli_fetch_field_flags.phpt | 4 +- ext/mysqli/tests/mysqli_fetch_field_oo.phpt | 8 +- .../tests/mysqli_fetch_field_types.phpt | 6 +- ext/mysqli/tests/mysqli_fetch_fields.phpt | 8 +- ext/mysqli/tests/mysqli_fetch_lengths.phpt | 8 +- ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt | 10 +- ext/mysqli/tests/mysqli_fetch_object.phpt | 8 +- .../mysqli_fetch_object_no_constructor.phpt | 8 +- .../tests/mysqli_fetch_object_no_object.phpt | 6 +- ext/mysqli/tests/mysqli_fetch_object_oo.phpt | 8 +- ext/mysqli/tests/mysqli_fetch_row.phpt | 8 +- ext/mysqli/tests/mysqli_field_count.phpt | 8 +- ext/mysqli/tests/mysqli_field_seek.phpt | 8 +- ext/mysqli/tests/mysqli_field_tell.phpt | 8 +- ext/mysqli/tests/mysqli_fork.phpt | 4 +- ext/mysqli/tests/mysqli_free_result.phpt | 8 +- ext/mysqli/tests/mysqli_get_charset.phpt | 8 +- ext/mysqli/tests/mysqli_get_client_stats.phpt | 8 +- ...mysqli_get_client_stats_implicit_free.phpt | 8 +- .../tests/mysqli_get_client_stats_off.phpt | 8 +- .../tests/mysqli_get_client_stats_ps.phpt | 8 +- .../mysqli_get_client_stats_skipped.phpt | 6 +- .../tests/mysqli_get_connection_stats.phpt | 8 +- .../mysqli_get_connection_stats_off.phpt | 4 +- ext/mysqli/tests/mysqli_get_host_info.phpt | 8 +- ext/mysqli/tests/mysqli_get_proto_info.phpt | 6 +- ext/mysqli/tests/mysqli_get_server_info.phpt | 8 +- .../tests/mysqli_get_server_version.phpt | 6 +- ext/mysqli/tests/mysqli_get_warnings.phpt | 4 +- ext/mysqli/tests/mysqli_info.phpt | 8 +- ext/mysqli/tests/mysqli_init.phpt | 2 +- ext/mysqli/tests/mysqli_insert_id.phpt | 8 +- .../tests/mysqli_insert_id_variation.phpt | 6 +- .../tests/mysqli_insert_packet_overflow.phpt | 4 +- ext/mysqli/tests/mysqli_kill.phpt | 8 +- ext/mysqli/tests/mysqli_last_insert_id.phpt | 6 +- .../mysqli_local_infile_default_off.phpt | 4 +- ..._local_infile_directory_access_denied.phpt | 2 +- ...ocal_infile_directory_vs_open_basedir.phpt | 4 +- .../tests/mysqli_local_infile_set_on.phpt | 4 +- ext/mysqli/tests/mysqli_max_links.phpt | 8 +- ext/mysqli/tests/mysqli_more_results.phpt | 8 +- ext/mysqli/tests/mysqli_multi_query.phpt | 8 +- .../tests/mysqli_mysqlnd_read_timeout.phpt | 2 +- .../mysqli_mysqlnd_read_timeout_long.phpt | 4 +- .../mysqli_mysqlnd_read_timeout_zero.phpt | 4 +- ext/mysqli/tests/mysqli_next_result.phpt | 8 +- .../tests/mysqli_next_result_error.phpt | 2 +- ext/mysqli/tests/mysqli_no_reconnect.phpt | 6 +- ext/mysqli/tests/mysqli_num_fields.phpt | 8 +- ext/mysqli/tests/mysqli_num_rows.phpt | 8 +- ext/mysqli/tests/mysqli_open_bug74432.phpt | 4 +- ext/mysqli/tests/mysqli_options.phpt | 2 +- .../tests/mysqli_options_init_command.phpt | 6 +- .../mysqli_options_int_and_float_native.phpt | 4 +- .../tests/mysqli_options_openbasedir.phpt | 4 +- ext/mysqli/tests/mysqli_pam_sha256.phpt | 4 +- .../mysqli_pam_sha256_public_key_ini.phpt | 4 +- .../mysqli_pam_sha256_public_key_option.phpt | 4 +- ..._pam_sha256_public_key_option_invalid.phpt | 4 +- .../tests/mysqli_pconn_conn_multiple.phpt | 4 +- ext/mysqli/tests/mysqli_pconn_disabled.phpt | 4 +- ext/mysqli/tests/mysqli_pconn_kill.phpt | 4 +- ext/mysqli/tests/mysqli_pconn_limits.phpt | 4 +- ext/mysqli/tests/mysqli_pconn_max_links.phpt | 10 +- ext/mysqli/tests/mysqli_pconn_reuse.phpt | 4 +- ext/mysqli/tests/mysqli_pconn_twice.phpt | 4 +- ext/mysqli/tests/mysqli_pconnect.phpt | 4 +- ext/mysqli/tests/mysqli_phpinfo.phpt | 4 +- ext/mysqli/tests/mysqli_ping.phpt | 6 +- ext/mysqli/tests/mysqli_poll.phpt | 2 +- ext/mysqli/tests/mysqli_poll_kill.phpt | 2 +- .../mysqli_poll_mixing_insert_select.phpt | 4 +- ext/mysqli/tests/mysqli_prepare.phpt | 8 +- .../tests/mysqli_prepare_no_object.phpt | 6 +- ext/mysqli/tests/mysqli_ps_select_union.phpt | 6 +- ext/mysqli/tests/mysqli_query.phpt | 8 +- ext/mysqli/tests/mysqli_query_iterators.phpt | 8 +- .../tests/mysqli_query_stored_proc.phpt | 2 +- ext/mysqli/tests/mysqli_real_connect.phpt | 6 +- ...mysqli_real_connect_compression_error.phpt | 6 +- .../tests/mysqli_real_connect_pconn.phpt | 4 +- .../tests/mysqli_real_escape_string.phpt | 6 +- .../tests/mysqli_real_escape_string_big5.phpt | 8 +- .../mysqli_real_escape_string_eucjpms.phpt | 8 +- .../mysqli_real_escape_string_euckr.phpt | 8 +- .../mysqli_real_escape_string_gb2312.phpt | 8 +- .../tests/mysqli_real_escape_string_gbk.phpt | 8 +- ...mysqli_real_escape_string_nobackslash.phpt | 6 +- .../tests/mysqli_real_escape_string_sjis.phpt | 8 +- .../mysqli_real_escape_string_unicode.phpt | 8 +- ext/mysqli/tests/mysqli_real_query.phpt | 8 +- ext/mysqli/tests/mysqli_reap_async_query.phpt | 2 +- .../tests/mysqli_reap_async_query_error.phpt | 2 +- .../tests/mysqli_release_savepoint.phpt | 4 +- ext/mysqli/tests/mysqli_report.phpt | 2 +- ext/mysqli/tests/mysqli_report_new.phpt | 2 +- ext/mysqli/tests/mysqli_report_wo_ps.phpt | 4 +- .../tests/mysqli_result_invalid_mode.phpt | 8 +- .../tests/mysqli_result_references.phpt | 8 +- .../mysqli_result_references_mysqlnd.phpt | 2 +- .../tests/mysqli_result_unclonable.phpt | 4 +- ext/mysqli/tests/mysqli_rollback.phpt | 4 +- ext/mysqli/tests/mysqli_savepoint.phpt | 4 +- ext/mysqli/tests/mysqli_select_db.phpt | 8 +- ext/mysqli/tests/mysqli_set_charset.phpt | 2 +- ext/mysqli/tests/mysqli_set_opt.phpt | 4 +- ext/mysqli/tests/mysqli_sqlstate.phpt | 8 +- ext/mysqli/tests/mysqli_ssl_set.phpt | 2 +- ext/mysqli/tests/mysqli_stat.phpt | 6 +- .../tests/mysqli_stmt_affected_rows.phpt | 6 +- ext/mysqli/tests/mysqli_stmt_attr_get.phpt | 8 +- .../tests/mysqli_stmt_attr_get_prefetch.phpt | 6 +- ext/mysqli/tests/mysqli_stmt_attr_set.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_big_prepare.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_bind_limits.phpt | 6 +- ext/mysqli/tests/mysqli_stmt_bind_param.phpt | 10 +- ...mysqli_stmt_bind_param_call_user_func.phpt | 8 +- ...stmt_bind_param_check_param_no_change.phpt | 12 +- .../mysqli_stmt_bind_param_many_columns.phpt | 6 +- .../mysqli_stmt_bind_param_references.phpt | 6 +- .../mysqli_stmt_bind_param_type_juggling.phpt | 6 +- ext/mysqli/tests/mysqli_stmt_bind_result.phpt | 8 +- .../tests/mysqli_stmt_bind_result_bit.phpt | 6 +- .../tests/mysqli_stmt_bind_result_format.phpt | 8 +- .../mysqli_stmt_bind_result_references.phpt | 6 +- .../mysqli_stmt_bind_result_zerofill.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_close.phpt | 10 +- ext/mysqli/tests/mysqli_stmt_data_seek.phpt | 8 +- .../tests/mysqli_stmt_datatype_change.phpt | 6 +- ext/mysqli/tests/mysqli_stmt_errno.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_error.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_execute.phpt | 4 +- .../tests/mysqli_stmt_execute_bind.phpt | 4 +- .../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.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt | 2 +- ...ysqli_stmt_fetch_fields_win32_unicode.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt | 6 +- ext/mysqli/tests/mysqli_stmt_field_count.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_free_result.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_get_result.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_get_result2.phpt | 8 +- .../tests/mysqli_stmt_get_result_bit.phpt | 2 +- .../mysqli_stmt_get_result_field_count.phpt | 6 +- .../tests/mysqli_stmt_get_result_geom.phpt | 6 +- .../mysqli_stmt_get_result_metadata.phpt | 6 +- ..._stmt_get_result_metadata_fetch_field.phpt | 6 +- .../mysqli_stmt_get_result_non_select.phpt | 6 +- .../tests/mysqli_stmt_get_result_seek.phpt | 6 +- .../tests/mysqli_stmt_get_result_types.phpt | 6 +- .../tests/mysqli_stmt_get_warnings.phpt | 4 +- ext/mysqli/tests/mysqli_stmt_init.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_insert_id.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_multires.phpt | 2 +- ext/mysqli/tests/mysqli_stmt_num_rows.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_param_count.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_prepare.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_reset.phpt | 8 +- .../tests/mysqli_stmt_result_metadata.phpt | 8 +- .../mysqli_stmt_result_metadata_sqltests.phpt | 6 +- .../tests/mysqli_stmt_send_long_data.phpt | 8 +- ...mt_send_long_data_packet_size_mysqlnd.phpt | 6 +- ext/mysqli/tests/mysqli_stmt_sqlstate.phpt | 8 +- .../tests/mysqli_stmt_store_result.phpt | 8 +- ext/mysqli/tests/mysqli_stmt_unclonable.phpt | 4 +- ext/mysqli/tests/mysqli_store_result.phpt | 8 +- .../tests/mysqli_store_result_buffered_c.phpt | 8 +- .../tests/mysqli_store_result_copy.phpt | 8 +- ext/mysqli/tests/mysqli_thread_id.phpt | 8 +- ext/mysqli/tests/mysqli_unclonable.phpt | 4 +- ext/mysqli/tests/mysqli_use_result.phpt | 8 +- ext/mysqli/tests/mysqli_warning_count.phpt | 8 +- .../tests/mysqli_warning_unclonable.phpt | 4 +- .../tests/ps_cursor_multiple_result_sets.phpt | 4 +- 399 files changed, 1121 insertions(+), 1121 deletions(-) diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt index b3c93a5c1f1..ec4cbc2c2d2 100644 --- a/ext/mysqli/tests/001.phpt +++ b/ext/mysqli/tests/001.phpt @@ -4,11 +4,11 @@ mysqli connect mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --EXPECT-- Num_of_rows=1 diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index 9726afe7802..5fef3f9250b 100644 --- a/ext/mysqli/tests/015.phpt +++ b/ext/mysqli/tests/015.phpt @@ -4,7 +4,7 @@ mysqli autocommit/commit/rollback with innodb mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- array(2) { diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt index 6d62b566a15..65414c34781 100644 --- a/ext/mysqli/tests/016.phpt +++ b/ext/mysqli/tests/016.phpt @@ -4,11 +4,11 @@ mysqli fetch user variable mysqli --SKIPIF-- --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --FILE-- --FILE-- --CLEAN-- --FILE-- --FILE-- --FILE-- --CLEAN-- --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --FILE-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- --CLEAN-- --FILE-- multi_query('SELECT 1;SELECT 2'); diff --git a/ext/mysqli/tests/070.phpt b/ext/mysqli/tests/070.phpt index e849fe06f8c..3f98cd46760 100644 --- a/ext/mysqli/tests/070.phpt +++ b/ext/mysqli/tests/070.phpt @@ -4,11 +4,11 @@ mysqli ping mysqli --SKIPIF-- --FILE-- ping()); diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt index 39d8ba77594..e1d36da4700 100644 --- a/ext/mysqli/tests/071.phpt +++ b/ext/mysqli/tests/071.phpt @@ -4,11 +4,11 @@ mysqli thread_id & kill mysqli --SKIPIF-- --FILE-- server_version; diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt index 91f302335d9..d0c29b3be1f 100644 --- a/ext/mysqli/tests/072.phpt +++ b/ext/mysqli/tests/072.phpt @@ -4,11 +4,11 @@ mysqli warning_count, get_warnings mysqli --SKIPIF-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- multi_query('SELECT 1;SELECT 2'); diff --git a/ext/mysqli/tests/bug32405.phpt b/ext/mysqli/tests/bug32405.phpt index 51d3c19387f..96e5130ea3d 100644 --- a/ext/mysqli/tests/bug32405.phpt +++ b/ext/mysqli/tests/bug32405.phpt @@ -4,11 +4,11 @@ Bug #32405 (mysqli->fetch() is returning bad data) mysqli --SKIPIF-- --FILE-- --CLEAN-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- --FILE-- query("DROP TABLE IF EXISTS test_bint"); @@ -54,7 +54,7 @@ EOSQL; ?> --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- - + --EXPECT-- done! diff --git a/ext/mysqli/tests/bug36420.phpt b/ext/mysqli/tests/bug36420.phpt index 5d0b52fefeb..3b603d2bd65 100644 --- a/ext/mysqli/tests/bug36420.phpt +++ b/ext/mysqli/tests/bug36420.phpt @@ -4,12 +4,12 @@ Bug #36420 (segfault when access result->num_rows after calling result->close()) mysqli --SKIPIF-- --FILE-- query('select 1'); diff --git a/ext/mysqli/tests/bug36745.phpt b/ext/mysqli/tests/bug36745.phpt index bbe11789b53..6c993eee385 100644 --- a/ext/mysqli/tests/bug36745.phpt +++ b/ext/mysqli/tests/bug36745.phpt @@ -4,13 +4,13 @@ Bug #36745 (LOAD DATA LOCAL INFILE doesn't return correct error message) mysqli --SKIPIF-- --INI-- mysqli.allow_local_infile=1 --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --FILE-- stmt_init(); diff --git a/ext/mysqli/tests/bug39457.phpt b/ext/mysqli/tests/bug39457.phpt index 979a568ba07..c72145fc4a4 100644 --- a/ext/mysqli/tests/bug39457.phpt +++ b/ext/mysqli/tests/bug39457.phpt @@ -4,11 +4,11 @@ Bug #39457 (Multiple invoked OO connections never close) mysqli --SKIPIF-- --FILE-- connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/bug42378.phpt b/ext/mysqli/tests/bug42378.phpt index 75661c60b5a..67256859b48 100644 --- a/ext/mysqli/tests/bug42378.phpt +++ b/ext/mysqli/tests/bug42378.phpt @@ -4,13 +4,13 @@ Bug #42378 (bind_result memory exhaustion, SELECT column, FORMAT(...) AS _format mysqli --SKIPIF-- --INI-- memory_limit=83886080 --FILE-- --CLEAN-- --EXPECT-- FLOAT diff --git a/ext/mysqli/tests/bug42548.phpt b/ext/mysqli/tests/bug42548.phpt index dccfd589041..6b1d2edd450 100644 --- a/ext/mysqli/tests/bug42548.phpt +++ b/ext/mysqli/tests/bug42548.phpt @@ -52,7 +52,7 @@ print "done!"; ?> --CLEAN-- --FILE-- query('DROP PROCEDURE IF EXISTS p')) printf("[001] [%d] %s\n", $link->errno, $link->error); @@ -69,7 +69,7 @@ if (mysqli_get_server_version($link) <= 50000) { ?> --CLEAN-- --FILE-- --FILE-- close(); @@ -32,7 +32,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- --EXPECTF-- [004] [%s diff --git a/ext/mysqli/tests/bug46109.phpt b/ext/mysqli/tests/bug46109.phpt index 62b40b962d9..47cb43bcbf9 100644 --- a/ext/mysqli/tests/bug46109.phpt +++ b/ext/mysqli/tests/bug46109.phpt @@ -4,11 +4,11 @@ Bug #46109 (MySQLi::init - Memory leaks) mysqli --SKIPIF-- --FILE-- init(); diff --git a/ext/mysqli/tests/bug46614.phpt b/ext/mysqli/tests/bug46614.phpt index 34c03585dfb..10a62f04ca0 100644 --- a/ext/mysqli/tests/bug46614.phpt +++ b/ext/mysqli/tests/bug46614.phpt @@ -4,7 +4,7 @@ Bug #46614 (Extended MySQLi class gives incorrect empty() result) mysqli --SKIPIF-- isEmpty(); diff --git a/ext/mysqli/tests/bug47050.phpt b/ext/mysqli/tests/bug47050.phpt index 151cd750f2b..0f23b9ff806 100644 --- a/ext/mysqli/tests/bug47050.phpt +++ b/ext/mysqli/tests/bug47050.phpt @@ -4,14 +4,14 @@ Bug #47050 (mysqli_poll() modifies improper variables) mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- done diff --git a/ext/mysqli/tests/bug49027.phpt b/ext/mysqli/tests/bug49027.phpt index 7bef3004d80..f77939f9fe0 100644 --- a/ext/mysqli/tests/bug49027.phpt +++ b/ext/mysqli/tests/bug49027.phpt @@ -4,11 +4,11 @@ Bug #49027 (mysqli_options() doesn't work when using mysqlnd) mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- array(1) { diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt index e5741ead4d5..a5057c5028e 100644 --- a/ext/mysqli/tests/bug49442.phpt +++ b/ext/mysqli/tests/bug49442.phpt @@ -23,7 +23,7 @@ mysqli.allow_persistent=1 mysqli.max_persistent=1 --FILE-- --CLEAN-- --EXPECT-- array(2) { diff --git a/ext/mysqli/tests/bug50772.phpt b/ext/mysqli/tests/bug50772.phpt index 4351e2108c5..0c61f9237b1 100644 --- a/ext/mysqli/tests/bug50772.phpt +++ b/ext/mysqli/tests/bug50772.phpt @@ -4,11 +4,11 @@ Bug #50772 (mysqli constructor without parameters does not return a working mysq mysqli --SKIPIF-- --FILE-- --INI-- mysqli.max_links = 1 @@ -12,7 +12,7 @@ mysqli.allow_persistent = Off mysqli.max_persistent = 0 --FILE-- close(); ?> --FILE-- --FILE-- options(MYSQLI_SET_CHARSET_NAME, "latin2"); if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) { diff --git a/ext/mysqli/tests/bug52891.phpt b/ext/mysqli/tests/bug52891.phpt index fc76f89b703..2d73ae70733 100644 --- a/ext/mysqli/tests/bug52891.phpt +++ b/ext/mysqli/tests/bug52891.phpt @@ -4,11 +4,11 @@ Bug #52891 (Wrong data inserted with mysqli/mysqlnd when using bind_param,value mysqli --SKIPIF-- --FILE-- --CLEAN-- --INI-- mysqli.max_links = 1 @@ -12,7 +12,7 @@ mysqli.allow_persistent = Off mysqli.max_persistent = 0 --FILE-- --INI-- mysqli.max_links = 1 @@ -12,7 +12,7 @@ mysqli.allow_persistent = Off mysqli.max_persistent = 0 --FILE-- close(); ?> --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- Okey diff --git a/ext/mysqli/tests/bug66124.phpt b/ext/mysqli/tests/bug66124.phpt index c0059e17143..521c17e8fb9 100644 --- a/ext/mysqli/tests/bug66124.phpt +++ b/ext/mysqli/tests/bug66124.phpt @@ -20,7 +20,7 @@ $table_delete = "DELETE FROM `test`"; $id = '1311200011005001566'; -require_once('connect.inc'); +require_once 'connect.inc'; if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", @@ -93,7 +93,7 @@ $link->close(); done --CLEAN-- --EXPECT-- Using 'i': diff --git a/ext/mysqli/tests/bug66762.phpt b/ext/mysqli/tests/bug66762.phpt index 2864793805b..0176e12e1cc 100644 --- a/ext/mysqli/tests/bug66762.phpt +++ b/ext/mysqli/tests/bug66762.phpt @@ -4,11 +4,11 @@ Bug #66762 mysqli@libmysql segfault in mysqli_stmt::bind_result() when link clo mysqli --SKIPIF-- --FILE-- --INI-- precision=5 --FILE-- --CLEAN-- --EXPECT-- 1: 9.9999: 9.9999 diff --git a/ext/mysqli/tests/bug67983.phpt b/ext/mysqli/tests/bug67983.phpt index d6aebc35fef..7146689d64e 100644 --- a/ext/mysqli/tests/bug67983.phpt +++ b/ext/mysqli/tests/bug67983.phpt @@ -4,12 +4,12 @@ Bug #67983: mysqlnd with MYSQLI_OPT_INT_AND_FLOAT_NATIVE fails to interpret bit mysqli --SKIPIF-- --FILE-- --CLEAN-- server_version < 50709) { ?> --CLEAN-- --EXPECT-- OK diff --git a/ext/mysqli/tests/bug70949.phpt b/ext/mysqli/tests/bug70949.phpt index 15ae23dae2d..e4bfb6b0641 100644 --- a/ext/mysqli/tests/bug70949.phpt +++ b/ext/mysqli/tests/bug70949.phpt @@ -8,7 +8,7 @@ require_once 'skipifconnectfailure.inc'; ?> --FILE-- query("DROP TABLE IF EXISTS bug70949"); @@ -43,7 +43,7 @@ if ($stmt = $mysql->prepare($sql)) ?> --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --FILE-- query('SET @@global.max_allowed_packet = 67108864'); diff --git a/ext/mysqli/tests/bug73949.phpt b/ext/mysqli/tests/bug73949.phpt index 7c5364c2747..65633d3dc5b 100644 --- a/ext/mysqli/tests/bug73949.phpt +++ b/ext/mysqli/tests/bug73949.phpt @@ -4,11 +4,11 @@ Bug #73949 (leak in mysqli_fetch_object) mysqli --SKIPIF-- --FILE-- --FILE-- query('SET @@global.max_allowed_packet = 67108864'); diff --git a/ext/mysqli/tests/bug74547.phpt b/ext/mysqli/tests/bug74547.phpt index 49d2bc8d3e6..a4516ea1a87 100644 --- a/ext/mysqli/tests/bug74547.phpt +++ b/ext/mysqli/tests/bug74547.phpt @@ -4,13 +4,13 @@ Bug #74547 mysqli::change_user() doesn't accept null as $database argument w/str mysqli --SKIPIF-- --FILE-- --FILE-- --FILE-- --FILE-- fetch_assoc()) { ?> --CLEAN-- --EXPECT-- string(1) "0" diff --git a/ext/mysqli/tests/bug75448.phpt b/ext/mysqli/tests/bug75448.phpt index 1ecb81b2003..fedcd3fb399 100644 --- a/ext/mysqli/tests/bug75448.phpt +++ b/ext/mysqli/tests/bug75448.phpt @@ -4,7 +4,7 @@ mysqli_prepare() called on a closed connection should return FALSE (bug #75448) mysqli --SKIPIF-- --FILE-- free_result(); } else { - echo('[FIRST][FAIL] mysqli::prepare returned false: ' . $link->error . PHP_EOL); + echo '[FIRST][FAIL] mysqli::prepare returned false: ' . $link->error . PHP_EOL; } $link->close(); @@ -74,7 +74,7 @@ if ($stmt) { } $stmt->free_result(); } else { - echo('[SECOND][FAIL] mysqli::prepare returned false: ' . $link->error . PHP_EOL); + echo '[SECOND][FAIL] mysqli::prepare returned false: ' . $link->error . PHP_EOL; } $link->close(); ?> diff --git a/ext/mysqli/tests/bug77597.phpt b/ext/mysqli/tests/bug77597.phpt index ffc0ccf1897..bc9de640ea2 100644 --- a/ext/mysqli/tests/bug77597.phpt +++ b/ext/mysqli/tests/bug77597.phpt @@ -4,13 +4,13 @@ Bug #77597: mysqli_fetch_field hangs scripts mysqli --SKIPIF-- --FILE-- query('DROP TABLE IF EXISTS test'); @@ -27,7 +27,7 @@ var_dump($field->name); ?> --CLEAN-- --EXPECT-- string(1) "b" diff --git a/ext/mysqli/tests/bug77935.phpt b/ext/mysqli/tests/bug77935.phpt index 5ebf1e97e5f..c2f2f9684b6 100644 --- a/ext/mysqli/tests/bug77935.phpt +++ b/ext/mysqli/tests/bug77935.phpt @@ -4,11 +4,11 @@ Bug #77935: Crash in mysqlnd_fetch_stmt_row_cursor when calling an SP with a cur mysqli --SKIPIF-- --FILE-- --CLEAN-- --FILE-- --FILE-- --FILE-- close(); ?> --CLEAN-- --EXPECTF-- Running query on first connection diff --git a/ext/mysqli/tests/bug80837.phpt b/ext/mysqli/tests/bug80837.phpt index d4b37a268b2..b8ad59eea23 100644 --- a/ext/mysqli/tests/bug80837.phpt +++ b/ext/mysqli/tests/bug80837.phpt @@ -9,7 +9,7 @@ if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd'); ?> --FILE-- close(); ?> --CLEAN-- --EXPECT-- Commands out of sync; you can't run this command now diff --git a/ext/mysqli/tests/bug_bits.phpt b/ext/mysqli/tests/bug_bits.phpt index 97e6dbe39b2..73bc95aa98d 100644 --- a/ext/mysqli/tests/bug_bits.phpt +++ b/ext/mysqli/tests/bug_bits.phpt @@ -4,12 +4,12 @@ Bug (Incorrectly decoding bit values / Malformed server packet. Field length poi mysqli --SKIPIF-- --FILE-- --CLEAN-- --FILE-- --FILE-- options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, true); @@ -22,7 +22,7 @@ var_dump($result->fetch_all()); ?> --CLEAN-- --EXPECT-- array(3) { diff --git a/ext/mysqli/tests/gh7932.phpt b/ext/mysqli/tests/gh7932.phpt index cc0317c314c..ed6d2443608 100644 --- a/ext/mysqli/tests/gh7932.phpt +++ b/ext/mysqli/tests/gh7932.phpt @@ -8,7 +8,7 @@ require_once 'skipifconnectfailure.inc'; ?> --FILE-- --FILE-- --FILE-- query('SELECT 42'); diff --git a/ext/mysqli/tests/gh8267.phpt b/ext/mysqli/tests/gh8267.phpt index 805bd695a6f..d7c0e8d80e9 100644 --- a/ext/mysqli/tests/gh8267.phpt +++ b/ext/mysqli/tests/gh8267.phpt @@ -4,11 +4,11 @@ Bug GH-8267 (MySQLi uses unsupported format specifier on Windows) mysqli --SKIPIF-- --FILE-- query("DROP TABLE IF EXISTS foo"); diff --git a/ext/mysqli/tests/gh9590.phpt b/ext/mysqli/tests/gh9590.phpt index 79f44c5d7d4..df373f7d3b3 100644 --- a/ext/mysqli/tests/gh9590.phpt +++ b/ext/mysqli/tests/gh9590.phpt @@ -5,7 +5,7 @@ mysqli posix --SKIPIF-- ---FILE-- -multi_query("SELECT 1"); - var_dump($link->next_result()); // should return false - var_dump($link->store_result()); // now what happens here!? - - - // Returns only one result set - $link->multi_query("SELECT 1"); - var_dump($link->next_result()); - var_dump($link->use_result()); - - $link->close(); -?> ---CLEAN-- - ---EXPECT-- -bool(false) -object(mysqli_result)#3 (5) { - ["current_field"]=> - int(0) - ["field_count"]=> - int(1) - ["lengths"]=> - NULL - ["num_rows"]=> - int(1) - ["type"]=> - int(0) -} -bool(false) -object(mysqli_result)#3 (5) { - ["current_field"]=> - int(0) - ["field_count"]=> - int(1) - ["lengths"]=> - NULL - ["num_rows"]=> - int(0) - ["type"]=> - int(1) -} +--TEST-- +Fail gracefully on empty result set +--EXTENSIONS-- +mysqli +--SKIPIF-- + +--FILE-- +multi_query("SELECT 1"); + var_dump($link->next_result()); // should return false + var_dump($link->store_result()); // now what happens here!? + + + // Returns only one result set + $link->multi_query("SELECT 1"); + var_dump($link->next_result()); + var_dump($link->use_result()); + + $link->close(); +?> +--CLEAN-- + +--EXPECT-- +bool(false) +object(mysqli_result)#3 (5) { + ["current_field"]=> + int(0) + ["field_count"]=> + int(1) + ["lengths"]=> + NULL + ["num_rows"]=> + int(1) + ["type"]=> + int(0) +} +bool(false) +object(mysqli_result)#3 (5) { + ["current_field"]=> + int(0) + ["field_count"]=> + int(1) + ["lengths"]=> + NULL + ["num_rows"]=> + int(0) + ["type"]=> + int(1) +} diff --git a/ext/mysqli/tests/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt index ebd505cb0ed..2547720b314 100644 --- a/ext/mysqli/tests/mysqli_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows.phpt @@ -4,11 +4,11 @@ mysqli_affected_rows() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt index 8a82cb01a44..69aec1ec24f 100644 --- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt @@ -4,11 +4,11 @@ mysqli->affected_rows mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- Property access is not allowed yet diff --git a/ext/mysqli/tests/mysqli_allow_local_infile_overrides_local_infile_directory.phpt b/ext/mysqli/tests/mysqli_allow_local_infile_overrides_local_infile_directory.phpt index 627c76ec539..8625be91e1d 100644 --- a/ext/mysqli/tests/mysqli_allow_local_infile_overrides_local_infile_directory.phpt +++ b/ext/mysqli/tests/mysqli_allow_local_infile_overrides_local_infile_directory.phpt @@ -22,7 +22,7 @@ mysqli.allow_local_infile=1 mysqli.local_infile_directory={PWD}/foo/bar --FILE-- --CLEAN-- --CLEAN-- diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt index 0da4e488e64..dae921c4140 100644 --- a/ext/mysqli/tests/mysqli_autocommit.phpt +++ b/ext/mysqli/tests/mysqli_autocommit.phpt @@ -16,7 +16,7 @@ mysqli ?> --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt index 0c0dbee834f..fe8ac72e02c 100644 --- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt +++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt @@ -15,7 +15,7 @@ mysqli ?> --FILE-- --CLEAN-- --EXPECT-- my_mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt b/ext/mysqli/tests/mysqli_begin_transaction.phpt index 20eda35cb3d..7a7d7e36fba 100644 --- a/ext/mysqli/tests/mysqli_begin_transaction.phpt +++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt @@ -4,9 +4,9 @@ mysqli_begin_transaction() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- NULL diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt index 2e3a772a7ed..9628770994f 100644 --- a/ext/mysqli/tests/mysqli_change_user.phpt +++ b/ext/mysqli/tests/mysqli_change_user.phpt @@ -4,11 +4,11 @@ mysqli_change_user() mysqli --SKIPIF-- --FILE-- --INI-- max_execution_time=240 --FILE-- --CLEAN-- --EXPECTF-- Testing GET_LOCK()... diff --git a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt index e220878c5ba..c4a39b756c8 100644 --- a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt @@ -54,7 +54,7 @@ require_once 'skipifconnectfailure.inc'; ?> --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt index 4c72190b9c7..36f5ec0329c 100644 --- a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt +++ b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt @@ -4,13 +4,13 @@ mysqli_change_user() - table locks, GET_LOCK(), temporary tables mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_old.phpt b/ext/mysqli/tests/mysqli_change_user_old.phpt index db9e7ca1831..1e2bfcc302f 100644 --- a/ext/mysqli/tests/mysqli_change_user_old.phpt +++ b/ext/mysqli/tests/mysqli_change_user_old.phpt @@ -4,7 +4,7 @@ mysqli_change_user(), MySQL < 5.6 mysqli --SKIPIF-- = 50600 && mysqli_get_server_version($link ?> --FILE-- = 50600) ?> --FILE-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt index 8e9e943528d..092f5412c24 100644 --- a/ext/mysqli/tests/mysqli_character_set.phpt +++ b/ext/mysqli/tests/mysqli_character_set.phpt @@ -4,7 +4,7 @@ Fetching results from tables of different charsets. mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt index 364d9a0ea8a..76e901c7975 100644 --- a/ext/mysqli/tests/mysqli_character_set_name.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name.phpt @@ -4,12 +4,12 @@ mysqli_character_set_name(), mysql_client_encoding() [alias] mysqli --SKIPIF-- --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- - + --EXPECTF-- Without RS diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt index 946657d3ef8..46c1348283d 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt @@ -4,12 +4,12 @@ Interface of the class mysqli_result mysqli --SKIPIF-- --FILE-- query('SELECT * FROM test'); diff --git a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt index c0101a8d9e4..40b8b224dc2 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt @@ -4,12 +4,12 @@ Interface of the class mysqli_stmt mysqli --SKIPIF-- --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_commit_oo.phpt b/ext/mysqli/tests/mysqli_commit_oo.phpt index fd4c1bbf008..f9c1865328f 100644 --- a/ext/mysqli/tests/mysqli_commit_oo.phpt +++ b/ext/mysqli/tests/mysqli_commit_oo.phpt @@ -98,7 +98,7 @@ if (!have_innodb($link)) ?> --CLEAN-- --EXPECTF-- mysqli object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt index f229515f0de..cf276d6886f 100644 --- a/ext/mysqli/tests/mysqli_connect.phpt +++ b/ext/mysqli/tests/mysqli_connect.phpt @@ -4,11 +4,11 @@ mysqli_connect() mysqli --SKIPIF-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- mysqli_data_seek(): Argument #2 ($offset) must be greater than or equal to 0 diff --git a/ext/mysqli/tests/mysqli_data_seek_oo.phpt b/ext/mysqli/tests/mysqli_data_seek_oo.phpt index 8801b7394eb..b9870cd407f 100644 --- a/ext/mysqli/tests/mysqli_data_seek_oo.phpt +++ b/ext/mysqli/tests/mysqli_data_seek_oo.phpt @@ -4,12 +4,12 @@ mysqli_result->data_seek() mysqli --SKIPIF-- --FILE-- --EXPECT-- mysqli_result object is already closed diff --git a/ext/mysqli/tests/mysqli_debug.phpt b/ext/mysqli/tests/mysqli_debug.phpt index 25cd8f2c8d6..510de3dae00 100644 --- a/ext/mysqli/tests/mysqli_debug.phpt +++ b/ext/mysqli/tests/mysqli_debug.phpt @@ -4,7 +4,7 @@ mysqli_debug() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- done%s diff --git a/ext/mysqli/tests/mysqli_debug_append.phpt b/ext/mysqli/tests/mysqli_debug_append.phpt index 1c26d469f51..f3f24cb9e34 100644 --- a/ext/mysqli/tests/mysqli_debug_append.phpt +++ b/ext/mysqli/tests/mysqli_debug_append.phpt @@ -4,7 +4,7 @@ mysqli_debug() - append to trace file mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- done%s diff --git a/ext/mysqli/tests/mysqli_debug_control_string.phpt b/ext/mysqli/tests/mysqli_debug_control_string.phpt index eec3a669d2a..b745ed2ebce 100644 --- a/ext/mysqli/tests/mysqli_debug_control_string.phpt +++ b/ext/mysqli/tests/mysqli_debug_control_string.phpt @@ -4,7 +4,7 @@ mysqli_debug() - invalid debug control strings mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- string(32) "t:O,/tmp/mysqli_debug_phpt.trace" diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt index 5c2f58e9f3d..e46f4aed198 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt @@ -4,7 +4,7 @@ mysqli_debug() - all control string options supported by both mysqlnd and libmys mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- [083][control string 'n:O,%smysqli_debug_phpt.trace'] Trace file has not been written. diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt index 8d905843975..ccee53b02cf 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt @@ -121,7 +121,7 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED) ?> --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_driver.phpt b/ext/mysqli/tests/mysqli_driver.phpt index 79f62cc8685..76ffb44080e 100644 --- a/ext/mysqli/tests/mysqli_driver.phpt +++ b/ext/mysqli/tests/mysqli_driver.phpt @@ -4,11 +4,11 @@ mysqli_driver class mysqli --SKIPIF-- --FILE-- --FILE-- --FILE-- --FILE-- errno mysqli --SKIPIF-- --FILE-- --FILE-- error mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECTF-- [005] [1064] 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 'some random gibberish' at line 1 diff --git a/ext/mysqli/tests/mysqli_expire_password.phpt b/ext/mysqli/tests/mysqli_expire_password.phpt index fa1b9a94b0f..8cfd8bd772d 100644 --- a/ext/mysqli/tests/mysqli_expire_password.phpt +++ b/ext/mysqli/tests/mysqli_expire_password.phpt @@ -4,7 +4,7 @@ MySQL 5.6 / MariaDB 10.4.3 EXPIRE PASSWORD protocol change mysqli --SKIPIF-- --FILE-- --CLEAN-- diff --git a/ext/mysqli/tests/mysqli_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt index af8d153bc75..320f2c71245 100644 --- a/ext/mysqli/tests/mysqli_explain_metadata.phpt +++ b/ext/mysqli/tests/mysqli_explain_metadata.phpt @@ -153,7 +153,7 @@ require_once 'skipifconnectfailure.inc'; ?> --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt index cfd28261c08..d396f27a104 100644 --- a/ext/mysqli/tests/mysqli_fetch_all.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all.phpt @@ -4,13 +4,13 @@ mysqli_fetch_all() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- [005] diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt index 8a5b5bfbd98..edea32b7f07 100644 --- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt @@ -4,11 +4,11 @@ $mysqli->fetch_all() (introduced with mysqlnd) mysqli --SKIPIF-- --FILE-- query("SELECT * FROM test ORDER BY id LIMIT 2")) { printf("[004] [%d] %s\n", $mysqli->errno, $mysqli->error); } @@ -305,7 +305,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- --EXPECT-- [005] diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt index 617ea91ff03..8e745fb1d4e 100644 --- a/ext/mysqli/tests/mysqli_fetch_array.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array.phpt @@ -4,13 +4,13 @@ mysqli_fetch_array() - all datatypes but BIT mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- [002] diff --git a/ext/mysqli/tests/mysqli_fetch_array_large.phpt b/ext/mysqli/tests/mysqli_fetch_array_large.phpt index 21b74e8ab7a..fa8d33b7696 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_large.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_large.phpt @@ -5,7 +5,7 @@ mysqli --SKIPIF-- --CONFLICTS-- all @@ -13,7 +13,7 @@ all memory_limit=-1 --FILE-- --CLEAN-- --EXPECTF-- stop: %s diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt index a96e4f5d32d..ebdf30d439b 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt @@ -4,11 +4,11 @@ mysqli_fetch_array() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt index 8695166338c..c473981945e 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt @@ -4,16 +4,16 @@ mysqli->fetch_array() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- [005] diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt index 80546ca1985..de8338ad5f6 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt @@ -4,15 +4,15 @@ mysqli_fetch_assoc() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- [005] diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt index 3e2bfea66ae..76b6e6fb1bc 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt @@ -107,7 +107,7 @@ if (mysqli_get_server_version($link) < 50003) ?> --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt index 7d48ff1193a..418a22a223e 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt @@ -4,11 +4,11 @@ mysqli_fetch_assoc() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- [003] diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt index bc3cf54d16f..82cf1299c03 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt @@ -4,11 +4,11 @@ mysqli_fetch_assoc() mysqli --SKIPIF-- --FILE-- getMessage() . "\n"; } - require('table.inc'); + require 'table.inc'; if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -58,7 +58,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- --EXPECT-- mysqli object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt index 147310ecc57..ae136ec4a51 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt @@ -4,12 +4,12 @@ mysqli_fetch_assoc() - ZEROFILL mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_column.phpt b/ext/mysqli/tests/mysqli_fetch_column.phpt index fddb41687d8..8b011628889 100644 --- a/ext/mysqli/tests/mysqli_fetch_column.phpt +++ b/ext/mysqli/tests/mysqli_fetch_column.phpt @@ -9,7 +9,7 @@ require_once 'skipifconnectfailure.inc'; --FILE-- --CLEAN-- --EXPECT-- [001] diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt index 512ae27b827..b30da382290 100644 --- a/ext/mysqli/tests/mysqli_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field.phpt @@ -4,15 +4,15 @@ mysqli_fetch_field() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- object(stdClass)#%d (13) { diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt index 1bd5538afba..5e33cacd473 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt @@ -4,13 +4,13 @@ mysqli_fetch_field_direct() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- mysqli_fetch_field_direct(): Argument #2 ($index) must be greater than or equal to 0 diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt index 238eeb65e9c..24d88b297dc 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt @@ -4,11 +4,11 @@ $res->fetch_field_direct(s) mysqli --SKIPIF-- --FILE-- getMessage() . "\n"; } - require('table.inc'); + require 'table.inc'; if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", @@ -54,7 +54,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- --EXPECTF-- mysqli object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt index 9874fff49f8..53eb3e69169 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -15,7 +15,7 @@ mysqli_close($link); ?> --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt index 6c43ea6bd5f..67f1b048950 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt @@ -4,11 +4,11 @@ mysqli_fetch_field() mysqli --SKIPIF-- --FILE-- getMessage() . "\n"; } - require('table.inc'); + require 'table.inc'; if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -63,7 +63,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- --EXPECTF-- mysqli object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt index 99e64ca45b4..041eb16694a 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt @@ -4,11 +4,11 @@ mysqli_fetch_field() - data types/field->type mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt index 47ed37e5889..f87e3dc235e 100644 --- a/ext/mysqli/tests/mysqli_fetch_fields.phpt +++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt @@ -4,15 +4,15 @@ mysqli_fetch_fields() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- object(stdClass)#%d (13) { diff --git a/ext/mysqli/tests/mysqli_fetch_lengths.phpt b/ext/mysqli/tests/mysqli_fetch_lengths.phpt index dae6588319d..36d805f99af 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths.phpt @@ -4,18 +4,18 @@ mysqli_fetch_lengths() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- bool(false) diff --git a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt index 26186053161..691ee119257 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt @@ -4,16 +4,16 @@ mysqli_result->lengths mysqli --SKIPIF-- --FILE-- query("SELECT id, label FROM test ORDER BY id LIMIT 1")) { printf("[002] [%d] %s\n", $mysqli->errno, $mysqli->error); } @@ -34,10 +34,10 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- --EXPECT-- NULL diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt index e409677146c..45d29bbd2e8 100644 --- a/ext/mysqli/tests/mysqli_fetch_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object.phpt @@ -4,13 +4,13 @@ mysqli_fetch_object() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- ArgumentCountError: Too few arguments to function mysqli_fetch_object_construct::__construct(), 0 passed and exactly 2 expected diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt index 371299808ce..6af2196b9a1 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt @@ -4,16 +4,16 @@ mysqli_fetch_object() - calling constructor on class wo constructor mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- No exception with PHP: diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt index 204cd932e89..3622abfa27c 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt @@ -4,11 +4,11 @@ mysqli_fetch_object() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- %s(6) "object" diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt index 56880828c35..c1ecc3fd312 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt @@ -4,11 +4,11 @@ mysqli_fetch_object() mysqli --SKIPIF-- --FILE-- getMessage(), "\n"; } - require('table.inc'); + require 'table.inc'; if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -124,7 +124,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- --EXPECT-- Error: mysqli object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt index a1f544dbbc3..58bca0acbd4 100644 --- a/ext/mysqli/tests/mysqli_fetch_row.phpt +++ b/ext/mysqli/tests/mysqli_fetch_row.phpt @@ -4,13 +4,13 @@ mysqli_fetch_row() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- [004] diff --git a/ext/mysqli/tests/mysqli_field_count.phpt b/ext/mysqli/tests/mysqli_field_count.phpt index bcc0c6e2116..7266a00051c 100644 --- a/ext/mysqli/tests/mysqli_field_count.phpt +++ b/ext/mysqli/tests/mysqli_field_count.phpt @@ -4,13 +4,13 @@ mysqli_field_count() mysqli --SKIPIF-- --FILE-- --EXPECT-- int(0) diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt index c4508fa5482..80992532a37 100644 --- a/ext/mysqli/tests/mysqli_field_seek.phpt +++ b/ext/mysqli/tests/mysqli_field_seek.phpt @@ -4,7 +4,7 @@ mysqli_field_seek() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- mysqli_field_seek(): Argument #2 ($index) must be greater than or equal to 0 diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt index cb1dcc3b98e..c863bc49c13 100644 --- a/ext/mysqli/tests/mysqli_field_tell.phpt +++ b/ext/mysqli/tests/mysqli_field_tell.phpt @@ -4,13 +4,13 @@ mysqli_field_tell() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- int(0) diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt index 411b1293875..f8ba36edafb 100644 --- a/ext/mysqli/tests/mysqli_fork.phpt +++ b/ext/mysqli/tests/mysqli_fork.phpt @@ -20,7 +20,7 @@ if (!have_innodb($link)) ?> --FILE-- --CLEAN-- --FILE-- --CLEAN-- --EXPECT-- a diff --git a/ext/mysqli/tests/mysqli_get_charset.phpt b/ext/mysqli/tests/mysqli_get_charset.phpt index f902b11746b..abd85fbab53 100644 --- a/ext/mysqli/tests/mysqli_get_charset.phpt +++ b/ext/mysqli/tests/mysqli_get_charset.phpt @@ -4,15 +4,15 @@ mysqli_get_charset() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt index aea4d3c0a0b..141a3901271 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt @@ -4,7 +4,7 @@ mysqli_get_client_stats() mysqli --SKIPIF-- --CLEAN-- --CLEAN-- --EXPECTF-- BEGINNING: implicit_free_result = %d diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt index 4faf1ffc204..67459a8799c 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt @@ -4,7 +4,7 @@ mysqli_get_client_stats() - php_ini setting mysqli --SKIPIF-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt index a348c38290c..bfa8cc370c2 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt @@ -4,7 +4,7 @@ mysqli_get_client_stats() - PS mysqli --SKIPIF-- --CLEAN-- --EXPECTF-- BEGINNING: rows_fetched_from_client_ps_unbuffered = %d diff --git a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt index 7bd92e88e6d..babf964fdaa 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt @@ -7,15 +7,15 @@ mysqlnd.collect_memory_statistics="1" mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt index 3cfa6400de6..ca9642a1ef3 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt @@ -7,7 +7,7 @@ mysqlnd.collect_memory_statistics="0" mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_get_proto_info.phpt b/ext/mysqli/tests/mysqli_get_proto_info.phpt index e0c41c09d7b..0300aaacb03 100644 --- a/ext/mysqli/tests/mysqli_get_proto_info.phpt +++ b/ext/mysqli/tests/mysqli_get_proto_info.phpt @@ -4,13 +4,13 @@ mysqli_get_proto_info() mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_get_server_version.phpt b/ext/mysqli/tests/mysqli_get_server_version.phpt index 1a895803546..0b714644a63 100644 --- a/ext/mysqli/tests/mysqli_get_server_version.phpt +++ b/ext/mysqli/tests/mysqli_get_server_version.phpt @@ -4,13 +4,13 @@ mysqli_get_server_version() mysqli --SKIPIF-- --FILE-- 50105 -- major_version*10000 + minor_version *100 + sub_version */ /* < 30000 = pre 3.2.3, very unlikely! */ if (!is_int($info = mysqli_get_server_version($link)) || ($info < (3 * 10000))) diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt index 2d2a0042d83..1c2087e88eb 100644 --- a/ext/mysqli/tests/mysqli_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_get_warnings.phpt @@ -10,7 +10,7 @@ if (!$TEST_EXPERIMENTAL) ?> --FILE-- --INI-- mysqli.allow_local_infile=1 --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_init.phpt b/ext/mysqli/tests/mysqli_init.phpt index 5bed5e4be79..94cce958c43 100644 --- a/ext/mysqli/tests/mysqli_init.phpt +++ b/ext/mysqli/tests/mysqli_init.phpt @@ -4,7 +4,7 @@ mysqli_init() mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt index d555ddedc20..593cf2ed9eb 100644 --- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt +++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt @@ -4,11 +4,11 @@ Checking last_insert_id after different operations mysqli --SKIPIF-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --EXPECTF-- mysqli_kill(): Argument #2 ($process_id) must be greater than 0 diff --git a/ext/mysqli/tests/mysqli_last_insert_id.phpt b/ext/mysqli/tests/mysqli_last_insert_id.phpt index 88a3702d2b2..27814aebdf0 100644 --- a/ext/mysqli/tests/mysqli_last_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_last_insert_id.phpt @@ -4,7 +4,7 @@ API vs. SQL LAST_INSERT_ID() mysqli --SKIPIF-- --FILE-- query("SELECT LAST_INSERT_ID() AS _id"))) { @@ -177,7 +177,7 @@ mysqli ?> --CLEAN-- --EXPECTF-- API: %d, SQL: %d diff --git a/ext/mysqli/tests/mysqli_local_infile_default_off.phpt b/ext/mysqli/tests/mysqli_local_infile_default_off.phpt index 63784703acf..8bf1ba67135 100644 --- a/ext/mysqli/tests/mysqli_local_infile_default_off.phpt +++ b/ext/mysqli/tests/mysqli_local_infile_default_off.phpt @@ -4,11 +4,11 @@ ensure default for local infile is off mysqli --SKIPIF-- --FILE-- --CLEAN-- --INI-- mysqli.allow_local_infile=1 --FILE-- --INI-- mysqli.max_links=1 --FILE-- --CLEAN-- --EXPECTF-- bool(true) diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt index ac0926d66fa..91ec3888663 100644 --- a/ext/mysqli/tests/mysqli_more_results.phpt +++ b/ext/mysqli/tests/mysqli_more_results.phpt @@ -4,13 +4,13 @@ mysqli_more_results() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- [004] diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt index 76c3b598aa8..ff5c3d44237 100644 --- a/ext/mysqli/tests/mysqli_multi_query.phpt +++ b/ext/mysqli/tests/mysqli_multi_query.phpt @@ -4,13 +4,13 @@ mysqli_multi_query() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- [006] 3 diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt index 95e11db9a6d..59a8719cbbe 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt @@ -12,7 +12,7 @@ max_execution_time=60 mysqlnd.net_read_timeout=1 --FILE-- default_socket_timeout mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_next_result_error.phpt b/ext/mysqli/tests/mysqli_next_result_error.phpt index 84c39083494..91ac2363177 100644 --- a/ext/mysqli/tests/mysqli_next_result_error.phpt +++ b/ext/mysqli/tests/mysqli_next_result_error.phpt @@ -4,7 +4,7 @@ Error in multi query mysqli --SKIPIF-- --FILE-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- mysqli_result object is already closed diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt index 58202f12cd4..d8e55adb86a 100644 --- a/ext/mysqli/tests/mysqli_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_num_rows.phpt @@ -4,13 +4,13 @@ mysqli_num_rows() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_result object is already closed diff --git a/ext/mysqli/tests/mysqli_open_bug74432.phpt b/ext/mysqli/tests/mysqli_open_bug74432.phpt index 72800439da1..91b7a858718 100644 --- a/ext/mysqli/tests/mysqli_open_bug74432.phpt +++ b/ext/mysqli/tests/mysqli_open_bug74432.phpt @@ -4,7 +4,7 @@ Bug #74432, BC issue on undocumented connect string mysqli --SKIPIF-- --FILE-- --FILE-- --FILE-- --CLEAN-- --EXPECTF-- Warning: mysqli_real_connect(): (%s/%d): %s in %s on line %d 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 ecf8bc5cfbe..c11e0deeb7d 100644 --- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt +++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt @@ -8,7 +8,7 @@ require_once 'skipifconnectfailure.inc'; ?> --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_options_openbasedir.phpt b/ext/mysqli/tests/mysqli_options_openbasedir.phpt index e27e85e731f..823eca9ef0b 100644 --- a/ext/mysqli/tests/mysqli_options_openbasedir.phpt +++ b/ext/mysqli/tests/mysqli_options_openbasedir.phpt @@ -4,11 +4,11 @@ mysqli_options() - MYSQLI_OPT_LOCAL_INFILE and open_basedir mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- query('DROP USER shatest'); $link->query('DROP USER shatest@localhost'); ?> 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 42a9640f1ea..986c19f4769 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt @@ -91,7 +91,7 @@ echo "nocache"; mysqlnd.sha256_server_public_key="test_sha256_ini" --FILE-- --CLEAN-- query('DROP USER shatest'); $link->query('DROP USER shatest@localhost'); $file = "test_sha256_ini"; 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 e0abe65e24e..25c87565a13 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt @@ -86,7 +86,7 @@ echo "nocache"; ?> --FILE-- --CLEAN-- query('DROP USER shatest'); $link->query('DROP USER shatest@localhost'); $file = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_" , @date("Ymd")); 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 5f13fa4f03f..5c4a60cd006 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 @@ -86,7 +86,7 @@ echo "nocache"; ?> --FILE-- --CLEAN-- query('DROP USER shatest'); $link->query('DROP USER shatest@localhost'); $file = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_" , @date("Ymd")); diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt index ae3f4cb2ec2..795c8664a22 100644 --- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt +++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt @@ -4,7 +4,7 @@ Calling connect() on an open persistent connection to create a new persistent co mysqli --SKIPIF-- --INI-- mysqli.allow_persistent=1 @@ -12,7 +12,7 @@ mysqli.max_persistent=-1 mysqli.max_links=-1 --FILE-- @@ -14,7 +14,7 @@ mysqli.max_persistent=2 mysqli.max_links=2 --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_pconn_limits.phpt b/ext/mysqli/tests/mysqli_pconn_limits.phpt index 4d9f8eed01c..650e2626190 100644 --- a/ext/mysqli/tests/mysqli_pconn_limits.phpt +++ b/ext/mysqli/tests/mysqli_pconn_limits.phpt @@ -12,7 +12,7 @@ mysqli.max_persistent=-1 mysqli.max_links=-1 --FILE-- --CLEAN-- --EXPECT-- Regular connection 1 - 'works..' diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt index e923fc71baa..4cf28f6819e 100644 --- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt +++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt @@ -4,8 +4,8 @@ Persistent connections and mysqli.max_links mysqli --SKIPIF-- --CLEAN-- --INI-- mysqli.allow_persistent=1 @@ -14,7 +14,7 @@ mysqli.max_persistent=2 mysqli.max_links=2 --FILE-- --INI-- @@ -13,7 +13,7 @@ mysqli.max_persistent=-1 mysqli.max_links=-1 --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --EXPECT-- a) [1065] Query was empty diff --git a/ext/mysqli/tests/mysqli_ps_select_union.phpt b/ext/mysqli/tests/mysqli_ps_select_union.phpt index 46bb3115caf..bd403c31e50 100644 --- a/ext/mysqli/tests/mysqli_ps_select_union.phpt +++ b/ext/mysqli/tests/mysqli_ps_select_union.phpt @@ -4,12 +4,12 @@ Prepared Statements and SELECT UNION mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --EXPECTF-- --- Testing default --- diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt index 6f71ed0b975..dbd22fbb38f 100644 --- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt @@ -151,7 +151,7 @@ END;')) { ?> --CLEAN-- --INI-- mysqli.allow_local_infile=1 --FILE-- --CLEAN-- --EXPECTF-- Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' %r(\(using password: \w+\) ){0,1}%rin %s on line %d diff --git a/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt b/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt index a72c1a74dbe..7a452d3a23c 100644 --- a/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt +++ b/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt @@ -4,7 +4,7 @@ Bug #80107 mysqli_query() fails for ~16 MB long query when compression is enable mysqli --SKIPIF-- fetch_assoc()['Value'] < 0xffffff) { --FILE-- close(); ?> --CLEAN-- --EXPECT-- array(0) { diff --git a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt index b2bd61978e7..5aa6c14d4cd 100644 --- a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt +++ b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt @@ -12,7 +12,7 @@ mysqli.allow_persistent=1 mysqli.max_persistent=10 --FILE-- --CLEAN-- --EXPECTF-- Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' %r(\(using password: \w+\) ){0,1}%rin %s on line %d diff --git a/ext/mysqli/tests/mysqli_real_escape_string.phpt b/ext/mysqli/tests/mysqli_real_escape_string.phpt index 38d9678c31e..11e6d04fcdb 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string.phpt @@ -4,13 +4,13 @@ mysqli_real_escape_string() mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- bool(true) diff --git a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt index bea70cb3e5a..ffc96d99796 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt @@ -5,8 +5,8 @@ mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- bool(true) diff --git a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt index b85b229aadd..316d8e8570d 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt @@ -5,8 +5,8 @@ mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- bool(true) diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt index dcc645d8671..3ebd07a6330 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt @@ -5,8 +5,8 @@ mysqli --SKIPIF-- --CLEAN-- --EXPECT-- bool(true) diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt index 5b3f079de5c..b993177ea13 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt @@ -4,8 +4,8 @@ mysqli_real_escape_string() - gbk mysqli --SKIPIF-- --CLEAN-- --EXPECT-- bool(true) diff --git a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt index 853ace720dc..cb33a53f892 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt @@ -4,12 +4,12 @@ mysqli_real_escape_string() - SQL Mode NO_BACKSLASH_ESCAPE mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_real_query.phpt b/ext/mysqli/tests/mysqli_real_query.phpt index 6601525b475..92d9b5bf778 100644 --- a/ext/mysqli/tests/mysqli_real_query.phpt +++ b/ext/mysqli/tests/mysqli_real_query.phpt @@ -4,13 +4,13 @@ mysqli_real_query() mysqli --SKIPIF-- --FILE-- --CLEAN-- --FILE-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- mysqli_release_savepoint(): Argument #2 ($name) cannot be empty diff --git a/ext/mysqli/tests/mysqli_report.phpt b/ext/mysqli/tests/mysqli_report.phpt index 91a88815fd4..b4998546d13 100644 --- a/ext/mysqli/tests/mysqli_report.phpt +++ b/ext/mysqli/tests/mysqli_report.phpt @@ -309,7 +309,7 @@ require_once 'skipifconnectfailure.inc'; ?> --CLEAN-- --EXPECTF-- Warning: mysqli_multi_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 'BAR; FOO' at line 1 in %s on line %d diff --git a/ext/mysqli/tests/mysqli_report_new.phpt b/ext/mysqli/tests/mysqli_report_new.phpt index e544bcb3664..50be858eb17 100644 --- a/ext/mysqli/tests/mysqli_report_new.phpt +++ b/ext/mysqli/tests/mysqli_report_new.phpt @@ -37,7 +37,7 @@ if (mysqli_get_server_version($link) < 50600) ?> --CLEAN-- --EXPECTF-- Warning: mysqli_change_user(): (%d/%d): Access denied for user '%s'@'%s' (using password: %s) in %s on line %d diff --git a/ext/mysqli/tests/mysqli_report_wo_ps.phpt b/ext/mysqli/tests/mysqli_report_wo_ps.phpt index c757de773db..1bab3e0ad9e 100644 --- a/ext/mysqli/tests/mysqli_report_wo_ps.phpt +++ b/ext/mysqli/tests/mysqli_report_wo_ps.phpt @@ -4,7 +4,7 @@ mysqli_report(), MySQL < 5.6 mysqli --SKIPIF-- = 50600) ?> --CLEAN-- --EXPECTF-- Warning: mysqli_multi_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 'BAR; FOO' at line 1 in %s on line %d diff --git a/ext/mysqli/tests/mysqli_result_invalid_mode.phpt b/ext/mysqli/tests/mysqli_result_invalid_mode.phpt index 1a1677589d5..aeac038682e 100644 --- a/ext/mysqli/tests/mysqli_result_invalid_mode.phpt +++ b/ext/mysqli/tests/mysqli_result_invalid_mode.phpt @@ -4,12 +4,12 @@ mysqli_result(), invalid mode mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_result::__construct(): Argument #2 ($result_mode) must be either MYSQLI_STORE_RESULT or MYSQLI_USE_RESULT diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt index 0e2e2d98be0..a7345de0bfa 100644 --- a/ext/mysqli/tests/mysqli_result_references.phpt +++ b/ext/mysqli/tests/mysqli_result_references.phpt @@ -4,14 +4,14 @@ References to result sets mysqli --SKIPIF-- --INI-- opcache.enable=0 --FILE-- --CLEAN-- --EXPECTF-- array(7) refcount(2){ diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt index 9b7119ac21d..4087d35055e 100644 --- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt @@ -49,7 +49,7 @@ require_once 'skipifconnectfailure.inc'; ?> --CLEAN-- --EXPECTF-- array(1) refcount(%d){ diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt index 0605e916a29..b54c39f7a17 100644 --- a/ext/mysqli/tests/mysqli_result_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt @@ -4,11 +4,11 @@ Trying to clone mysqli_result object mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_savepoint.phpt b/ext/mysqli/tests/mysqli_savepoint.phpt index 71e0b2d2181..810a0842498 100644 --- a/ext/mysqli/tests/mysqli_savepoint.phpt +++ b/ext/mysqli/tests/mysqli_savepoint.phpt @@ -13,7 +13,7 @@ if (!have_innodb($link)) ?> --FILE-- --CLEAN-- --EXPECT-- mysqli_savepoint(): Argument #2 ($name) cannot be empty diff --git a/ext/mysqli/tests/mysqli_select_db.phpt b/ext/mysqli/tests/mysqli_select_db.phpt index 76f64df743c..33c55c12409 100644 --- a/ext/mysqli/tests/mysqli_select_db.phpt +++ b/ext/mysqli/tests/mysqli_select_db.phpt @@ -4,12 +4,12 @@ mysqli_select_db() mysqli --SKIPIF-- --FILE-- --CLEAN-- - + --EXPECT-- mysqli object is already closed done! diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt index 50da0c217e3..6425eb07485 100644 --- a/ext/mysqli/tests/mysqli_set_charset.phpt +++ b/ext/mysqli/tests/mysqli_set_charset.phpt @@ -125,7 +125,7 @@ if ((($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin1"', MYSQLI_STOR ?> --CLEAN-- --EXPECTF-- Exception: %s diff --git a/ext/mysqli/tests/mysqli_set_opt.phpt b/ext/mysqli/tests/mysqli_set_opt.phpt index c6868e2e418..218e9f51778 100644 --- a/ext/mysqli/tests/mysqli_set_opt.phpt +++ b/ext/mysqli/tests/mysqli_set_opt.phpt @@ -4,11 +4,11 @@ mysqli_set_opt() mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECTF-- %s(5) "00000" diff --git a/ext/mysqli/tests/mysqli_ssl_set.phpt b/ext/mysqli/tests/mysqli_ssl_set.phpt index 5ea79b96498..fe692edede0 100644 --- a/ext/mysqli/tests/mysqli_ssl_set.phpt +++ b/ext/mysqli/tests/mysqli_ssl_set.phpt @@ -12,7 +12,7 @@ if (!function_exists('mysqli_ssl_set')) ?> --FILE-- --FILE-- --FILE-- --CLEAN-- --EXPECTF-- [009] [%d] (error message varies with the MySQL Server version, check the error code) diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt index 6f6e011de10..ade57892120 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt @@ -4,13 +4,13 @@ mysqli_stmt_attr_get() mysqli --SKIPIF-- --FILE-- MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH, @@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- --EXPECT-- mysqli_stmt_attr_get(): Argument #2 ($attribute) must be one of MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH, MYSQLI_STMT_ATTR_PREFETCH_ROWS, or STMT_ATTR_CURSOR_TYPE diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt index 320486f42db..d125d5d1e89 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt @@ -4,12 +4,12 @@ mysqli_stmt_attr_get() - prefetch mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt index 0b17edf7a1a..1fd00171189 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt @@ -4,13 +4,13 @@ mysqli_stmt_attr_set() - mysqlnd does not check for invalid codes mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- Error: mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt index 04d0a3c0ebd..e315c122652 100644 --- a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt +++ b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt @@ -4,11 +4,11 @@ mysqli_stmt_prepare() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt index 03a980d929c..cd39247b1ce 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt @@ -4,13 +4,13 @@ Bind limits mysqli --SKIPIF-- --CONFLICTS-- all --FILE-- --CLEAN-- --EXPECT-- Testing 273 columns with 240 rows... diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt index 009a089137e..8d93dc9ceb9 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt @@ -4,7 +4,7 @@ mysqli_stmt_bind_param() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- The number of variables must match the number of parameters in the prepared statement diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt index f23433dcd72..40296ad63d2 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt @@ -4,12 +4,12 @@ mysqli_stmt_bind_param used with call_user_func_array() (see also bug #43568) mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- Regular, procedural, using variables 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 f33076d64e1..b941edcfe5f 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 @@ -4,11 +4,11 @@ mysqli_stmt_bind_param() - checking whether the parameters are modified (bug#443 mysqli --SKIPIF-- --FILE-- set_charset('latin1'); class foo { @@ -28,7 +28,7 @@ require_once('skipifconnectfailure.inc'); $stmt->execute(); $stmt->fetch(); $stmt->free_result(); - echo("$one\n\n"); + echo "$one\n\n"; // it is getting worse. Binding the same var twice with different // types you can get unexpected results e.g. binary trash for the @@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc'); $stmt->bind_result($one, $two); $stmt->fetch(); $stmt->free_result(); - echo("$one - $two\n\n"); + echo "$one - $two\n\n"; echo "Test 3:\n"; @@ -59,12 +59,12 @@ require_once('skipifconnectfailure.inc'); $stmt->execute(); $stmt->fetch(); $stmt->free_result(); - echo("$one - $two\n\n"); + echo "$one - $two\n\n"; echo "done!"; ?> --CLEAN-- --EXPECTF-- Test 1: diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt index 251bb546a31..640690af4d2 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt @@ -4,7 +4,7 @@ mysqli_stmt_bind_param() - Binding with very high number of columns mysqli --SKIPIF-- --INI-- memory_limit=256M @@ -19,7 +19,7 @@ memory_limit=256M in this file and we test mysqli_stmt_bind_result() in the other test -- therefore the "duplicate" makes some sense to me. */ - require_once("connect.inc"); + require_once 'connect.inc'; if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", @@ -94,7 +94,7 @@ memory_limit=256M ?> --CLEAN-- --EXPECTF-- int(%d) diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt index 9c6a80a3a46..ac02db31d50 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt @@ -4,11 +4,11 @@ mysqli_stmt_bind_param() - playing with references mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- 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 e85a97a9944..887d557a078 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt @@ -4,11 +4,11 @@ mysqli_stmt_bind_param() - binding variable twice mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt index 597b4f395a3..31523599da3 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt @@ -4,12 +4,12 @@ mysqli_stmt_bind_result() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt index 46a6f60da01..8000336403a 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt @@ -4,11 +4,11 @@ mysqli_stmt_bind_result() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt index b40f414b39e..a379359b45a 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt @@ -4,13 +4,13 @@ Playing with SELECT FORMAT(...) AS _format - see also bugs.php.net/42378 mysqli --SKIPIF-- --INI-- memory_limit=83886080 --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt index 138655ed212..a7cef70a530 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt @@ -4,11 +4,11 @@ mysqli_stmt_bind_result() - playing with references mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- plain vanilla... diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt index 1955290c2c5..34b93ce0b3b 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt @@ -4,12 +4,12 @@ mysqli_stmt_bind_result() - ZEROFILL mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_close.phpt b/ext/mysqli/tests/mysqli_stmt_close.phpt index 03788c0c0be..cefaa22bc69 100644 --- a/ext/mysqli/tests/mysqli_stmt_close.phpt +++ b/ext/mysqli/tests/mysqli_stmt_close.phpt @@ -4,13 +4,13 @@ mysqli_stmt_close() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt index ba79b53ab5b..6a03e1d9e75 100644 --- a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt @@ -4,13 +4,13 @@ mysqli_stmt_data_seek() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt index 3ab05504bbe..e98824a65db 100644 --- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt @@ -4,11 +4,11 @@ Playing with datatype change between prepare and execute mysqli --SKIPIF-- --FILE-- --CLEAN-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is already closed diff --git a/ext/mysqli/tests/mysqli_stmt_error.phpt b/ext/mysqli/tests/mysqli_stmt_error.phpt index ce3b248622c..fee614c67d5 100644 --- a/ext/mysqli/tests/mysqli_stmt_error.phpt +++ b/ext/mysqli/tests/mysqli_stmt_error.phpt @@ -4,13 +4,13 @@ mysqli_stmt_error() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is already closed diff --git a/ext/mysqli/tests/mysqli_stmt_execute.phpt b/ext/mysqli/tests/mysqli_stmt_execute.phpt index 90de4a78433..2440b584376 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute.phpt @@ -4,7 +4,7 @@ mysqli_stmt_execute() mysqli --SKIPIF-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_execute_bind.phpt b/ext/mysqli/tests/mysqli_stmt_execute_bind.phpt index 7921e51f75b..d382ad36836 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_bind.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_bind.phpt @@ -8,7 +8,7 @@ require_once 'skipifconnectfailure.inc'; ?> --FILE-- --CLEAN-- --EXPECT-- [001] mysqli_stmt::execute(): Argument #1 ($params) must consist of exactly 3 elements, 2 present diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt index 3af364dfb55..3d9795db4d6 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt @@ -187,7 +187,7 @@ if (mysqli_get_server_version($link) <= 50000) { ?> --CLEAN-- --CLEAN-- --CLEAN-- --FILE-- --CLEAN-- --EXPECTF-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt index 1c49f2a198e..325314f5003 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt @@ -69,7 +69,7 @@ if (mysqli_get_server_version($link) < 50003) { ?> --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt index 574a20f40de..48e2e6f8dec 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt @@ -4,12 +4,12 @@ mysqli_stmt_fetch_fields() unicode, win32 mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- OK: 1 diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt index 4055501c115..9191df87ac7 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt @@ -4,14 +4,14 @@ mysqli_stmt_fetch - geometry / spatial types mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_field_count.phpt index ee3d4072289..d667de2a1f6 100644 --- a/ext/mysqli/tests/mysqli_stmt_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_field_count.phpt @@ -4,13 +4,13 @@ mysqli_stmt_field_counts() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_free_result.phpt b/ext/mysqli/tests/mysqli_stmt_free_result.phpt index e14befed267..fcf86c8a091 100644 --- a/ext/mysqli/tests/mysqli_stmt_free_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_free_result.phpt @@ -4,7 +4,7 @@ mysqli_stmt_free_result() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt index d63ee6b8f0a..d68f9b4d8e3 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt @@ -4,7 +4,7 @@ mysqli_stmt_get_result() mysqli --SKIPIF-- --CLEAN-- --EXPECTF-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt index fc0deef2c82..1acd4e10aff 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt @@ -4,7 +4,7 @@ mysqli_stmt_get_result() mysqli --SKIPIF-- @@ -15,9 +15,9 @@ if (!function_exists('mysqli_stmt_get_result')) mysqli_stmt_bind_result.phpt already. Restrict this test case to the basics. */ - require_once("connect.inc"); + require_once 'connect.inc'; - require('table.inc'); + require 'table.inc'; if (!$stmt = mysqli_stmt_init($link)) printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -142,7 +142,7 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --CLEAN-- --EXPECT-- array(2) { diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt index c3a68db0797..a6bd7c55bb4 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt @@ -127,7 +127,7 @@ if (mysqli_get_server_version($link) < 50003) { ?> --CLEAN-- --EXPECT-- 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 0c60fc61bde..0e58eb63665 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt @@ -4,14 +4,14 @@ mysqli_stmt_get_result() - meta data, field_count() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- 2 2 diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt index 6eac7978a43..b2fe144dd37 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt @@ -4,7 +4,7 @@ mysqli_stmt_get_result - geometry / spatial types mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt index e1c2be6cee3..37afd39d15e 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt @@ -4,14 +4,14 @@ mysqli_stmt_get_result() - meta data mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- array(2) { diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt index 9f4b01b93ae..c50c99b9eac 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt @@ -4,14 +4,14 @@ mysqli_stmt_get_result() - meta data, field info mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- object(stdClass)#%d (13) { diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt index d92177e7a30..b633f43d0cc 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt @@ -4,7 +4,7 @@ mysqli_stmt_get_result() - SHOW, DESCRIBE, EXPLAIN mysqli --SKIPIF-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt index 65daea87137..5ebdf7e0749 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt @@ -4,14 +4,14 @@ mysqli_stmt_get_result() - seeking mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_result::data_seek(): Argument #1 ($offset) must be greater than or equal to 0 diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt index d1ac2080ebf..dff2fa383c8 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt @@ -4,14 +4,14 @@ mysqli_stmt_get_result - data types mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt index e372977844b..86bd19da71c 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt @@ -4,7 +4,7 @@ mysqli_stmt_get_warnings() - TODO mysqli --SKIPIF-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_init.phpt b/ext/mysqli/tests/mysqli_stmt_init.phpt index fca0cc522f6..ea45661e6de 100644 --- a/ext/mysqli/tests/mysqli_stmt_init.phpt +++ b/ext/mysqli/tests/mysqli_stmt_init.phpt @@ -4,7 +4,7 @@ mysqli_stmt_init() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt index 61a1aeadb45..2fe2edd9c56 100644 --- a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt @@ -4,13 +4,13 @@ mysqli_stmt_insert_id() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_multires.phpt b/ext/mysqli/tests/mysqli_stmt_multires.phpt index 9d883ff3410..0352a464e86 100644 --- a/ext/mysqli/tests/mysqli_stmt_multires.phpt +++ b/ext/mysqli/tests/mysqli_stmt_multires.phpt @@ -4,7 +4,7 @@ Multiple result set with PS mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- run_tests.php don't fool me with your 'ungreedy' expression '.+?'! diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt index e1f4c342492..9152aa231ee 100644 --- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt @@ -4,13 +4,13 @@ mysqli_stmt_param_count() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_prepare.phpt index b3f4e69eb9b..733fe9e1b3b 100644 --- a/ext/mysqli/tests/mysqli_stmt_prepare.phpt +++ b/ext/mysqli/tests/mysqli_stmt_prepare.phpt @@ -4,11 +4,11 @@ mysqli_stmt_prepare() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is already closed diff --git a/ext/mysqli/tests/mysqli_stmt_reset.phpt b/ext/mysqli/tests/mysqli_stmt_reset.phpt index 38b57e17b49..0d31a56fcf9 100644 --- a/ext/mysqli/tests/mysqli_stmt_reset.phpt +++ b/ext/mysqli/tests/mysqli_stmt_reset.phpt @@ -4,11 +4,11 @@ mysqli_stmt_reset() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt index 0eb0f782210..81797c98e09 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt @@ -4,13 +4,13 @@ mysqli_stmt_result_metadata() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECTF-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt index 5eac0ba5d20..2fade6aabf1 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt @@ -4,13 +4,13 @@ mysqli_stmt_result_metadata() - non SELECT statements mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt index 048d6f0fd9b..6875e42e792 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt @@ -4,13 +4,13 @@ mysqli_stmt_send_long_data() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt_send_long_data(): Argument #2 ($param_num) must be greater than or equal to 0 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 eafdfd434b8..5c7ffd9c6da 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 @@ -4,11 +4,11 @@ mysqli_stmt_send_long_data() - exceed packet size, mysqlnd mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt index 34a6c28b12f..d82201134a2 100644 --- a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt @@ -4,13 +4,13 @@ mysqli_stmt_sqlstate() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt index 10df777b9fa..cd16c0a20eb 100644 --- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt @@ -4,13 +4,13 @@ mysqli_stmt_store_result() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli_stmt object is not fully initialized diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt index 0db0f0a2baf..29658bb25c6 100644 --- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt @@ -4,11 +4,11 @@ Trying to clone mysqli_stmt object mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt index 2c38f2159ad..9315e706dd9 100644 --- a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt +++ b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt @@ -4,20 +4,20 @@ mysqli_store_result() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_store_result_copy.phpt b/ext/mysqli/tests/mysqli_store_result_copy.phpt index d48701caca1..ffa335e0937 100644 --- a/ext/mysqli/tests/mysqli_store_result_copy.phpt +++ b/ext/mysqli/tests/mysqli_store_result_copy.phpt @@ -4,7 +4,7 @@ mysqli_store_result() mysqli --SKIPIF-- --INI-- mysqlnd.debug="d:t:O,{TMP}/mysqlnd.trace" @@ -13,12 +13,12 @@ mysqlnd.mempool_default_size=1 mysqlnd.fetch_data_copy=0 --FILE-- --CLEAN-- --EXPECTF-- array(2) { diff --git a/ext/mysqli/tests/mysqli_thread_id.phpt b/ext/mysqli/tests/mysqli_thread_id.phpt index 9862fadaa9c..4f0ffc0658b 100644 --- a/ext/mysqli/tests/mysqli_thread_id.phpt +++ b/ext/mysqli/tests/mysqli_thread_id.phpt @@ -4,13 +4,13 @@ mysqli_thread_id() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt index d1686888c1f..0772854ed96 100644 --- a/ext/mysqli/tests/mysqli_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_unclonable.phpt @@ -4,11 +4,11 @@ Trying to clone mysqli object mysqli --SKIPIF-- --FILE-- --FILE-- --CLEAN-- --EXPECT-- mysqli_data_seek() cannot be used in MYSQLI_USE_RESULT mode diff --git a/ext/mysqli/tests/mysqli_warning_count.phpt b/ext/mysqli/tests/mysqli_warning_count.phpt index 0babf59593f..6ae11434dfa 100644 --- a/ext/mysqli/tests/mysqli_warning_count.phpt +++ b/ext/mysqli/tests/mysqli_warning_count.phpt @@ -4,13 +4,13 @@ mysqli_warning_count() mysqli --SKIPIF-- --FILE-- --CLEAN-- --EXPECT-- mysqli object is already closed diff --git a/ext/mysqli/tests/mysqli_warning_unclonable.phpt b/ext/mysqli/tests/mysqli_warning_unclonable.phpt index 460334024b3..c51747b5144 100644 --- a/ext/mysqli/tests/mysqli_warning_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_warning_unclonable.phpt @@ -10,7 +10,7 @@ if (!$TEST_EXPERIMENTAL) ?> --FILE-- --CLEAN-- --EXPECTF-- Fatal error: Trying to clone an uncloneable object of class mysqli_warning in %s on line %d diff --git a/ext/mysqli/tests/ps_cursor_multiple_result_sets.phpt b/ext/mysqli/tests/ps_cursor_multiple_result_sets.phpt index d6956b7e635..7b706ac434d 100644 --- a/ext/mysqli/tests/ps_cursor_multiple_result_sets.phpt +++ b/ext/mysqli/tests/ps_cursor_multiple_result_sets.phpt @@ -4,11 +4,11 @@ PS using cursor and returning multiple result sets mysqli --SKIPIF-- --FILE--