Merge pull request #159 from wmde/0.9.x-remove-getType

0.9.x remove get type
wmde · Aug 26, 2014 · ee8c720 · ee8c720
2 parents 843c363 + d0494ca
commit ee8c720
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,9 @@
 # Wikibase DataModel release notes
 
+## Version 0.9.1 (2014-08-26)
+
+* Fixed error caused by redeclaration of getType in `Entity`, after it already got defined in `EntityDocument`
+
 ## Version 0.9 (2014-08-15)
 
 * Changed the signatures of `setLabel`, `setDescription` and `setAliasGroup` in `Fingerprint`

diff --git a/WikibaseDataModel.php b/WikibaseDataModel.php
@@ -12,7 +12,7 @@
 	return 1;
 }
 
-define( 'WIKIBASE_DATAMODEL_VERSION', '0.9' );
+define( 'WIKIBASE_DATAMODEL_VERSION', '0.9.1' );
 
 // Temporary global to migrate away from DataValueFactory::singleton.
 // It should not be used outside this component and should not be used

diff --git a/src/Entity/Entity.php b/src/Entity/Entity.php
@@ -60,15 +60,6 @@ abstract class Entity implements \Comparable, ClaimAggregate, \Serializable, Fin
 	 */
 	protected $claims;
 
-	/**
-	 * Returns a type identifier for the entity.
-	 *
-	 * @since 0.1
-	 *
-	 * @return string
-	 */
-	public abstract function getType();
-
 	/**
 	 * Constructor.
 	 * Do not use to construct new stuff from outside of this class, use the static newFoobar methods.