Merge pull request #438 from wmde/hasClaim

Drop Claims::hasClaim

Author: JeroenDeDauw

RELEASE-NOTES.md

@@ -21,6 +21,7 @@
 * Removed `Claims::getGuids`
 * Removed `Claims::equals` (and `Claims` no longer implements `Comparable`)
 * Removed `Claims::getHash` (and `Claims` no longer implements `Hashable`)
+* Removed `Claims::hasClaim`
 * Removed `Claims::isEmpty` (you can use `StatementList::isEmpty` instead)
 * Removed `Claims::indexOf` (you can use `StatementList::getIndexByGuid` instead)
 * Removed `Claims::removeClaim`

src/Claim/Claims.php

@@ -92,25 +92,6 @@ public function addClaim( Claim $claim ) {
 		$this[] = $claim;
 	}
 
-	/**
-	 * @since 0.1
-	 * @deprecated since 1.0, should not be needed any more.
-	 *
-	 * @param Claim $claim
-	 *
-	 * @return bool
-	 */
-	public function hasClaim( Claim $claim ) {
-		$guid = $claim->getGuid();
-
-		if ( $guid === null ) {
-			return false;
-		}
-
-		$key = $this->getGuidKey( $guid );
-		return $this->offsetExists( $key );
-	}
-
 	/**
 	 * @since 0.3
 	 * @deprecated since 1.0, use StatementList::getIndexByGuid() instead.

tests/unit/Claim/ClaimsTest.php

@@ -85,27 +85,6 @@ public function constructorErrorProvider() {
 		);
 	}
 
-	public function testHasClaim() {
-		$claims = new Claims();
-		$claim1 = $this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P15' ) ) );
-		$claim2 = $this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P16' ) ) );
-
-		$this->assertFalse( $claims->hasClaim( $claim1 ) );
-		$this->assertFalse( $claims->hasClaim( $claim2 ) );
-
-		$claims->addClaim( $claim1 );
-		$this->assertTrue( $claims->hasClaim( $claim1 ) );
-		$this->assertFalse( $claims->hasClaim( $claim2 ) );
-
-		$claims->addClaim( $claim2 );
-		$this->assertTrue( $claims->hasClaim( $claim1 ) );
-		$this->assertTrue( $claims->hasClaim( $claim2 ) );
-
-		// no guid
-		$claim0 = new Claim( new PropertyNoValueSnak( new PropertyId( 'P15' ) ) );
-		$this->assertFalse( $claims->hasClaim( $claim0 ) );
-	}
-
 	public function testHasClaimWithGuid() {
 		$claims = new Claims();
 		$claim1 = $this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P15' ) ) );
@@ -133,13 +112,9 @@ public function testRemoveClaimWithGuid() {
 		$this->assertSame( 2, $claims->count() );
 
 		$claims->removeClaimWithGuid( $claim1->getGuid() );
-		$this->assertFalse( $claims->hasClaim( $claim1 ) );
-		$this->assertNull( $claims->getClaimWithGuid( $claim1->getGuid() ) );
 		$this->assertSame( 1, $claims->count() );
 
 		$claims->removeClaimWithGuid( $claim2->getGuid() );
-		$this->assertFalse( $claims->hasClaim( $claim2 ) );
-		$this->assertNull( $claims->getClaimWithGuid( $claim2->getGuid() ) );
 		$this->assertSame( 0, $claims->count() );
 	}
 
@@ -153,13 +128,9 @@ public function testOffsetUnset() {
 		$this->assertSame( 2, $claims->count() );
 
 		$claims->offsetUnset( $claim1->getGuid() );
-		$this->assertFalse( $claims->hasClaim( $claim1 ) );
-		$this->assertNull( $claims->getClaimWithGuid( $claim1->getGuid() ) );
 		$this->assertSame( 1, $claims->count() );
 
 		$claims->offsetUnset( $claim2->getGuid() );
-		$this->assertFalse( $claims->hasClaim( $claim2 ) );
-		$this->assertNull( $claims->getClaimWithGuid( $claim2->getGuid() ) );
 		$this->assertSame( 0, $claims->count() );
 	}