X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fuser%2FUserArray.php;h=c398e4904e0252f009025ed72ce350d3f446eeb3;hb=b02658c48097517aaedcf9c50266d78eee92a8a0;hp=f3a7f9f2366174d9cc766ebef07124319cedf86a;hpb=16c80e429be5904fb42a93f260f8de3d18f0c692;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/user/UserArray.php b/includes/user/UserArray.php
index f3a7f9f236..c398e4904e 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 ) {
@@ -32,10 +32,7 @@ abstract class UserArray implements Iterator {
 		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 );
 	}
-
-	/**
-	 * @param ResultWrapper $res
-	 * @return UserArrayFromResult
-	 */
-	protected static function newFromResult_internal( $res ) {
-		return new UserArrayFromResult( $res );
-	}
 }