jenkins-bot has submitted this change and it was merged.
Change subject: Remove old EntityId usage from api/getentities
......................................................................
Remove old EntityId usage from api/getentities
Change-Id: Iad26f6028fca6aea86ae5a3517c5a84789e2f5fa
---
M repo/includes/api/GetEntities.php
1 file changed, 5 insertions(+), 8 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 6bd366f..410bfc6 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -4,16 +4,13 @@
use ApiBase;
use MWException;
-
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lib\Serializers\EntitySerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Utils;
use Wikibase\StoreFactory;
-use Wikibase\EntityId;
use Wikibase\Item;
-use Wikibase\Settings;
-use Wikibase\LibRegistry;
use Wikibase\EntityContentFactory;
/**
@@ -142,13 +139,13 @@
$entityContentFactory = EntityContentFactory::singleton();
$entityIdFormatter =
WikibaseRepo::getDefaultInstance()->getEntityIdFormatter();
+ $entityIdParser =
WikibaseRepo::getDefaultInstance()->getEntityIdParser();
$res = $this->getResult();
- $entityId = EntityId::newFromPrefixedId( $id );
-
- if ( !$entityId ) {
- //TODO: report as missing instead?
+ try {
+ $entityId = $entityIdParser->parse( $id );
+ } catch( \ValueParsers\ParseException $e ) {
wfProfileOut( __METHOD__ );
$this->dieUsage( "Invalid id: $id", 'no-such-entity' );
}
--
To view, visit https://gerrit.wikimedia.org/r/82379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad26f6028fca6aea86ae5a3517c5a84789e2f5fa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
