Merge "Show protection log on creation-protected pages"

[lhc/web/wiklou.git] / includes / libs / rdbms / database / DatabaseMysqli.php

diff --git a/includes/libs/rdbms/database/DatabaseMysqli.php b/includes/libs/rdbms/database/DatabaseMysqli.php
index be25489..4d1b87b 100644 (file)
--- a/includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/includes/libs/rdbms/database/DatabaseMysqli.php
@@ -23,7 +23,7 @@
 namespace Wikimedia\Rdbms;
 
 use mysqli;
-use DBConnectionError;
+use mysqli_result;
 use IP;
 
 /**
@@ -191,7 +191,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
        }
 
        /**
-        * @param mysqli $res
+        * @param mysqli_result $res
         * @return bool
         */
        protected function mysqlFreeResult( $res ) {
@@ -201,7 +201,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
        }
 
        /**
-        * @param mysqli $res
+        * @param mysqli_result $res
         * @return bool
         */
        protected function mysqlFetchObject( $res ) {
@@ -214,7 +214,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
        }
 
        /**
-        * @param mysqli $res
+        * @param mysqli_result $res
         * @return bool
         */
        protected function mysqlFetchArray( $res ) {
@@ -227,7 +227,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
        }
 
        /**
-        * @param mysqli $res
+        * @param mysqli_result $res
         * @return mixed
         */
        protected function mysqlNumRows( $res ) {
@@ -288,7 +288,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
        }
 
        /**
-        * @param mysqli $res
+        * @param mysqli_result $res
         * @param int $row
         * @return mixed
         */