From: Umherirrender <umherirrender_de.wp@web.de>
Date: Thu, 5 Apr 2018 22:06:35 +0000 (+0200)
Subject: Use IResultWrapper in UserArray and TitleArray
X-Git-Tag: 1.31.0-rc.0~169^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=cd8568ad8930e9ea72dad315877fc8ea23fc4c63;p=lhc%2Fweb%2Fwiklou.git

Use IResultWrapper in UserArray and TitleArray

The result of IDatabase::select is directly passed around and that type
is IResultWrapper

Change-Id: I7668fcac960bb83e834d849aaef5fe90e5bc115b
---

diff --git a/includes/TitleArray.php b/includes/TitleArray.php
index bf2344bbb7..a1eabe5b25 100644
--- a/includes/TitleArray.php
+++ b/includes/TitleArray.php
@@ -24,7 +24,7 @@
  * @file
  */
 
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 
 /**
  * The TitleArray class only exists to provide the newFromResult method at pre-
@@ -32,7 +32,7 @@ use Wikimedia\Rdbms\ResultWrapper;
  */
 abstract class TitleArray implements Iterator {
 	/**
-	 * @param ResultWrapper $res A SQL result including at least page_namespace and
+	 * @param IResultWrapper $res A SQL result including at least page_namespace and
 	 *   page_title -- also can have page_id, page_len, page_is_redirect,
 	 *   page_latest (if those will be used).  See Title::newFromRow.
 	 * @return TitleArrayFromResult
@@ -49,7 +49,7 @@ abstract class TitleArray implements Iterator {
 	}
 
 	/**
-	 * @param ResultWrapper $res
+	 * @param IResultWrapper $res
 	 * @return TitleArrayFromResult
 	 */
 	protected static function newFromResult_internal( $res ) {
diff --git a/includes/TitleArrayFromResult.php b/includes/TitleArrayFromResult.php
index 189fb40549..ee60f7b967 100644
--- a/includes/TitleArrayFromResult.php
+++ b/includes/TitleArrayFromResult.php
@@ -24,10 +24,10 @@
  * @file
  */
 
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 
 class TitleArrayFromResult extends TitleArray implements Countable {
-	/** @var ResultWrapper */
+	/** @var IResultWrapper */
 	public $res;
 
 	public $key;
@@ -41,7 +41,7 @@ class TitleArrayFromResult extends TitleArray implements Countable {
 	}
 
 	/**
-	 * @param bool|ResultWrapper $row
+	 * @param bool|IResultWrapper $row
 	 * @return void
 	 */
 	protected function setCurrent( $row ) {
diff --git a/includes/user/UserArray.php b/includes/user/UserArray.php
index f3a7f9f236..66d9c7a1f8 100644
--- a/includes/user/UserArray.php
+++ b/includes/user/UserArray.php
@@ -20,11 +20,11 @@
  * @file
  */
 
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 
 abstract class UserArray implements Iterator {
 	/**
-	 * @param ResultWrapper $res
+	 * @param IResultWrapper $res
 	 * @return UserArrayFromResult
 	 */
 	static function newFromResult( $res ) {
@@ -86,7 +86,7 @@ abstract class UserArray implements Iterator {
 	}
 
 	/**
-	 * @param ResultWrapper $res
+	 * @param IResultWrapper $res
 	 * @return UserArrayFromResult
 	 */
 	protected static function newFromResult_internal( $res ) {
diff --git a/includes/user/UserArrayFromResult.php b/includes/user/UserArrayFromResult.php
index 527df7fa44..0830e42289 100644
--- a/includes/user/UserArrayFromResult.php
+++ b/includes/user/UserArrayFromResult.php
@@ -20,10 +20,10 @@
  * @file
  */
 
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 
 class UserArrayFromResult extends UserArray implements Countable {
-	/** @var ResultWrapper */
+	/** @var IResultWrapper */
 	public $res;
 
 	/** @var int */
@@ -33,7 +33,7 @@ class UserArrayFromResult extends UserArray implements Countable {
 	public $current;
 
 	/**
-	 * @param ResultWrapper $res
+	 * @param IResultWrapper $res
 	 */
 	function __construct( $res ) {
 		$this->res = $res;