Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/107132
Change subject: Remove all use of deprecated addSimpleSiteLink
......................................................................
Remove all use of deprecated addSimpleSiteLink
Change-Id: Ia179c66fc16b213a8806f16ebf43f5f786e5a3df
---
M client/tests/phpunit/includes/ChangeHandlerTest.php
M client/tests/phpunit/includes/ReferencedPagesFinderTest.php
M client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M
client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementationTest.php
M lib/includes/UpdateRepoOnMoveJob.php
M lib/includes/serializers/ItemSerializer.php
M lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/changes/TestChanges.php
M lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php
M lib/tests/phpunit/store/ItemUsageIndexTest.php
M lib/tests/phpunit/store/SiteLinkTableTest.php
M repo/includes/ChangeOp/ChangeOpSiteLink.php
M repo/includes/api/LinkTitles.php
M repo/includes/specials/SpecialNewItem.php
M repo/maintenance/createBlacklistedItems.php
M repo/maintenance/importInterlang.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
M repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
M repo/tests/phpunit/includes/content/ItemContentTest.php
M repo/tests/phpunit/includes/content/ItemHandlerTest.php
M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
23 files changed, 85 insertions(+), 85 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/32/107132/1
diff --git a/client/tests/phpunit/includes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/ChangeHandlerTest.php
index 249811a..e2408cc 100644
--- a/client/tests/phpunit/includes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/ChangeHandlerTest.php
@@ -1145,7 +1145,7 @@
$siteIdentifier = $siteId;
}
- $entity->addSimpleSiteLink( new
SimpleSiteLink( $siteIdentifier, $page ) );
+ $entity->addSiteLink( new
SimpleSiteLink( $siteIdentifier, $page ) );
}
} else {
$entity = $v;
diff --git a/client/tests/phpunit/includes/ReferencedPagesFinderTest.php
b/client/tests/phpunit/includes/ReferencedPagesFinderTest.php
index 37e3013..7580e37 100644
--- a/client/tests/phpunit/includes/ReferencedPagesFinderTest.php
+++ b/client/tests/phpunit/includes/ReferencedPagesFinderTest.php
@@ -155,7 +155,7 @@
$itemWithBadge = $this->getEmptyItem();
$badges = array( new ItemId( 'Q34' ) );
- $itemWithBadge->addSimpleSiteLink( new SimpleSiteLink(
'enwiki', 'Rome', $badges ) );
+ $itemWithBadge->addSiteLink( new SimpleSiteLink( 'enwiki',
'Rome', $badges ) );
$cases[] = array(
array(),
@@ -180,7 +180,7 @@
$item = $this->getEmptyItem();
foreach( $links as $siteId => $page ) {
- $item->addSimpleSiteLink(
+ $item->addSiteLink(
new SimpleSiteLink( $siteId, $page )
);
}
diff --git a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
index f6713ec..16a1425 100644
--- a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
+++ b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
@@ -78,7 +78,7 @@
protected function getConnectDiff() {
$item = $this->getNewItem();
$item2 = $item->copy();
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Japan' ) );
+ $item2->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan' ) );
$change = ItemChange::newFromUpdate( ItemChange::UPDATE, $item,
$item2 );
@@ -87,7 +87,7 @@
protected function getUnlinkDiff() {
$item = $this->getNewItem();
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Japan'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan' ) );
$item2 = $item->copy();
$item2->removeSiteLink( 'enwiki', 'Japan' );
@@ -99,10 +99,10 @@
protected function getLinkChangeDiff() {
$item = $this->getNewItem();
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Japan'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan' ) );
$item2 = $item->copy();
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Tokyo' ) );
+ $item2->addSiteLink( new SimpleSiteLink( 'enwiki', 'Tokyo' ) );
$change = ItemChange::newFromUpdate( ItemChange::UPDATE, $item,
$item2 );
@@ -119,10 +119,10 @@
protected function getBadgeChangeDiff() {
$item = $this->getNewItem();
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Japan'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan' ) );
$item2 = $item->copy();
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Japan', array( new ItemId( 'Q17' ) ) ) );
+ $item2->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan',
array( new ItemId( 'Q17' ) ) ) );
$change = ItemChange::newFromUpdate( ItemChange::UPDATE, $item,
$item2 );
@@ -131,10 +131,10 @@
protected function getAddLinkDiff() {
$item = $this->getNewItem();
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Japan'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan' ) );
$item2 = $item->copy();
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'dewiki',
'Japan' ) );
+ $item2->addSiteLink( new SimpleSiteLink( 'dewiki', 'Japan' ) );
$change = ItemChange::newFromUpdate( ItemChange::UPDATE, $item,
$item2 );
@@ -143,11 +143,11 @@
protected function getAddMultipleLinksDiff() {
$item = $this->getNewItem();
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Japan'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan' ) );
$item2 = $item->copy();
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'dewiki',
'Japan' ) );
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'frwiki',
'Japan' ) );
+ $item2->addSiteLink( new SimpleSiteLink( 'dewiki', 'Japan' ) );
+ $item2->addSiteLink( new SimpleSiteLink( 'frwiki', 'Japan' ) );
$change = ItemChange::newFromUpdate( ItemChange::UPDATE, $item,
$item2 );
@@ -156,8 +156,8 @@
protected function getRemoveLinkDiff() {
$item = $this->getNewItem();
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Japan'
) );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Japan'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan' ) );
+ $item->addSiteLink( new SimpleSiteLink( 'dewiki', 'Japan' ) );
$item2 = $item->copy();
$item2->removeSiteLink( 'dewiki', 'Japan' );
@@ -169,11 +169,11 @@
protected function getChangeLinkDiff() {
$item = $this->getNewItem();
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Japan'
) );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Japan'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan' ) );
+ $item->addSiteLink( new SimpleSiteLink( 'dewiki', 'Japan' ) );
$item2 = $item->copy();
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'dewiki',
'Tokyo' ) );
+ $item2->addSiteLink( new SimpleSiteLink( 'dewiki', 'Tokyo' ) );
$change = ItemChange::newFromUpdate( ItemChange::UPDATE, $item,
$item2 );
@@ -182,7 +182,7 @@
protected function getDeleteDiff() {
$item = $this->getNewItem();
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Japan'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan' ) );
$change = ItemChange::newFromUpdate( ItemChange::REMOVE, $item,
null );
@@ -191,7 +191,7 @@
protected function getRestoreDiff() {
$item = $this->getNewItem();
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Japan'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Japan' ) );
$change = ItemChange::newFromUpdate( ItemChange::RESTORE, null,
$item );
diff --git
a/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementationTest.php
b/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementationTest.php
index 0340c93..3ce3d10 100644
---
a/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementationTest.php
+++
b/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementationTest.php
@@ -107,8 +107,8 @@
$item->setId( $itemId );
$item->setLabel( 'en', 'Beer' );
$item->setDescription( 'en', 'yummy beverage' );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Beer'
) );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Bier'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Beer' ) );
+ $item->addSiteLink( new SimpleSiteLink( 'dewiki', 'Bier' ) );
return $item;
}
diff --git a/lib/includes/UpdateRepoOnMoveJob.php
b/lib/includes/UpdateRepoOnMoveJob.php
index 438bbe5..11eb137 100644
--- a/lib/includes/UpdateRepoOnMoveJob.php
+++ b/lib/includes/UpdateRepoOnMoveJob.php
@@ -212,7 +212,7 @@
public function doUpdateSiteLink( $itemContent, $siteLink, $editEntity,
$summary, $user ) {
$item = $itemContent->getItem();
- $item->addSimpleSiteLink( $siteLink );
+ $item->addSiteLink( $siteLink );
//NOTE: Temporary hack to avoid more dependency mess.
// The Right Thing would be to use a SummaryFormatter.
diff --git a/lib/includes/serializers/ItemSerializer.php
b/lib/includes/serializers/ItemSerializer.php
index a6baf0e..a0847da 100644
--- a/lib/includes/serializers/ItemSerializer.php
+++ b/lib/includes/serializers/ItemSerializer.php
@@ -100,7 +100,7 @@
$siteLinks = $siteLinkSerializer->newFromSerialization(
$data['sitelinks'] );
foreach( $siteLinks as $siteLink ) {
- $item->addSimpleSiteLink( $siteLink );
+ $item->addSiteLink( $siteLink );
}
}
diff --git a/lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
b/lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
index ff671d1..6ab4d86 100644
--- a/lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
+++ b/lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
@@ -79,7 +79,7 @@
}
if ( $entity instanceof Item ) {
- $entity->addSimpleSiteLink( new SimpleSiteLink( 'test',
'Foo' ) );
+ $entity->addSiteLink( new SimpleSiteLink( 'test', 'Foo'
) );
}
return $entity;
diff --git a/lib/tests/phpunit/MockRepositoryTest.php
b/lib/tests/phpunit/MockRepositoryTest.php
index ac7b9c0..724f63a 100644
--- a/lib/tests/phpunit/MockRepositoryTest.php
+++ b/lib/tests/phpunit/MockRepositoryTest.php
@@ -140,7 +140,7 @@
public function testGetItemIdForLink() {
$item = new Item( array() );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' )
);
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
// test item lookup
$this->repo->putEntity( $item );
@@ -150,7 +150,7 @@
$this->assertEquals( false, $this->repo->getItemIdForLink(
'xywiki', 'Foo' ) );
// test lookup after item modification
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Bar'
), 'set' );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Bar' ),
'set' );
$this->repo->putEntity( $item );
$this->assertEquals( false, $this->repo->getItemIdForLink(
'enwiki', 'Foo' ) );
@@ -168,36 +168,36 @@
// #0: same link ---------
$a = new Item( array( 'id' => 1 ) );
- $a->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
- $a->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Foo' ) );
+ $a->addSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
+ $a->addSiteLink( new SimpleSiteLink( 'dewiki', 'Foo' ) );
$b = new Item( array( 'id' => 2 ) );
- $b->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
- $b->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Bar' ) );
+ $b->addSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
+ $b->addSiteLink( new SimpleSiteLink( 'dewiki', 'Bar' ) );
$cases[] = array( $a, $b, array( array( 'enwiki', 'Foo', 1 ) )
);
// #1: same site ---------
$a = new Item( array( 'id' => 1 ) );
- $a->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
+ $a->addSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
$b = new Item( array( 'id' => 2 ) );
- $b->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Bar' ) );
+ $b->addSiteLink( new SimpleSiteLink( 'enwiki', 'Bar' ) );
$cases[] = array( $a, $b, array() );
// #2: same page ---------
$a = new Item( array( 'id' => 1 ) );
- $a->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
+ $a->addSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
$b = new Item( array( 'id' => 2 ) );
- $b->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Foo' ) );
+ $b->addSiteLink( new SimpleSiteLink( 'dewiki', 'Foo' ) );
$cases[] = array( $a, $b, array() );
// #3: same item ---------
$a = new Item( array( 'id' => 1 ) );
- $a->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
+ $a->addSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
$cases[] = array( $a, $a, array() );
@@ -218,12 +218,12 @@
$cases = array();
$a = new Item( array( 'id' => 1 ) );
- $a->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
- $a->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Bar' ) );
+ $a->addSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
+ $a->addSiteLink( new SimpleSiteLink( 'dewiki', 'Bar' ) );
$b = new Item( array( 'id' => 2 ) );
- $b->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Bar' ) );
- $b->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Xoo' ) );
+ $b->addSiteLink( new SimpleSiteLink( 'enwiki', 'Bar' ) );
+ $b->addSiteLink( new SimpleSiteLink( 'dewiki', 'Xoo' ) );
$items = array( $a, $b );
@@ -441,8 +441,8 @@
public function testGetSiteLinksForItem() {
$one = new Item( array( 'id' => 1 ) );
- $one->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Xoo' )
);
- $one->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' )
);
+ $one->addSiteLink( new SimpleSiteLink( 'dewiki', 'Xoo' ) );
+ $one->addSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
$this->repo->putEntity( $one );
diff --git a/lib/tests/phpunit/changes/TestChanges.php
b/lib/tests/phpunit/changes/TestChanges.php
index f75ecdc..e990db7 100644
--- a/lib/tests/phpunit/changes/TestChanges.php
+++ b/lib/tests/phpunit/changes/TestChanges.php
@@ -37,9 +37,9 @@
$item->setDescription( 'en', 'a country' );
$item->addAliases( 'en', array( 'Bolivarian Republic of
Venezuela' ) );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Venezuela' ) );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'jawiki', 'ベネズエラ'
) );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'cawiki',
'Veneçuela' ) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Venezuela' )
);
+ $item->addSiteLink( new SimpleSiteLink( 'jawiki', 'ベネズエラ' ) );
+ $item->addSiteLink( new SimpleSiteLink( 'cawiki', 'Veneçuela' )
);
return $item;
}
@@ -86,12 +86,12 @@
// generated here, or elsewhere in test cases.
$link = new SimpleSiteLink( 'dewiki', "Dummy" );
- $new->addSimpleSiteLink( $link, 'add' );
+ $new->addSiteLink( $link, 'add' );
$changes['set-dewiki-sitelink'] =
EntityChange::newFromUpdate( EntityChange::UPDATE, $old, $new );
$old = $new->copy();
$link = new SimpleSiteLink( 'enwiki', "Emmy" );
- $new->addSimpleSiteLink( $link, 'add' );
+ $new->addSiteLink( $link, 'add' );
$changes['set-enwiki-sitelink'] =
EntityChange::newFromUpdate( EntityChange::UPDATE, $old, $new );
$old = $new->copy();
@@ -100,27 +100,27 @@
$new->removeSiteLink( 'dewiki' );
$link = new SimpleSiteLink( 'enwiki', "Emmy" );
- $new->addSimpleSiteLink( $link, 'add' );
+ $new->addSiteLink( $link, 'add' );
$link = new SimpleSiteLink( 'dewiki', "Dummy" );
- $new->addSimpleSiteLink( $link, 'add' );
+ $new->addSiteLink( $link, 'add' );
$changes['change-sitelink-order'] =
EntityChange::newFromUpdate( EntityChange::UPDATE, $old, $new );
$old = $new->copy();
// -----
$link = new SimpleSiteLink( 'dewiki', "Dummy2" );
- $new->addSimpleSiteLink( $link, 'set' );
+ $new->addSiteLink( $link, 'set' );
$changes['change-dewiki-sitelink'] =
EntityChange::newFromUpdate( EntityChange::UPDATE, $old, $new );
$old = $new->copy();
$link = new SimpleSiteLink( 'enwiki', "Emmy2" );
- $new->addSimpleSiteLink( $link, 'set' );
+ $new->addSiteLink( $link, 'set' );
$changes['change-enwiki-sitelink'] =
EntityChange::newFromUpdate( EntityChange::UPDATE, $old, $new );
$old = $new->copy();
$link = new SimpleSiteLink( 'enwiki', "Emmy2", array(
new ItemId( 'Q17' ) ) );
- $new->addSimpleSiteLink( $link, 'set' );
+ $new->addSiteLink( $link, 'set' );
$changes['change-enwiki-sitelink-badges'] =
EntityChange::newFromUpdate( EntityChange::UPDATE, $old, $new );
$old = $new->copy();
diff --git a/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php
b/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php
index d46c6c1..3474b94 100644
--- a/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php
+++ b/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php
@@ -76,7 +76,7 @@
protected function getItemInstance() {
$item = Item::newEmpty();
$item->setId( new ItemId( 'Q17' ) );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'test', 'Foo' ) );
+ $item->addSiteLink( new SimpleSiteLink( 'test', 'Foo' ) );
return $item;
}
diff --git a/lib/tests/phpunit/store/ItemUsageIndexTest.php
b/lib/tests/phpunit/store/ItemUsageIndexTest.php
index 673e56d..ff4b02d 100644
--- a/lib/tests/phpunit/store/ItemUsageIndexTest.php
+++ b/lib/tests/phpunit/store/ItemUsageIndexTest.php
@@ -34,7 +34,7 @@
$item->setId( $id );
foreach ( $links as $siteId => $page ) {
- $item->addSimpleSiteLink( new SimpleSiteLink( $siteId,
$page ) );
+ $item->addSiteLink( new SimpleSiteLink( $siteId, $page
) );
}
return $item;
diff --git a/lib/tests/phpunit/store/SiteLinkTableTest.php
b/lib/tests/phpunit/store/SiteLinkTableTest.php
index 1a93168..0a43c9f 100644
--- a/lib/tests/phpunit/store/SiteLinkTableTest.php
+++ b/lib/tests/phpunit/store/SiteLinkTableTest.php
@@ -53,7 +53,7 @@
);
foreach( $sitelinks as $site => $page ) {
- $item->addSimpleSiteLink( new SimpleSiteLink( $site,
$page ) );
+ $item->addSiteLink( new SimpleSiteLink( $site, $page )
);
}
$items[] = $item;
@@ -76,16 +76,16 @@
// save initial links
$item = Item::newEmpty();
$item->setId( new ItemId( 'q177' ) );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' )
);
- $item->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Bar' )
);
- $item->addSimpleSiteLink( new SimpleSiteLink( 'svwiki', 'Börk'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
+ $item->addSiteLink( new SimpleSiteLink( 'dewiki', 'Bar' ) );
+ $item->addSiteLink( new SimpleSiteLink( 'svwiki', 'Börk' ) );
$this->siteLinkTable->saveLinksOfItem( $item );
// modify links, and save again
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'FooK'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'FooK' ) );
$item->removeSiteLink( 'dewiki' );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'nlwiki', 'GrooK'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'nlwiki', 'GrooK' ) );
$this->siteLinkTable->saveLinksOfItem( $item );
diff --git a/repo/includes/ChangeOp/ChangeOpSiteLink.php
b/repo/includes/ChangeOp/ChangeOpSiteLink.php
index c852d8a..3a0e57c 100644
--- a/repo/includes/ChangeOp/ChangeOpSiteLink.php
+++ b/repo/includes/ChangeOp/ChangeOpSiteLink.php
@@ -164,7 +164,7 @@
$this->updateSummary( $summary, $action, $this->siteId,
$commentArgs );
- $entity->addSimpleSiteLink( new SimpleSiteLink(
$this->siteId, $pageName, $badges ) );
+ $entity->addSiteLink( new SimpleSiteLink(
$this->siteId, $pageName, $badges ) );
}
return true;
diff --git a/repo/includes/api/LinkTitles.php b/repo/includes/api/LinkTitles.php
index ff442c8..687893b 100644
--- a/repo/includes/api/LinkTitles.php
+++ b/repo/includes/api/LinkTitles.php
@@ -83,10 +83,10 @@
// create new item
$itemContent = ItemContent::newEmpty();
$toLink = new SimpleSiteLink( $toSite->getGlobalId(),
$toPage );
- $itemContent->getItem()->addSimpleSiteLink( $toLink );
+ $itemContent->getItem()->addSiteLink( $toLink );
$return[] = $toLink;
$fromLink = new SimpleSiteLink(
$fromSite->getGlobalId(), $fromPage );
- $itemContent->getItem()->addSimpleSiteLink( $fromLink );
+ $itemContent->getItem()->addSiteLink( $fromLink );
$return[] = $fromLink;
$flags |= EDIT_NEW;
@@ -97,7 +97,7 @@
/** @var ItemContent $itemContent */
$itemContent = $entityContentFactory->getFromId(
ItemId::newFromNumber( $toId ) );
$fromLink = new SimpleSiteLink(
$fromSite->getGlobalId(), $fromPage );
- $itemContent->getItem()->addSimpleSiteLink( $fromLink );
+ $itemContent->getItem()->addSiteLink( $fromLink );
$return[] = $fromLink;
$summary->setAction( 'connect' );
}
@@ -106,7 +106,7 @@
/** @var ItemContent $itemContent */
$itemContent = $entityContentFactory->getFromId(
ItemId::newFromNumber( $fromId ) );
$toLink = new SimpleSiteLink( $toSite->getGlobalId(),
$toPage );
- $itemContent->getItem()->addSimpleSiteLink( $toLink );
+ $itemContent->getItem()->addSiteLink( $toLink );
$return[] = $toLink;
$summary->setAction( 'connect' );
}
diff --git a/repo/includes/specials/SpecialNewItem.php
b/repo/includes/specials/SpecialNewItem.php
index ea8b509..4d468b4 100644
--- a/repo/includes/specials/SpecialNewItem.php
+++ b/repo/includes/specials/SpecialNewItem.php
@@ -82,7 +82,7 @@
}
$link = new SimpleSiteLink( $site->getGlobalId(), $page
);
- $ret = $itemContent->getItem()->addSimpleSiteLink(
$link );
+ $ret = $itemContent->getItem()->addSiteLink( $link );
if ( $ret === false ) {
$status->error(
'wikibase-newitem-add-sitelink-failed' );
diff --git a/repo/maintenance/createBlacklistedItems.php
b/repo/maintenance/createBlacklistedItems.php
index cf21b83..c1d0a1e 100644
--- a/repo/maintenance/createBlacklistedItems.php
+++ b/repo/maintenance/createBlacklistedItems.php
@@ -83,7 +83,7 @@
$item->setId( $id );
$item->setLabel( 'en', $name );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
$name ) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', $name
) );
$itemContent = ItemContent::newFromItem( $item );
$itemContent->save( 'Import' );
diff --git a/repo/maintenance/importInterlang.php
b/repo/maintenance/importInterlang.php
index 20709e7..b6a88a1 100644
--- a/repo/maintenance/importInterlang.php
+++ b/repo/maintenance/importInterlang.php
@@ -128,7 +128,7 @@
$label = preg_replace( '/ *\(.*\)$/u', '', $name );
$item->setLabel( $lang, $label );
- $item->addSimpleSiteLink( new SimpleSiteLink( $lang .
'wiki', $name ) );
+ $item->addSiteLink( new SimpleSiteLink( $lang . 'wiki',
$name ) );
}
$content = \Wikibase\ItemContent::newFromItem( $item );
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
index 648719a..91a9901 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
@@ -60,7 +60,7 @@
$item = Item::newEmpty();
foreach ( $existingSiteLinks as $siteLink ) {
- $item->addSimpleSiteLink( $siteLink );
+ $item->addSiteLink( $siteLink );
}
$args = array();
@@ -150,7 +150,7 @@
$item = Item::newEmpty();
foreach ( $existingSiteLinks as $siteLink ) {
- $item->addSimpleSiteLink( $siteLink );
+ $item->addSiteLink( $siteLink );
}
$args = array();
diff --git a/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
b/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
index 8f1bf3b..7baf8f1 100644
--- a/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
+++ b/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
@@ -27,8 +27,8 @@
$item->setDescription( 'en', 'city in Spain' );
$item->setAliases( 'en', array( 'abc', 'cde' ) );
$item->setAliases( 'de', array( 'xyz', 'uvw' ) );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'dewiki',
'Berlin' ) );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Rome'
) );
+ $item->addSiteLink( new SimpleSiteLink( 'dewiki', 'Berlin' ) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Rome' ) );
$patterns = array(
'/^Test$/',
diff --git a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index 338962f..91d7fae 100644
--- a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -139,7 +139,7 @@
$item->addAliases( 'en', array( 'bar', 'baz' ) );
$item->setDescription( 'pt', 'ptDesc' );
$item->setDescription( 'pl', 'plDesc' );
- $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Berlin', array( new ItemId( 'Q333' ) ) ) );
+ $item->addSiteLink( new SimpleSiteLink( 'enwiki', 'Berlin',
array( new ItemId( 'Q333' ) ) ) );
$claim = new Claim( new PropertySomeValueSnak( new PropertyId(
'P65' ) ) );
$claim->setGuid( 'imaguid' );
$item->addClaim( $claim );
diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php
b/repo/tests/phpunit/includes/content/ItemContentTest.php
index b5e435b..8fb817a 100644
--- a/repo/tests/phpunit/includes/content/ItemContentTest.php
+++ b/repo/tests/phpunit/includes/content/ItemContentTest.php
@@ -91,14 +91,14 @@
*/
public function testSiteLinkConflict( SimpleSiteLink $siteLink,
$expected ) {
$content = ItemContent::newEmpty();
- $content->getItem()->addSimpleSiteLink( $siteLink );
+ $content->getItem()->addSiteLink( $siteLink );
$status = $content->save( 'add item', null, EDIT_NEW );
$this->assertTrue( $status->isOK(), 'item creation succeeded' );
$content1 = ItemContent::newEmpty();
- $content1->getItem()->addSimpleSiteLink( $siteLink );
+ $content1->getItem()->addSiteLink( $siteLink );
$status = $content1->save( 'add item', null, EDIT_NEW );
@@ -208,7 +208,7 @@
public function getTextForSearchIndexProvider() {
$itemContent = $this->newEmpty();
$itemContent->getEntity()->setLabel( 'en', "cake" );
- $itemContent->getEntity()->addSimpleSiteLink( new
SimpleSiteLink( 'dewiki', 'Berlin' ) );
+ $itemContent->getEntity()->addSiteLink( new SimpleSiteLink(
'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 f8ef089..06528b7 100644
--- a/repo/tests/phpunit/includes/content/ItemHandlerTest.php
+++ b/repo/tests/phpunit/includes/content/ItemHandlerTest.php
@@ -47,7 +47,7 @@
* @var ItemContent $content
*/
$content = clone $contents[1][0];
- $content->getItem()->addSimpleSiteLink( new SimpleSiteLink(
'enwiki', 'Foobar' ) );
+ $content->getItem()->addSiteLink( new SimpleSiteLink( 'enwiki',
'Foobar' ) );
$contents[] = array( $content );
return $contents;
diff --git a/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
b/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
index d168672..a27fcb3 100644
--- a/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
+++ b/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
@@ -110,7 +110,7 @@
$item1->setId( 42 );
$item1->setLabel( $languageCode, $termText );
- $item1->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'A' )
);
+ $item1->addSiteLink( new SimpleSiteLink( 'enwiki', 'A' ) );
$termIndex->saveTermsOfEntity( $item1 );
@@ -118,10 +118,10 @@
$item2->setId( 23 );
$item2->setLabel( $languageCode, $termText );
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'B' )
);
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'B' )
);
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'hrwiki', 'B' )
);
- $item2->addSimpleSiteLink( new SimpleSiteLink( 'uzwiki', 'B' )
);
+ $item2->addSiteLink( new SimpleSiteLink( 'enwiki', 'B' ) );
+ $item2->addSiteLink( new SimpleSiteLink( 'dewiki', 'B' ) );
+ $item2->addSiteLink( new SimpleSiteLink( 'hrwiki', 'B' ) );
+ $item2->addSiteLink( new SimpleSiteLink( 'uzwiki', 'B' ) );
$termIndex->saveTermsOfEntity( $item2 );
@@ -129,8 +129,8 @@
$item3->setId( 108 );
$item3->setLabel( $languageCode, $termText );
- $item3->addSimpleSiteLink( new SimpleSiteLink( 'hrwiki', 'C' )
);
- $item3->addSimpleSiteLink( new SimpleSiteLink( 'uzwiki', 'C' )
);
+ $item3->addSiteLink( new SimpleSiteLink( 'hrwiki', 'C' ) );
+ $item3->addSiteLink( new SimpleSiteLink( 'uzwiki', 'C' ) );
$termIndex->saveTermsOfEntity( $item3 );
--
To view, visit https://gerrit.wikimedia.org/r/107132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia179c66fc16b213a8806f16ebf43f5f786e5a3df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
