Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174109
Change subject: Replace some deprecated setClaims with getStatements
......................................................................
Replace some deprecated setClaims with getStatements
Change-Id: Ifb57318b61f7a9e9f11176aed56db14fdd2364c4
---
M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/api/ClaimModificationHelperTest.php
M repo/tests/phpunit/includes/api/SetClaimTest.php
10 files changed, 58 insertions(+), 61 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/09/174109/1
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
index 4026582..7fabcc2 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
@@ -78,11 +78,12 @@
$item = Item::newEmpty();
$item->setId( new ItemId( $itemIdString ) );
- $claim = $item->newClaim( $snak );
- $claim->setGuid( $item->getId()->getSerialization() .
'$D8404CDA-25E4-4334-AG93-A3290BCD9C0P' );
- $claims = new Claims();
- $claims->addClaim( $claim );
- $item->setClaims( $claims );
+ $item->getStatements()->addNewStatement(
+ $snak,
+ null,
+ null,
+ $item->getId()->getSerialization() .
'$D8404CDA-25E4-4334-AG93-A3290BCD9C0P'
+ );
return $item;
}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
index e600cbd..f8c0c10 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
@@ -183,11 +183,12 @@
$item = Item::newEmpty();
$item->setId( new ItemId( $itemIdString ) );
- $claim = $item->newClaim( $snak );
- $claim->setGuid(
$this->mockProvider->getGuidGenerator()->newGuid( $item->getId() ) );
- $claims = new Claims();
- $claims->addClaim( $claim );
- $item->setClaims( $claims );
+ $item->getStatements()->addNewStatement(
+ $snak,
+ null,
+ null,
+ $this->mockProvider->getGuidGenerator()->newGuid(
$item->getId() )
+ );
return $item;
}
diff --git
a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
index 4f6fd94..15349f1 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
@@ -81,13 +81,14 @@
$item = Item::newEmpty();
$item->setId( new ItemId( $itemIdString ) );
- $claim = $item->newClaim( $snak );
- $claim->setGuid( $itemIdString .
'$D8404CDA-25E4-4334-AG03-A3290BCD9CQP' );
- $claims = new Claims();
- $claims->addClaim( $claim );
- $item->setClaims( $claims );
+ $item->getStatements()->addNewStatement(
+ $snak,
+ null,
+ null,
+ $itemIdString . '$D8404CDA-25E4-4334-AG03-A3290BCD9CQP'
+ );
return $item;
}
-}
\ No newline at end of file
+}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
index b861e2a..beb309e 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
@@ -148,11 +148,12 @@
$item = Item::newEmpty();
$item->setId( 123 );
- $claim = $item->newClaim( $snak );
- $claim->setGuid( $item->getId()->getSerialization() .
'$D8404CDA-25E4-4334-AG03-A3290BCD9CQP' );
- $claims = new Claims();
- $claims->addClaim( $claim );
- $item->setClaims( $claims );
+ $item->getStatements()->addNewStatement(
+ $snak,
+ null,
+ null,
+ $item->getId()->getSerialization() .
'$D8404CDA-25E4-4334-AG03-A3290BCD9CQP'
+ );
return $item;
}
diff --git
a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
index 325f58c..e24dc7f 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
@@ -103,11 +103,12 @@
$item = Item::newEmpty();
$item->setId( new ItemId( $itemIdString ) );
- $claim = $item->newClaim( $snak );
- $claim->setGuid( $item->getId()->getSerialization() .
'$D8494TYA-25E4-4334-AG03-A3290BCT9CQP' );
- $claims = new Claims();
- $claims->addClaim( $claim );
- $item->setClaims( $claims );
+ $item->getStatements()->addNewStatement(
+ $snak,
+ null,
+ null,
+ $item->getId()->getSerialization() .
'$D8494TYA-25E4-4334-AG03-A3290BCT9CQP'
+ );
return $item;
}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
index 182982f..6a98857 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
@@ -243,11 +243,12 @@
$item = Item::newEmpty();
$item->setId( 123 );
- $claim = $item->newClaim( $snak );
- $claim->setGuid( $item->getId()->getSerialization() .
'$D8494TYA-25E4-4334-AG03-A3290BCT9CQP' );
- $claims = new Claims();
- $claims->addClaim( $claim );
- $item->setClaims( $claims );
+ $item->getStatements()->addNewStatement(
+ $snak,
+ null,
+ null,
+ $item->getId()->getSerialization() .
'$D8494TYA-25E4-4334-AG03-A3290BCT9CQP'
+ );
return $item;
}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
index b75ad29..8207ea6 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
@@ -5,13 +5,10 @@
use DataValues\StringValue;
use InvalidArgumentException;
use Wikibase\ChangeOp\ChangeOpStatementRank;
-use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\DataModel\Statement\Statement;
-use Wikibase\DataModel\Statement\StatementList;
use Wikibase\Lib\ClaimGuidGenerator;
/**
@@ -86,10 +83,12 @@
$item = Item::newEmpty();
$item->setId( new ItemId( $itemIdString ) );
- $statement = new Statement( new Claim( $mainSnak ) );
- $statement->setGuid( $itemIdString .
'$D8499CDA-25E4-4334-AG03-A3290BCD9CQP' );
- $statements = new StatementList( array( $statement ) );
- $item->setStatements( $statements );
+ $item->getStatements()->addNewStatement(
+ $mainSnak,
+ null,
+ null,
+ $itemIdString . '$D8499CDA-25E4-4334-AG03-A3290BCD9CQP'
+ );
return $item;
}
diff --git a/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
b/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
index 76fdcd8..e833fc2 100644
--- a/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
+++ b/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
@@ -9,7 +9,6 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\DataModel\Statement\StatementList;
use Wikibase\EntityParserOutputGenerator;
use Wikibase\EntityRevision;
use Wikibase\Lib\Store\Sql\SqlEntityInfoBuilderFactory;
@@ -60,15 +59,13 @@
private function newItem() {
$item = Item::newEmpty();
- $statements = new StatementList();
+ $statements = $item->getStatements();
$statements->addNewStatement( new PropertyValueSnak( 42, new
StringValue( 'http://an.url.com' ) ) );
$statements->addNewStatement( new PropertyValueSnak( 42, new
StringValue( 'https://another.url.org' ) ) );
$statements->addNewStatement( new PropertyValueSnak( 10, new
StringValue( 'File:This is a file.pdf' ) ) );
$statements->addNewStatement( new PropertyValueSnak( 10, new
StringValue( 'File:Selfie.jpg' ) ) );
-
- $item->setStatements( $statements );
return $item;
}
diff --git a/repo/tests/phpunit/includes/api/ClaimModificationHelperTest.php
b/repo/tests/phpunit/includes/api/ClaimModificationHelperTest.php
index 6e7702d..0fffcc8 100644
--- a/repo/tests/phpunit/includes/api/ClaimModificationHelperTest.php
+++ b/repo/tests/phpunit/includes/api/ClaimModificationHelperTest.php
@@ -9,9 +9,9 @@
use Wikibase\Api\ApiErrorReporter;
use Wikibase\Api\ClaimModificationHelper;
use Wikibase\Api\CreateClaim;
-use Wikibase\DataModel\Claim\Claims;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Snak\PropertyValueSnak;
+use Wikibase\DataModel\Statement\Statement;
use Wikibase\Lib\Localizer\DispatchingExceptionLocalizer;
use Wikibase\Repo\WikibaseRepo;
@@ -75,9 +75,7 @@
$snak = new PropertyValueSnak( 2754236, new StringValue( 'test'
) );
$claim = $item->newClaim( $snak );
$claim->setGuid( 'q42$D8404CDA-25E4-4334-AF13-A3290BCD9C0F' );
- $claims = new Claims();
- $claims->addClaim( $claim );
- $item->setClaims( $claims );
+ $item->getStatements()->addStatement( new Statement( $claim ) );
$claimGuid = $claim->getGuid();
$this->assertEquals( $claim,
$claimModificationHelper->getClaimFromEntity( $claimGuid, $item ) );
diff --git a/repo/tests/phpunit/includes/api/SetClaimTest.php
b/repo/tests/phpunit/includes/api/SetClaimTest.php
index 03d1314..e39e753 100644
--- a/repo/tests/phpunit/includes/api/SetClaimTest.php
+++ b/repo/tests/phpunit/includes/api/SetClaimTest.php
@@ -247,25 +247,22 @@
public function testSetClaimAtIndex() {
$store = WikibaseRepo::getDefaultInstance()->getEntityStore();
- // Generate an item with some claims:
$item = Item::newEmpty();
- $claims = new Claims();
- // Initialize item content with empty claims:
- $item->setClaims( $claims );
$store->saveEntity( $item, 'setclaimtest', $GLOBALS['wgUser'],
EDIT_NEW );
$itemId = $item->getId();
$guidGenerator = new ClaimGuidGenerator();
for ( $i = 1; $i <= 3; $i++ ) {
- $preexistingClaim = $item->newClaim( new
PropertyNoValueSnak( $i ) );
- $preexistingClaim->setGuid( $guidGenerator->newGuid(
$itemId ) );
- $claims->addClaim( $preexistingClaim );
+ $item->getStatements()->addNewStatement(
+ new PropertyNoValueSnak( $i ),
+ null,
+ null,
+ $guidGenerator->newGuid( $itemId )
+ );
}
- // Add preexisting claims:
- $item->setClaims( $claims );
$store->saveEntity( $item, 'setclaimtest', $GLOBALS['wgUser'],
EDIT_UPDATE );
$guid = $guidGenerator->newGuid( $itemId );
@@ -398,19 +395,19 @@
// Initialize item content with empty claims:
$item = Item::newEmpty();
- $claims = new Claims();
- $item->setClaims( $claims );
$store->saveEntity( $item, 'setclaimtest', $GLOBALS['wgUser'],
EDIT_NEW );
// Generate a single claim:
$itemId = $item->getId();
$guidGenerator = new ClaimGuidGenerator();
- $preexistingClaim = $item->newClaim( new PropertyNoValueSnak(
self::$propertyIds[1] ) );
- $preexistingClaim->setGuid( $guidGenerator->newGuid( $itemId )
);
- $claims->addClaim( $preexistingClaim );
// Save the single claim
- $item->setClaims( $claims );
+ $item->getStatements()->addNewStatement(
+ new PropertyNoValueSnak( self::$propertyIds[1] ),
+ null,
+ null,
+ $guidGenerator->newGuid( $itemId )
+ );
$revision = $store->saveEntity( $item, 'setclaimtest',
$GLOBALS['wgUser'], EDIT_UPDATE );
// Add new claim at index 3 using the baserevid and a different
property id
--
To view, visit https://gerrit.wikimedia.org/r/174109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb57318b61f7a9e9f11176aed56db14fdd2364c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
