From 46319b5952750bc2a5e030c0a216023b551b60c1 Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Sat, 20 Jun 2020 14:54:52 +0000 Subject: [PATCH] MySQLi: various updates [2] - method modifiers (mysqli) Add modifiers to the class methods for the mysqli class to make the [Class Synopsos](https://www.php.net/manual/en/class.mysqli.php#mysqli.synopsis) more consistent. Based on the [stub](https://github.com/php/php-src/blob/master/ext/mysqli/mysqli.stub.php) all methods in the class are `public`, so I've annotated them as such. Includes minor indentation fixes. Patch contributed by jrfnl. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@350059 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/mysqli/mysqli/autocommit.xml | 2 +- reference/mysqli/mysqli/change-user.xml | 2 +- reference/mysqli/mysqli/character-set-name.xml | 2 +- reference/mysqli/mysqli/close.xml | 2 +- reference/mysqli/mysqli/commit.xml | 2 +- reference/mysqli/mysqli/construct.xml | 4 ++-- reference/mysqli/mysqli/debug.xml | 2 +- reference/mysqli/mysqli/dump-debug-info.xml | 2 +- reference/mysqli/mysqli/get-charset.xml | 2 +- reference/mysqli/mysqli/get-client-info.xml | 2 +- reference/mysqli/mysqli/get-connection-stats.xml | 2 +- reference/mysqli/mysqli/get-warnings.xml | 2 +- reference/mysqli/mysqli/init.xml | 2 +- reference/mysqli/mysqli/kill.xml | 2 +- reference/mysqli/mysqli/more-results.xml | 2 +- reference/mysqli/mysqli/multi-query.xml | 2 +- reference/mysqli/mysqli/next-result.xml | 2 +- reference/mysqli/mysqli/options.xml | 2 +- reference/mysqli/mysqli/ping.xml | 2 +- reference/mysqli/mysqli/prepare.xml | 2 +- reference/mysqli/mysqli/query.xml | 2 +- reference/mysqli/mysqli/real-connect.xml | 2 +- reference/mysqli/mysqli/real-escape-string.xml | 2 +- reference/mysqli/mysqli/real-query.xml | 8 ++++---- reference/mysqli/mysqli/rollback.xml | 2 +- reference/mysqli/mysqli/rpl-query-type.xml | 2 +- reference/mysqli/mysqli/select-db.xml | 2 +- reference/mysqli/mysqli/send-query.xml | 2 +- reference/mysqli/mysqli/set-charset.xml | 2 +- reference/mysqli/mysqli/ssl-set.xml | 2 +- reference/mysqli/mysqli/stat.xml | 2 +- reference/mysqli/mysqli/stmt-init.xml | 2 +- reference/mysqli/mysqli/store-result.xml | 2 +- reference/mysqli/mysqli/use-result.xml | 2 +- 34 files changed, 38 insertions(+), 38 deletions(-) diff --git a/reference/mysqli/mysqli/autocommit.xml b/reference/mysqli/mysqli/autocommit.xml index 2820368643..329592254e 100644 --- a/reference/mysqli/mysqli/autocommit.xml +++ b/reference/mysqli/mysqli/autocommit.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::autocommit + public boolmysqli::autocommit boolmode &style.procedural; diff --git a/reference/mysqli/mysqli/change-user.xml b/reference/mysqli/mysqli/change-user.xml index 04ed4bdca7..9fc8272787 100644 --- a/reference/mysqli/mysqli/change-user.xml +++ b/reference/mysqli/mysqli/change-user.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::change_user + public boolmysqli::change_user stringuser stringpassword stringdatabase diff --git a/reference/mysqli/mysqli/character-set-name.xml b/reference/mysqli/mysqli/character-set-name.xml index 947071779f..e04fbec21b 100644 --- a/reference/mysqli/mysqli/character-set-name.xml +++ b/reference/mysqli/mysqli/character-set-name.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - stringmysqli::character_set_name + public stringmysqli::character_set_name &style.procedural; diff --git a/reference/mysqli/mysqli/close.xml b/reference/mysqli/mysqli/close.xml index 082b32cb58..218d6caf96 100644 --- a/reference/mysqli/mysqli/close.xml +++ b/reference/mysqli/mysqli/close.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::close + public boolmysqli::close &style.procedural; diff --git a/reference/mysqli/mysqli/commit.xml b/reference/mysqli/mysqli/commit.xml index 77aeeb272f..91896cba05 100644 --- a/reference/mysqli/mysqli/commit.xml +++ b/reference/mysqli/mysqli/commit.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::commit + public boolmysqli::commit intflags0 stringname diff --git a/reference/mysqli/mysqli/construct.xml b/reference/mysqli/mysqli/construct.xml index 1bdd423f99..42e8dc3803 100644 --- a/reference/mysqli/mysqli/construct.xml +++ b/reference/mysqli/mysqli/construct.xml @@ -12,7 +12,7 @@ &reftitle.description; &style.oop; - mysqli::__construct + public mysqli::__construct stringhostini_get("mysqli.default_host") stringusernameini_get("mysqli.default_user") stringpasswdini_get("mysqli.default_pw") @@ -21,7 +21,7 @@ stringsocketini_get("mysqli.default_socket") - voidmysqli::connect + public voidmysqli::connect stringhostini_get("mysqli.default_host") stringusernameini_get("mysqli.default_user") stringpasswdini_get("mysqli.default_pw") diff --git a/reference/mysqli/mysqli/debug.xml b/reference/mysqli/mysqli/debug.xml index 9cd107e722..3fe0a9e41e 100644 --- a/reference/mysqli/mysqli/debug.xml +++ b/reference/mysqli/mysqli/debug.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::debug + public boolmysqli::debug stringmessage &style.procedural; diff --git a/reference/mysqli/mysqli/dump-debug-info.xml b/reference/mysqli/mysqli/dump-debug-info.xml index 0559b8f63a..b0876921fe 100644 --- a/reference/mysqli/mysqli/dump-debug-info.xml +++ b/reference/mysqli/mysqli/dump-debug-info.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::dump_debug_info + public boolmysqli::dump_debug_info &style.procedural; diff --git a/reference/mysqli/mysqli/get-charset.xml b/reference/mysqli/mysqli/get-charset.xml index fd57f11015..d8b974934f 100644 --- a/reference/mysqli/mysqli/get-charset.xml +++ b/reference/mysqli/mysqli/get-charset.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - objectmysqli::get_charset + public objectmysqli::get_charset &style.procedural; diff --git a/reference/mysqli/mysqli/get-client-info.xml b/reference/mysqli/mysqli/get-client-info.xml index c03ac660a8..4a0379c6d6 100644 --- a/reference/mysqli/mysqli/get-client-info.xml +++ b/reference/mysqli/mysqli/get-client-info.xml @@ -13,7 +13,7 @@ &style.oop; stringmysqli->client_info - stringmysqli::get_client_info + public stringmysqli::get_client_info &style.procedural; diff --git a/reference/mysqli/mysqli/get-connection-stats.xml b/reference/mysqli/mysqli/get-connection-stats.xml index 390dafb0ce..a5abec0e75 100644 --- a/reference/mysqli/mysqli/get-connection-stats.xml +++ b/reference/mysqli/mysqli/get-connection-stats.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::get_connection_stats + public boolmysqli::get_connection_stats &style.procedural; diff --git a/reference/mysqli/mysqli/get-warnings.xml b/reference/mysqli/mysqli/get-warnings.xml index e45351fca2..3886705d19 100644 --- a/reference/mysqli/mysqli/get-warnings.xml +++ b/reference/mysqli/mysqli/get-warnings.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - mysqli_warningmysqli::get_warnings + public mysqli_warningmysqli::get_warnings &style.procedural; diff --git a/reference/mysqli/mysqli/init.xml b/reference/mysqli/mysqli/init.xml index 622fdc7fe6..4822584c6b 100644 --- a/reference/mysqli/mysqli/init.xml +++ b/reference/mysqli/mysqli/init.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - mysqlimysqli::init + public mysqlimysqli::init &style.procedural; diff --git a/reference/mysqli/mysqli/kill.xml b/reference/mysqli/mysqli/kill.xml index 311a531a9f..1bc1934fa2 100644 --- a/reference/mysqli/mysqli/kill.xml +++ b/reference/mysqli/mysqli/kill.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::kill + public boolmysqli::kill intprocessid &style.procedural; diff --git a/reference/mysqli/mysqli/more-results.xml b/reference/mysqli/mysqli/more-results.xml index 754e6d1613..58ff70cc56 100644 --- a/reference/mysqli/mysqli/more-results.xml +++ b/reference/mysqli/mysqli/more-results.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::more_results + public boolmysqli::more_results &style.procedural; diff --git a/reference/mysqli/mysqli/multi-query.xml b/reference/mysqli/mysqli/multi-query.xml index 6eb9fcecbd..815b1e2ebe 100644 --- a/reference/mysqli/mysqli/multi-query.xml +++ b/reference/mysqli/mysqli/multi-query.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::multi_query + public boolmysqli::multi_query stringquery &style.procedural; diff --git a/reference/mysqli/mysqli/next-result.xml b/reference/mysqli/mysqli/next-result.xml index c06dbd489a..0a8fa4589b 100644 --- a/reference/mysqli/mysqli/next-result.xml +++ b/reference/mysqli/mysqli/next-result.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::next_result + public boolmysqli::next_result &style.procedural; diff --git a/reference/mysqli/mysqli/options.xml b/reference/mysqli/mysqli/options.xml index 1ab7bcce0f..9eeb696ba8 100644 --- a/reference/mysqli/mysqli/options.xml +++ b/reference/mysqli/mysqli/options.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::options + public boolmysqli::options intoption mixedvalue diff --git a/reference/mysqli/mysqli/ping.xml b/reference/mysqli/mysqli/ping.xml index 86b23d6922..460ea56750 100644 --- a/reference/mysqli/mysqli/ping.xml +++ b/reference/mysqli/mysqli/ping.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::ping + public boolmysqli::ping &style.procedural; diff --git a/reference/mysqli/mysqli/prepare.xml b/reference/mysqli/mysqli/prepare.xml index f31f2de747..62806d2dc5 100644 --- a/reference/mysqli/mysqli/prepare.xml +++ b/reference/mysqli/mysqli/prepare.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - mysqli_stmtmysqli::prepare + public mysqli_stmtmysqli::prepare stringquery &style.procedural; diff --git a/reference/mysqli/mysqli/query.xml b/reference/mysqli/mysqli/query.xml index fe8a05e22f..55ad0eb8ec 100644 --- a/reference/mysqli/mysqli/query.xml +++ b/reference/mysqli/mysqli/query.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - mixedmysqli::query + public mixedmysqli::query stringquery intresultmodeMYSQLI_STORE_RESULT diff --git a/reference/mysqli/mysqli/real-connect.xml b/reference/mysqli/mysqli/real-connect.xml index c433518dfd..0b9a744a1e 100644 --- a/reference/mysqli/mysqli/real-connect.xml +++ b/reference/mysqli/mysqli/real-connect.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::real_connect + public boolmysqli::real_connect stringhost stringusername stringpasswd diff --git a/reference/mysqli/mysqli/real-escape-string.xml b/reference/mysqli/mysqli/real-escape-string.xml index 9710605db5..2b7b0d21e1 100644 --- a/reference/mysqli/mysqli/real-escape-string.xml +++ b/reference/mysqli/mysqli/real-escape-string.xml @@ -12,7 +12,7 @@ &reftitle.description; &style.oop; - stringmysqli::escape_string + public stringmysqli::escape_string stringescapestr diff --git a/reference/mysqli/mysqli/real-query.xml b/reference/mysqli/mysqli/real-query.xml index b4d4bc8a73..2fc9bb0b84 100644 --- a/reference/mysqli/mysqli/real-query.xml +++ b/reference/mysqli/mysqli/real-query.xml @@ -10,10 +10,10 @@ &reftitle.description; &style.oop; - - boolmysqli::real_query - stringquery - + + public boolmysqli::real_query + stringquery + &style.procedural; boolmysqli_real_query diff --git a/reference/mysqli/mysqli/rollback.xml b/reference/mysqli/mysqli/rollback.xml index 3b0977e097..dbc1b4f419 100644 --- a/reference/mysqli/mysqli/rollback.xml +++ b/reference/mysqli/mysqli/rollback.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::rollback + public boolmysqli::rollback intflags0 stringname diff --git a/reference/mysqli/mysqli/rpl-query-type.xml b/reference/mysqli/mysqli/rpl-query-type.xml index a287fa8ebb..bb284b8f4c 100644 --- a/reference/mysqli/mysqli/rpl-query-type.xml +++ b/reference/mysqli/mysqli/rpl-query-type.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - intmysqli::rpl_query_type + public intmysqli::rpl_query_type stringquery &style.procedural; diff --git a/reference/mysqli/mysqli/select-db.xml b/reference/mysqli/mysqli/select-db.xml index 274f83588b..7f79587a21 100644 --- a/reference/mysqli/mysqli/select-db.xml +++ b/reference/mysqli/mysqli/select-db.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::select_db + public boolmysqli::select_db stringdbname &style.procedural; diff --git a/reference/mysqli/mysqli/send-query.xml b/reference/mysqli/mysqli/send-query.xml index 2b4d99a5fb..f007fc5dc7 100644 --- a/reference/mysqli/mysqli/send-query.xml +++ b/reference/mysqli/mysqli/send-query.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::send_query + public boolmysqli::send_query stringquery &style.procedural; diff --git a/reference/mysqli/mysqli/set-charset.xml b/reference/mysqli/mysqli/set-charset.xml index bb4e73a644..faab7a5e6c 100644 --- a/reference/mysqli/mysqli/set-charset.xml +++ b/reference/mysqli/mysqli/set-charset.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::set_charset + public boolmysqli::set_charset stringcharset &style.procedural; diff --git a/reference/mysqli/mysqli/ssl-set.xml b/reference/mysqli/mysqli/ssl-set.xml index 1efa1e3032..2d43b38f3a 100644 --- a/reference/mysqli/mysqli/ssl-set.xml +++ b/reference/mysqli/mysqli/ssl-set.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - boolmysqli::ssl_set + public boolmysqli::ssl_set stringkey stringcert stringca diff --git a/reference/mysqli/mysqli/stat.xml b/reference/mysqli/mysqli/stat.xml index 8c84c47f65..a1c2e8eaa5 100644 --- a/reference/mysqli/mysqli/stat.xml +++ b/reference/mysqli/mysqli/stat.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - stringmysqli::stat + public stringmysqli::stat &style.procedural; diff --git a/reference/mysqli/mysqli/stmt-init.xml b/reference/mysqli/mysqli/stmt-init.xml index 6abab2e352..3337bc55a9 100644 --- a/reference/mysqli/mysqli/stmt-init.xml +++ b/reference/mysqli/mysqli/stmt-init.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - mysqli_stmtmysqli::stmt_init + public mysqli_stmtmysqli::stmt_init &style.procedural; diff --git a/reference/mysqli/mysqli/store-result.xml b/reference/mysqli/mysqli/store-result.xml index 6fb72b9b97..a3457c183c 100644 --- a/reference/mysqli/mysqli/store-result.xml +++ b/reference/mysqli/mysqli/store-result.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - mysqli_resultmysqli::store_result + public mysqli_resultmysqli::store_result intoption &style.procedural; diff --git a/reference/mysqli/mysqli/use-result.xml b/reference/mysqli/mysqli/use-result.xml index 8d0863aa7e..bb51eaff80 100644 --- a/reference/mysqli/mysqli/use-result.xml +++ b/reference/mysqli/mysqli/use-result.xml @@ -11,7 +11,7 @@ &reftitle.description; &style.oop; - mysqli_resultmysqli::use_result + public mysqli_resultmysqli::use_result &style.procedural;