Merge pull request #791 from wmde/SiteLinkList

Allow iterable in SiteLinkList constructor
wmde · Nov 1, 2018 · fbeec44 · fbeec44
2 parents 56ec215 + a0aadb2
commit fbeec44
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/SiteLinkList.php b/src/SiteLinkList.php
@@ -30,11 +30,11 @@ class SiteLinkList implements IteratorAggregate, Countable, Comparable {
 	private $siteLinks = [];
 
 	/**
-	 * @param SiteLink[] $siteLinks
+	 * @param iterable|SiteLink[] $siteLinks Can be a non-array iterable since 8.1
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( array $siteLinks = [] ) {
+	public function __construct( /* iterable */ $siteLinks = [] ) {
 		foreach ( $siteLinks as $siteLink ) {
 			if ( !( $siteLink instanceof SiteLink ) ) {
 				throw new InvalidArgumentException( 'Every element of $siteLinks must be an instance of SiteLink' );

diff --git a/tests/unit/SiteLinkListTest.php b/tests/unit/SiteLinkListTest.php
@@ -337,4 +337,13 @@ public function testListWithElementsHasCorrectCount() {
 		$this->assertSame( 3, $list->count() );
 	}
 
+	public function testCanConstructWithIterable() {
+		$links = [ new SiteLink( 'enwiki', 'foo' ) ];
+
+		$this->assertEquals(
+			new SiteLinkList( $links ),
+			new SiteLinkList( new SiteLinkList( $links ) )
+		);
+	}
+
 }