Change StatementList::getIndexByGuid to take a guid rather than a Statement

Author: JeroenDeDauw

src/Statement/StatementList.php

@@ -285,15 +285,19 @@ public function isEmpty() {
 	/**
 	 * @since 3.0
 	 *
-	 * @param Statement $statement
+	 * @param string|null $statementGuid
 	 *
 	 * @return int|bool
 	 */
-	public function getIndexByGuid( Statement $statement ) {
+	public function getIndexByGuid( $statementGuid ) {
+		if ( !is_string( $statementGuid ) && !is_null( $statementGuid ) ) {
+			throw new InvalidArgumentException( '$statementGuid needs to be string or null' );
+		}
+
 		$index = 0;
 
 		foreach ( $this->statements as $s ) {
-			if ( $s->getGuid() === $statement->getGuid() ) {
+			if ( $s->getGuid() === $statementGuid ) {
 				return $index;
 			}
 			$index++;

tests/unit/Statement/StatementListTest.php

@@ -543,7 +543,7 @@ public function testWhenNoPreferredStatements_getBestStatementsReturnsOnlyNormal
 	public function testGivenNotPresentStatement_getIndexByGuidReturnsFalse() {
 		$statements = new StatementList();
 
-		$this->assertFalse( $statements->getIndexByGuid( $this->getStatement( 1, 'kittens' ) ) );
+		$this->assertFalse( $statements->getIndexByGuid( 'kittens' ) );
 	}
 
 	public function testGivenPresentStatement_getIndexByGuidReturnsItsIndex() {
@@ -555,7 +555,7 @@ public function testGivenPresentStatement_getIndexByGuidReturnsItsIndex() {
 
 		$this->assertSame(
 			1,
-			$statements->getIndexByGuid( $this->getStatement( 42, 'kittens42' ) )
+			$statements->getIndexByGuid( 'kittens42' )
 		);
 	}
 
@@ -569,7 +569,7 @@ public function testGivenDoublyPresentStatement_getIndexByGuidReturnsTheFirstInd
 
 		$this->assertSame(
 			1,
-			$statements->getIndexByGuid( $this->getStatement( 42, 'kittens42' ) )
+			$statements->getIndexByGuid( 'kittens42' )
 		);
 	}
 
@@ -582,8 +582,15 @@ public function testGivenDifferentStatementWithSameGuid_getIndexByGuidReturnsIts
 
 		$this->assertSame(
 			2,
-			$statements->getIndexByGuid( $this->getStatement( 42, 'kittens41' ) )
+			$statements->getIndexByGuid( 'kittens41' )
 		);
 	}
 
+	public function testGivenInvalidGuid_getIndexByGuidThrowsException() {
+		$statements = new StatementList();
+
+		$this->setExpectedException( 'InvalidArgumentException' );
+		$statements->getIndexByGuid( false );
+	}
+
 }