Merge pull request #433 from wmde/addClaim

Drop deprecated Entity::addClaim

Author: JeroenDeDauw

RELEASE-NOTES.md

@@ -11,8 +11,7 @@
 	* `Statement::setClaim` and `Statement::getClaim` have been removed
 	* Removed `ClaimList`
 	* Removed `ClaimListAccess`
-	* Removed `hasClaims` from all entity classes
-	* Removed `newClaim` from all entity classes
+	* Removed `addClaim`, `hasClaims` and `newClaim` from all entity classes
 * 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)

src/Entity/Entity.php

@@ -3,11 +3,9 @@
 namespace Wikibase\DataModel\Entity;
 
 use InvalidArgumentException;
-use RuntimeException;
 use Wikibase\DataModel\Entity\Diff\EntityDiff;
 use Wikibase\DataModel\Entity\Diff\EntityDiffer;
 use Wikibase\DataModel\Entity\Diff\EntityPatcher;
-use Wikibase\DataModel\Snak\Snak;
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Term\AliasGroup;
 use Wikibase\DataModel\Term\AliasGroupList;
@@ -348,19 +346,6 @@ public function copy() {
 		return unserialize( serialize( $this ) );
 	}
 
-	/**
-	 * @since 0.3
-	 * @deprecated since 1.0, use getStatements()->addStatement() instead.
-	 *
-	 * @param Statement $statement
-	 *
-	 * @throws InvalidArgumentException
-	 * @throws RuntimeException
-	 */
-	public function addClaim( Statement $statement ) {
-		throw new RuntimeException( 'Statements on entities are not supported any more.' );
-	}
-
 	/**
 	 * @since 0.3
 	 * @deprecated since 1.0, use getStatements()->toArray() instead.

src/Entity/Item.php

@@ -7,7 +7,6 @@
 use Wikibase\DataModel\Claim\Claims;
 use Wikibase\DataModel\SiteLink;
 use Wikibase\DataModel\SiteLinkList;
-use Wikibase\DataModel\Snak\Snak;
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Statement\StatementList;
 use Wikibase\DataModel\StatementListProvider;
@@ -225,21 +224,6 @@ public function clear() {
 		$this->statements = new StatementList();
 	}
 
-	/**
-	 * @deprecated since 1.0, use getStatements()->addStatement() instead.
-	 *
-	 * @param Statement $statement
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	public function addClaim( Statement $statement ) {
-		if ( $statement->getGuid() === null ) {
-			throw new InvalidArgumentException( 'Can\'t add a Claim without a GUID.' );
-		}
-
-		$this->statements->addStatement( $statement );
-	}
-
 	/**
 	 * @since 1.0
 	 *

src/Entity/Property.php

@@ -4,7 +4,6 @@
 
 use InvalidArgumentException;
 use Wikibase\DataModel\Claim\Claims;
-use Wikibase\DataModel\Snak\Snak;
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Statement\StatementList;
 use Wikibase\DataModel\StatementListProvider;
@@ -222,19 +221,4 @@ public function setClaims( Claims $claims ) {
 		$this->statements = new StatementList( iterator_to_array( $claims ) );
 	}
 
-	/**
-	 * @deprecated since 1.0, use getStatements()->addStatement() instead.
-	 *
-	 * @param Statement $statement
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	public function addClaim( Statement $statement ) {
-		if ( $statement->getGuid() === null ) {
-			throw new InvalidArgumentException( 'Can\'t add a Claim without a GUID.' );
-		}
-
-		$this->statements->addStatement( $statement );
-	}
-
 }

tests/unit/Entity/ItemTest.php

@@ -15,7 +15,6 @@
 use Wikibase\DataModel\SiteLink;
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 use Wikibase\DataModel\Snak\PropertySomeValueSnak;
-use Wikibase\DataModel\Snak\Snak;
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Statement\StatementList;
 
@@ -549,7 +548,7 @@ public function testItemWithStuffIsNotEmpty() {
 		$this->assertFalse( $item->isEmpty() );
 
 		$item = new Item();
-		$item->addClaim( $this->newStatement() );
+		$item->getStatements()->addStatement( $this->newStatement() );
 		$this->assertFalse( $item->isEmpty() );
 	}
 
@@ -574,7 +573,7 @@ public function testClearRemovesAllButId() {
 		$item = new Item( new ItemId( 'Q42' ) );
 		$item->getFingerprint()->setLabel( 'en', 'foo' );
 		$item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
-		$item->addClaim( $this->newStatement() );
+		$item->getStatements()->addStatement( $this->newStatement() );
 
 		$item->clear();