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 "Add attributes parameter to ShowSearchHitTitle"
[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
7a2200a
..
c1a5698
100644
(file)
--- a/
includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/
includes/libs/rdbms/database/DatabaseMysqli.php
@@
-20,8
+20,11
@@
* @file
* @ingroup Database
*/
* @file
* @ingroup Database
*/
+namespace Wikimedia\Rdbms;
-use Wikimedia\Rdbms\ResultWrapper;
+use mysqli;
+use mysqli_result;
+use IP;
/**
* Database abstraction object for PHP extension mysqli.
/**
* Database abstraction object for PHP extension mysqli.
@@
-31,7
+34,7
@@
use Wikimedia\Rdbms\ResultWrapper;
* @see Database
*/
class DatabaseMysqli extends DatabaseMysqlBase {
* @see Database
*/
class DatabaseMysqli extends DatabaseMysqlBase {
- /** @var
$mConn mysqli
*/
+ /** @var
mysqli $mConn
*/
/**
* @param string $sql
/**
* @param string $sql
@@
-88,7
+91,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
$mysqli->ssl_set(
$this->sslKeyPath,
$this->sslCertPath,
$mysqli->ssl_set(
$this->sslKeyPath,
$this->sslCertPath,
-
null
,
+
$this->sslCAFile
,
$this->sslCAPath,
$this->sslCiphers
);
$this->sslCAPath,
$this->sslCiphers
);
@@
-188,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 ) {
@@
-198,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 ) {
@@
-211,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 ) {
@@
-224,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 ) {
@@
-263,7
+266,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param
resource|ResultWrapper
$res
+ * @param
mysqli
$res
* @param int $n
* @return mixed
*/
* @param int $n
* @return mixed
*/
@@
-274,7
+277,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param
resource|ResultWrapper
$res
+ * @param
mysqli
$res
* @param int $n
* @return mixed
*/
* @param int $n
* @return mixed
*/
@@
-285,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
*/
@@
-313,7
+316,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
protected function mysqlRealEscapeString( $s ) {
$conn = $this->getBindingHandle();
protected function mysqlRealEscapeString( $s ) {
$conn = $this->getBindingHandle();
- return $conn->real_escape_string( $s );
+ return $conn->real_escape_string(
(string)
$s );
}
/**
}
/**
@@
-331,3
+334,5
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
}
}
}
}
}
+
+class_alias( DatabaseMysqli::class, 'DatabaseMysqli' );