Merge pull request #417 from wmde/indexofrm

Remove Claims::indexOf

Author: thiemowmde

RELEASE-NOTES.md

@@ -19,6 +19,7 @@
 * Removed `Claims::equals` (and `Claims` no longer implements `Comparable`)
 * Removed `Claims::getHash` (and `Claims` no longer implements `Hashable`)
 * Removed `Claims::isEmpty` (you can use `StatementList::isEmpty` instead)
+* Removed `Claims::indexOf` and added `StatementList::getIndexByGuid`
 
 ## Version 2.6.0 (2015-03-08)
 

src/Claim/Claims.php

@@ -135,30 +135,6 @@ public function hasClaim( Claim $claim ) {
 		return $this->offsetExists( $key );
 	}
 
-	/**
-	 * @since 0.5
-	 *
-	 * @param Claim $claim
-	 *
-	 * @return int|bool
-	 */
-	public function indexOf( Claim $claim ) {
-		$guid = $claim->getGuid();
-		$index = 0;
-
-		/**
-		 * @var Claim $claimObject
-		 */
-		foreach ( $this as $claimObject ) {
-			if ( $claimObject->getGuid() === $guid ) {
-				return $index;
-			}
-			$index++;
-		}
-
-		return false;
-	}
-
 	/**
 	 * @since 0.1
 	 *

tests/unit/Claim/ClaimsTest.php

@@ -237,38 +237,22 @@ public function testAddClaim() {
 		// Insert claim at the beginning:
 		$claim3 = $this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P17' ) ) );
 		$claims->addClaim( $claim3, 0 );
-		$this->assertEquals( 0, $claims->indexOf( $claim3 ), 'Inserting claim at the beginning failed' );
 
 		// Insert claim at another index:
 		$claim4 = $this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P18' ) ) );
 		$claims->addClaim( $claim4, 1 );
-		$this->assertEquals( 1, $claims->indexOf( $claim4 ), 'Inserting claim at index 1 failed' );
 
 		// Insert claim with an index out of bounds:
 		$claim5 = $this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P19' ) ) );
 		$claims->addClaim( $claim5, 99999 );
-		$this->assertEquals( 4, $claims->indexOf( $claim5 ), 'Appending claim by specifying an index out of bounds failed' );
-	}
-
-	public function testIndexOf() {
-		$claims = new Claims();
-		$claimArray = array(
-			$this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P1' ) ) ),
-			$this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P2' ) ) ),
-			$this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P3' ) ) ),
-		);
-		$excludedClaim = $this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P99' ) ) );
 
-		foreach( $claimArray as $claim ) {
-			$claims->addClaim( $claim );
-		}
-
-		$this->assertFalse( $claims->indexOf( $excludedClaim ) );
-
-		$i = 0;
-		foreach( $claimArray as $claim ) {
-			$this->assertEquals( $i++, $claims->indexOf( $claim ) );
-		}
+		$this->assertSame( array(
+			'TEST$CLAIM-3' => $claim3,
+			'TEST$CLAIM-4' => $claim4,
+			'TEST$CLAIM-1' => $claim1,
+			'TEST$CLAIM-2' => $claim2,
+			'TEST$CLAIM-5' => $claim5,
+		), $claims->getArrayCopy() );
 	}
 
 	public function testAppend() {