From 7b59c4f43f63b1407d522ef99445469097349f05 Mon Sep 17 00:00:00 2001 From: addshore Date: Mon, 25 Aug 2014 23:07:43 +0100 Subject: [PATCH 1/3] Remove abstract getType() method from Entity This is included in the EntityDocument interface and causes a fatal if it is left here --- RELEASE-NOTES.md | 4 ++++ src/Entity/Entity.php | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index d2cbf973..8d823c26 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,5 +1,9 @@ # Wikibase DataModel release notes +## Version 0.9.1 (in development) + +* Fixed fatal error: Can't inherit abstract function EntityDocument::getType() (previously declared abstract in Entity) + ## Version 0.9 (2014-08-15) * Changed the signatures of `setLabel`, `setDescription` and `setAliasGroup` in `Fingerprint` diff --git a/src/Entity/Entity.php b/src/Entity/Entity.php index 08365ead..3dc1b01e 100644 --- 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. From dc04e592369d4da73bac09249fc96b98a7399136 Mon Sep 17 00:00:00 2001 From: addshore Date: Mon, 25 Aug 2014 23:11:37 +0100 Subject: [PATCH 2/3] Update for 0.9.1 release --- RELEASE-NOTES.md | 2 +- WikibaseDataModel.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 8d823c26..ad7fb298 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,6 +1,6 @@ # Wikibase DataModel release notes -## Version 0.9.1 (in development) +## Version 0.9.1 (2014-08-25) * Fixed fatal error: Can't inherit abstract function EntityDocument::getType() (previously declared abstract in Entity) diff --git a/WikibaseDataModel.php b/WikibaseDataModel.php index a49c6a53..e085a458 100644 --- 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 From d0494caca19eb2702d013926aaa09128e450075f Mon Sep 17 00:00:00 2001 From: Jeroen De Dauw Date: Tue, 26 Aug 2014 11:22:45 +0200 Subject: [PATCH 3/3] Update RELEASE-NOTES.md --- RELEASE-NOTES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index ad7fb298..d7e4a478 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,8 +1,8 @@ # Wikibase DataModel release notes -## Version 0.9.1 (2014-08-25) +## Version 0.9.1 (2014-08-26) -* Fixed fatal error: Can't inherit abstract function EntityDocument::getType() (previously declared abstract in Entity) +* Fixed error caused by redeclaration of getType in `Entity`, after it already got defined in `EntityDocument` ## Version 0.9 (2014-08-15)