From e01fd443887b47c86d5248a4a32eca5e5ed98a97 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 18 Feb 2017 21:03:13 -0800 Subject: [PATCH] Move ResultWrapper subclasses to Rdbms Change-Id: I6f3f0e85e268b24c57c537aa6ad8016e0b4cdddb --- autoload.php | 4 +++- includes/Revision.php | 3 +++ includes/RevisionList.php | 1 + includes/TitleArray.php | 2 ++ includes/TitleArrayFromResult.php | 2 ++ includes/WatchedItemQueryServiceExtension.php | 2 ++ includes/actions/HistoryAction.php | 2 ++ includes/api/ApiPageSet.php | 1 + includes/api/ApiQueryBase.php | 2 ++ includes/cache/BacklinkCache.php | 3 +++ includes/cache/LinkBatch.php | 1 + includes/changes/ChangesFeed.php | 2 ++ includes/changes/ChangesList.php | 1 + includes/db/DatabaseOracle.php | 1 + includes/export/WikiExporter.php | 2 ++ includes/filerepo/LocalRepo.php | 2 ++ includes/libs/rdbms/database/Database.php | 1 + includes/libs/rdbms/database/DatabaseMssql.php | 2 ++ includes/libs/rdbms/database/DatabaseMysqlBase.php | 1 + includes/libs/rdbms/database/DatabaseMysqli.php | 2 ++ includes/libs/rdbms/database/DatabasePostgres.php | 1 + includes/libs/rdbms/database/DatabaseSqlite.php | 1 + includes/libs/rdbms/database/IDatabase.php | 13 +++++++------ .../database/resultwrapper/FakeResultWrapper.php | 8 ++++++++ .../database/resultwrapper/MssqlResultWrapper.php | 5 +++++ .../rdbms/database/resultwrapper/ResultWrapper.php | 8 +++++++- includes/page/ImagePage.php | 2 ++ includes/page/WikiFilePage.php | 2 ++ includes/page/WikiPage.php | 1 + includes/pager/IndexPager.php | 2 ++ includes/revisiondelete/RevDelRevisionList.php | 2 ++ includes/search/SqlSearchResultSet.php | 3 +++ includes/specialpage/ChangesListSpecialPage.php | 1 + includes/specialpage/ImageQueryPage.php | 2 ++ includes/specialpage/PageQueryPage.php | 2 ++ includes/specialpage/QueryPage.php | 2 ++ includes/specialpage/WantedQueryPage.php | 2 ++ includes/specials/SpecialBrokenRedirects.php | 2 ++ includes/specials/SpecialDoubleRedirects.php | 2 ++ includes/specials/SpecialLinkSearch.php | 2 ++ includes/specials/SpecialListDuplicatedFiles.php | 2 ++ includes/specials/SpecialListredirects.php | 2 ++ includes/specials/SpecialMediaStatistics.php | 2 ++ 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/SpecialRecentchanges.php | 1 + includes/specials/SpecialShortpages.php | 2 ++ includes/specials/SpecialUndelete.php | 1 + includes/specials/SpecialUnwatchedpages.php | 2 ++ includes/specials/SpecialWatchlist.php | 1 + includes/specials/pagers/AllMessagesTablePager.php | 2 ++ includes/specials/pagers/BlockListPager.php | 1 + includes/specials/pagers/ContribsPager.php | 2 ++ includes/specials/pagers/DeletedContribsPager.php | 2 ++ includes/specials/pagers/ImageListPager.php | 2 ++ includes/user/UserArray.php | 6 ++++-- includes/user/UserArrayFromResult.php | 4 +++- maintenance/convertUserOptions.php | 2 ++ maintenance/namespaceDupes.php | 3 ++- maintenance/purgeChangedPages.php | 2 ++ maintenance/sql.php | 6 ++++-- 64 files changed, 141 insertions(+), 14 deletions(-) diff --git a/autoload.php b/autoload.php index ad442738cd..62500e46a4 100644 --- a/autoload.php +++ b/autoload.php @@ -973,7 +973,6 @@ $wgAutoloadLocalClasses = [ 'MovePage' => __DIR__ . '/includes/MovePage.php', 'MovePageForm' => __DIR__ . '/includes/specials/SpecialMovepage.php', 'MssqlInstaller' => __DIR__ . '/includes/installer/MssqlInstaller.php', - 'MssqlResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php', 'MssqlUpdater' => __DIR__ . '/includes/installer/MssqlUpdater.php', 'MultiConfig' => __DIR__ . '/includes/config/MultiConfig.php', 'MultiHttpClient' => __DIR__ . '/includes/libs/MultiHttpClient.php', @@ -1582,6 +1581,7 @@ $wgAutoloadLocalClasses = [ 'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/ConnectionManager.php', 'Wikimedia\\Rdbms\\DBMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/DBMasterPos.php', 'Wikimedia\\Rdbms\\DatabaseDomain' => __DIR__ . '/includes/libs/rdbms/database/DatabaseDomain.php', + 'Wikimedia\\Rdbms\\FakeResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php', 'Wikimedia\\Rdbms\\Field' => __DIR__ . '/includes/libs/rdbms/field/Field.php', 'Wikimedia\\Rdbms\\IBlob' => __DIR__ . '/includes/libs/rdbms/encasing/IBlob.php', 'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/ILBFactory.php', @@ -1600,10 +1600,12 @@ $wgAutoloadLocalClasses = [ 'Wikimedia\\Rdbms\\LoadMonitorNull' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php', 'Wikimedia\\Rdbms\\MssqlBlob' => __DIR__ . '/includes/libs/rdbms/encasing/MssqlBlob.php', 'Wikimedia\\Rdbms\\MssqlField' => __DIR__ . '/includes/libs/rdbms/field/MssqlField.php', + 'Wikimedia\\Rdbms\\MssqlResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php', 'Wikimedia\\Rdbms\\MySQLField' => __DIR__ . '/includes/libs/rdbms/field/MySQLField.php', 'Wikimedia\\Rdbms\\MySQLMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/MySQLMasterPos.php', 'Wikimedia\\Rdbms\\PostgresBlob' => __DIR__ . '/includes/libs/rdbms/encasing/PostgresBlob.php', 'Wikimedia\\Rdbms\\PostgresField' => __DIR__ . '/includes/libs/rdbms/field/PostgresField.php', + 'Wikimedia\\Rdbms\\ResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php', 'Wikimedia\\Rdbms\\SQLiteField' => __DIR__ . '/includes/libs/rdbms/field/SQLiteField.php', 'Wikimedia\\Rdbms\\SessionConsistentConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php', 'Wikimedia\\Rdbms\\TransactionProfiler' => __DIR__ . '/includes/libs/rdbms/TransactionProfiler.php', diff --git a/includes/Revision.php b/includes/Revision.php index d6cfcd9ffd..4b9435ae66 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -21,6 +21,8 @@ */ use MediaWiki\Linker\LinkTarget; use MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\ResultWrapper; +use Wikimedia\Rdbms\FakeResultWrapper; /** * @todo document @@ -1781,6 +1783,7 @@ class Revision implements IDBAccessObject { * * @param Title $title * @param int $id + * @param int $flags * @return string|bool False if not found */ static function getTimestampFromId( $title, $id, $flags = 0 ) { diff --git a/includes/RevisionList.php b/includes/RevisionList.php index 53cf6998a8..d909a652d7 100644 --- a/includes/RevisionList.php +++ b/includes/RevisionList.php @@ -21,6 +21,7 @@ */ use MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\ResultWrapper; /** * List for revision table items for a single page diff --git a/includes/TitleArray.php b/includes/TitleArray.php index 5a28b85035..bf2344bbb7 100644 --- a/includes/TitleArray.php +++ b/includes/TitleArray.php @@ -24,6 +24,8 @@ * @file */ +use Wikimedia\Rdbms\ResultWrapper; + /** * The TitleArray class only exists to provide the newFromResult method at pre- * sent. diff --git a/includes/TitleArrayFromResult.php b/includes/TitleArrayFromResult.php index 668ea54b91..189fb40549 100644 --- a/includes/TitleArrayFromResult.php +++ b/includes/TitleArrayFromResult.php @@ -24,6 +24,8 @@ * @file */ +use Wikimedia\Rdbms\ResultWrapper; + class TitleArrayFromResult extends TitleArray implements Countable { /** @var ResultWrapper */ public $res; diff --git a/includes/WatchedItemQueryServiceExtension.php b/includes/WatchedItemQueryServiceExtension.php index 8fcf1311df..6301576f63 100644 --- a/includes/WatchedItemQueryServiceExtension.php +++ b/includes/WatchedItemQueryServiceExtension.php @@ -1,5 +1,7 @@ [ 'LEFT JOIN', 'page_latest=rev_id' ] ] * - * @return ResultWrapper|bool If the query returned no rows, a ResultWrapper + * @return IResultWrapper|bool If the query returned no rows, a IResultWrapper * with no rows in it will be returned. If there was a query error, a * DBQueryError exception will be thrown, except if the "ignore errors" * option was set, in which case false will be returned. @@ -1196,7 +1197,7 @@ interface IDatabase { * for the format. Use $conds == "*" to delete all rows * @param string $fname Name of the calling function * @throws DBUnexpectedError - * @return bool|ResultWrapper + * @return bool|IResultWrapper */ public function delete( $table, $conds, $fname = __METHOD__ ); @@ -1224,7 +1225,7 @@ interface IDatabase { * @param array $selectOptions Options for the SELECT part of the query, see * IDatabase::select() for details. * - * @return ResultWrapper + * @return IResultWrapper */ public function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = __METHOD__, diff --git a/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php b/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php index 1a046cf696..fd7af110e5 100644 --- a/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php +++ b/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php @@ -1,4 +1,9 @@ fetchObject(); } } + +class_alias( FakeResultWrapper::class, 'FakeResultWrapper' ); + diff --git a/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php b/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php index b591f4f389..4e28397455 100644 --- a/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php +++ b/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php @@ -1,4 +1,9 @@ current() !== false; } } + +class_alias( ResultWrapper::class, 'ResultWrapper' ); diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php index 714d3a9df1..f8202a6cb2 100644 --- a/includes/page/ImagePage.php +++ b/includes/page/ImagePage.php @@ -20,6 +20,8 @@ * @file */ +use Wikimedia\Rdbms\ResultWrapper; + /** * Class for viewing MediaWiki file description pages * diff --git a/includes/page/WikiFilePage.php b/includes/page/WikiFilePage.php index 1fa4bfa981..e4b524b811 100644 --- a/includes/page/WikiFilePage.php +++ b/includes/page/WikiFilePage.php @@ -20,6 +20,8 @@ * @file */ +use Wikimedia\Rdbms\FakeResultWrapper; + /** * Special handling for file pages * diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index e49ef2a172..4bc8ad6125 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -22,6 +22,7 @@ use \MediaWiki\Logger\LoggerFactory; use \MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\FakeResultWrapper; /** * Class representing a MediaWiki article and history. diff --git a/includes/pager/IndexPager.php b/includes/pager/IndexPager.php index 395cee5b80..dc302a2d62 100644 --- a/includes/pager/IndexPager.php +++ b/includes/pager/IndexPager.php @@ -21,6 +21,8 @@ * @ingroup Pager */ +use Wikimedia\Rdbms\ResultWrapper; + /** * IndexPager is an efficient pager which uses a (roughly unique) index in the * data set to implement paging, rather than a "LIMIT offset,limit" clause. diff --git a/includes/revisiondelete/RevDelRevisionList.php b/includes/revisiondelete/RevDelRevisionList.php index f0b1907d83..453c6cca70 100644 --- a/includes/revisiondelete/RevDelRevisionList.php +++ b/includes/revisiondelete/RevDelRevisionList.php @@ -19,6 +19,8 @@ * @ingroup RevisionDelete */ +use Wikimedia\Rdbms\FakeResultWrapper; + /** * List for revision table items * diff --git a/includes/search/SqlSearchResultSet.php b/includes/search/SqlSearchResultSet.php index c3985d1852..53d09e82b1 100644 --- a/includes/search/SqlSearchResultSet.php +++ b/includes/search/SqlSearchResultSet.php @@ -1,4 +1,7 @@ */ +use Wikimedia\Rdbms\ResultWrapper; + /** * Special:Listredirects - Lists all the redirects on the wiki. * @ingroup SpecialPage diff --git a/includes/specials/SpecialMediaStatistics.php b/includes/specials/SpecialMediaStatistics.php index 1cb6549696..a88767ae4d 100644 --- a/includes/specials/SpecialMediaStatistics.php +++ b/includes/specials/SpecialMediaStatistics.php @@ -22,6 +22,8 @@ * @author Brian Wolff */ +use Wikimedia\Rdbms\ResultWrapper; + /** * @ingroup SpecialPage */ diff --git a/includes/specials/SpecialMostcategories.php b/includes/specials/SpecialMostcategories.php index 6095412ac7..0776eec7b9 100644 --- a/includes/specials/SpecialMostcategories.php +++ b/includes/specials/SpecialMostcategories.php @@ -24,6 +24,8 @@ * @author Ævar Arnfjörð Bjarmason */ +use Wikimedia\Rdbms\ResultWrapper; + /** * A special page that list pages that have highest category count * diff --git a/includes/specials/SpecialMostinterwikis.php b/includes/specials/SpecialMostinterwikis.php index 210c4a2808..8560dca357 100644 --- a/includes/specials/SpecialMostinterwikis.php +++ b/includes/specials/SpecialMostinterwikis.php @@ -24,6 +24,8 @@ * @author Umherirrender */ +use Wikimedia\Rdbms\ResultWrapper; + /** * A special page that listed pages that have highest interwiki count * diff --git a/includes/specials/SpecialMostlinked.php b/includes/specials/SpecialMostlinked.php index 712574cf14..ff8550d10a 100644 --- a/includes/specials/SpecialMostlinked.php +++ b/includes/specials/SpecialMostlinked.php @@ -25,6 +25,8 @@ * @author Rob Church */ +use Wikimedia\Rdbms\ResultWrapper; + /** * A special page to show pages ordered by the number of pages linking to them. * diff --git a/includes/specials/SpecialMostlinkedcategories.php b/includes/specials/SpecialMostlinkedcategories.php index 41678cb34d..699940b2e9 100644 --- a/includes/specials/SpecialMostlinkedcategories.php +++ b/includes/specials/SpecialMostlinkedcategories.php @@ -24,6 +24,8 @@ * @author Ævar Arnfjörð Bjarmason */ +use Wikimedia\Rdbms\ResultWrapper; + /** * A querypage to show categories ordered in descending order by the pages in them * diff --git a/includes/specials/SpecialMostlinkedtemplates.php b/includes/specials/SpecialMostlinkedtemplates.php index d10279163a..f5c2c5fb50 100644 --- a/includes/specials/SpecialMostlinkedtemplates.php +++ b/includes/specials/SpecialMostlinkedtemplates.php @@ -22,6 +22,8 @@ * @author Rob Church */ +use Wikimedia\Rdbms\ResultWrapper; + /** * Special page lists templates with a large number of * transclusion links, i.e. "most used" templates diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 150530808b..56d866ff26 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -22,6 +22,7 @@ */ use MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\ResultWrapper; /** * A special page that lists last changes made to the wiki diff --git a/includes/specials/SpecialShortpages.php b/includes/specials/SpecialShortpages.php index a78b082432..a5e51134b9 100644 --- a/includes/specials/SpecialShortpages.php +++ b/includes/specials/SpecialShortpages.php @@ -21,6 +21,8 @@ * @ingroup SpecialPage */ +use Wikimedia\Rdbms\ResultWrapper; + /** * SpecialShortpages extends QueryPage. It is used to return the shortest * pages in the database. diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index d5c24c2722..56920b32b1 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -21,6 +21,7 @@ * @ingroup SpecialPage */ use MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\ResultWrapper; /** * Used to show archived pages and eventually restore them. diff --git a/includes/specials/SpecialUnwatchedpages.php b/includes/specials/SpecialUnwatchedpages.php index 96878a38aa..e82279e224 100644 --- a/includes/specials/SpecialUnwatchedpages.php +++ b/includes/specials/SpecialUnwatchedpages.php @@ -24,6 +24,8 @@ * @author Ævar Arnfjörð Bjarmason */ +use Wikimedia\Rdbms\ResultWrapper; + /** * A special page that displays a list of pages that are not on anyones watchlist. * diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index 85ac2de680..822648bff0 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -22,6 +22,7 @@ */ use MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\ResultWrapper; /** * A special page that lists last changes made to the wiki, diff --git a/includes/specials/pagers/AllMessagesTablePager.php b/includes/specials/pagers/AllMessagesTablePager.php index efc51ef3ff..ca1b7dca9d 100644 --- a/includes/specials/pagers/AllMessagesTablePager.php +++ b/includes/specials/pagers/AllMessagesTablePager.php @@ -19,6 +19,8 @@ * @ingroup Pager */ +use Wikimedia\Rdbms\FakeResultWrapper; + /** * Use TablePager for prettified output. We have to pretend that we're * getting data from a table when in fact not all of it comes from the database. diff --git a/includes/specials/pagers/BlockListPager.php b/includes/specials/pagers/BlockListPager.php index a4124db5f4..9a447ef8f3 100644 --- a/includes/specials/pagers/BlockListPager.php +++ b/includes/specials/pagers/BlockListPager.php @@ -23,6 +23,7 @@ * @ingroup Pager */ use MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\ResultWrapper; class BlockListPager extends TablePager { diff --git a/includes/specials/pagers/ContribsPager.php b/includes/specials/pagers/ContribsPager.php index fb8d8f6ced..5126bad1a8 100644 --- a/includes/specials/pagers/ContribsPager.php +++ b/includes/specials/pagers/ContribsPager.php @@ -24,6 +24,8 @@ * @ingroup Pager */ use MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\ResultWrapper; +use Wikimedia\Rdbms\FakeResultWrapper; class ContribsPager extends ReverseChronologicalPager { diff --git a/includes/specials/pagers/DeletedContribsPager.php b/includes/specials/pagers/DeletedContribsPager.php index 2425dd529a..a1f6b84506 100644 --- a/includes/specials/pagers/DeletedContribsPager.php +++ b/includes/specials/pagers/DeletedContribsPager.php @@ -23,6 +23,8 @@ * @ingroup Pager */ use MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\ResultWrapper; +use Wikimedia\Rdbms\FakeResultWrapper; class DeletedContribsPager extends IndexPager { diff --git a/includes/specials/pagers/ImageListPager.php b/includes/specials/pagers/ImageListPager.php index 4c1e8eebf4..3789dfa6e8 100644 --- a/includes/specials/pagers/ImageListPager.php +++ b/includes/specials/pagers/ImageListPager.php @@ -23,6 +23,8 @@ * @ingroup Pager */ use MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\ResultWrapper; +use Wikimedia\Rdbms\FakeResultWrapper; class ImageListPager extends TablePager { diff --git a/includes/user/UserArray.php b/includes/user/UserArray.php index dddc850bd0..ab6683b297 100644 --- a/includes/user/UserArray.php +++ b/includes/user/UserArray.php @@ -20,6 +20,8 @@ * @file */ +use Wikimedia\Rdbms\ResultWrapper; + abstract class UserArray implements Iterator { /** * @param ResultWrapper $res @@ -38,7 +40,7 @@ abstract class UserArray implements Iterator { /** * @param array $ids - * @return UserArrayFromResult + * @return UserArrayFromResult|ArrayIterator */ static function newFromIDs( $ids ) { $ids = array_map( 'intval', (array)$ids ); // paranoia @@ -59,7 +61,7 @@ abstract class UserArray implements Iterator { /** * @since 1.25 * @param array $names - * @return UserArrayFromResult + * @return UserArrayFromResult|ArrayIterator */ static function newFromNames( $names ) { $names = array_map( 'strval', (array)$names ); // paranoia diff --git a/includes/user/UserArrayFromResult.php b/includes/user/UserArrayFromResult.php index fb533d08b4..527df7fa44 100644 --- a/includes/user/UserArrayFromResult.php +++ b/includes/user/UserArrayFromResult.php @@ -20,6 +20,8 @@ * @file */ +use Wikimedia\Rdbms\ResultWrapper; + class UserArrayFromResult extends UserArray implements Countable { /** @var ResultWrapper */ public $res; @@ -27,7 +29,7 @@ class UserArrayFromResult extends UserArray implements Countable { /** @var int */ public $key; - /** @var bool|stdClass */ + /** @var bool|User */ public $current; /** diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php index b8001a4d21..70f365485d 100644 --- a/maintenance/convertUserOptions.php +++ b/maintenance/convertUserOptions.php @@ -23,6 +23,8 @@ require_once __DIR__ . '/Maintenance.php'; +use Wikimedia\Rdbms\ResultWrapper; + /** * Maintenance script to convert user options to the new `user_properties` table. * diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php index 522871d9df..80e8011f40 100644 --- a/maintenance/namespaceDupes.php +++ b/maintenance/namespaceDupes.php @@ -26,6 +26,7 @@ use MediaWiki\Linker\LinkTarget; use MediaWiki\MediaWikiServices; +use Wikimedia\Rdbms\ResultWrapper; require_once __DIR__ . '/Maintenance.php'; @@ -571,7 +572,7 @@ class NamespaceConflictChecker extends Maintenance { /** * Merge page histories * - * @param integer $id The page_id + * @param stdClass $row Page row * @param Title $newTitle The new title * @return bool */ diff --git a/maintenance/purgeChangedPages.php b/maintenance/purgeChangedPages.php index b354399f88..cf65c69315 100644 --- a/maintenance/purgeChangedPages.php +++ b/maintenance/purgeChangedPages.php @@ -23,6 +23,8 @@ require_once __DIR__ . '/Maintenance.php'; +use Wikimedia\Rdbms\ResultWrapper; + /** * Maintenance script that sends purge requests for pages edited in a date * range to squid/varnish. diff --git a/maintenance/sql.php b/maintenance/sql.php index e42a8efad0..58472e9bdf 100644 --- a/maintenance/sql.php +++ b/maintenance/sql.php @@ -24,6 +24,8 @@ require_once __DIR__ . '/Maintenance.php'; +use Wikimedia\Rdbms\ResultWrapper; + /** * Maintenance script that sends SQL queries from the specified file to the database. * @@ -50,7 +52,7 @@ class MwSql extends Maintenance { $wiki = $this->hasOption( 'wikidb' ) ? $this->getOption( 'wikidb' ) : false; // Get the appropriate load balancer (for this wiki) if ( $this->hasOption( 'cluster' ) ) { - $lb = wfGetLBFactory()->getExternalLB( $this->getOption( 'cluster' ), $wiki ); + $lb = wfGetLBFactory()->getExternalLB( $this->getOption( 'cluster' ) ); } else { $lb = wfGetLB( $wiki ); } @@ -159,7 +161,7 @@ class MwSql extends Maintenance { /** * Print the results, callback for $db->sourceStream() - * @param ResultWrapper $res The results object + * @param ResultWrapper|bool $res The results object * @param IDatabase $db */ public function sqlPrintResult( $res, $db ) { -- 2.20.1