jenkins-bot has submitted this change and it was merged.
Change subject: Remove usage of deprecated methods
......................................................................
Remove usage of deprecated methods
Bug: T104895
Change-Id: I4032fe08bf7aff3700d54e2ee2be029265b5dc3b
---
M client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
M
client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/store/EntityInfoBuilderTest.php
M lib/tests/phpunit/store/Sql/SqlEntityInfoBuilderTest.php
M lib/tests/phpunit/store/TermIndexTest.php
M repo/Wikibase.hooks.php
M repo/includes/ChangeOp/ChangeOpsMerge.php
M repo/includes/actions/HistoryEntityAction.php
M repo/includes/api/SetAliases.php
M repo/includes/content/EntityContent.php
M repo/includes/specials/SpecialSetAliases.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
M repo/tests/phpunit/includes/actions/EditEntityActionTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
M repo/tests/phpunit/includes/content/EntityHandlerTest.php
19 files changed, 86 insertions(+), 56 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
b/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
index a0d4b1d..d1eb145 100644
--- a/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
+++ b/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
@@ -516,7 +516,7 @@
*/
private function getItemWithAliases( ItemId $id, $languageCode, array
$aliases ) {
$item = new Item( $id );
- $item->addAliases( $languageCode, $aliases );
+ $item->setAliases( $languageCode, $aliases );
return $item;
}
diff --git
a/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
b/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
index 5940856..6acf02f 100644
---
a/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
+++
b/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
@@ -16,6 +16,7 @@
use Wikibase\DataModel\Snak\SnakList;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementList;
+use Wikibase\DataModel\Term\TermList;
use Wikibase\SnakFactory;
use Wikibase\Test\MockClientStore;
use Wikibase\Test\MockRepository;
@@ -147,9 +148,12 @@
*/
private function createTestItem( ItemId $id, array $labels, array
$statements = null, array $siteLinks = null ) {
$item = new Item( $id );
- $item->setLabels( $labels );
$item->getFingerprint()->setDescription( 'de', 'Description of
' . $id->getSerialization() );
+ foreach ( $labels as $lang => $label ) {
+ $item->setLabel( $lang, $label );
+ }
+
if ( $statements !== null ) {
$item->setStatements( new StatementList( $statements )
);
}
diff --git a/lib/tests/phpunit/MockRepositoryTest.php
b/lib/tests/phpunit/MockRepositoryTest.php
index 34060b4..3e8619c 100644
--- a/lib/tests/phpunit/MockRepositoryTest.php
+++ b/lib/tests/phpunit/MockRepositoryTest.php
@@ -84,13 +84,13 @@
$item = $this->repo->getEntity( $itemId );
$this->assertNotNull( $item, "Entity " . $itemId );
$this->assertInstanceOf( 'Wikibase\DataModel\Entity\Item',
$item, "Entity " . $itemId );
- $this->assertEquals( 'foo', $item->getLabel( 'en' ) );
- $this->assertEquals( 'bar', $item->getLabel( 'de' ) );
+ $this->assertEquals( 'foo', $item->getFingerprint()->getLabel(
'en' )->getText() );
+ $this->assertEquals( 'bar', $item->getFingerprint()->getLabel(
'de' )->getText() );
// test we can't mess with entities in the repo
$item->setLabel( 'en', 'STRANGE' );
$item = $this->repo->getEntity( $itemId );
- $this->assertEquals( 'foo', $item->getLabel( 'en' ) );
+ $this->assertEquals( 'foo', $item->getFingerprint()->getLabel(
'en' )->getText() );
// test latest prop
$prop = $this->repo->getEntity( $propId );
@@ -415,7 +415,7 @@
$actual = array();
foreach ( $entities as $key => $e ) {
if ( is_object( $e ) ) {
- $actual[ $e->getId()->getSerialization() ] =
$e->getLabels();
+ $actual[ $e->getId()->getSerialization() ] =
$e->getFingerprint()->getLabels()->toTextArray();
} else {
$actual[ $key ] = $e;
}
@@ -533,14 +533,16 @@
$this->assertEquals( $entity->getId()->getSerialization(),
$logEntry['entity'] );
$this->assertEquals( 'f00', $logEntry['summary'] );
- $this->assertEquals( $entity->getLabels(),
$rev->getEntity()->getLabels() );
- $this->assertEquals( $entity->getLabels(),
$this->repo->getEntity( $entity->getId() )->getLabels() );
+ $savedEntity = $this->repo->getEntity( $entity->getId() );
+
+ $this->assertTrue( $entity->getFingerprint()->equals(
$rev->getEntity()->getFingerprint() ) );
+ $this->assertTrue( $entity->getFingerprint()->equals(
$savedEntity->getFingerprint() ) );
// test we can't mess with entities in the repo
$entity->getFingerprint()->setLabel( 'en', 'STRANGE' );
$entity = $this->repo->getEntity( $entity->getId() );
$this->assertNotNull( $entity );
- $this->assertNotEquals( 'STRANGE', $entity->getLabel( 'en' ) );
+ $this->assertNotEquals( 'STRANGE',
$entity->getFingerprint()->getLabel( 'en' )->getText() );
}
public function testSaveRedirect() {
diff --git a/lib/tests/phpunit/store/EntityInfoBuilderTest.php
b/lib/tests/phpunit/store/EntityInfoBuilderTest.php
index 41d96e0..1050d9e 100644
--- a/lib/tests/phpunit/store/EntityInfoBuilderTest.php
+++ b/lib/tests/phpunit/store/EntityInfoBuilderTest.php
@@ -39,14 +39,14 @@
$q1->setLabel( 'de', 'label:Q1/de' );
$q1->setDescription( 'en', 'description:Q1/en' );
$q1->setDescription( 'de', 'description:Q1/de' );
- $q1->addAliases( 'en', array( 'alias:Q1/en#1' ) );
- $q1->addAliases( 'de', array( 'alias:Q1/de#1', 'alias:Q1/de#2'
) );
+ $q1->setAliases( 'en', array( 'alias:Q1/en#1' ) );
+ $q1->setAliases( 'de', array( 'alias:Q1/de#1', 'alias:Q1/de#2'
) );
$q2 = new Item( new ItemId( 'Q2' ) );
$q2->setLabel( 'en', 'label:Q2/en' );
$q2->setLabel( 'de', 'label:Q2/de' );
- $q2->addAliases( 'en', array( 'alias:Q2/en#1' ) );
- $q2->addAliases( 'de', array( 'alias:Q2/de#1', 'alias:Q2/de#2'
) );
+ $q2->setAliases( 'en', array( 'alias:Q2/en#1' ) );
+ $q2->setAliases( 'de', array( 'alias:Q2/de#1', 'alias:Q2/de#2'
) );
$p2 = Property::newFromType( 'string' );
$p2->setId( new PropertyId( 'P2' ) );
@@ -54,8 +54,8 @@
$p2->setLabel( 'de', 'label:P2/de' );
$p2->setDescription( 'en', 'description:P2/en' );
$p2->setDescription( 'de', 'description:P2/de' );
- $p2->addAliases( 'en', array( 'alias:P2/en#1' ) );
- $p2->addAliases( 'de', array( 'alias:P2/de#1', 'alias:P2/de#2'
) );
+ $p2->setAliases( 'en', array( 'alias:P2/en#1' ) );
+ $p2->setAliases( 'de', array( 'alias:P2/de#1', 'alias:P2/de#2'
) );
$p3 = Property::newFromType( 'string' );
$p3->setId( new PropertyId( 'P3' ) );
diff --git a/lib/tests/phpunit/store/Sql/SqlEntityInfoBuilderTest.php
b/lib/tests/phpunit/store/Sql/SqlEntityInfoBuilderTest.php
index 398b5fa..baaaf30 100644
--- a/lib/tests/phpunit/store/Sql/SqlEntityInfoBuilderTest.php
+++ b/lib/tests/phpunit/store/Sql/SqlEntityInfoBuilderTest.php
@@ -53,9 +53,13 @@
null
);
- $termRows = array_merge( $termRows, $this->getTermRows(
$entity->getId(), 'label', $entity->getLabels() ) );
- $termRows = array_merge( $termRows, $this->getTermRows(
$entity->getId(), 'description', $entity->getDescriptions() ) );
- $termRows = array_merge( $termRows, $this->getTermRows(
$entity->getId(), 'alias', $entity->getAllAliases() ) );
+ $labels =
$entity->getFingerprint()->getLabels()->toTextArray();
+ $descriptions =
$entity->getFingerprint()->getDescriptions()->toTextArray();
+ $aliases =
$entity->getFingerprint()->getAliasGroups()->toTextArray();
+
+ $termRows = array_merge( $termRows, $this->getTermRows(
$entity->getId(), 'label', $labels ) );
+ $termRows = array_merge( $termRows, $this->getTermRows(
$entity->getId(), 'description', $descriptions ) );
+ $termRows = array_merge( $termRows, $this->getTermRows(
$entity->getId(), 'alias', $aliases ) );
if ( $entity instanceof Property ) {
$infoRows[] = array(
diff --git a/lib/tests/phpunit/store/TermIndexTest.php
b/lib/tests/phpunit/store/TermIndexTest.php
index f1ff80f..83c7dbf 100644
--- a/lib/tests/phpunit/store/TermIndexTest.php
+++ b/lib/tests/phpunit/store/TermIndexTest.php
@@ -509,7 +509,7 @@
$deFooBarP6 = Property::newFromType( 'string' );
$deFooBarP6->setId( new PropertyId( 'P6' ) );
$deFooBarP6->setLabel( 'de', 'Foo' );
- $deFooBarP6->addAliases( 'de', array( 'AFoo' ) );
+ $deFooBarP6->setAliases( 'de', array( 'AFoo' ) );
$deFooBarP6->setDescription( 'de', 'Bar' );
$entities = array(
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index a3a52b0..9feee44 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -667,10 +667,10 @@
if ( $content && !$content->isRedirect() ) {
$entity = $content->getEntity();
- $language = $searchPage->getLanguage();
- $description = $entity->getDescription(
$language->getCode() ); // TODO: language fallback!
+ $languageCode =
$searchPage->getLanguage()->getCode(); // TODO: language fallback!
- if ( $description !== false && $description !==
'' ) {
+ if ( $entity->getFingerprint()->hasDescription(
$languageCode ) ) {
+ $description =
$entity->getFingerprint()->getDescription( $languageCode )->getText();
$attr = array( 'class' =>
'wb-itemlink-description' );
$link .= wfMessage( 'colon-separator'
)->text();
$link .= Html::element( 'span', $attr,
$description );
diff --git a/repo/includes/ChangeOp/ChangeOpsMerge.php
b/repo/includes/ChangeOp/ChangeOpsMerge.php
index 3fc814c..02271d9 100644
--- a/repo/includes/ChangeOp/ChangeOpsMerge.php
+++ b/repo/includes/ChangeOp/ChangeOpsMerge.php
@@ -162,8 +162,9 @@
private function generateLabelsChangeOps() {
foreach (
$this->fromItem->getFingerprint()->getLabels()->toTextArray() as $langCode =>
$label ) {
- $toLabel = $this->toItem->getLabel( $langCode );
- if ( $toLabel === false || $toLabel === $label ) {
+ if ( !$this->toItem->getFingerprint()->hasLabel(
$langCode )
+ || $this->toItem->getFingerprint()->getLabel(
$langCode )->getText() === $label
+ ) {
$this->fromChangeOps->add(
$this->getFingerprintChangeOpFactory()->newRemoveLabelOp( $langCode ) );
$this->toChangeOps->add(
$this->getFingerprintChangeOpFactory()->newSetLabelOp( $langCode, $label ) );
} else {
@@ -175,8 +176,9 @@
private function generateDescriptionsChangeOps() {
foreach (
$this->fromItem->getFingerprint()->getDescriptions()->toTextArray() as
$langCode => $desc ) {
- $toDescription = $this->toItem->getDescription(
$langCode );
- if ( $toDescription === false || $toDescription ===
$desc ) {
+ if ( !$this->toItem->getFingerprint()->hasDescription(
$langCode )
+ ||
$this->toItem->getFingerprint()->getDescription( $langCode )->getText() ===
$desc
+ ) {
$this->fromChangeOps->add(
$this->getFingerprintChangeOpFactory()->newRemoveDescriptionOp( $langCode ) );
$this->toChangeOps->add(
$this->getFingerprintChangeOpFactory()->newSetDescriptionOp( $langCode, $desc )
);
} else {
@@ -195,9 +197,9 @@
}
private function generateSitelinksChangeOps() {
- foreach ( $this->fromItem->getSiteLinks() as $fromSiteLink ) {
+ foreach ( $this->fromItem->getSiteLinkList()->toArray() as
$fromSiteLink ) {
$siteId = $fromSiteLink->getSiteId();
- if ( !$this->toItem->hasLinkToSite( $siteId ) ) {
+ if (
!$this->toItem->getSiteLinkList()->hasLinkWithSiteId( $siteId ) ) {
$this->generateSitelinksChangeOpsWithNoConflict( $fromSiteLink );
} else {
$this->generateSitelinksChangeOpsWithConflict(
$fromSiteLink );
diff --git a/repo/includes/actions/HistoryEntityAction.php
b/repo/includes/actions/HistoryEntityAction.php
index d167c49..c89f389 100644
--- a/repo/includes/actions/HistoryEntityAction.php
+++ b/repo/includes/actions/HistoryEntityAction.php
@@ -76,7 +76,8 @@
$entity = $content->getEntity();
$languageFallbackChain = $this->getLanguageFallbackChain();
- $labelData =
$languageFallbackChain->extractPreferredValueOrAny( $entity->getLabels() );
+ $labels = $entity->getFingerprint()->getLabels()->toTextArray();
+ $labelData =
$languageFallbackChain->extractPreferredValueOrAny( $labels );
if ( $labelData ) {
$labelText = $labelData['value'];
diff --git a/repo/includes/api/SetAliases.php b/repo/includes/api/SetAliases.php
index 325bcfe..8f8ca2b 100644
--- a/repo/includes/api/SetAliases.php
+++ b/repo/includes/api/SetAliases.php
@@ -128,7 +128,11 @@
$summary->setLanguage( $language );
// Get the full list of current aliases
- $summary->addAutoSummaryArgs( $entity->getAliases(
$language ) );
+ $fingerprint = $entity->getFingerprint();
+ $aliases = $fingerprint->hasAliasGroup( $language )
+ ? $fingerprint->getAliasGroup( $language
)->getAliases()
+ : array();
+ $summary->addAutoSummaryArgs( $aliases );
}
$fingerprint = $entity->getFingerprint();
diff --git a/repo/includes/content/EntityContent.php
b/repo/includes/content/EntityContent.php
index d808c33..25cd290 100644
--- a/repo/includes/content/EntityContent.php
+++ b/repo/includes/content/EntityContent.php
@@ -425,7 +425,9 @@
/* @var Language $language */
$language = $GLOBALS['wgLang'];
- $description = $this->getEntity()->getDescription(
$language->getCode() );
+ $fingerprint = $this->getEntity()->getFingerprint();
+ $description = $fingerprint->hasDescription(
$language->getCode() )
+ ? $fingerprint->getDescription( $language->getCode()
)->getText() : '';
return substr( $description, 0, $maxLength );
}
diff --git a/repo/includes/specials/SpecialSetAliases.php
b/repo/includes/specials/SpecialSetAliases.php
index 5bb7d5d..9a9bda9 100644
--- a/repo/includes/specials/SpecialSetAliases.php
+++ b/repo/includes/specials/SpecialSetAliases.php
@@ -66,7 +66,8 @@
$summary = new Summary( 'wbsetaliases' );
if ( $value === '' ) {
- $changeOp =
$this->termChangeOpFactory->newRemoveAliasesOp( $languageCode,
$entity->getAliases( $languageCode ) );
+ $aliases = $entity->getFingerprint()->getAliasGroup(
$languageCode )->getAliases();
+ $changeOp =
$this->termChangeOpFactory->newRemoveAliasesOp( $languageCode, $aliases );
} else {
$changeOp =
$this->termChangeOpFactory->newSetAliasesOp( $languageCode, explode( '|',
$value ) );
}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
index 4f062ca..5bd67a1 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
@@ -61,7 +61,11 @@
$changeOpDescription->apply( $entity );
- $this->assertEquals( $expectedDescription,
$entity->getDescription( 'en' ) );
+ if ( $expectedDescription === '' ) {
+ $this->assertFalse(
$entity->getFingerprint()->hasDescription( 'en' ) );
+ } else {
+ $this->assertEquals( $expectedDescription,
$entity->getFingerprint()->getDescription( 'en' )->getText() );
+ }
}
public function validateProvider() {
@@ -87,13 +91,14 @@
public function testValidate( ChangeOp $changeOp, $valid ) {
$entity = $this->provideNewEntity();
- $oldLabels = $entity->getDescriptions();
+ $oldDescriptions =
$entity->getFingerprint()->getDescriptions()->toTextArray();
$result = $changeOp->validate( $entity );
$this->assertEquals( $valid, $result->isValid(), 'isValid()' );
- // labels should not have changed during validation
- $this->assertEquals( $oldLabels, $entity->getDescriptions(),
'Descriptions modified by validation!' );
+ // descriptions should not have changed during validation
+ $newDescriptions =
$entity->getFingerprint()->getDescriptions()->toTextArray();
+ $this->assertEquals( $oldDescriptions, $newDescriptions,
'Descriptions modified by validation!' );
}
/**
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
index 9de6652..feb815b 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
@@ -61,7 +61,11 @@
$changeOpLabel->apply( $entity );
- $this->assertEquals( $expectedLabel, $entity->getLabel( 'en' )
);
+ if ( $expectedLabel === '' ) {
+ $this->assertFalse(
$entity->getFingerprint()->hasLabel( 'en' ) );
+ } else {
+ $this->assertEquals( $expectedLabel,
$entity->getFingerprint()->getLabel( 'en' )->getText() );
+ }
}
public function validateProvider() {
@@ -87,13 +91,14 @@
public function testValidate( ChangeOp $changeOp, $valid ) {
$entity = $this->provideNewEntity();
- $oldLabels = $entity->getLabels();
+ $oldLabels =
$entity->getFingerprint()->getLabels()->toTextArray();
$result = $changeOp->validate( $entity );
$this->assertEquals( $valid, $result->isValid(), 'isValid()' );
// labels should not have changed during validation
- $this->assertEquals( $oldLabels, $entity->getLabels(), 'Labels
modified by validation!' );
+ $newLabels =
$entity->getFingerprint()->getLabels()->toTextArray();
+ $this->assertEquals( $oldLabels, $newLabels, 'Labels modified
by validation!' );
}
/**
@@ -122,7 +127,7 @@
$args[] = array( $entity, new ChangeOpLabel( 'de', null,
$validatorFactory ), 'remove', 'de' );
$entity = $this->provideNewEntity();
- $entity->removeLabel( 'de' );
+ $entity->getFingerprint()->removeLabel( 'de' );
$args[] = array( $entity, new ChangeOpLabel( 'de',
'Zusammenfassung', $validatorFactory
), 'add', 'de' );
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
index 20f8426..ea8a0bf 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
@@ -276,7 +276,7 @@
}
public function detectLabelConflictsForEntity( Entity $entity ) {
- foreach ( $entity->getLabels() as $lang => $label ) {
+ foreach ( $entity->getFingerprint()->getLabels()->toTextArray()
as $lang => $label ) {
if ( $label === 'DUPE' ) {
return Result::newError( array(
Error::newError(
@@ -298,13 +298,13 @@
}
public function detectLabelDescriptionConflictsForEntity( Entity
$entity ) {
- foreach ( $entity->getLabels() as $lang => $label ) {
- $description = $entity->getDescription( $lang );
-
- if ( $description === null ) {
+ foreach ( $entity->getFingerprint()->getLabels()->toTextArray()
as $lang => $label ) {
+ if ( !$entity->getFingerprint()->hasDescription( $lang
) ) {
continue;
}
+ $description =
$entity->getFingerprint()->getDescription( $lang )->getText();
+
if ( $label === 'DUPE' && $description === 'DUPE' ) {
return Result::newError( array(
Error::newError(
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
index 4c4d891..9356aab 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
@@ -126,8 +126,8 @@
$entity = new Item();
$changeOps->apply( $entity );
- $this->assertEquals( $expectedLabel, $entity->getLabel(
$language ) );
- $this->assertEquals( $expectedDescription,
$entity->getDescription( $language ) );
+ $this->assertEquals( $expectedLabel,
$entity->getFingerprint()->getLabel( $language )->getText() );
+ $this->assertEquals( $expectedDescription,
$entity->getFingerprint()->getDescription( $language )->getText() );
}
public function testValidate() {
@@ -165,7 +165,7 @@
->method( 'validate' )
->will( $this->returnCallback( function( Item $item ) {
// Fail when the label is already set (by a
previous apply call).
- return $item->getLabel( 'en' )
+ return $item->getFingerprint()->hasLabel( 'en' )
? Result::newError( array() )
: Result::newSuccess();
} ) );
diff --git a/repo/tests/phpunit/includes/actions/EditEntityActionTest.php
b/repo/tests/phpunit/includes/actions/EditEntityActionTest.php
index d7d8328..704eddf 100644
--- a/repo/tests/phpunit/includes/actions/EditEntityActionTest.php
+++ b/repo/tests/phpunit/includes/actions/EditEntityActionTest.php
@@ -802,15 +802,15 @@
$item = $this->loadTestItem( $handle );
if ( isset( $expected['labels'] ) ) {
- $this->assertArrayEquals( $expected['labels'],
$item->getLabels(), false, true );
+ $this->assertArrayEquals( $expected['labels'],
$item->getFingerprint()->getLabels()->toTextArray(), false, true );
}
if ( isset( $expected['descriptions'] ) ) {
- $this->assertArrayEquals( $expected['descriptions'],
$item->getDescriptions(), false, true );
+ $this->assertArrayEquals( $expected['descriptions'],
$item->getFingerprint()->getDescriptions()->toTextArray(), false, true );
}
if ( isset( $expected['aliases'] ) ) {
- $this->assertArrayEquals( $expected['aliases'],
$item->getAllAliases(), false, true );
+ $this->assertArrayEquals( $expected['aliases'],
$item->getFingerprint()->getAliasGroups()->toTextArray(), false, true );
}
if ( isset( $expected['sitelinks'] ) ) {
diff --git a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index 8653af6..b3e7702 100644
--- a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -437,12 +437,12 @@
//Basic
$item->setLabel( 'de', 'foo' );
$item->setLabel( 'zh_classical', 'Longer Label' );
- $item->addAliases( 'en', array( 'bar', 'baz' ) );
- $item->addAliases( 'zh', array( '????????' ) );
+ $item->setAliases( 'en', array( 'bar', 'baz' ) );
+ $item->setAliases( 'zh', array( '????????' ) );
$item->setDescription( 'pt', 'ptDesc' );
$item->setDescription( 'pl', 'Longer Description For An Item' );
- $item->addSiteLink( new SiteLink( 'enwiki', 'Berlin', array(
new ItemId( 'Q333' ) ) ) );
- $item->addSiteLink( new SiteLink( 'zh_classicalwiki',
'User:Addshore', array() ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Berlin',
array( new ItemId( 'Q333' ) ) );
+ $item->getSiteLinkList()->addNewSiteLink( 'zh_classicalwiki',
'User:Addshore', array() );
$snak = new PropertyValueSnak( new PropertyId( 'P65' ), new
StringValue( 'snakStringValue' ) );
diff --git a/repo/tests/phpunit/includes/content/EntityHandlerTest.php
b/repo/tests/phpunit/includes/content/EntityHandlerTest.php
index 091af93..1a8af78 100644
--- a/repo/tests/phpunit/includes/content/EntityHandlerTest.php
+++ b/repo/tests/phpunit/includes/content/EntityHandlerTest.php
@@ -107,7 +107,7 @@
*/
public function contentProvider() {
$content = $this->newEntityContent();
- $content->getEntity()->addAliases( 'en', array( 'foo' ) );
+ $content->getEntity()->setAliases( 'en', array( 'foo' ) );
$content->getEntity()->setDescription( 'de', 'foobar' );
$content->getEntity()->setDescription( 'en', 'baz' );
$content->getEntity()->setLabel( 'nl', 'o_O' );
--
To view, visit https://gerrit.wikimedia.org/r/233921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4032fe08bf7aff3700d54e2ee2be029265b5dc3b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
