Merge pull request #631 from wmde/entity

Make Item and Property no longer extend Entity

Author: Daniel Kinzler

RELEASE-NOTES.md

@@ -1,5 +1,13 @@
 # Wikibase DataModel release notes
 
+## Version 6.0.0 (dev)
+
+* Removed `Entity` class (deprecated since 1.0)
+* `Item` and `Property` no longer extend `Entity`
+    * Removed `getLabel`, `getLabels`, `getDescription`, `getDescriptions`, `getAliases`,
+      `getAllAliases`, `setLabels`, `setDescriptions`, `addAliases`, `setAllAliases`,
+      `removeLabel`, `removeDescription` and `removeAliases` methods
+
 ## Version 5.1.0 (2016-03-08)
 
 This release significantly reduces the memory footprint when entities are cloned.

src/Entity/Entity.php

@@ -9,6 +9,7 @@
 use Wikibase\DataModel\Statement\StatementList;
 use Wikibase\DataModel\Statement\StatementListHolder;
 use Wikibase\DataModel\Term\Fingerprint;
+use Wikibase\DataModel\Term\FingerprintHolder;
 
 /**
  * Represents a single Wikibase item.
@@ -19,7 +20,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-class Item extends Entity implements StatementListHolder {
+class Item implements EntityDocument, FingerprintHolder, StatementListHolder {
 
 	const ENTITY_TYPE = 'item';
 

src/Entity/Item.php

@@ -6,6 +6,7 @@
 use Wikibase\DataModel\Statement\StatementList;
 use Wikibase\DataModel\Statement\StatementListHolder;
 use Wikibase\DataModel\Term\Fingerprint;
+use Wikibase\DataModel\Term\FingerprintHolder;
 
 /**
  * Represents a single Wikibase property.
@@ -16,7 +17,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-class Property extends Entity implements StatementListHolder {
+class Property implements EntityDocument, FingerprintHolder, StatementListHolder {
 
 	const ENTITY_TYPE = 'property';