X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2FTitleArray.php;h=bf2344bbb7717f93089c3e6f47d8ae3050dc2154;hb=55c51f36a4869614d870dac5d870638ec58a95ff;hp=cc130d253bb5a809149deba10c1a07123303bf95;hpb=32234445e06df7ba8f7508b16feff0a58d346348;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/TitleArray.php b/includes/TitleArray.php
index cc130d253b..bf2344bbb7 100644
--- a/includes/TitleArray.php
+++ b/includes/TitleArray.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Classes to walk into a list of Title objects.
+ * Class to walk into a list of Title objects.
  *
  * Note: this entire file is a byte-for-byte copy of UserArray.php with
  * s/User/Title/.  If anyone can figure out how to do this nicely with
@@ -24,20 +24,22 @@
  * @file
  */
 
+use Wikimedia\Rdbms\ResultWrapper;
+
 /**
  * The TitleArray class only exists to provide the newFromResult method at pre-
  * sent.
  */
 abstract class TitleArray implements Iterator {
 	/**
-	 * @param $res ResultWrapper A SQL result including at least page_namespace and
+	 * @param ResultWrapper $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
 	 */
 	static function newFromResult( $res ) {
 		$array = null;
-		if ( !wfRunHooks( 'TitleArrayFromResult', array( &$array, $res ) ) ) {
+		if ( !Hooks::run( 'TitleArrayFromResult', [ &$array, $res ] ) ) {
 			return null;
 		}
 		if ( $array === null ) {
@@ -47,7 +49,7 @@ abstract class TitleArray implements Iterator {
 	}
 
 	/**
-	 * @param $res ResultWrapper
+	 * @param ResultWrapper $res
 	 * @return TitleArrayFromResult
 	 */
 	protected static function newFromResult_internal( $res ) {
@@ -55,64 +57,3 @@ abstract class TitleArray implements Iterator {
 		return $array;
 	}
 }
-
-class TitleArrayFromResult extends TitleArray implements Countable {
-
-	/**
-	 * @var ResultWrapper
-	 */
-	var $res;
-	var $key, $current;
-
-	function __construct( $res ) {
-		$this->res = $res;
-		$this->key = 0;
-		$this->setCurrent( $this->res->current() );
-	}
-
-	/**
-	 * @param $row ResultWrapper
-	 * @return void
-	 */
-	protected function setCurrent( $row ) {
-		if ( $row === false ) {
-			$this->current = false;
-		} else {
-			$this->current = Title::newFromRow( $row );
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public function count() {
-		return $this->res->numRows();
-	}
-
-	function current() {
-		return $this->current;
-	}
-
-	function key() {
-		return $this->key;
-	}
-
-	function next() {
-		$row = $this->res->next();
-		$this->setCurrent( $row );
-		$this->key++;
-	}
-
-	function rewind() {
-		$this->res->rewind();
-		$this->key = 0;
-		$this->setCurrent( $this->res->current() );
-	}
-
-	/**
-	 * @return bool
-	 */
-	function valid() {
-		return $this->current !== false;
-	}
-}