jenkins-bot has submitted this change and it was merged.
Change subject: Remove usages of deprecated setSiteLink method
......................................................................
Remove usages of deprecated setSiteLink method
Change-Id: I40069ec11f30fbb2c5d75d84b91cf46f60a05795
---
M client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php
M lib/tests/phpunit/store/SiteLinkTableTest.php
M repo/tests/phpunit/TestItemContents.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
M repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
M repo/tests/phpunit/includes/Validators/SiteLinkUniquenessValidatorTest.php
M repo/tests/phpunit/includes/View/SiteLinksViewTest.php
M repo/tests/phpunit/includes/api/EntityTestHelper.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
15 files changed, 79 insertions(+), 78 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
index 41de08e..3c187d2 100644
--- a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
+++ b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
@@ -74,7 +74,7 @@
protected function getConnectDiff() {
$item = $this->getNewItem();
$item2 = $item->copy();
- $item2->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
+ $item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
$changeFactory = TestChanges::getEntityChangeFactory();
$change = $changeFactory->newFromUpdate( ItemChange::UPDATE,
$item, $item2 );
@@ -84,7 +84,7 @@
protected function getUnlinkDiff() {
$item = $this->getNewItem();
- $item->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
$item2 = $this->getNewItem();
$item2->removeSiteLink( 'enwiki' );
@@ -97,10 +97,10 @@
protected function getLinkChangeDiff() {
$item = $this->getNewItem();
- $item->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
$item2 = $this->getNewItem();
- $item2->addSiteLink( new SiteLink( 'enwiki', 'Tokyo' ) );
+ $item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Tokyo' );
$changeFactory = TestChanges::getEntityChangeFactory();
$change = $changeFactory->newFromUpdate( ItemChange::UPDATE,
$item, $item2 );
@@ -118,7 +118,7 @@
protected function getBadgeChangeDiff() {
$item = $this->getNewItem();
- $item->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
$item2 = $this->getNewItem();
$item2->addSiteLink( new SiteLink( 'enwiki', 'Japan', array(
new ItemId( 'Q17' ) ) ) );
@@ -131,10 +131,10 @@
protected function getAddLinkDiff() {
$item = $this->getNewItem();
- $item->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
$item2 = $item->copy();
- $item2->addSiteLink( new SiteLink( 'dewiki', 'Japan' ) );
+ $item2->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Japan' );
$changeFactory = TestChanges::getEntityChangeFactory();
$change = $changeFactory->newFromUpdate( ItemChange::UPDATE,
$item, $item2 );
@@ -144,11 +144,11 @@
protected function getAddMultipleLinksDiff() {
$item = $this->getNewItem();
- $item->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
$item2 = $item->copy();
- $item2->addSiteLink( new SiteLink( 'dewiki', 'Japan' ) );
- $item2->addSiteLink( new SiteLink( 'frwiki', 'Japan' ) );
+ $item2->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Japan' );
+ $item2->getSiteLinkList()->addNewSiteLink( 'frwiki', 'Japan' );
$changeFactory = TestChanges::getEntityChangeFactory();
$change = $changeFactory->newFromUpdate( ItemChange::UPDATE,
$item, $item2 );
@@ -158,8 +158,8 @@
protected function getRemoveLinkDiff() {
$item = $this->getNewItem();
- $item->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
- $item->addSiteLink( new SiteLink( 'dewiki', 'Japan' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
+ $item->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Japan' );
$item2 = $item->copy();
$item2->removeSiteLink( 'dewiki' );
@@ -172,12 +172,12 @@
protected function getChangeLinkDiff() {
$item = $this->getNewItem();
- $item->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
- $item->addSiteLink( new SiteLink( 'dewiki', 'Japan' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
+ $item->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Japan' );
$item2 = $this->getNewItem();
- $item2->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
- $item2->addSiteLink( new SiteLink( 'dewiki', 'Tokyo' ) );
+ $item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
+ $item2->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Tokyo' );
$changeFactory = TestChanges::getEntityChangeFactory();
$change = $changeFactory->newFromUpdate( ItemChange::UPDATE,
$item, $item2 );
@@ -187,7 +187,7 @@
protected function getDeleteDiff() {
$item = $this->getNewItem();
- $item->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
$changeFactory = TestChanges::getEntityChangeFactory();
$change = $changeFactory->newFromUpdate( ItemChange::REMOVE,
$item, null );
@@ -197,7 +197,7 @@
protected function getRestoreDiff() {
$item = $this->getNewItem();
- $item->addSiteLink( new SiteLink( 'enwiki', 'Japan' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
$changeFactory = TestChanges::getEntityChangeFactory();
$change = $changeFactory->newFromUpdate( ItemChange::RESTORE,
null, $item );
diff --git
a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
index 60408f0..a1ff24e 100644
--- a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
+++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
@@ -224,8 +224,8 @@
$item->setId( $itemId );
$item->setLabel( 'en', 'Beer' );
$item->setDescription( 'en', 'yummy beverage' );
- $item->addSiteLink( new SiteLink( 'enwiki', 'Beer' ) );
- $item->addSiteLink( new SiteLink( 'dewiki', 'Bier' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Beer' );
+ $item->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Bier' );
return $item;
}
diff --git a/lib/tests/phpunit/MockRepositoryTest.php
b/lib/tests/phpunit/MockRepositoryTest.php
index 633ad95..0bc9440 100644
--- a/lib/tests/phpunit/MockRepositoryTest.php
+++ b/lib/tests/phpunit/MockRepositoryTest.php
@@ -138,7 +138,7 @@
public function testGetItemIdForLink() {
$item = Item::newEmpty();
- $item->addSiteLink( new SiteLink( 'enwiki', 'Foo' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
// test item lookup
$this->repo->putEntity( $item );
@@ -167,42 +167,42 @@
// #0: same link ---------
$a = Item::newEmpty();
$a->setId( 1 );
- $a->addSiteLink( new SiteLink( 'enwiki', 'Foo' ) );
- $a->addSiteLink( new SiteLink( 'dewiki', 'Foo' ) );
+ $a->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
+ $a->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Foo' );
$b = Item::newEmpty();
$b->setId( 2 );
- $b->addSiteLink( new SiteLink( 'enwiki', 'Foo' ) );
- $b->addSiteLink( new SiteLink( 'dewiki', 'Bar' ) );
+ $b->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
+ $b->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Bar' );
$cases[] = array( $a, $b, array( array( 'enwiki', 'Foo', 1 ) )
);
// #1: same site ---------
$a = Item::newEmpty();
$a->setId( 1 );
- $a->addSiteLink( new SiteLink( 'enwiki', 'Foo' ) );
+ $a->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
$b = Item::newEmpty();
$b->setId( 2 );
- $b->addSiteLink( new SiteLink( 'enwiki', 'Bar' ) );
+ $b->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Bar' );
$cases[] = array( $a, $b, array() );
// #2: same page ---------
$a = Item::newEmpty();
$a->setId( 1 );
- $a->addSiteLink( new SiteLink( 'enwiki', 'Foo' ) );
+ $a->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
$b = Item::newEmpty();
$b->setId( 2 );
- $b->addSiteLink( new SiteLink( 'dewiki', 'Foo' ) );
+ $b->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Foo' );
$cases[] = array( $a, $b, array() );
// #3: same item ---------
$a = Item::newEmpty();
$a->setId( 1 );
- $a->addSiteLink( new SiteLink( 'enwiki', 'Foo' ) );
+ $a->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
$cases[] = array( $a, $a, array() );
@@ -224,13 +224,13 @@
$a = Item::newEmpty();
$a->setId( 1 );
- $a->addSiteLink( new SiteLink( 'enwiki', 'Foo' ) );
- $a->addSiteLink( new SiteLink( 'dewiki', 'Bar' ) );
+ $a->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
+ $a->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Bar' );
$b = Item::newEmpty();
$b->setId( 2 );
- $b->addSiteLink( new SiteLink( 'enwiki', 'Bar' ) );
- $b->addSiteLink( new SiteLink( 'dewiki', 'Xoo' ) );
+ $b->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Bar' );
+ $b->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Xoo' );
$items = array( $a, $b );
@@ -464,8 +464,8 @@
$one = Item::newEmpty();
$one->setId( 1 );
- $one->addSiteLink( new SiteLink( 'dewiki', 'Xoo' ) );
- $one->addSiteLink( new SiteLink( 'enwiki', 'Foo' ) );
+ $one->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Xoo' );
+ $one->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
$this->repo->putEntity( $one );
diff --git a/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php
b/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php
index 3319e0a..3ebf15e 100644
--- a/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php
+++ b/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php
@@ -67,7 +67,7 @@
protected function getItemInstance() {
$item = Item::newEmpty();
$item->setId( new ItemId( 'Q17' ) );
- $item->addSiteLink( new SiteLink( 'test', 'Foo' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'test', 'Foo' );
return $item;
}
diff --git a/lib/tests/phpunit/store/SiteLinkTableTest.php
b/lib/tests/phpunit/store/SiteLinkTableTest.php
index 8f55dd4..9d4fbac 100644
--- a/lib/tests/phpunit/store/SiteLinkTableTest.php
+++ b/lib/tests/phpunit/store/SiteLinkTableTest.php
@@ -74,16 +74,17 @@
// save initial links
$item = Item::newEmpty();
$item->setId( new ItemId( 'q177' ) );
- $item->addSiteLink( new SiteLink( 'enwiki', 'Foo' ) );
- $item->addSiteLink( new SiteLink( 'dewiki', 'Bar' ) );
- $item->addSiteLink( new SiteLink( 'svwiki', 'Börk' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
+ $item->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Bar' );
+ $item->getSiteLinkList()->addNewSiteLink( 'svwiki', 'Börk' );
$this->siteLinkTable->saveLinksOfItem( $item );
// modify links, and save again
- $item->addSiteLink( new SiteLink( 'enwiki', 'FooK' ) );
+ $item->getSiteLinkList()->removeLinkWithSiteId( 'enwiki' );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'FooK' );
$item->removeSiteLink( 'dewiki' );
- $item->addSiteLink( new SiteLink( 'nlwiki', 'GrooK' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'nlwiki', 'GrooK' );
$this->siteLinkTable->saveLinksOfItem( $item );
diff --git a/repo/tests/phpunit/TestItemContents.php
b/repo/tests/phpunit/TestItemContents.php
index ecbf13f..b0ee093 100644
--- a/repo/tests/phpunit/TestItemContents.php
+++ b/repo/tests/phpunit/TestItemContents.php
@@ -43,13 +43,13 @@
$items[] = $item;
$item = Item::newEmpty();
- $item->addSiteLink( new SiteLink( 'enwiki', 'spam' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'spam' );
$items[] = $item;
$item = Item::newEmpty();
- $item->addSiteLink( new SiteLink( 'enwiki', 'spamz' ) );
- $item->addSiteLink( new SiteLink( 'dewiki', 'foobar' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'spamz' );
+ $item->getSiteLinkList()->addNewSiteLink( 'dewiki', 'foobar' );
$item->setDescription( 'en', 'foo' );
$item->setLabel( 'en', 'bar' );
diff --git a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
index 5b7443f..6735119 100644
--- a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
@@ -81,7 +81,7 @@
}
if ( $entity instanceof Item ) {
- $entity->addSiteLink( new SiteLink( 'test', 'Foo' ) );
+ $entity->getSiteLinkList()->addNewSiteLink( 'test',
'Foo' );
}
return $entity;
diff --git a/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
b/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
index 6325831..f809ab2 100644
--- a/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
+++ b/repo/tests/phpunit/includes/ItemSearchTextGeneratorTest.php
@@ -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 SiteLink( 'dewiki', 'Berlin' ) );
- $item->addSiteLink( new SiteLink( 'enwiki', 'Rome' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Berlin' );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Rome' );
$patterns = array(
'/^Test$/',
diff --git
a/repo/tests/phpunit/includes/Validators/SiteLinkUniquenessValidatorTest.php
b/repo/tests/phpunit/includes/Validators/SiteLinkUniquenessValidatorTest.php
index 2ea5e03..fc9362a 100644
--- a/repo/tests/phpunit/includes/Validators/SiteLinkUniquenessValidatorTest.php
+++ b/repo/tests/phpunit/includes/Validators/SiteLinkUniquenessValidatorTest.php
@@ -33,7 +33,7 @@
public function testValidateEntity() {
$goodEntity = Item::newEmpty();
$goodEntity->setId( new ItemId( 'Q5' ) );
- $goodEntity->addSiteLink( new SiteLink( 'testwiki', 'Foo' ) );
+ $goodEntity->getSiteLinkList()->addNewSiteLink( 'testwiki',
'Foo' );
$siteLinkLookup = $this->getMockSiteLinkLookup();
@@ -47,7 +47,7 @@
public function testValidateEntity_conflict() {
$badEntity = Item::newEmpty();
$badEntity->setId( new ItemId( 'Q7' ) );
- $badEntity->addSiteLink( new SiteLink( 'testwiki', 'DUPE' ) );
+ $badEntity->getSiteLinkList()->addNewSiteLink( 'testwiki',
'DUPE' );
$siteLinkLookup = $this->getMockSiteLinkLookup();
diff --git a/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
b/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
index 822ccae..efea324 100644
--- a/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
+++ b/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
@@ -68,7 +68,7 @@
$item = Item::newEmpty();
$item->setId( new ItemId( 'Q1' ) );
- $item->addSiteLink( new SiteLink( 'enwiki', 'test' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'test' );
$testCases[] = array(
$item,
@@ -106,7 +106,7 @@
$item = Item::newEmpty();
$item->setId( new ItemId( 'Q1' ) );
- $item->addSiteLink( new SiteLink( 'specialwiki', 'test' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'specialwiki', 'test'
);
$testCases[] = array(
$item,
@@ -217,7 +217,7 @@
false,
);
- $item->addSiteLink( new SiteLink( 'enwiki', 'test' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'test' );
$testCases[] = array(
$item,
diff --git a/repo/tests/phpunit/includes/api/EntityTestHelper.php
b/repo/tests/phpunit/includes/api/EntityTestHelper.php
index c967b14..be7156a 100644
--- a/repo/tests/phpunit/includes/api/EntityTestHelper.php
+++ b/repo/tests/phpunit/includes/api/EntityTestHelper.php
@@ -553,10 +553,10 @@
)
)
);
- $entities['Q3']->addSiteLink( new SiteLink( 'dewiki', 'Berlin'
) );
- $entities['Q3']->addSiteLink( new SiteLink( 'enwiki', 'Berlin'
) );
- $entities['Q3']->addSiteLink( new SiteLink( 'nlwiki', 'Berlin'
) );
- $entities['Q3']->addSiteLink( new SiteLink( 'nnwiki', 'Berlin'
) );
+ $entities['Q3']->getSiteLinkList()->addNewSiteLink( 'dewiki',
'Berlin' );
+ $entities['Q3']->getSiteLinkList()->addNewSiteLink( 'enwiki',
'Berlin' );
+ $entities['Q3']->getSiteLinkList()->addNewSiteLink( 'nlwiki',
'Berlin' );
+ $entities['Q3']->getSiteLinkList()->addNewSiteLink( 'nnwiki',
'Berlin' );
$claim = new Claim (
new PropertyValueSnak(
PropertyId::newFromNumber( 1 ),
@@ -595,10 +595,10 @@
)
)
);
- $entities['Q4']->addSiteLink( new SiteLink( 'dewiki', 'London'
) );
- $entities['Q4']->addSiteLink( new SiteLink( 'enwiki', 'London'
) );
- $entities['Q4']->addSiteLink( new SiteLink( 'nlwiki', 'London'
) );
- $entities['Q4']->addSiteLink( new SiteLink( 'nnwiki', 'London'
) );
+ $entities['Q4']->getSiteLinkList()->addNewSiteLink( 'dewiki',
'London' );
+ $entities['Q4']->getSiteLinkList()->addNewSiteLink( 'enwiki',
'London' );
+ $entities['Q4']->getSiteLinkList()->addNewSiteLink( 'nlwiki',
'London' );
+ $entities['Q4']->getSiteLinkList()->addNewSiteLink( 'nnwiki',
'London' );
$entities['Q5'] = Item::newEmpty();
$entities['Q5']->setId( ItemId::newFromNumber( 5 ) );
@@ -631,10 +631,10 @@
)
)
);
- $entities['Q5']->addSiteLink( new SiteLink( 'dewiki', 'Oslo' )
);
- $entities['Q5']->addSiteLink( new SiteLink( 'enwiki', 'Oslo' )
);
- $entities['Q5']->addSiteLink( new SiteLink( 'nlwiki', 'Oslo' )
);
- $entities['Q5']->addSiteLink( new SiteLink( 'nnwiki', 'Oslo' )
);
+ $entities['Q5']->getSiteLinkList()->addNewSiteLink( 'dewiki',
'Oslo' );
+ $entities['Q5']->getSiteLinkList()->addNewSiteLink( 'enwiki',
'Oslo' );
+ $entities['Q5']->getSiteLinkList()->addNewSiteLink( 'nlwiki',
'Oslo' );
+ $entities['Q5']->getSiteLinkList()->addNewSiteLink( 'nnwiki',
'Oslo' );
$entities['Q6'] = Item::newEmpty();
$entities['Q6']->setId( ItemId::newFromNumber( 6 ) );
diff --git a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index 7f4b062..1e4e8a6 100644
--- a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -327,8 +327,8 @@
public function testAddEntityRevisionWithSiteLinksFilter() {
$item = Item::newEmpty();
$item->setId( new ItemId( 'Q123099' ) );
- $item->addSiteLink( new SiteLink( 'enwiki', 'Berlin' ) );
- $item->addSiteLink( new SiteLink( 'dewiki', 'Berlin' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Berlin' );
+ $item->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Berlin' );
$entityRevision = new EntityRevision( $item );
$options = new SerializationOptions();
@@ -365,8 +365,8 @@
$item = Item::newEmpty();
$item->setId( new ItemId( 'Q123100' ) );
- $item->addSiteLink( new SiteLink( 'enwiki', 'Berlin' ) );
- $item->addSiteLink( new SiteLink( 'dewiki', 'Berlin' ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Berlin' );
+ $item->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Berlin' );
$entityRevision = new EntityRevision( $item );
$options = new SerializationOptions();
diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php
b/repo/tests/phpunit/includes/content/ItemContentTest.php
index c541520..508c96c 100644
--- a/repo/tests/phpunit/includes/content/ItemContentTest.php
+++ b/repo/tests/phpunit/includes/content/ItemContentTest.php
@@ -94,7 +94,7 @@
public function getTextForSearchIndexProvider() {
$itemContent = $this->newEmpty();
$itemContent->getEntity()->setLabel( 'en', "cake" );
- $itemContent->getEntity()->addSiteLink( new SiteLink( 'dewiki',
'Berlin' ) );
+ $itemContent->getEntity()->getSiteLinkList()->addNewSiteLink(
'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 118fc72..3fba8c0 100644
--- a/repo/tests/phpunit/includes/content/ItemHandlerTest.php
+++ b/repo/tests/phpunit/includes/content/ItemHandlerTest.php
@@ -54,7 +54,7 @@
* @var ItemContent $content
*/
$content = clone $contents[1][0];
- $content->getItem()->addSiteLink( new SiteLink( 'enwiki',
'Foobar' ) );
+ $content->getItem()->getSiteLinkList()->addNewSiteLink(
'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 d755542..811a81b 100644
--- a/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
+++ b/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
@@ -198,7 +198,7 @@
$item1->setId( 42 );
$item1->setLabel( $languageCode, $termText );
- $item1->addSiteLink( new SiteLink( 'enwiki', 'A' ) );
+ $item1->getSiteLinkList()->addNewSiteLink( 'enwiki', 'A' );
$termIndex->saveTermsOfEntity( $item1 );
@@ -206,10 +206,10 @@
$item2->setId( 23 );
$item2->setLabel( $languageCode, $termText );
- $item2->addSiteLink( new SiteLink( 'enwiki', 'B' ) );
- $item2->addSiteLink( new SiteLink( 'dewiki', 'B' ) );
- $item2->addSiteLink( new SiteLink( 'hrwiki', 'B' ) );
- $item2->addSiteLink( new SiteLink( 'uzwiki', 'B' ) );
+ $item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 'B' );
+ $item2->getSiteLinkList()->addNewSiteLink( 'dewiki', 'B' );
+ $item2->getSiteLinkList()->addNewSiteLink( 'hrwiki', 'B' );
+ $item2->getSiteLinkList()->addNewSiteLink( 'uzwiki', 'B' );
$termIndex->saveTermsOfEntity( $item2 );
@@ -217,8 +217,8 @@
$item3->setId( 108 );
$item3->setLabel( $languageCode, $termText );
- $item3->addSiteLink( new SiteLink( 'hrwiki', 'C' ) );
- $item3->addSiteLink( new SiteLink( 'uzwiki', 'C' ) );
+ $item3->getSiteLinkList()->addNewSiteLink( 'hrwiki', 'C' );
+ $item3->getSiteLinkList()->addNewSiteLink( 'uzwiki', 'C' );
$termIndex->saveTermsOfEntity( $item3 );
--
To view, visit https://gerrit.wikimedia.org/r/176313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40069ec11f30fbb2c5d75d84b91cf46f60a05795
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
