Merge pull request #546 from wmde/iteratorArrays

Add workaround type hints to getIterator implementations

Author: JeroenDeDauw

src/Entity/ItemIdSet.php

@@ -2,6 +2,7 @@
 
 namespace Wikibase\DataModel\Entity;
 
+use ArrayIterator;
 use Comparable;
 use Countable;
 use InvalidArgumentException;
@@ -51,10 +52,10 @@ public function count() {
 	/**
 	 * @see IteratorAggregate::getIterator
 	 *
-	 * @return Traversable
+	 * @return Traversable|ItemId[]
 	 */
 	public function getIterator() {
-		return new \ArrayIterator( $this->ids );
+		return new ArrayIterator( $this->ids );
 	}
 
 	/**

src/Statement/StatementByGuidMap.php

@@ -23,6 +23,9 @@
  */
 class StatementByGuidMap implements IteratorAggregate, Countable {
 
+	/**
+	 * @var Statement[]
+	 */
 	private $statements = array();
 
 	/**
@@ -104,7 +107,7 @@ public function count() {
 	 * The iterator has the GUIDs of the statements as keys.
 	 *
 	 * @see IteratorAggregate::getIterator
-	 * @return Traversable
+	 * @return Traversable|Statement[]
 	 */
 	public function getIterator() {
 		return new ArrayIterator( $this->statements );

src/Statement/StatementList.php

@@ -224,7 +224,7 @@ public function getMainSnaks() {
 	}
 
 	/**
-	 * @return Traversable
+	 * @return Traversable|Statement[]
 	 */
 	public function getIterator() {
 		return new ArrayIterator( $this->statements );

src/Term/AliasGroupList.php

@@ -2,6 +2,7 @@
 
 namespace Wikibase\DataModel\Term;
 
+use ArrayIterator;
 use Countable;
 use InvalidArgumentException;
 use IteratorAggregate;
@@ -51,10 +52,10 @@ public function count() {
 
 	/**
 	 * @see IteratorAggregate::getIterator
-	 * @return Traversable
+	 * @return Traversable|AliasGroup[]
 	 */
 	public function getIterator() {
-		return new \ArrayIterator( $this->groups );
+		return new ArrayIterator( $this->groups );
 	}
 
 	/**

src/Term/TermList.php

@@ -2,6 +2,7 @@
 
 namespace Wikibase\DataModel\Term;
 
+use ArrayIterator;
 use Comparable;
 use Countable;
 use InvalidArgumentException;
@@ -64,10 +65,10 @@ public function toTextArray() {
 
 	/**
 	 * @see IteratorAggregate::getIterator
-	 * @return Traversable
+	 * @return Traversable|Term[]
 	 */
 	public function getIterator() {
-		return new \ArrayIterator( $this->terms );
+		return new ArrayIterator( $this->terms );
 	}
 
 	/**