Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/202389
Change subject: Replace deprecated Entity::addClaim ...................................................................... Replace deprecated Entity::addClaim This is some simple refactoring, required for https://github.com/wmde/WikibaseDataModel/issues/282. Bug: T78290 Change-Id: I393edbb5e5aaeb8e09b817650f67abd216e612a1 --- M client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php M repo/tests/phpunit/includes/api/ApiXmlFormatTest.php M repo/tests/phpunit/includes/api/GetClaimsTest.php M repo/tests/phpunit/includes/api/RemoveClaimsTest.php M repo/tests/phpunit/includes/api/RemoveQualifiersTest.php M repo/tests/phpunit/includes/api/RemoveReferencesTest.php M repo/tests/phpunit/includes/api/ResultBuilderTest.php M repo/tests/phpunit/includes/api/SetClaimTest.php M repo/tests/phpunit/includes/api/SetClaimValueTest.php M repo/tests/phpunit/includes/api/SetQualifierTest.php M repo/tests/phpunit/includes/api/SetReferenceTest.php M repo/tests/phpunit/includes/content/ItemContentTest.php M view/tests/phpunit/ItemViewTest.php M view/tests/phpunit/PropertyViewTest.php 17 files changed, 73 insertions(+), 110 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/89/202389/1 diff --git a/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php b/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php index d1792ff..69cc56b 100644 --- a/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php +++ b/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php @@ -11,9 +11,11 @@ use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\SiteLink; +use Wikibase\DataModel\SiteLinkList; use Wikibase\DataModel\Snak\Snak; use Wikibase\DataModel\Snak\SnakList; use Wikibase\DataModel\Statement\Statement; +use Wikibase\DataModel\Statement\StatementList; use Wikibase\SnakFactory; use Wikibase\Test\MockClientStore; @@ -127,25 +129,21 @@ /** * @param ItemId $id * @param string[] $labels - * @param Claim[]|null $claims + * @param Statement[]|null $statements * @param SiteLink[]|null $siteLinks * * @return Item */ - private function createTestItem( ItemId $id, array $labels, array $claims = null, array $siteLinks = null ) { + private function createTestItem( ItemId $id, array $labels, array $statements = null, array $siteLinks = null ) { $item = new Item( $id ); $item->setLabels( $labels ); - if ( is_array( $siteLinks ) ) { - foreach( $siteLinks as $siteLink ) { - $item->addSiteLink( $siteLink ); - } + if ( $statements !== null ) { + $item->setStatements( new StatementList( $statements ) ); } - if ( is_array( $claims ) ) { - foreach( $claims as $claim ) { - $item->addClaim( $claim ); - } + if ( $siteLinks !== null ) { + $item->setSiteLinkList( new SiteLinkList( $siteLinks ) ); } $this->mockRepository->putEntity( $item ); diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php index 0f727d8..a30f5ce 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php @@ -16,7 +16,6 @@ use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\DataModel\Snak\Snak; use Wikibase\DataModel\Snak\SnakList; -use Wikibase\DataModel\Statement\Statement; use Wikibase\Lib\ClaimGuidGenerator; /** @@ -166,9 +165,9 @@ $oldSnak = new PropertyValueSnak( $p11, new StringValue( "old qualifier" ) ); - $claim = new Statement( new Claim( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ) ); - $claim->setGuid( $claimGuid ); - $item->addClaim( $claim ); + $snak = new PropertyNoValueSnak( $p11 ); + $qualifiers = new SnakList( array( $oldSnak ) ); + $item->getStatements()->addNewStatement( $snak, $qualifiers, null, $claimGuid ); //NOTE: the mock validator will consider the string "INVALID" to be invalid. $goodSnak = new PropertyValueSnak( $p11, new StringValue( 'good' ) ); @@ -209,9 +208,9 @@ $oldSnak = new PropertyValueSnak( $p11, new StringValue( "old qualifier" ) ); - $claim = new Statement( new Claim( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ) ); - $claim->setGuid( $claimGuid ); - $item->addClaim( $claim ); + $snak = new PropertyNoValueSnak( $p11 ); + $qualifiers = new SnakList( array( $oldSnak ) ); + $item->getStatements()->addNewStatement( $snak, $qualifiers, null, $claimGuid ); //NOTE: the mock validator will consider the string "INVALID" to be invalid. $badSnak = new PropertyValueSnak( $p11, new StringValue( 'INVALID' ) ); diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php index ffb4521..248d25c 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php @@ -6,7 +6,6 @@ use DataValues\StringValue; use InvalidArgumentException; use Wikibase\ChangeOp\ChangeOpReference; -use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; @@ -262,9 +261,9 @@ $oldSnak = new PropertyValueSnak( $p11, new StringValue( "old reference" ) ); $oldReference = new Reference( new SnakList( array( $oldSnak ) ) ); - $claim = new Statement( new Claim( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ) ); - $claim->setGuid( $claimGuid ); - $item->addClaim( $claim ); + $snak = new PropertyNoValueSnak( $p11 ); + $qualifiers = new SnakList( array( $oldSnak ) ); + $item->getStatements()->addNewStatement( $snak, $qualifiers, null, $claimGuid ); $goodSnak = new PropertyValueSnak( $p11, new StringValue( 'good' ) ); @@ -309,9 +308,9 @@ $oldSnak = new PropertyValueSnak( $p11, new StringValue( "old reference" ) ); $oldReference = new Reference( new SnakList( array( $oldSnak ) ) ); - $claim = new Statement( new Claim( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ) ); - $claim->setGuid( $claimGuid ); - $item->addClaim( $claim ); + $snak = new PropertyNoValueSnak( $p11 ); + $qualifiers = new SnakList( array( $oldSnak ) ); + $item->getStatements()->addNewStatement( $snak, $qualifiers, null, $claimGuid ); //NOTE: the mock validator will consider the string "INVALID" to be invalid. $badSnak = new PropertyValueSnak( $p11, new StringValue( 'INVALID' ) ); diff --git a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php index 706572d..58bf7dd 100644 --- a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php +++ b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php @@ -3,15 +3,12 @@ namespace Wikibase\Test; use Language; -use MediaWikiTestCase; -use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityIdValue; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Snak\PropertyValueSnak; -use Wikibase\DataModel\Statement\Statement; use Wikibase\LanguageFallbackChain; use Wikibase\LanguageFallbackChainFactory; use Wikibase\Lib\Serializers\SerializationOptions; @@ -105,11 +102,8 @@ new PropertyId( 'P794' ), new EntityIdValue( new ItemId( 'Q9000' ) ) ); - - $statement = new Statement( new Claim( $snak ) ); - $statement->setGuid( 'P794$muahahaha' ); - - $item->addClaim( $statement ); + $guid = 'P794$muahahaha'; + $item->getStatements()->addNewStatement( $snak, null, null, $guid ); return $item; } diff --git a/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php b/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php index ea671b6..9fb8029 100644 --- a/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php +++ b/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php @@ -5,11 +5,9 @@ use ApiBase; use ApiMain; use FauxRequest; -use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Snak\PropertyNoValueSnak; -use Wikibase\DataModel\Statement\Statement; use Wikibase\EntityRevision; use Wikibase\Repo\WikibaseRepo; @@ -160,13 +158,12 @@ $item = new Item(); $entityRevision = $store->saveEntity( $item, 'testing', $GLOBALS['wgUser'], EDIT_NEW ); + /** @var Item $item */ $item = $entityRevision->getEntity(); - $snak = new PropertyNoValueSnak( $propertyId->getNumericId() ); - $statement = new Statement( new Claim( $snak ) ); - - $statement->setGuid( $item->getId()->getSerialization() . '$kittens' ); - $item->addClaim( $statement ); + $snak = new PropertyNoValueSnak( $propertyId ); + $guid = $item->getId()->getSerialization() . '$kittens'; + $item->getStatements()->addNewStatement( $snak, null, null, $guid ); $entityRevision = $store->saveEntity( $item, 'testing more!', $GLOBALS['wgUser'] ); return $entityRevision; diff --git a/repo/tests/phpunit/includes/api/GetClaimsTest.php b/repo/tests/phpunit/includes/api/GetClaimsTest.php index 40cc8e5..d5819df 100644 --- a/repo/tests/phpunit/includes/api/GetClaimsTest.php +++ b/repo/tests/phpunit/includes/api/GetClaimsTest.php @@ -72,7 +72,7 @@ foreach ( $statements as $key => $statement ) { $statement->setGuid( $item->getId()->getSerialization() . '$D8404CDA-56A1-4334-AF13-A3290BCD9CL' . $key ); - $item->addClaim( $statement ); + $item->getStatements()->addStatement( $statement ); } } diff --git a/repo/tests/phpunit/includes/api/RemoveClaimsTest.php b/repo/tests/phpunit/includes/api/RemoveClaimsTest.php index 732ca0f..43e634b 100644 --- a/repo/tests/phpunit/includes/api/RemoveClaimsTest.php +++ b/repo/tests/phpunit/includes/api/RemoveClaimsTest.php @@ -60,7 +60,7 @@ foreach ( $statements as $statement ) { $guidGenerator = new ClaimGuidGenerator(); $statement->setGuid( $guidGenerator->newGuid( $item->getId() ) ); - $item->addClaim( $statement ); + $item->getStatements()->addStatement( $statement ); } $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_UPDATE ); diff --git a/repo/tests/phpunit/includes/api/RemoveQualifiersTest.php b/repo/tests/phpunit/includes/api/RemoveQualifiersTest.php index 26cc2be..cf3b46f 100644 --- a/repo/tests/phpunit/includes/api/RemoveQualifiersTest.php +++ b/repo/tests/phpunit/includes/api/RemoveQualifiersTest.php @@ -81,7 +81,7 @@ $guidGenerator = new ClaimGuidGenerator(); $statement->setGuid( $guidGenerator->newGuid( $item->getId() ) ); - $item->addClaim( $statement ); + $item->getStatements()->addStatement( $statement ); $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_UPDATE ); diff --git a/repo/tests/phpunit/includes/api/RemoveReferencesTest.php b/repo/tests/phpunit/includes/api/RemoveReferencesTest.php index c06c260..b834c5c 100644 --- a/repo/tests/phpunit/includes/api/RemoveReferencesTest.php +++ b/repo/tests/phpunit/includes/api/RemoveReferencesTest.php @@ -81,7 +81,7 @@ $guidGenerator = new ClaimGuidGenerator(); $statement->setGuid( $guidGenerator->newGuid( $item->getId() ) ); - $item->addClaim( $statement ); + $item->getStatements()->addStatement( $statement ); $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_UPDATE ); diff --git a/repo/tests/phpunit/includes/api/ResultBuilderTest.php b/repo/tests/phpunit/includes/api/ResultBuilderTest.php index 776596d..3a893a4 100644 --- a/repo/tests/phpunit/includes/api/ResultBuilderTest.php +++ b/repo/tests/phpunit/includes/api/ResultBuilderTest.php @@ -15,7 +15,6 @@ use Wikibase\DataModel\Snak\PropertySomeValueSnak; use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\DataModel\Snak\SnakList; -use Wikibase\DataModel\Statement\Statement; use Wikibase\EntityRevision; use Wikibase\Lib\Serializers\SerializationOptions; use Wikibase\Lib\Serializers\SerializerFactory; @@ -158,22 +157,20 @@ $item->addSiteLink( new SiteLink( 'enwiki', 'Berlin', array( new ItemId( 'Q333' ) ) ) ); $item->addSiteLink( new SiteLink( 'zh_classicalwiki', 'User:Addshore', array() ) ); - $statement = new Statement( new Claim( new PropertySomeValueSnak( new PropertyId( 'P65' ) ) ) ); - $statement->setGuid( 'imaguid' ); + $snak = new PropertySomeValueSnak( new PropertyId( 'P65' ) ); $qualifiers = new SnakList(); $qualifiers->addSnak( new PropertySomeValueSnak( new PropertyId( 'P65' ) ) ); $qualifiers->addSnak( new PropertyValueSnak( new PropertyId( 'P65' ), new StringValue( 'string!' ) ) ); - $statement->setQualifiers( $qualifiers ); $references = new ReferenceList(); $referenceSnaks = new SnakList(); $referenceSnaks->addSnak( new PropertySomeValueSnak( new PropertyId( 'P65' ) ) ); $referenceSnaks->addSnak( new PropertySomeValueSnak( new PropertyId( 'P68' ) ) ); $references->addReference( new Reference( $referenceSnaks ) ); - $statement->setReferences( $references ); - $item->addClaim( $statement ); + $guid = 'imaguid'; + $item->getStatements()->addNewStatement( $snak, $qualifiers, $references, $guid ); $entityRevision = new EntityRevision( $item, 33, '20131126202923' ); diff --git a/repo/tests/phpunit/includes/api/SetClaimTest.php b/repo/tests/phpunit/includes/api/SetClaimTest.php index 753d348..74a05e0 100644 --- a/repo/tests/phpunit/includes/api/SetClaimTest.php +++ b/repo/tests/phpunit/includes/api/SetClaimTest.php @@ -420,20 +420,19 @@ $store = WikibaseRepo::getDefaultInstance()->getEntityStore(); $serializerFactory = new SerializerFactory(); - // create property $property = Property::newFromType( 'quantity' ); $property = $store->saveEntity( $property, '', $GLOBALS['wgUser'], EDIT_NEW )->getEntity(); - // create item $item = new Item(); + /** @var Item $item */ $item = $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_NEW )->getEntity(); // add a claim $guidGenerator = new ClaimGuidGenerator(); - $claim = new Statement( new Claim( new PropertyNoValueSnak( $property->getId() ) ) ); - $claim->setGuid( $guidGenerator->newGuid( $item->getId() ) ); + $statement = new Statement( new Claim( new PropertyNoValueSnak( $property->getId() ) ) ); + $statement->setGuid( $guidGenerator->newGuid( $item->getId() ) ); - $item->addClaim( $claim ); + $item->getStatements()->addStatement( $statement ); $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_UPDATE ); // try to change the main snak's property @@ -442,7 +441,7 @@ $badClaim = new Statement( new Claim( new PropertyNoValueSnak( $badProperty->getId() ) ) ); - $serializer = $serializerFactory->newSerializerForObject( $claim ); + $serializer = $serializerFactory->newSerializerForObject( $statement ); $serializedBadClaim = $serializer->getSerialized( $badClaim ); $params = array( diff --git a/repo/tests/phpunit/includes/api/SetClaimValueTest.php b/repo/tests/phpunit/includes/api/SetClaimValueTest.php index 7badc3b..206ca1a 100644 --- a/repo/tests/phpunit/includes/api/SetClaimValueTest.php +++ b/repo/tests/phpunit/includes/api/SetClaimValueTest.php @@ -19,7 +19,6 @@ use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Snak\PropertyValueSnak; -use Wikibase\DataModel\Statement\Statement; use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\EntityIdPlainLinkFormatter; use Wikibase\Lib\EntityIdValueFormatter; @@ -77,11 +76,12 @@ $store = WikibaseRepo::getDefaultInstance()->getEntityStore(); $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_NEW ); - $statement = new Statement( new Claim( new PropertyValueSnak( $propertyId, new StringValue( 'o_O' ) ) ) ); - $statement->setGuid( $item->getId()->getSerialization() . '$D8404CDA-25E4-4334-AG93-A3290BCD9C0P' ); - $item->addClaim( $statement ); + $snak = new PropertyValueSnak( $propertyId, new StringValue( 'o_O' ) ); + $guid = $item->getId()->getSerialization() . '$D8404CDA-25E4-4334-AG93-A3290BCD9C0P'; + $item->getStatements()->addNewStatement( $snak, null, null, $guid ); $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_UPDATE ); + return $item; } diff --git a/repo/tests/phpunit/includes/api/SetQualifierTest.php b/repo/tests/phpunit/includes/api/SetQualifierTest.php index b9b3fd1..e8e0bdf 100644 --- a/repo/tests/phpunit/includes/api/SetQualifierTest.php +++ b/repo/tests/phpunit/includes/api/SetQualifierTest.php @@ -12,7 +12,6 @@ use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\DataModel\Snak\Snak; -use Wikibase\DataModel\Statement\Statement; use Wikibase\Lib\ClaimGuidGenerator; use Wikibase\Repo\WikibaseRepo; @@ -95,11 +94,11 @@ $prop = Property::newFromType( 'string' ); $propId = $this->makeProperty( $prop )->getId(); - $claim = new Statement( new Claim( new PropertyValueSnak( $propId, new StringValue( '^_^' ) ) ) ); + $snak = new PropertyValueSnak( $propId, new StringValue( '^_^' ) ); $guidGenerator = new ClaimGuidGenerator(); - $claim->setGuid( $guidGenerator->newGuid( $newItem->getId() ) ); - $newItem->addClaim( $claim ); + $guid = $guidGenerator->newGuid( $newItem->getId() ); + $newItem->getStatements()->addNewStatement( $snak, null, null, $guid ); $store->saveEntity( $newItem, '', $GLOBALS['wgUser'], EDIT_UPDATE ); $item = $newItem; diff --git a/repo/tests/phpunit/includes/api/SetReferenceTest.php b/repo/tests/phpunit/includes/api/SetReferenceTest.php index a196cd3..455facb 100644 --- a/repo/tests/phpunit/includes/api/SetReferenceTest.php +++ b/repo/tests/phpunit/includes/api/SetReferenceTest.php @@ -70,16 +70,10 @@ $item = new Item(); $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_NEW ); - $statement = new Statement( new Claim( new PropertyNoValueSnak( self::$propertyIds[0] ) ) ); - $statement->setGuid( $item->getId()->getSerialization() . '$D8505CDA-25E4-4334-AG93-A3290BCD9C0P' ); - - $reference = new Reference( new SnakList( - array( new PropertySomeValueSnak( 100 ) ) - ) ); - - $statement->getReferences()->addReference( $reference ); - - $item->addClaim( $statement ); + $snak = new PropertyNoValueSnak( self::$propertyIds[0] ); + $reference = new Reference( array( new PropertySomeValueSnak( 100 ) ) ); + $guid = $item->getId()->getSerialization() . '$D8505CDA-25E4-4334-AG93-A3290BCD9C0P'; + $item->getStatements()->addNewStatement( $snak, null, array( $reference ), $guid ); $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_UPDATE ); @@ -90,14 +84,14 @@ ) ); $serializedReference = $this->makeValidRequest( - $statement->getGuid(), + $guid, $referenceHash, $reference ); // Since the reference got modified, the hash should no longer match $this->makeInvalidRequest( - $statement->getGuid(), + $guid, $referenceHash, $reference ); @@ -113,7 +107,7 @@ // Set reference with two snaks: $serializedReference = $this->makeValidRequest( - $statement->getGuid(), + $guid, $referenceHash, $reference ); @@ -126,7 +120,7 @@ // Make another request with reordered snaks-order: $this->makeValidRequest( - $statement->getGuid(), + $guid, $referenceHash, $serializedReference ); @@ -139,19 +133,16 @@ $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_NEW ); // Create a statement to act upon: - $statement = new Statement( new Claim( new PropertyNoValueSnak( self::$propertyIds[0] ) ) ); - $statement->setGuid( - $item->getId()->getSerialization() . '$D8505CDA-25E4-4334-AG93-A3290BCD9C0P' - ); - - $item->addClaim( $statement ); + $snak = new PropertyNoValueSnak( self::$propertyIds[0] ); + $guid = $item->getId()->getSerialization() . '$D8505CDA-25E4-4334-AG93-A3290BCD9C0P'; + $item->getStatements()->addNewStatement( $snak, null, null, $guid ); $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_UPDATE ); $snak = new PropertySomeValueSnak( new PropertyId( 'P23728525' ) ); $reference = new Reference( new SnakList( array( $snak ) ) ); - $this->makeInvalidRequest( $statement->getGuid(), null, $reference, 'modification-failed' ); + $this->makeInvalidRequest( $guid, null, $reference, 'modification-failed' ); } public function testSettingIndex() { @@ -162,9 +153,8 @@ // Create a statement to act upon: $statement = new Statement( new Claim( new PropertyNoValueSnak( self::$propertyIds[0] ) ) ); - $statement->setGuid( - $item->getId()->getSerialization() . '$D8505CDA-25E4-4334-AG93-A3290BCD9C0P' - ); + $guid = $item->getId()->getSerialization() . '$D8505CDA-25E4-4334-AG93-A3290BCD9C0P'; + $statement->setGuid( $guid ); // Pre-fill statement with three references: $references = array( @@ -177,12 +167,12 @@ $statement->getReferences()->addReference( $reference ); } - $item->addClaim( $statement ); + $item->getStatements()->addStatement( $statement ); $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_UPDATE ); $this->makeValidRequest( - $statement->getGuid(), + $guid, $references[2]->getHash(), $references[2], 0 diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php b/repo/tests/phpunit/includes/content/ItemContentTest.php index f4c893f..e232c8a 100644 --- a/repo/tests/phpunit/includes/content/ItemContentTest.php +++ b/repo/tests/phpunit/includes/content/ItemContentTest.php @@ -7,7 +7,6 @@ use Diff\DiffOp\DiffOpAdd; use Diff\DiffOp\DiffOpRemove; use Title; -use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\ItemId; @@ -15,7 +14,6 @@ use Wikibase\DataModel\SiteLink; use Wikibase\DataModel\SiteLinkList; use Wikibase\DataModel\Snak\PropertyNoValueSnak; -use Wikibase\DataModel\Statement\Statement; use Wikibase\EntityContent; use Wikibase\ItemContent; use Wikibase\Lib\Store\EntityRedirect; @@ -116,9 +114,9 @@ // @todo this is needed in PropertyContentTest as well // once we have statements in properties $contentWithClaim = $this->newEmpty(); - $claim = new Statement( new Claim( new PropertyNoValueSnak( 83 ) ) ); - $claim->setGuid( '$testing$' ); - $contentWithClaim->getEntity()->addClaim( $claim ); + $snak = new PropertyNoValueSnak( 83 ); + $guid = '$testing$'; + $contentWithClaim->getEntity()->getStatements()->addNewStatement( $snak, null, null, $guid ); $cases['claims'] = array( $contentWithClaim, @@ -150,9 +148,9 @@ // @todo this is needed in PropertyContentTest as well // once we have statements in properties $contentWithClaim = $this->newEmpty(); - $claim = new Statement( new Claim( new PropertyNoValueSnak( 83 ) ) ); - $claim->setGuid( '$testing$' ); - $contentWithClaim->getEntity()->addClaim( $claim ); + $snak = new PropertyNoValueSnak( 83 ); + $guid = '$testing$'; + $contentWithClaim->getEntity()->getStatements()->addNewStatement( $snak, null, null, $guid ); $cases['claims'] = array( $contentWithClaim, diff --git a/view/tests/phpunit/ItemViewTest.php b/view/tests/phpunit/ItemViewTest.php index 1ec47a9..456d930 100644 --- a/view/tests/phpunit/ItemViewTest.php +++ b/view/tests/phpunit/ItemViewTest.php @@ -5,6 +5,7 @@ use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; +use Wikibase\DataModel\Statement\StatementList; use Wikibase\View\ItemView; use Wikibase\View\Template\TemplateFactory; use Wikibase\View\Template\TemplateRegistry; @@ -28,12 +29,11 @@ protected function makeEntity( EntityId $id, array $statements = array() ) { $item = new Item( $id ); + $item->setLabel( 'en', "label:$id" ); $item->setDescription( 'en', "description:$id" ); - foreach ( $statements as $statement ) { - $item->addClaim( $statement ); - } + $item->setStatements( new StatementList( $statements ) ); return $item; } diff --git a/view/tests/phpunit/PropertyViewTest.php b/view/tests/phpunit/PropertyViewTest.php index 89f79a2..3088195 100644 --- a/view/tests/phpunit/PropertyViewTest.php +++ b/view/tests/phpunit/PropertyViewTest.php @@ -9,6 +9,7 @@ use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Statement\Statement; +use Wikibase\DataModel\Statement\StatementList; use Wikibase\View\PropertyView; use Wikibase\View\Template\TemplateFactory; use Wikibase\View\Template\TemplateRegistry; @@ -37,21 +38,13 @@ * @return Entity */ protected function makeEntity( EntityId $id, array $statements = array() ) { - $dataTypeId = 'string'; - - if ( is_string( $id ) ) { - $id = new PropertyId( $id ); - } - - $property = Property::newFromType( $dataTypeId ); + $property = Property::newFromType( 'string' ); $property->setId( $id ); $property->setLabel( 'en', "label:$id" ); $property->setDescription( 'en', "description:$id" ); - foreach ( $statements as $statement ) { - $property->addClaim( $statement ); - } + $property->setStatements( new StatementList( $statements ) ); return $property; } -- To view, visit https://gerrit.wikimedia.org/r/202389 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I393edbb5e5aaeb8e09b817650f67abd216e612a1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
