Merge pull request #466 from wmde/revert-459-toarray

Revert "Alter guarantees provided by StatementList::toArray"

Author: JeroenDeDauw

src/Statement/StatementList.php

@@ -117,6 +117,8 @@ public function removeStatementsWithGuid( $guid ) {
 				unset( $this->statements[$index] );
 			}
 		}
+
+		$this->statements = array_values( $this->statements );
 	}
 
 	/**
@@ -241,10 +243,7 @@ public function getIterator() {
 	}
 
 	/**
-	 * Returns the wrapped array of statements. This retrieval operation is cheap.
-	 * No guarantees are given about the keys of the returned array.
-	 *
-	 * @return Statement[]
+	 * @return Statement[] Numerically indexed (non-sparse) array.
 	 */
 	public function toArray() {
 		return $this->statements;

tests/unit/Statement/StatementListTest.php

@@ -268,11 +268,7 @@ public function testGivenGuidOfPresentStatement_statementIsRemoved() {
 		$list = new StatementList( array( $statement1, $statement2, $statement3 ) );
 		$list->removeStatementsWithGuid( 'foo' );
 
-		$statements = array();
-		$statements[1] = $statement2;
-		$statements[2] = $statement3;
-
-		$this->assertEquals( $statements, $list->toArray() );
+		$this->assertEquals( new StatementList( $statement2, $statement3 ), $list );
 	}
 
 	public function testGivenGuidOfMultipleStatements_multipleStatementsAreRemoved() {
@@ -283,10 +279,7 @@ public function testGivenGuidOfMultipleStatements_multipleStatementsAreRemoved()
 		$list = new StatementList( array( $statement1, $statement2, $statement3 ) );
 		$list->removeStatementsWithGuid( 'bar' );
 
-		$this->assertEquals(
-			new StatementList( array( $statement1 ) ),
-			$list
-		);
+		$this->assertEquals( new StatementList( $statement1 ), $list );
 	}
 
 	public function testGivenNotPresentGuid_listIsNotModified() {
@@ -297,10 +290,7 @@ public function testGivenNotPresentGuid_listIsNotModified() {
 		$list = new StatementList( array( $statement1, $statement2, $statement3 ) );
 		$list->removeStatementsWithGuid( 'baz' );
 
-		$this->assertEquals(
-			new StatementList( array( $statement1, $statement2, $statement3 ) ),
-			$list
-		);
+		$this->assertEquals( new StatementList( $statement1, $statement2, $statement3 ), $list );
 	}
 
 	public function testGivenNullGuid_allStatementsWithNoGuidAreRemoved() {
@@ -311,10 +301,7 @@ public function testGivenNullGuid_allStatementsWithNoGuidAreRemoved() {
 		$list = new StatementList( array( $statement1, $statement2, $statement3 ) );
 		$list->removeStatementsWithGuid( null );
 
-		$this->assertEquals(
-			new StatementList( array( $statement1 ) ),
-			$list
-		);
+		$this->assertEquals( new StatementList( $statement1 ), $list );
 	}
 
 	public function testCanConstructWithClaimsObjectContainingOnlyStatements() {