jenkins-bot has submitted this change and it was merged.
Change subject: Changed some DatabaseBase type hints to IDatabase
......................................................................
Changed some DatabaseBase type hints to IDatabase
Change-Id: I1158c71f110b140473f56d5cbe352da1f4513ad9
---
M includes/revisiondelete/RevDelArchiveList.php
M includes/revisiondelete/RevDelArchivedFileList.php
M includes/revisiondelete/RevDelFileList.php
M includes/revisiondelete/RevDelLogList.php
M includes/revisiondelete/RevDelRevisionList.php
M includes/revisiondelete/RevisionDeleteUser.php
M includes/specialpage/ChangesListSpecialPage.php
M includes/specialpage/ImageQueryPage.php
M includes/specialpage/PageQueryPage.php
M includes/specialpage/QueryPage.php
M includes/specialpage/WantedQueryPage.php
11 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/revisiondelete/RevDelArchiveList.php
b/includes/revisiondelete/RevDelArchiveList.php
index e7aed73..6ae0afc 100644
--- a/includes/revisiondelete/RevDelArchiveList.php
+++ b/includes/revisiondelete/RevDelArchiveList.php
@@ -32,7 +32,7 @@
}
/**
- * @param DatabaseBase $db
+ * @param IDatabase $db
* @return mixed
*/
public function doQuery( $db ) {
diff --git a/includes/revisiondelete/RevDelArchivedFileList.php
b/includes/revisiondelete/RevDelArchivedFileList.php
index aec51b1..f2b99ae 100644
--- a/includes/revisiondelete/RevDelArchivedFileList.php
+++ b/includes/revisiondelete/RevDelArchivedFileList.php
@@ -32,7 +32,7 @@
}
/**
- * @param DatabaseBase $db
+ * @param IDatabase $db
* @return mixed
*/
public function doQuery( $db ) {
diff --git a/includes/revisiondelete/RevDelFileList.php
b/includes/revisiondelete/RevDelFileList.php
index 57e15d8..2295eaa 100644
--- a/includes/revisiondelete/RevDelFileList.php
+++ b/includes/revisiondelete/RevDelFileList.php
@@ -49,7 +49,7 @@
}
/**
- * @param DatabaseBase $db
+ * @param IDatabase $db
* @return mixed
*/
public function doQuery( $db ) {
diff --git a/includes/revisiondelete/RevDelLogList.php
b/includes/revisiondelete/RevDelLogList.php
index ad04042..86c5af3 100644
--- a/includes/revisiondelete/RevDelLogList.php
+++ b/includes/revisiondelete/RevDelLogList.php
@@ -55,7 +55,7 @@
}
/**
- * @param DatabaseBase $db
+ * @param IDatabase $db
* @return mixed
*/
public function doQuery( $db ) {
diff --git a/includes/revisiondelete/RevDelRevisionList.php
b/includes/revisiondelete/RevDelRevisionList.php
index 2545072..733fa97 100644
--- a/includes/revisiondelete/RevDelRevisionList.php
+++ b/includes/revisiondelete/RevDelRevisionList.php
@@ -54,7 +54,7 @@
}
/**
- * @param DatabaseBase $db
+ * @param IDatabase $db
* @return mixed
*/
public function doQuery( $db ) {
diff --git a/includes/revisiondelete/RevisionDeleteUser.php
b/includes/revisiondelete/RevisionDeleteUser.php
index 55c46c5..79802d6 100644
--- a/includes/revisiondelete/RevisionDeleteUser.php
+++ b/includes/revisiondelete/RevisionDeleteUser.php
@@ -36,14 +36,14 @@
* @param string $name Username
* @param int $userId User id
* @param string $op Operator '|' or '&'
- * @param null|DatabaseBase $dbw If you happen to have one lying around
+ * @param null|IDatabase $dbw If you happen to have one lying around
* @return bool
*/
private static function setUsernameBitfields( $name, $userId, $op, $dbw
) {
if ( !$userId || ( $op !== '|' && $op !== '&' ) ) {
return false; // sanity check
}
- if ( !$dbw instanceof DatabaseBase ) {
+ if ( !$dbw instanceof IDatabase ) {
$dbw = wfGetDB( DB_MASTER );
}
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index c28aa86..17a651f 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -317,9 +317,9 @@
}
/**
- * Return a DatabaseBase object for reading
+ * Return a IDatabase object for reading
*
- * @return DatabaseBase
+ * @return IDatabase
*/
protected function getDB() {
return wfGetDB( DB_SLAVE );
diff --git a/includes/specialpage/ImageQueryPage.php
b/includes/specialpage/ImageQueryPage.php
index c837d1a..c4e53ee 100644
--- a/includes/specialpage/ImageQueryPage.php
+++ b/includes/specialpage/ImageQueryPage.php
@@ -35,7 +35,7 @@
*
* @param OutputPage $out OutputPage to print to
* @param Skin $skin User skin to use [unused]
- * @param DatabaseBase $dbr (read) connection to use
+ * @param IDatabase $dbr (read) connection to use
* @param ResultWrapper $res Result pointer
* @param int $num Number of available result rows
* @param int $offset Paging offset
diff --git a/includes/specialpage/PageQueryPage.php
b/includes/specialpage/PageQueryPage.php
index afc0227..d72744b 100644
--- a/includes/specialpage/PageQueryPage.php
+++ b/includes/specialpage/PageQueryPage.php
@@ -32,7 +32,7 @@
* like page existence and information for stub color and redirect
hints.
* This should be done for live data and cached data.
*
- * @param DatabaseBase $db
+ * @param IDatabase $db
* @param ResultWrapper $res
*/
public function preprocessResults( $db, $res ) {
diff --git a/includes/specialpage/QueryPage.php
b/includes/specialpage/QueryPage.php
index 167135b..f902acf 100644
--- a/includes/specialpage/QueryPage.php
+++ b/includes/specialpage/QueryPage.php
@@ -346,7 +346,7 @@
/**
* Get a DB connection to be used for slow recache queries
- * @return DatabaseBase
+ * @return IDatabase
*/
function getRecacheDB() {
return wfGetDB( DB_SLAVE, array( $this->getName(),
'QueryPage::recache', 'vslow' ) );
@@ -576,7 +576,7 @@
*
* @param OutputPage $out OutputPage to print to
* @param Skin $skin User skin to use
- * @param DatabaseBase $dbr Database (read) connection to use
+ * @param IDatabase $dbr Database (read) connection to use
* @param ResultWrapper $res Result pointer
* @param int $num Number of available result rows
* @param int $offset Paging offset
@@ -649,7 +649,7 @@
/**
* Do any necessary preprocessing of the result object.
- * @param DatabaseBase $db
+ * @param IDatabase $db
* @param ResultWrapper $res
*/
function preprocessResults( $db, $res ) {
diff --git a/includes/specialpage/WantedQueryPage.php
b/includes/specialpage/WantedQueryPage.php
index be2f1e8..ce28de5 100644
--- a/includes/specialpage/WantedQueryPage.php
+++ b/includes/specialpage/WantedQueryPage.php
@@ -37,7 +37,7 @@
/**
* Cache page existence for performance
- * @param DatabaseBase $db
+ * @param IDatabase $db
* @param ResultWrapper $res
*/
function preprocessResults( $db, $res ) {
--
To view, visit https://gerrit.wikimedia.org/r/178458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1158c71f110b140473f56d5cbe352da1f4513ad9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
