Merge pull request #579 from wmde/die-evil-empty-terms-o-doom

Filter out terms with empty string value in termlist

Author: thiemowmde

src/Term/TermList.php

@@ -36,7 +36,7 @@ public function __construct( array $terms = array() ) {
 				throw new InvalidArgumentException( 'Every element in $terms must be an instance of Term' );
 			}
 
-			$this->terms[$term->getLanguageCode()] = $term;
+			$this->setTerm( $term );
 		}
 	}
 
@@ -116,7 +116,12 @@ private function assertIsLanguageCode( $languageCode ) {
 	}
 
 	public function setTerm( Term $term ) {
-		$this->terms[$term->getLanguageCode()] = $term;
+		if ( $term->getText() === '' ) {
+			unset( $this->terms[$term->getLanguageCode()] );
+		}
+		else {
+			$this->terms[$term->getLanguageCode()] = $term;
+		}
 	}
 
 	/**

tests/unit/Term/TermListTest.php

@@ -362,4 +362,40 @@ public function testGivenSomeLanguages_getWithLanguagesReturnsPartialList() {
 		$this->assertEquals( $expectedList, $list->getWithLanguages( array( 'en', 'nl' ) ) );
 	}
 
+	public function testGivenEmptyTerms_constructorOnlyAddsNonEmptyTerms() {
+		$list = new TermList( array(
+			new Term( 'en', 'foo' ),
+			new Term( 'de', '' ),
+			new Term( 'nl', 'baz' ),
+			new Term( 'fr', '' ),
+		) );
+
+		$this->assertEquals(
+			array(
+				'en' => new Term( 'en', 'foo' ),
+				'nl' => new Term( 'nl', 'baz' ),
+			),
+			iterator_to_array( $list )
+		);
+	}
+
+	public function testGivenEmptyTerm_setTermDoesNotAddIt() {
+		$list = new TermList();
+		$list->setTerm( new Term( 'en', '' ) );
+
+		$this->assertEquals( new TermList(), $list );
+	}
+
+	public function testGivenEmptyTerm_setTermRemovesExistingOne() {
+		$list = new TermList();
+		$list->setTerm( new Term( 'en', 'foo' ) );
+		$list->setTerm( new Term( 'de', 'bar' ) );
+		$list->setTerm( new Term( 'en', '' ) );
+
+		$this->assertEquals(
+			new TermList( array( new Term( 'de', 'bar' ) ) ),
+			$list
+		);
+	}
+
 }