Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/142451
Change subject: Stop using SimpleSiteLink alias
......................................................................
Stop using SimpleSiteLink alias
Change-Id: Iff2c8929adae05717cc5fa6672fdb3791d7810eb
---
M repo/includes/ItemView.php
M repo/includes/UpdateRepoOnMoveJob.php
M repo/maintenance/createBlacklistedItems.php
M repo/maintenance/importInterlang.php
M repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
M repo/tests/phpunit/includes/content/ItemContentTest.php
M repo/tests/phpunit/includes/content/ItemHandlerTest.php
7 files changed, 17 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/51/142451/1
diff --git a/repo/includes/ItemView.php b/repo/includes/ItemView.php
index e226d5a..871ec48 100644
--- a/repo/includes/ItemView.php
+++ b/repo/includes/ItemView.php
@@ -2,7 +2,6 @@
namespace Wikibase;
-use Wikibase\DataModel\SimpleSiteLink;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Repo\View\SiteLinksView;
diff --git a/repo/includes/UpdateRepoOnMoveJob.php
b/repo/includes/UpdateRepoOnMoveJob.php
index a21f65d..df83b0e 100644
--- a/repo/includes/UpdateRepoOnMoveJob.php
+++ b/repo/includes/UpdateRepoOnMoveJob.php
@@ -8,7 +8,6 @@
use Title;
use User;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\SimpleSiteLink;
use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Repo\WikibaseRepo;
@@ -101,14 +100,14 @@
}
/**
- * Get a SimpleSiteLink for a specific item and site
+ * Get a SiteLink for a specific item and site
*
* @param Item $item
* @param string $globalId
*
- * @return SimpleSiteLink|null
+ * @return SiteLink|null
*/
- protected function getSimpleSiteLink( $item, $globalId ) {
+ protected function getSiteLink( $item, $globalId ) {
try {
return $item->getSiteLink( $globalId );
} catch( OutOfBoundsException $e ) {
@@ -162,7 +161,7 @@
$site = $this->getSite( $siteId );
- $oldSiteLink = $this->getSimpleSiteLink( $item, $siteId );
+ $oldSiteLink = $this->getSiteLink( $item, $siteId );
if ( !$oldSiteLink || $oldSiteLink->getPageName() !== $oldPage
) {
// Probably something changed since the job has been
inserted
wfDebugLog( __CLASS__, __FUNCTION__ . ": The site link
to " . $siteId . " is no longer $oldPage" );
@@ -178,7 +177,7 @@
return false;
}
- $siteLink = new SimpleSiteLink(
+ $siteLink = new SiteLink(
$siteId,
$newPage
);
diff --git a/repo/maintenance/createBlacklistedItems.php
b/repo/maintenance/createBlacklistedItems.php
index c8a4838..3d57b6c 100644
--- a/repo/maintenance/createBlacklistedItems.php
+++ b/repo/maintenance/createBlacklistedItems.php
@@ -2,7 +2,7 @@
namespace Wikibase;
-use Wikibase\DataModel\SimpleSiteLink;
+use Wikibase\DataModel\SiteLink;
use Wikibase\Repo\WikibaseRepo;
$basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH'
) : __DIR__ . '/../../../..';
@@ -71,7 +71,7 @@
$item->setId( $id );
$item->setLabel( 'en', $name );
- $item->addSiteLink( new SimpleSiteLink( 'enwiki', $name
) );
+ $item->addSiteLink( new SiteLink( 'enwiki', $name ) );
$store->saveEntity( $item, 'Import', $user, EDIT_NEW );
}
diff --git a/repo/maintenance/importInterlang.php
b/repo/maintenance/importInterlang.php
index 1f4f75a..75d555b 100644
--- a/repo/maintenance/importInterlang.php
+++ b/repo/maintenance/importInterlang.php
@@ -14,7 +14,7 @@
* @author Jens Ohlig < jens.oh...@wikimedia.de >
*/
-use Wikibase\DataModel\SimpleSiteLink;
+use Wikibase\DataModel\SiteLink;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Lib\Store\EntityStore;
@@ -141,7 +141,7 @@
$label = preg_replace( '/ *\(.*\)$/u', '', $name );
$item->setLabel( $lang, $label );
- $item->addSiteLink( new SimpleSiteLink( $lang . 'wiki',
$name ) );
+ $item->addSiteLink( new SiteLink( $lang . 'wiki',
$name ) );
}
try {
diff --git a/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
b/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
index 1129f8c..6325831 100644
--- a/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
+++ b/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
@@ -2,8 +2,8 @@
namespace Wikibase\Test;
-use Wikibase\DataModel\SimpleSiteLink;
-use Wikibase\Item;
+use Wikibase\DataModel\SiteLink;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\Repo\ItemSearchTextGenerator;
/**
@@ -25,8 +25,8 @@
$item->setDescription( 'en', 'city in Spain' );
$item->setAliases( 'en', array( 'abc', 'cde' ) );
$item->setAliases( 'de', array( 'xyz', 'uvw' ) );
- $item->addSiteLink( new SimpleSiteLink( 'dewiki', 'Berlin' ) );
- $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Rome' ) );
+ $item->addSiteLink( new SiteLink( 'dewiki', 'Berlin' ) );
+ $item->addSiteLink( new SiteLink( 'enwiki', 'Rome' ) );
$patterns = array(
'/^Test$/',
diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php
b/repo/tests/phpunit/includes/content/ItemContentTest.php
index efcf024..5043ab9 100644
--- a/repo/tests/phpunit/includes/content/ItemContentTest.php
+++ b/repo/tests/phpunit/includes/content/ItemContentTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\Test;
-use Wikibase\DataModel\SimpleSiteLink;
+use Wikibase\DataModel\SiteLink;
use Wikibase\EntityContent;
use Wikibase\ItemContent;
@@ -120,7 +120,7 @@
/** @var ItemContent $itemContent */
$itemContent = $this->newEmpty();
$itemContent->getEntity()->setLabel( 'en', "cake" );
- $itemContent->getEntity()->addSiteLink( new SimpleSiteLink(
'dewiki', 'Berlin' ) );
+ $itemContent->getEntity()->addSiteLink( new SiteLink( 'dewiki',
'Berlin' ) );
return array(
array( $itemContent, '!^cake$!' ),
diff --git a/repo/tests/phpunit/includes/content/ItemHandlerTest.php
b/repo/tests/phpunit/includes/content/ItemHandlerTest.php
index 1861b40..e3f76d9 100644
--- a/repo/tests/phpunit/includes/content/ItemHandlerTest.php
+++ b/repo/tests/phpunit/includes/content/ItemHandlerTest.php
@@ -5,7 +5,7 @@
use Title;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\SimpleSiteLink;
+use Wikibase\DataModel\SiteLink;
use Wikibase\ItemContent;
use Wikibase\ItemHandler;
use Wikibase\Lib\Store\EntityContentDataCodec;
@@ -52,7 +52,7 @@
* @var ItemContent $content
*/
$content = clone $contents[1][0];
- $content->getItem()->addSiteLink( new SimpleSiteLink( 'enwiki',
'Foobar' ) );
+ $content->getItem()->addSiteLink( new SiteLink( 'enwiki',
'Foobar' ) );
$contents[] = array( $content );
return $contents;
--
To view, visit https://gerrit.wikimedia.org/r/142451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff2c8929adae05717cc5fa6672fdb3791d7810eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
