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 "Follow-up 8697ba8: No need for two dependencies on the same module"
[lhc/web/wiklou.git]
/
includes
/
user
/
UserArray.php
diff --git
a/includes/user/UserArray.php
b/includes/user/UserArray.php
index
f3a7f9f
..
c398e49
100644
(file)
--- a/
includes/user/UserArray.php
+++ b/
includes/user/UserArray.php
@@
-20,11
+20,11
@@
* @file
*/
* @file
*/
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\
I
ResultWrapper;
abstract class UserArray implements Iterator {
/**
abstract class UserArray implements Iterator {
/**
- * @param ResultWrapper $res
+ * @param
I
ResultWrapper $res
* @return UserArrayFromResult
*/
static function newFromResult( $res ) {
* @return UserArrayFromResult
*/
static function newFromResult( $res ) {
@@
-32,10
+32,7
@@
abstract class UserArray implements Iterator {
if ( !Hooks::run( 'UserArrayFromResult', [ &$userArray, $res ] ) ) {
return null;
}
if ( !Hooks::run( 'UserArrayFromResult', [ &$userArray, $res ] ) ) {
return null;
}
- if ( $userArray === null ) {
- $userArray = self::newFromResult_internal( $res );
- }
- return $userArray;
+ return $userArray ?? new UserArrayFromResult( $res );
}
/**
}
/**
@@
-84,12
+81,4
@@
abstract class UserArray implements Iterator {
);
return self::newFromResult( $res );
}
);
return self::newFromResult( $res );
}
-
- /**
- * @param ResultWrapper $res
- * @return UserArrayFromResult
- */
- protected static function newFromResult_internal( $res ) {
- return new UserArrayFromResult( $res );
- }
}
}