Merge "Parser: Remove deprecated method Parser::fetchFile()"

diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index 64c6f45..6b24b63 100644 (file)
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -20,7 +20,7 @@
  * @file
  */
 use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
 
 /**
@@ -735,7 +735,7 @@ class ApiPageSet extends ApiBase {
         * $this->getPageTableFields().
         *
         * @param IDatabase $db
-        * @param ResultWrapper $queryResult
+        * @param IResultWrapper $queryResult
         */
        public function populateFromQueryResult( $db, $queryResult ) {
                $this->initFromQueryResult( $queryResult );
@@ -854,7 +854,7 @@ class ApiPageSet extends ApiBase {
        /**
         * Iterate through the result of the query on 'page' table,
         * and for each row create and store title object and save any extra fields requested.
-        * @param ResultWrapper $res DB Query result
+        * @param IResultWrapper $res DB Query result
         * @param array $remaining Array of either pageID or ns/title elements (optional).
         *        If given, any missing items will go to $mMissingPageIDs and $mMissingTitles
         * @param bool $processTitles Must be provided together with $remaining.

diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index 59ec4f6..ec432d8 100644 (file)
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -21,7 +21,7 @@
  */
 
 use Wikimedia\Rdbms\IDatabase;
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 
 /**
  * This is a base class for all Query modules.
@@ -368,7 +368,7 @@ abstract class ApiQueryBase extends ApiBase {
         * @param array|null &$hookData If set, the ApiQueryBaseBeforeQuery and
         *  ApiQueryBaseAfterQuery hooks will be called, and the
         *  ApiQueryBaseProcessRow hook will be expected.
-        * @return ResultWrapper
+        * @return IResultWrapper
         */
        protected function select( $method, $extraQuery = [], array &$hookData = null ) {
                $tables = array_merge(

diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index c1a096f..2cb3770 100644 (file)
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -23,7 +23,7 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
 
 /**
@@ -76,7 +76,7 @@ class ConvertUserOptions extends Maintenance {
        }
 
        /**
-        * @param ResultWrapper $res
+        * @param IResultWrapper $res
         * @param IDatabase $dbw
         * @return null|int
         */

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 3c73306..333b8b9 100644 (file)
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -28,7 +28,7 @@ require_once __DIR__ . '/Maintenance.php';
 
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 
 /**
@@ -429,7 +429,7 @@ class NamespaceDupes extends Maintenance {
         * @param string $name Prefix that is being made a namespace
         * @param array $options Associative array of validated command-line options
         *
-        * @return ResultWrapper
+        * @return IResultWrapper
         */
        private function getTargetList( $ns, $name, $options ) {
                if (

diff --git a/maintenance/populateContentTables.php b/maintenance/populateContentTables.php
index a264545..f3e373a 100644 (file)
--- a/maintenance/populateContentTables.php
+++ b/maintenance/populateContentTables.php
@@ -25,7 +25,7 @@ use MediaWiki\Storage\NameTableStore;
 use MediaWiki\Storage\SqlBlobStore;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Rdbms\IDatabase;
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 
 require_once __DIR__ . '/Maintenance.php';
 
@@ -239,12 +239,12 @@ class PopulateContentTables extends Maintenance {
        }
 
        /**
-        * @param ResultWrapper $rows
+        * @param IResultWrapper $rows
         * @param int $startId
         * @param string $table
         * @return int|null
         */
-       private function populateContentTablesForRowBatch( ResultWrapper $rows, $startId, $table ) {
+       private function populateContentTablesForRowBatch( IResultWrapper $rows, $startId, $table ) {
                $this->beginTransaction( $this->dbw, __METHOD__ );
 
                if ( $this->contentRowMap === null ) {

diff --git a/maintenance/purgeChangedPages.php b/maintenance/purgeChangedPages.php
index 8f47b16..8ecd810 100644 (file)
--- a/maintenance/purgeChangedPages.php
+++ b/maintenance/purgeChangedPages.php
@@ -23,7 +23,7 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 
 /**
  * Maintenance script that sends purge requests for pages edited in a date
@@ -163,12 +163,12 @@ class PurgeChangedPages extends Maintenance {
         *
         * @todo move this elsewhere
         *
-        * @param ResultWrapper $res Query result sorted by $column (ascending)
+        * @param IResultWrapper $res Query result sorted by $column (ascending)
         * @param string $column
         * @param int $limit
         * @return array (array of rows, string column value)
         */
-       protected function pageableSortedRows( ResultWrapper $res, $column, $limit ) {
+       protected function pageableSortedRows( IResultWrapper $res, $column, $limit ) {
                $rows = iterator_to_array( $res, false );
 
                // Nothing to do

diff --git a/maintenance/sql.php b/maintenance/sql.php
index 6a4cf04..3b0607f 100644 (file)
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -25,7 +25,7 @@
 require_once __DIR__ . '/Maintenance.php';
 
 use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\DBQueryError;
 
@@ -186,7 +186,7 @@ class MwSql extends Maintenance {
 
        /**
         * Print the results, callback for $db->sourceStream()
-        * @param ResultWrapper|bool $res
+        * @param IResultWrapper|bool $res
         * @param IDatabase $db
         * @return int|null Number of rows selected or updated, or null if the query was unsuccessful.
         */