dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
2f27ff9
..
4d1b87b
100644
(file)
--- a/
includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/
includes/libs/rdbms/database/DatabaseMysqli.php
@@
-20,6
+20,11
@@
* @file
* @ingroup Database
*/
* @file
* @ingroup Database
*/
+namespace Wikimedia\Rdbms;
+
+use mysqli;
+use mysqli_result;
+use IP;
/**
* Database abstraction object for PHP extension mysqli.
/**
* Database abstraction object for PHP extension mysqli.
@@
-186,7
+191,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @return bool
*/
protected function mysqlFreeResult( $res ) {
* @return bool
*/
protected function mysqlFreeResult( $res ) {
@@
-196,7
+201,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @return bool
*/
protected function mysqlFetchObject( $res ) {
* @return bool
*/
protected function mysqlFetchObject( $res ) {
@@
-209,7
+214,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @return bool
*/
protected function mysqlFetchArray( $res ) {
* @return bool
*/
protected function mysqlFetchArray( $res ) {
@@
-222,7
+227,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @return mixed
*/
protected function mysqlNumRows( $res ) {
* @return mixed
*/
protected function mysqlNumRows( $res ) {
@@
-261,7
+266,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param
resource|ResultWrapper
$res
+ * @param
mysqli
$res
* @param int $n
* @return mixed
*/
* @param int $n
* @return mixed
*/
@@
-272,7
+277,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param
resource|ResultWrapper
$res
+ * @param
mysqli
$res
* @param int $n
* @return mixed
*/
* @param int $n
* @return mixed
*/
@@
-283,7
+288,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param
resource|ResultWrapper
$res
+ * @param
mysqli_result
$res
* @param int $row
* @return mixed
*/
* @param int $row
* @return mixed
*/
@@
-329,3
+334,5
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
}
}
}
}
}
+
+class_alias( DatabaseMysqli::class, 'DatabaseMysqli' );