Take iterable in TermList constructor

Author: JeroenDeDauw

RELEASE-NOTES.md

@@ -1,5 +1,10 @@
 # Wikibase DataModel release notes
 
+## Version 8.1.0 (dev)
+
+* The `TermList` constructor now take any `iterable` instead of just `array`
+* Added `TermList::addAll`
+
 ## Version 8.0.0 (2018-08-03)
 
 #### Breaking changes

composer.json

@@ -49,7 +49,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "8.0.x-dev"
+			"dev-master": "8.1.x-dev"
 		}
 	},
 	"scripts": {

src/Term/TermList.php

@@ -28,17 +28,11 @@ class TermList implements Countable, IteratorAggregate, Comparable {
 	private $terms = [];
 
 	/**
-	 * @param Term[] $terms
+	 * @param iterable|Term[] $terms Can be a non-array since 8.1
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( array $terms = [] ) {
-		foreach ( $terms as $term ) {
-			if ( !( $term instanceof Term ) ) {
-				throw new InvalidArgumentException( 'Every element in $terms must be an instance of Term' );
-			}
-
-			$this->setTerm( $term );
-		}
+	public function __construct( /* iterable */ $terms = [] ) {
+		$this->addAll( $terms );
 	}
 
 	/**
@@ -199,9 +193,14 @@ public function clear() {
 	 * @since 8.1
 	 *
 	 * @param iterable|Term[] $terms
+	 * @throws InvalidArgumentException
 	 */
 	public function addAll( /* iterable */ $terms ) {
 		foreach ( $terms as $term ) {
+			if ( !( $term instanceof Term ) ) {
+				throw new InvalidArgumentException( 'Every element in $terms must be an instance of Term' );
+			}
+
 			$this->setTerm( $term );
 		}
 	}

tests/unit/Term/TermListTest.php

@@ -457,4 +457,14 @@ public function testWhenAddingEmptyTerms_theyRemoveExistingOnes() {
 		$this->assertEquals( new TermList(), $terms );
 	}
 
+	public function testCanConstructWithIterables() {
+		$enTerm = new Term( 'en', 'foo' );
+		$deTerm = new Term( 'de', 'bar' );
+
+		$terms = new TermList( new TermList( [ $enTerm, $deTerm ] ) );
+
+		$this->assertEquals( $enTerm, $terms->getByLanguage( 'en' ) );
+		$this->assertEquals( $deTerm, $terms->getByLanguage( 'de' ) );
+	}
+
 }