Daniel Kinzler has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/355443 )
Change subject: Prevent creation of Properties without data type [WIP].
......................................................................
Prevent creation of Properties without data type [WIP].
WIP: a t is, this probably prevents *all* creation of properties.
Property creation must be passible at least via the wbeditentity API
module and via Special:NewProperty.
Change-Id: Ie6b9b8756edd04225578336abf80f009e054ae4c
---
M repo/includes/Content/PropertyContent.php
M repo/includes/Content/PropertyHandler.php
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/43/355443/1
diff --git a/repo/includes/Content/PropertyContent.php
b/repo/includes/Content/PropertyContent.php
index b9330d7..9551487 100644
--- a/repo/includes/Content/PropertyContent.php
+++ b/repo/includes/Content/PropertyContent.php
@@ -112,7 +112,9 @@
*/
public function isValid() {
//TODO: provide a way to get the data type from the holder
directly!
- return parent::isValid() &&
$this->getProperty()->getDataTypeId() !== null;
+ return parent::isValid()
+ && $this->getProperty()->getDataTypeId() !== null
+ && $this->getProperty()->getDataTypeId() !== '';
}
/**
diff --git a/repo/includes/Content/PropertyHandler.php
b/repo/includes/Content/PropertyHandler.php
index 9579199..fb31dd5 100644
--- a/repo/includes/Content/PropertyHandler.php
+++ b/repo/includes/Content/PropertyHandler.php
@@ -5,6 +5,7 @@
use DataUpdate;
use IContextSource;
use Page;
+use RuntimeException;
use Title;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
@@ -206,7 +207,8 @@
* @return EntityContent
*/
public function makeEmptyEntity() {
- return Property::newFromType( '' );
+ // XXX: throwing this exception is strictly speaking an
interface violation
+ throw new RuntimeException( 'Properties cannot be created
empty.' );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/355443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6b9b8756edd04225578336abf80f009e054ae4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
