From 2fe030d7e1cafdec6a31f5d6843d52fec7efe991 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 2 Dec 2014 10:44:26 -0800 Subject: [PATCH] Changed some DatabaseBase type hints to IDatabase Change-Id: Id945aaabbf5b467106676ea9f3eab3a6161c7f3d --- includes/specials/SpecialActiveusers.php | 8 ++++---- includes/specials/SpecialContributions.php | 2 +- includes/specials/SpecialDeletedContributions.php | 2 +- includes/specials/SpecialLinkSearch.php | 2 +- includes/specials/SpecialListDuplicatedFiles.php | 2 +- includes/specials/SpecialListredirects.php | 2 +- includes/specials/SpecialMediaStatistics.php | 4 ++-- includes/specials/SpecialMostcategories.php | 2 +- includes/specials/SpecialMostinterwikis.php | 2 +- includes/specials/SpecialMostlinked.php | 2 +- includes/specials/SpecialMostlinkedcategories.php | 2 +- includes/specials/SpecialMostlinkedtemplates.php | 2 +- includes/specials/SpecialShortpages.php | 2 +- includes/specials/SpecialUndelete.php | 2 +- includes/specials/SpecialWatchlist.php | 6 +++--- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php index 6219fc48d2..fe06375822 100644 --- a/includes/specials/SpecialActiveusers.php +++ b/includes/specials/SpecialActiveusers.php @@ -314,10 +314,10 @@ class SpecialActiveUsers extends SpecialPage { } /** - * @param DatabaseBase $dbw Passed in from updateSpecialPages.php + * @param IDatabase $dbw Passed in from updateSpecialPages.php * @return void */ - public static function cacheUpdate( DatabaseBase $dbw ) { + public static function cacheUpdate( IDatabase $dbw ) { global $wgActiveUserDays; self::doQueryCacheUpdate( $dbw, $wgActiveUserDays, $wgActiveUserDays * 86400 ); @@ -326,12 +326,12 @@ class SpecialActiveUsers extends SpecialPage { /** * Update the query cache as needed * - * @param DatabaseBase $dbw + * @param IDatabase $dbw * @param int $days How many days user must be idle before he is considered inactive * @param int $window Maximum time range of new data to scan (in seconds) * @return int|bool UNIX timestamp the cache is now up-to-date as of (false on error) */ - protected static function doQueryCacheUpdate( DatabaseBase $dbw, $days, $window ) { + protected static function doQueryCacheUpdate( IDatabase $dbw, $days, $window ) { $dbw->startAtomic( __METHOD__ ); $lockKey = wfWikiID() . '-activeusers'; diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index 59e2bbaada..1e829b1627 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -658,7 +658,7 @@ class ContribsPager extends ReverseChronologicalPager { public $mDb; public $preventClickjacking = false; - /** @var DatabaseBase */ + /** @var IDatabase */ public $mDbSecondary; /** diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php index e739a8622d..29c3fd4144 100644 --- a/includes/specials/SpecialDeletedContributions.php +++ b/includes/specials/SpecialDeletedContributions.php @@ -266,7 +266,7 @@ class DeletedContribsPager extends IndexPager { /** * Get the Database object in use * - * @return DatabaseBase + * @return IDatabase */ public function getDatabase() { return $this->mDb; diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php index 05c89c2003..f6cb84d28d 100644 --- a/includes/specials/SpecialLinkSearch.php +++ b/includes/specials/SpecialLinkSearch.php @@ -254,7 +254,7 @@ class LinkSearchPage extends QueryPage { /** * Pre-fill the link cache * - * @param DatabaseBase $db + * @param IDatabase $db * @param ResultWrapper $res */ function preprocessResults( $db, $res ) { diff --git a/includes/specials/SpecialListDuplicatedFiles.php b/includes/specials/SpecialListDuplicatedFiles.php index 26672706b8..1e3dff6f34 100644 --- a/includes/specials/SpecialListDuplicatedFiles.php +++ b/includes/specials/SpecialListDuplicatedFiles.php @@ -71,7 +71,7 @@ class ListDuplicatedFilesPage extends QueryPage { /** * Pre-fill the link cache * - * @param DatabaseBase $db + * @param IDatabase $db * @param ResultWrapper $res */ function preprocessResults( $db, $res ) { diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php index de05be41f8..2df4834729 100644 --- a/includes/specials/SpecialListredirects.php +++ b/includes/specials/SpecialListredirects.php @@ -72,7 +72,7 @@ class ListredirectsPage extends QueryPage { /** * Cache page existence for performance * - * @param DatabaseBase $db + * @param IDatabase $db * @param ResultWrapper $res */ function preprocessResults( $db, $res ) { diff --git a/includes/specials/SpecialMediaStatistics.php b/includes/specials/SpecialMediaStatistics.php index 1084482434..c26adc5ed3 100644 --- a/includes/specials/SpecialMediaStatistics.php +++ b/includes/specials/SpecialMediaStatistics.php @@ -99,7 +99,7 @@ class MediaStatisticsPage extends QueryPage { * * @param $out OutputPage * @param $skin Skin (deprecated presumably) - * @param $dbr DatabaseBase + * @param $dbr IDatabase * @param $res ResultWrapper Results from query * @param $num integer Number of results * @param $offset integer Paging offset (Should always be 0 in our case) @@ -314,7 +314,7 @@ class MediaStatisticsPage extends QueryPage { /** * Initialize total values so we can figure out percentages later. * - * @param $dbr DatabaseBase + * @param $dbr IDatabase * @param $res ResultWrapper */ public function preprocessResults( $dbr, $res ) { diff --git a/includes/specials/SpecialMostcategories.php b/includes/specials/SpecialMostcategories.php index 9b67f34339..c70bbdbad0 100644 --- a/includes/specials/SpecialMostcategories.php +++ b/includes/specials/SpecialMostcategories.php @@ -65,7 +65,7 @@ class MostcategoriesPage extends QueryPage { } /** - * @param DatabaseBase $db + * @param IDatabase $db * @param ResultWrapper $res */ function preprocessResults( $db, $res ) { diff --git a/includes/specials/SpecialMostinterwikis.php b/includes/specials/SpecialMostinterwikis.php index 30ccbe5a06..ab3d9c91f0 100644 --- a/includes/specials/SpecialMostinterwikis.php +++ b/includes/specials/SpecialMostinterwikis.php @@ -71,7 +71,7 @@ class MostinterwikisPage extends QueryPage { /** * Pre-fill the link cache * - * @param DatabaseBase $db + * @param IDatabase $db * @param ResultWrapper $res */ function preprocessResults( $db, $res ) { diff --git a/includes/specials/SpecialMostlinked.php b/includes/specials/SpecialMostlinked.php index 99f0ecf5ed..ae0b07087e 100644 --- a/includes/specials/SpecialMostlinked.php +++ b/includes/specials/SpecialMostlinked.php @@ -74,7 +74,7 @@ class MostlinkedPage extends QueryPage { /** * Pre-fill the link cache * - * @param DatabaseBase $db + * @param IDatabase $db * @param ResultWrapper $res */ function preprocessResults( $db, $res ) { diff --git a/includes/specials/SpecialMostlinkedcategories.php b/includes/specials/SpecialMostlinkedcategories.php index f61a115881..cc718e06ab 100644 --- a/includes/specials/SpecialMostlinkedcategories.php +++ b/includes/specials/SpecialMostlinkedcategories.php @@ -55,7 +55,7 @@ class MostlinkedCategoriesPage extends QueryPage { /** * Fetch user page links and cache their existence * - * @param DatabaseBase $db + * @param IDatabase $db * @param ResultWrapper $res */ function preprocessResults( $db, $res ) { diff --git a/includes/specials/SpecialMostlinkedtemplates.php b/includes/specials/SpecialMostlinkedtemplates.php index 8e6a596d60..a924525d8f 100644 --- a/includes/specials/SpecialMostlinkedtemplates.php +++ b/includes/specials/SpecialMostlinkedtemplates.php @@ -75,7 +75,7 @@ class MostlinkedTemplatesPage extends QueryPage { /** * Pre-cache page existence to speed up link generation * - * @param DatabaseBase $db + * @param IDatabase $db * @param ResultWrapper $res */ public function preprocessResults( $db, $res ) { diff --git a/includes/specials/SpecialShortpages.php b/includes/specials/SpecialShortpages.php index 782d9a175a..7ec69e06f0 100644 --- a/includes/specials/SpecialShortpages.php +++ b/includes/specials/SpecialShortpages.php @@ -58,7 +58,7 @@ class ShortPagesPage extends QueryPage { } /** - * @param DatabaseBase $db + * @param IDatabase $db * @param ResultWrapper $res */ function preprocessResults( $db, $res ) { diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index a1f48e9fb0..bcf83c8d8d 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -94,7 +94,7 @@ class PageArchive { } /** - * @param DatabaseBase $dbr + * @param IDatabase $dbr * @param string|array $condition * @return bool|ResultWrapper */ diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index 421840f05b..ee4f486abe 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -300,9 +300,9 @@ class SpecialWatchlist extends ChangesListSpecialPage { } /** - * Return a DatabaseBase object for reading + * Return a IDatabase object for reading * - * @return DatabaseBase + * @return IDatabase */ protected function getDB() { return wfGetDB( DB_SLAVE, 'watchlist' ); @@ -607,7 +607,7 @@ class SpecialWatchlist extends ChangesListSpecialPage { /** * Count the number of items on a user's watchlist * - * @param DatabaseBase $dbr A database connection + * @param IDatabase $dbr A database connection * @return int */ protected function countItems( $dbr ) { -- 2.20.1