dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "build: Bump grunt-banana-checker from 0.5.0 to 0.6.0"
[lhc/web/wiklou.git]
/
includes
/
user
/
UserArray.php
diff --git
a/includes/user/UserArray.php
b/includes/user/UserArray.php
index
dddc850
..
ab6683b
100644
(file)
--- a/
includes/user/UserArray.php
+++ b/
includes/user/UserArray.php
@@
-20,6
+20,8
@@
* @file
*/
* @file
*/
+use Wikimedia\Rdbms\ResultWrapper;
+
abstract class UserArray implements Iterator {
/**
* @param ResultWrapper $res
abstract class UserArray implements Iterator {
/**
* @param ResultWrapper $res
@@
-38,7
+40,7
@@
abstract class UserArray implements Iterator {
/**
* @param array $ids
/**
* @param array $ids
- * @return UserArrayFromResult
+ * @return UserArrayFromResult
|ArrayIterator
*/
static function newFromIDs( $ids ) {
$ids = array_map( 'intval', (array)$ids ); // paranoia
*/
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
/**
* @since 1.25
* @param array $names
- * @return UserArrayFromResult
+ * @return UserArrayFromResult
|ArrayIterator
*/
static function newFromNames( $names ) {
$names = array_map( 'strval', (array)$names ); // paranoia
*/
static function newFromNames( $names ) {
$names = array_map( 'strval', (array)$names ); // paranoia