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
rdbms: correct atomic section examples in comments
[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
9152d1e
..
0a5450c
100644
(file)
--- a/
includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/
includes/libs/rdbms/database/DatabaseMysqli.php
@@
-25,6
+25,7
@@
namespace Wikimedia\Rdbms;
use mysqli;
use mysqli_result;
use IP;
use mysqli;
use mysqli_result;
use IP;
+use stdClass;
/**
* Database abstraction object for PHP extension mysqli.
/**
* Database abstraction object for PHP extension mysqli.
@@
-34,11
+35,9
@@
use IP;
* @see Database
*/
class DatabaseMysqli extends DatabaseMysqlBase {
* @see Database
*/
class DatabaseMysqli extends DatabaseMysqlBase {
- /** @var mysqli $mConn */
-
/**
* @param string $sql
/**
* @param string $sql
- * @return
resource
+ * @return
mysqli_result
*/
protected function doQuery( $sql ) {
$conn = $this->getBindingHandle();
*/
protected function doQuery( $sql ) {
$conn = $this->getBindingHandle();
@@
-162,7
+161,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
* @return int
*/
function lastErrno() {
* @return int
*/
function lastErrno() {
- if ( $this->conn ) {
+ if ( $this->conn
instanceof mysqli
) {
return $this->conn->errno;
} else {
return mysqli_connect_errno();
return $this->conn->errno;
} else {
return mysqli_connect_errno();
@@
-202,7
+201,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
/**
* @param mysqli_result $res
/**
* @param mysqli_result $res
- * @return bool
+ * @return
stdClass|
bool
*/
protected function mysqlFetchObject( $res ) {
$object = $res->fetch_object();
*/
protected function mysqlFetchObject( $res ) {
$object = $res->fetch_object();
@@
-235,7
+234,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @return mixed
*/
protected function mysqlNumFields( $res ) {
* @return mixed
*/
protected function mysqlNumFields( $res ) {
@@
-243,7
+242,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @param int $n
* @return mixed
*/
* @param int $n
* @return mixed
*/
@@
-266,7
+265,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @param int $n
* @return mixed
*/
* @param int $n
* @return mixed
*/
@@
-277,7
+276,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @param int $n
* @return mixed
*/
* @param int $n
* @return mixed
*/
@@
-333,6
+332,13
@@
class DatabaseMysqli extends DatabaseMysqlBase {
return (string)$this->conn;
}
}
return (string)$this->conn;
}
}
+
+ /**
+ * @return mysqli
+ */
+ protected function getBindingHandle() {
+ return parent::getBindingHandle();
+ }
}
class_alias( DatabaseMysqli::class, 'DatabaseMysqli' );
}
class_alias( DatabaseMysqli::class, 'DatabaseMysqli' );