Removed Claims::getMainSnaks and Claims::getClaimsForProperty

Author: JeroenDeDauw

RELEASE-NOTES.md

@@ -11,6 +11,8 @@
 	* Removed `ClaimListAccess`
 * Removed `Claims::getBestClaims` (you can use `StatementList::getBestStatements` instead)
 * Removed `Claims::getByRank` and `Claims::getByRanks` (you can use `StatementList::getWithRank` instead)
+* Removed `Claims::getMainSnaks` (you can use `StatementList::getMainSnaks` instead)
+* Removed `Claims::getClaimsForProperty` (you can use `StatementList::getWithPropertyId` instead)
 
 ## Version 2.6.0 (2015-03-08)
 

src/Claim/Claims.php

@@ -292,44 +292,6 @@ public function getGuids() {
 		}, iterator_to_array( $this ) );
 	}
 
-	/**
-	 * Returns the claims for the given property.
-	 *
-	 * @since 0.4
-	 *
-	 * @param PropertyId $propertyId
-	 *
-	 * @return Claims
-	 */
-	public function getClaimsForProperty( PropertyId $propertyId ) {
-		$byPropertyIdGrouper = new ByPropertyIdGrouper( $this );
-
-		if ( !$byPropertyIdGrouper->hasPropertyId( $propertyId ) ) {
-			return new self();
-		}
-
-		return new self( $byPropertyIdGrouper->getByPropertyId( $propertyId ) );
-	}
-
-	/**
-	 * Returns the main Snaks of the claims in this list.
-	 *
-	 * @since 0.4
-	 *
-	 * @return Snak[]
-	 */
-	public function getMainSnaks() {
-		$snaks = array();
-
-		/* @var Claim $claim */
-		foreach ( $this as $claim ) {
-			$guid = $claim->getGuid();
-			$snaks[$guid] = $claim->getMainSnak();
-		}
-
-		return $snaks;
-	}
-
 	/**
 	 * Returns a map from GUIDs to claim hashes.
 	 *

tests/unit/Claim/ClaimsTest.php

@@ -384,24 +384,6 @@ public function testGuidNormalization() {
 		$this->assertEquals( $claim2, $claims->getClaimWithGuid( $claim2UpperGuid ) );
 	}
 
-	public function testGetMainSnaks() {
-		$claims = new Claims( array(
-			$this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P42' ) ) ),
-			$this->makeClaim( new PropertySomeValueSnak( new PropertyId( 'P42' ) ) ),
-			$this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P23' ) ) ),
-			$this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P9000' ) ) ),
-		) );
-
-		$snaks = $claims->getMainSnaks();
-		$this->assertInternalType( 'array', $snaks );
-		$this->assertSameSize( $claims, $snaks );
-
-		foreach ( $snaks as $guid => $snak ) {
-			$this->assertInstanceOf( 'Wikibase\DataModel\Snak\Snak', $snak );
-			$this->assertTrue( $claims->hasClaimWithGuid( $guid ) );
-		}
-	}
-
 	public function testGetGuids() {
 		$claims = new Claims( array(
 			$this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P42' ) ) ),
@@ -444,26 +426,6 @@ public function testGetHashes() {
 		}
 	}
 
-	public function testGetClaimsForProperty() {
-		$claims = new Claims( array(
-			$this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P42' ) ) ),
-			$this->makeClaim( new PropertySomeValueSnak( new PropertyId( 'P42' ) ) ),
-			$this->makeClaim( new PropertyNoValueSnak( new PropertyId( 'P23' ) ) ),
-		) );
-
-		$matches = $claims->getClaimsForProperty( new PropertyId( 'P42' ) );
-		$this->assertInstanceOf( 'Wikibase\DataModel\Claim\Claims', $claims );
-		$this->assertSame( 2, $matches->count() );
-
-		$matches = $claims->getClaimsForProperty( new PropertyId( 'P23' ) );
-		$this->assertInstanceOf( 'Wikibase\DataModel\Claim\Claims', $claims );
-		$this->assertSame( 1, $matches->count() );
-
-		$matches = $claims->getClaimsForProperty( new PropertyId( 'P9000' ) );
-		$this->assertInstanceOf( 'Wikibase\DataModel\Claim\Claims', $claims );
-		$this->assertSame( 0, $matches->count() );
-	}
-
 	/**
 	 * Attempts to add Claims with no GUID set will fail.
 	 */