Use IResultWrapper in UserArray and TitleArray

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

Change-Id: I7668fcac960bb83e834d849aaef5fe90e5bc115b
This commit is contained in:
Umherirrender 2018-04-06 00:06:35 +02:00
parent ecc6d0bbb3
commit cd8568ad89
4 changed files with 12 additions and 12 deletions

View file

@ -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 ) {

View file

@ -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 ) {

View file

@ -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 ) {

View file

@ -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;