From fa607f56b200200fd984a78ba8283f3ebab4aa2f Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 19 Jun 2019 21:42:32 +0200
Subject: [PATCH] Type hint against IResultWrapper in maintenance classes

Change-Id: I6a58e9cfe645056a854c80b2db1e71fb59bd226b
---
 maintenance/convertUserOptions.php    | 4 ++--
 maintenance/namespaceDupes.php        | 4 ++--
 maintenance/populateContentTables.php | 6 +++---
 maintenance/purgeChangedPages.php     | 6 +++---
 maintenance/sql.php                   | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index c1a096fd23..2cb3770569 100644
--- 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 3c73306eb6..333b8b95de 100644
--- 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 a264545e7f..f3e373a5f1 100644
--- 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 8f47b1605f..8ecd810ff2 100644
--- 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 6a4cf0426b..3b0607f5fc 100644
--- 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.
 	 */
-- 
2.20.1