X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FTitleArray.php;h=f6969851d5749d08607b97c1c56d8870b29c1bb4;hb=837f2d76ae358d7cfc6b45bcaf62ddf758c23d8f;hp=bf2344bbb7717f93089c3e6f47d8ae3050dc2154;hpb=980c688c2b9833fd83c3f4a7f5bf75031a071c74;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/TitleArray.php b/includes/TitleArray.php
index bf2344bbb7..f6969851d5 100644
--- a/includes/TitleArray.php
+++ b/includes/TitleArray.php
@@ -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
@@ -42,18 +42,6 @@ abstract class TitleArray implements Iterator {
 		if ( !Hooks::run( 'TitleArrayFromResult', [ &$array, $res ] ) ) {
 			return null;
 		}
-		if ( $array === null ) {
-			$array = self::newFromResult_internal( $res );
-		}
-		return $array;
-	}
-
-	/**
-	 * @param ResultWrapper $res
-	 * @return TitleArrayFromResult
-	 */
-	protected static function newFromResult_internal( $res ) {
-		$array = new TitleArrayFromResult( $res );
-		return $array;
+		return $array ?? new TitleArrayFromResult( $res );
 	}
 }