From: Thiemo Mättig <thiemo.maettig@wikimedia.de>
Date: Tue, 9 Jan 2018 12:55:37 +0000 (+0100)
Subject: Use IDatabase interface instead of Database in DBAccessBase
X-Git-Tag: 1.31.0-rc.0~963
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=eb6c589e54e8c69cb9b1a22705457b50b8b21a83;p=lhc%2Fweb%2Fwiklou.git

Use IDatabase interface instead of Database in DBAccessBase

There is one subclass I'm aware of that overwrites the releaseConnection
method. It's in the EducationProgram extension and already updated, see
Ibb067ca.

Change-Id: I68504f9cd32aa0d0c6c068dbaa1f2ee65649afa4
---

diff --git a/includes/dao/DBAccessBase.php b/includes/dao/DBAccessBase.php
index 0f8d7f7301..6e171d52e6 100644
--- a/includes/dao/DBAccessBase.php
+++ b/includes/dao/DBAccessBase.php
@@ -1,6 +1,6 @@
 <?php
 
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
 
 /**
@@ -56,7 +56,7 @@ abstract class DBAccessBase implements IDBAccessObject {
 	 * @param int $id Which connection to use
 	 * @param array $groups Query groups
 	 *
-	 * @return Database
+	 * @return IDatabase
 	 */
 	protected function getConnection( $id, $groups = [] ) {
 		$loadBalancer = wfGetLB( $this->wiki );
@@ -71,9 +71,9 @@ abstract class DBAccessBase implements IDBAccessObject {
 	 *
 	 * @since 1.21
 	 *
-	 * @param Database $db The database connection to release.
+	 * @param IDatabase $db The database connection to release.
 	 */
-	protected function releaseConnection( Database $db ) {
+	protected function releaseConnection( IDatabase $db ) {
 		if ( $this->wiki !== false ) {
 			$loadBalancer = $this->getLoadBalancer();
 			$loadBalancer->reuseConnection( $db );