jenkins-bot has submitted this change and it was merged.
Change subject: Remove old EntityId usage from api/linktitles
......................................................................
Remove old EntityId usage from api/linktitles
Change-Id: I1835e0caf3f1a0b778a19ee59f6f8c72cd010002
---
M repo/includes/api/LinkTitles.php
1 file changed, 8 insertions(+), 10 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/LinkTitles.php b/repo/includes/api/LinkTitles.php
index ff6276b..90ca0d8 100644
--- a/repo/includes/api/LinkTitles.php
+++ b/repo/includes/api/LinkTitles.php
@@ -3,17 +3,15 @@
namespace Wikibase\Api;
use ApiBase, User, Status;
-
+use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SimpleSiteLink;
-use Wikibase\SiteLink;
-use Wikibase\EntityId;
use Wikibase\Entity;
use Wikibase\EntityContentFactory;
use Wikibase\Item;
use Wikibase\ItemContent;
+use Wikibase\Repo\WikibaseRepo;
use Wikibase\StoreFactory;
use Wikibase\Summary;
-use Wikibase\Settings;
/**
* API module to associate two pages on two different sites with a Wikibase
item .
@@ -87,6 +85,8 @@
$summary = new Summary( $this->getModuleName() );
$summary->addAutoSummaryArgs( $fromSite->getGlobalId() .
":$fromPage", $toSite->getGlobalId() . ":$toPage" );
+ $entityContentFactory =
WikibaseRepo::getDefaultInstance()->getEntityContentFactory();
+
// Figure out which parts to use and what to create anew
if ( !$fromId && !$toId ) {
// create new item
@@ -103,9 +103,8 @@
}
elseif ( !$fromId && $toId ) {
// reuse to-site's item
- $itemContent =
EntityContentFactory::singleton()->getFromId(
- new EntityId( Item::ENTITY_TYPE, $toId )
- );
+ /** @var ItemContent $itemContent */
+ $itemContent = $entityContentFactory->getFromId(
ItemId::newFromNumber( $toId ) );
$fromLink = new SimpleSiteLink(
$fromSite->getGlobalId(), $fromPage );
$itemContent->getItem()->addSimpleSiteLink( $fromLink );
$return[] = $fromLink;
@@ -113,9 +112,8 @@
}
elseif ( $fromId && !$toId ) {
// reuse from-site's item
- $itemContent =
EntityContentFactory::singleton()->getFromId(
- new EntityId( Item::ENTITY_TYPE, $fromId )
- );
+ /** @var ItemContent $itemContent */
+ $itemContent = $entityContentFactory->getFromId(
ItemId::newFromNumber( $fromId ) );
$toLink = new SimpleSiteLink( $toSite->getGlobalId(),
$toPage );
$itemContent->getItem()->addSimpleSiteLink( $toLink );
$return[] = $toLink;
--
To view, visit https://gerrit.wikimedia.org/r/82381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1835e0caf3f1a0b778a19ee59f6f8c72cd010002
Gerrit-PatchSet: 1
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
