Parent5446 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178590
Change subject: Revert "Changed some DatabaseBase type hints to IDatabase"
......................................................................
Revert "Changed some DatabaseBase type hints to IDatabase"
None of these type hints are accurate. Also not sure why we
even have an empty IDatabase class in the first place. It's
more than a little strange.
This reverts commit a4a44f7731483489a3798ad5859b56639f6613e3.
Change-Id: I0c25729a2c20bec34fad40cfa1a3615a84a92d24
---
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(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/178590/1
diff --git a/includes/revisiondelete/RevDelArchiveList.php
b/includes/revisiondelete/RevDelArchiveList.php
index 6ae0afc..e7aed73 100644
--- a/includes/revisiondelete/RevDelArchiveList.php
+++ b/includes/revisiondelete/RevDelArchiveList.php
@@ -32,7 +32,7 @@
}
/**
- * @param IDatabase $db
+ * @param DatabaseBase $db
* @return mixed
*/
public function doQuery( $db ) {
diff --git a/includes/revisiondelete/RevDelArchivedFileList.php
b/includes/revisiondelete/RevDelArchivedFileList.php
index f2b99ae..aec51b1 100644
--- a/includes/revisiondelete/RevDelArchivedFileList.php
+++ b/includes/revisiondelete/RevDelArchivedFileList.php
@@ -32,7 +32,7 @@
}
/**
- * @param IDatabase $db
+ * @param DatabaseBase $db
* @return mixed
*/
public function doQuery( $db ) {
diff --git a/includes/revisiondelete/RevDelFileList.php
b/includes/revisiondelete/RevDelFileList.php
index 2295eaa..57e15d8 100644
--- a/includes/revisiondelete/RevDelFileList.php
+++ b/includes/revisiondelete/RevDelFileList.php
@@ -49,7 +49,7 @@
}
/**
- * @param IDatabase $db
+ * @param DatabaseBase $db
* @return mixed
*/
public function doQuery( $db ) {
diff --git a/includes/revisiondelete/RevDelLogList.php
b/includes/revisiondelete/RevDelLogList.php
index 86c5af3..ad04042 100644
--- a/includes/revisiondelete/RevDelLogList.php
+++ b/includes/revisiondelete/RevDelLogList.php
@@ -55,7 +55,7 @@
}
/**
- * @param IDatabase $db
+ * @param DatabaseBase $db
* @return mixed
*/
public function doQuery( $db ) {
diff --git a/includes/revisiondelete/RevDelRevisionList.php
b/includes/revisiondelete/RevDelRevisionList.php
index 733fa97..2545072 100644
--- a/includes/revisiondelete/RevDelRevisionList.php
+++ b/includes/revisiondelete/RevDelRevisionList.php
@@ -54,7 +54,7 @@
}
/**
- * @param IDatabase $db
+ * @param DatabaseBase $db
* @return mixed
*/
public function doQuery( $db ) {
diff --git a/includes/revisiondelete/RevisionDeleteUser.php
b/includes/revisiondelete/RevisionDeleteUser.php
index 79802d6..55c46c5 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|IDatabase $dbw If you happen to have one lying around
+ * @param null|DatabaseBase $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 IDatabase ) {
+ if ( !$dbw instanceof DatabaseBase ) {
$dbw = wfGetDB( DB_MASTER );
}
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index 17a651f..c28aa86 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -317,9 +317,9 @@
}
/**
- * Return a IDatabase object for reading
+ * Return a DatabaseBase object for reading
*
- * @return IDatabase
+ * @return DatabaseBase
*/
protected function getDB() {
return wfGetDB( DB_SLAVE );
diff --git a/includes/specialpage/ImageQueryPage.php
b/includes/specialpage/ImageQueryPage.php
index c4e53ee..c837d1a 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 IDatabase $dbr (read) connection to use
+ * @param DatabaseBase $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 d72744b..afc0227 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 IDatabase $db
+ * @param DatabaseBase $db
* @param ResultWrapper $res
*/
public function preprocessResults( $db, $res ) {
diff --git a/includes/specialpage/QueryPage.php
b/includes/specialpage/QueryPage.php
index f902acf..167135b 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 IDatabase
+ * @return DatabaseBase
*/
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 IDatabase $dbr Database (read) connection to use
+ * @param DatabaseBase $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 IDatabase $db
+ * @param DatabaseBase $db
* @param ResultWrapper $res
*/
function preprocessResults( $db, $res ) {
diff --git a/includes/specialpage/WantedQueryPage.php
b/includes/specialpage/WantedQueryPage.php
index ce28de5..be2f1e8 100644
--- a/includes/specialpage/WantedQueryPage.php
+++ b/includes/specialpage/WantedQueryPage.php
@@ -37,7 +37,7 @@
/**
* Cache page existence for performance
- * @param IDatabase $db
+ * @param DatabaseBase $db
* @param ResultWrapper $res
*/
function preprocessResults( $db, $res ) {
--
To view, visit https://gerrit.wikimedia.org/r/178590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c25729a2c20bec34fad40cfa1a3615a84a92d24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Parent5446 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
