* @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 ) {
if ( !Hooks::run( 'UserArrayFromResult', [ &$userArray, $res ] ) ) {
return null;
}
- if ( $userArray === null ) {
- $userArray = self::newFromResult_internal( $res );
- }
- return $userArray;
+ return $userArray ?? new UserArrayFromResult( $res );
}
/**
);
return self::newFromResult( $res );
}
-
- /**
- * @param ResultWrapper $res
- * @return UserArrayFromResult
- */
- protected static function newFromResult_internal( $res ) {
- return new UserArrayFromResult( $res );
- }
}