Removed Claims::getByRank and Claims::getByRanks

Author: JeroenDeDauw

RELEASE-NOTES.md

@@ -10,6 +10,7 @@
 	* Removed `ClaimList`
 	* Removed `ClaimListAccess`
 * Removed `Claims::getBestClaims` (you can use `StatementList::getBestStatements` instead)
+* Removed `Claims::getByRank` and `Claims::getByRanks` (you can use `StatementList::getWithRank` instead)
 
 ## Version 2.6.0 (2015-03-08)
 

src/Claim/Claims.php

@@ -376,51 +376,6 @@ public function isEmpty() {
 		return !$this->getIterator()->valid();
 	}
 
-	/**
-	 * Returns a new instance only containing the claims with the given rank.
-	 *
-	 * @since 0.7
-	 *
-	 * @param int $rank
-	 *
-	 * @return Claims
-	 */
-	public function getByRank( $rank ) {
-		$claims = new self();
-
-		/* @var Claim $claim */
-		foreach ( $this as $claim ) {
-			if ( $claim->getRank() === $rank ) {
-				$claims[] = $claim;
-			}
-		}
-
-		return $claims;
-	}
-
-	/**
-	 * Returns a new instance only containing the claims with the given ranks.
-	 *
-	 * @since 0.7.2
-	 *
-	 * @param int[] $ranks
-	 *
-	 * @return Claims
-	 */
-	public function getByRanks( array $ranks ) {
-		$ranks = array_flip( $ranks );
-		$claims = new self();
-
-		/* @var Claim $claim */
-		foreach ( $this as $claim ) {
-			if ( isset( $ranks[$claim->getRank()] ) ) {
-				$claims[] = $claim;
-			}
-		}
-
-		return $claims;
-	}
-
 	/**
 	 * @see Comparable::equals
 	 *

tests/unit/Claim/ClaimsTest.php

@@ -542,85 +542,6 @@ public function testIsEmpty() {
 		$this->assertTrue( $claims->isEmpty() );
 	}
 
-	public function provideGetByRank() {
-		$s1 = $this->makeStatement( new PropertyNoValueSnak( new PropertyId( 'P1' ) ) );
-		$s1->setRank( Statement::RANK_DEPRECATED );
-
-		$s2 = $this->makeStatement( new PropertyNoValueSnak( new PropertyId( 'P2' ) ) );
-		$s2->setRank( Statement::RANK_PREFERRED );
-
-		$s3 = $this->makeStatement( new PropertyNoValueSnak( new PropertyId( 'P3' ) ) );
-		$s3->setRank( Statement::RANK_PREFERRED );
-
-		return array(
-			// Empty yields empty
-			array(
-				new Claims(),
-				Statement::RANK_NORMAL,
-				new Claims()
-			),
-			// One statement with RANK_PREFERRED, so return it
-			array(
-				new Claims( array( $s2 ) ),
-				Statement::RANK_PREFERRED,
-				new Claims( array( $s2 ) ),
-			),
-			// s2 and s3 have RANK_PREFERRED, so return them
-			array(
-				new Claims( array( $s2, $s1, $s3 ) ),
-				Statement::RANK_PREFERRED,
-				new Claims( array( $s2, $s3 ) ),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider provideGetByRank
-	 */
-	public function testGetByRank( Claims $input, $rank, $expected ) {
-		$this->assertEquals( $input->getByRank( $rank ), $expected );
-	}
-
-	public function provideGetByRanks() {
-		$s1 = $this->makeStatement( new PropertyNoValueSnak( new PropertyId( 'P1' ) ) );
-		$s1->setRank( Statement::RANK_NORMAL );
-
-		$s2 = $this->makeStatement( new PropertyNoValueSnak( new PropertyId( 'P2' ) ) );
-		$s2->setRank( Statement::RANK_PREFERRED );
-
-		$ret = array(
-			// s1 has RANK_NORMAL, thus doesn't match
-			array(
-				new Claims( array( $s2, $s1 ) ),
-				array( Statement::RANK_PREFERRED, Statement::RANK_DEPRECATED ),
-				new Claims( array( $s2 ) ),
-			),
-			// s2 has RANK_PREFERRED and s1 has RANK_NORMAL, so return them
-			array(
-				new Claims( array( $s2, $s1 ) ),
-				array( Statement::RANK_PREFERRED, Statement::RANK_NORMAL ),
-				new Claims( array( $s2, $s1 ) ),
-			)
-		);
-
-		// This function acts very similar to Claims::getByRank, so that we
-		// can reuse the test cases
-		$ret = array_merge( $this->provideGetByRank(), $ret );
-
-		return $ret;
-	}
-
-	/**
-	 * @dataProvider provideGetByRanks
-	 */
-	public function testGetByRanks( Claims $input, $ranks, $expected ) {
-		if ( !is_array( $ranks ) ) {
-			$ranks = array( $ranks );
-		}
-
-		$this->assertEquals( $input->getByRanks( $ranks ), $expected );
-	}
-
 	public function testEmptyListEqualsEmptyList() {
 		$list = new Claims( array() );
 		$this->assertTrue( $list->equals( clone $list ) );