X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Flibs%2Frdbms%2Fdatabase%2FDatabaseMysqli.php;h=fcd29c3c3cde5cac7bf4664795fa8d3822ee9f34;hb=5120937028f768749d058aa91dde82a96de0af1c;hp=7a2200a4da1db883fdebcdd655ca2e3a7f260a5b;hpb=22806b0a4509e97b56fb52b387e17e3c80fb7eb2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/rdbms/database/DatabaseMysqli.php b/includes/libs/rdbms/database/DatabaseMysqli.php
index 7a2200a4da..c1a56988d5 100644
--- a/includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/includes/libs/rdbms/database/DatabaseMysqli.php
@@ -20,8 +20,11 @@
  * @file
  * @ingroup Database
  */
+namespace Wikimedia\Rdbms;
 
-use Wikimedia\Rdbms\ResultWrapper;
+use mysqli;
+use mysqli_result;
+use IP;
 
 /**
  * Database abstraction object for PHP extension mysqli.
@@ -31,7 +34,7 @@ use Wikimedia\Rdbms\ResultWrapper;
  * @see Database
  */
 class DatabaseMysqli extends DatabaseMysqlBase {
-	/** @var $mConn mysqli */
+	/** @var mysqli $mConn */
 
 	/**
 	 * @param string $sql
@@ -88,7 +91,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 			$mysqli->ssl_set(
 				$this->sslKeyPath,
 				$this->sslCertPath,
-				null,
+				$this->sslCAFile,
 				$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 ) {
@@ -198,7 +201,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 	}
 
 	/**
-	 * @param mysqli $res
+	 * @param mysqli_result $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 ) {
@@ -224,7 +227,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 	}
 
 	/**
-	 * @param mysqli $res
+	 * @param mysqli_result $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
 	 */
@@ -274,7 +277,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 	}
 
 	/**
-	 * @param resource|ResultWrapper $res
+	 * @param mysqli $res
 	 * @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
 	 */
@@ -313,7 +316,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 	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' );