Jeroen De Dauw has submitted this change and it was merged. Change subject: Use the new Statement constructor everywhere ......................................................................
Use the new Statement constructor everywhere Step to tackle DataModel 2.0 See also GitHub: https://github.com/wmde/WikibaseDataModel/pull/234 Change-Id: I97d38b057427af37e076895b12f14e61920c1c65 --- M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php M client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php M client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php M lib/includes/serializers/ClaimSerializer.php M lib/tests/phpunit/changes/TestChanges.php M lib/tests/phpunit/serializers/ClaimSerializerTest.php M lib/tests/phpunit/serializers/ClaimsSerializerTest.php M lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php M lib/tests/phpunit/serializers/ItemSerializerTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php M repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php M repo/tests/phpunit/includes/EntityViewTest.php M repo/tests/phpunit/includes/Hook/MakeGlobalVariablesScriptHandlerTest.php M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php M repo/tests/phpunit/includes/Validators/SnakValidatorTest.php M repo/tests/phpunit/includes/api/ApiXmlFormatTest.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/SetClaimTest.php M repo/tests/phpunit/includes/api/SetClaimValueTest.php M repo/tests/phpunit/includes/api/SetQualifierTest.php M repo/tests/phpunit/includes/content/ItemContentTest.php 29 files changed, 97 insertions(+), 76 deletions(-) Approvals: Jeroen De Dauw: Looks good to me, approved diff --git a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php index e497a04..061a298 100644 --- a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php +++ b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php @@ -39,23 +39,23 @@ $entityLookup = new MockRepository(); - $statement1 = new Statement( new PropertyValueSnak( + $statement1 = new Statement( new Claim( new PropertyValueSnak( $propertyId, new StringValue( 'a kitten!' ) - ) ); + ) ) ); $statement1->setGuid( 'Q42$1' ); - $statement2 = new Statement( new PropertyValueSnak( + $statement2 = new Statement( new Claim( new PropertyValueSnak( $propertyId, new StringValue( 'two kittens!!' ) - ) ); + ) ) ); $statement2->setGuid( 'Q42$2' ); // A Statement with a lower rank which should not affect the output - $statement3 = new Statement( new PropertyValueSnak( + $statement3 = new Statement( new Claim( new PropertyValueSnak( $propertyId, new StringValue( 'three kittens!!!' ) - ) ); + ) ) ); $statement3->setGuid( 'Q42$3' ); $statement3->setRank( Claim::RANK_DEPRECATED ); diff --git a/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php b/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php index 9b9fcb8..4662ee6 100644 --- a/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php +++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php @@ -4,6 +4,7 @@ use Language; use Wikibase\Client\Scribunto\WikibaseLuaEntityBindings; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\PropertyId; @@ -53,7 +54,7 @@ new PropertyId( 'P123456' ), 'somevalue' ); - $statement = new Statement( $snak ); + $statement = new Statement( new Claim( $snak ) ); $statement->setGuid( 'gsdfgsadg' ); $item = Item::newEmpty(); diff --git a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php index a1ea74b..0d1f72c 100644 --- a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php +++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php @@ -148,7 +148,7 @@ * @return Statement */ protected function getTestStatement( Snak $mainSnak ) { - $statement = new Statement( $mainSnak ); + $statement = new Statement( new Claim( $mainSnak ) ); $statement->setGuid( uniqid( 'kittens', true ) ); return $statement; diff --git a/lib/includes/serializers/ClaimSerializer.php b/lib/includes/serializers/ClaimSerializer.php index 218ea03..6685701 100644 --- a/lib/includes/serializers/ClaimSerializer.php +++ b/lib/includes/serializers/ClaimSerializer.php @@ -222,7 +222,7 @@ $mainSnak = $snakUnserializer->newFromSerialization( $serialization['mainsnak'] ); if ( $isStatement ) { - $claim = new Statement( $mainSnak ); + $claim = new Statement( new Claim( $mainSnak ) ); } else { $claim = new Claim( $mainSnak ); } diff --git a/lib/tests/phpunit/changes/TestChanges.php b/lib/tests/phpunit/changes/TestChanges.php index 1fea7af..9ad8b8d 100644 --- a/lib/tests/phpunit/changes/TestChanges.php +++ b/lib/tests/phpunit/changes/TestChanges.php @@ -5,6 +5,7 @@ use Wikibase\Change; use Wikibase\ChangeRow; use Wikibase\ChangesTable; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; @@ -174,7 +175,7 @@ // ----- $propertyId = new PropertyId( 'p23' ); $snak = new PropertyNoValueSnak( $propertyId ); - $statement = new Statement( $snak ); + $statement = new Statement( new Claim( $snak ) ); $statement->setGuid( 'TEST$test-guid' ); $claims = new Claims( array( $statement ) ); diff --git a/lib/tests/phpunit/serializers/ClaimSerializerTest.php b/lib/tests/phpunit/serializers/ClaimSerializerTest.php index b2c29aa..b47a1d0 100644 --- a/lib/tests/phpunit/serializers/ClaimSerializerTest.php +++ b/lib/tests/phpunit/serializers/ClaimSerializerTest.php @@ -72,7 +72,7 @@ ), ); - $statement = new Statement( new PropertyNoValueSnak( $id ) ); + $statement = new Statement( new Claim( new PropertyNoValueSnak( $id ) ) ); $validArgs['statement'] = array( $statement, @@ -159,7 +159,7 @@ */ public function testRankSerialization( $rank ) { $id = new PropertyId( 'P42' ); - $statement = new Statement( new PropertyNoValueSnak( $id ) ); + $statement = new Statement( new Claim( new PropertyNoValueSnak( $id ) ) ); $statement->setRank( $rank ); diff --git a/lib/tests/phpunit/serializers/ClaimsSerializerTest.php b/lib/tests/phpunit/serializers/ClaimsSerializerTest.php index a3ef5e5..31487db 100644 --- a/lib/tests/phpunit/serializers/ClaimsSerializerTest.php +++ b/lib/tests/phpunit/serializers/ClaimsSerializerTest.php @@ -54,7 +54,7 @@ $claims = array( new Claim( new PropertyNoValueSnak( $propertyId ) ), - new Statement( new PropertyNoValueSnak( $propertyId ) ), + new Statement( new Claim( new PropertyNoValueSnak( $propertyId ) ) ), new Claim( new PropertySomeValueSnak( new PropertyId( 'P1' ) ) ), ); diff --git a/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php b/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php index 9c582f5..8cf7e64 100644 --- a/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php +++ b/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php @@ -235,7 +235,7 @@ private function addStatementsWithoutQualifiers( Item $item ) { foreach ( $this->getSnaks( 'P40' ) as $mainSnak ) { - $statement = new Statement( $mainSnak ); + $statement = new Statement( new Claim( $mainSnak ) ); $this->setGuid( $statement ); $item->addClaim( $statement ); } @@ -246,7 +246,7 @@ new PropertyId( 'P501' ) ); $qualifiers = new SnakList( $this->getSnaks( 'P51' ) ); - $statement = new Statement( $mainSnak, $qualifiers ); + $statement = new Statement( new Claim( $mainSnak, $qualifiers ) ); $this->setGuid( $statement ); $item->addClaim( $statement ); } @@ -261,7 +261,7 @@ $mainSnak = new PropertyNoValueSnak( new PropertyId( 'P70' . $id ) ); - $statement = new Statement( $mainSnak ); + $statement = new Statement( new Claim( $mainSnak ) ); $this->setGuid( $statement ); $statement->setRank( $rank ); $item->addClaim( $statement ); @@ -275,7 +275,7 @@ $qualifiers = new SnakList( $this->getSnaks( 'P61' ) ); $reference = new Reference( new SnakList( $this->getSnaks( 'P62' ) ) ); $references = new ReferenceList( array( $reference ) ); - $statement = new Statement( $mainSnak, $qualifiers, $references ); + $statement = new Statement( new Claim( $mainSnak, $qualifiers ), $references ); $this->setGuid( $statement ); $item->addClaim( $statement ); } diff --git a/lib/tests/phpunit/serializers/ItemSerializerTest.php b/lib/tests/phpunit/serializers/ItemSerializerTest.php index 1b25e16..6ce08b9 100644 --- a/lib/tests/phpunit/serializers/ItemSerializerTest.php +++ b/lib/tests/phpunit/serializers/ItemSerializerTest.php @@ -4,6 +4,7 @@ use DataValues\StringValue; use SiteSQLStore; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Snak\PropertyValueSnak; @@ -190,9 +191,11 @@ ); $statement = new Statement( - new PropertyValueSnak( - new PropertyId( 'P42' ), - new StringValue( 'foobar!' ) + new Claim( + new PropertyValueSnak( + new PropertyId( 'P42' ), + new StringValue( 'foobar!' ) + ) ) ); diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php index 9a0f78f..f658c34 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php @@ -6,6 +6,7 @@ use DataValues\StringValue; use InvalidArgumentException; use Wikibase\ChangeOp\ChangeOpClaim; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Claim\ClaimGuidParser; use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\BasicEntityIdParser; @@ -91,7 +92,7 @@ $statement666 = reset( $item666Statements ); //claims that exist on the given entities - $statements[0] = new Statement( new PropertyNoValueSnak( 43 ) ); + $statements[0] = new Statement( new Claim( new PropertyNoValueSnak( 43 ) ) ); $statements[777] = clone $statement777; $statements[666] = clone $statement666; //claims with a null guid @@ -105,9 +106,9 @@ $statements[6666] = clone $statement666; $statements[6666]->setGuid( 'Q666$D8404CDA-25E4-4334-AF13-A3290BC66666' ); - $statements[11] = new Statement( new PropertyNoValueSnak( 1 ) ); + $statements[11] = new Statement( new Claim( new PropertyNoValueSnak( 1 ) ) ); $statements[11]->setGuid( null ); - $statements[12] = new Statement( new PropertySomeValueSnak( 1 ) ); + $statements[12] = new Statement( new Claim( new PropertySomeValueSnak( 1 ) ) ); $statements[12]->setGuid( null ); $statements[13] = clone $statements[12]; $statements[13]->setGuid( 'Q666$D8404CDA-25E4-4334-AF13-A3290BC66613' ); @@ -277,33 +278,33 @@ $cases = array(); - $statement = new Statement( $badSnak ); + $statement = new Statement( new Claim( $badSnak ) ); $statement->setGuid( $guidGenerator->newGuid( $q17 ) ); $cases['invalid value in main snak'] = array( $q17, $statement ); - $statement = new Statement( $brokenSnak ); + $statement = new Statement( new Claim( $brokenSnak ) ); $statement->setGuid( $guidGenerator->newGuid( $q17 ) ); $cases['mismatching value in main snak'] = array( $q17, $statement ); - $statement = new Statement( $goodSnak ); + $statement = new Statement( new Claim( $goodSnak ) ); $statement->setGuid( $guidGenerator->newGuid( $q17 ) ); $statement->setQualifiers( new SnakList( array( $badSnak ) ) ); $cases['bad snak in qualifiers'] = array( $q17, $statement ); - $statement = new Statement( $goodSnak ); + $statement = new Statement( new Claim( $goodSnak ) ); $statement->setGuid( $guidGenerator->newGuid( $q17 ) ); $statement->setQualifiers( new SnakList( array( $brokenSnak ) ) ); $cases['mismatching value in qualifier'] = array( $q17, $statement ); - $statement = new Statement( $goodSnak ); + $statement = new Statement( new Claim( $goodSnak ) ); $reference = new Reference( new SnakList( array( $badSnak ) ) ); $statement->setGuid( $guidGenerator->newGuid( $q17 ) ); $statement->setReferences( new ReferenceList( array( $reference ) ) ); $cases['bad snak in reference'] = array( $q17, $statement ); - $statement = new Statement( $goodSnak ); + $statement = new Statement( new Claim( $goodSnak ) ); $reference = new Reference( new SnakList( array( $badSnak ) ) ); $statement->setGuid( $guidGenerator->newGuid( $q17 ) ); $statement->setReferences( new ReferenceList( array( $reference ) ) ); diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php index b8e41b0..2e08e31 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php @@ -168,7 +168,7 @@ $oldSnak = new PropertyValueSnak( $p11, new StringValue( "old qualifier" ) ); - $claim = new Statement( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ); + $claim = new Statement( new Claim( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ) ); $claim->setGuid( $claimGuid ); $item->addClaim( $claim ); @@ -212,7 +212,7 @@ $oldSnak = new PropertyValueSnak( $p11, new StringValue( "old qualifier" ) ); - $claim = new Statement( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ); + $claim = new Statement( new Claim( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ) ); $claim->setGuid( $claimGuid ); $item->addClaim( $claim ); diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php index 8f54b41..9ca2ce1 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php @@ -6,6 +6,7 @@ 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; @@ -263,7 +264,7 @@ $oldSnak = new PropertyValueSnak( $p11, new StringValue( "old reference" ) ); $oldReference = new Reference( new SnakList( array( $oldSnak ) ) ); - $claim = new Statement( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ); + $claim = new Statement( new Claim( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ) ); $claim->setGuid( $claimGuid ); $item->addClaim( $claim ); @@ -313,7 +314,7 @@ $oldSnak = new PropertyValueSnak( $p11, new StringValue( "old reference" ) ); $oldReference = new Reference( new SnakList( array( $oldSnak ) ) ); - $claim = new Statement( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ); + $claim = new Statement( new Claim( new PropertyNoValueSnak( $p11 ), new SnakList( array( $oldSnak ) ) ) ); $claim->setGuid( $claimGuid ); $item->addClaim( $claim ); diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php index 33b40b4..c7d10df 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php @@ -13,6 +13,7 @@ use ValueValidators\Error; use ValueValidators\Result; use ValueValidators\ValueValidator; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Claim\ClaimGuidParser; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityId; @@ -26,6 +27,7 @@ use Wikibase\Lib\ClaimGuidGenerator; use Wikibase\Lib\ClaimGuidValidator; use Wikibase\Lib\Store\SiteLinkCache; +use Wikibase\Lib\Store\SiteLinkLookup; use Wikibase\Validators\CompositeFingerprintValidator; use Wikibase\Validators\CompositeValidator; use Wikibase\Validators\DataValueValidator; @@ -105,7 +107,7 @@ $snak = new PropertyValueSnak( $propertyId, $value ); } - return new Statement( $snak ); + return new Statement( new Claim( $snak ) ); } /** diff --git a/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php b/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php index f21483a..8f76e8e 100644 --- a/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php +++ b/repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php @@ -136,8 +136,10 @@ $snakFormatter, $entityTitleLookupMock, new Statement( - new PropertyValueSnak( 50, new StringValue( 'chocolate!' ) ), - new SnakList(), + new Claim( + new PropertyValueSnak( 50, new StringValue( 'chocolate!' ) ), + new SnakList() + ), new ReferenceList( array( new Reference( new SnakList( array ( new PropertyValueSnak( 50, new StringValue( 'second snak' ) ) ) ) ) ) ) diff --git a/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php b/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php index 8b1a2f6..d32b29f 100644 --- a/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php +++ b/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php @@ -50,7 +50,7 @@ $statements = array(); $mainSnak = new PropertyValueSnak( 112358, new StringValue( "don't panic" ) ); - $statement = new Statement( $mainSnak ); + $statement = new Statement( new Claim( $mainSnak ) ); $statements[] = $statement; foreach ( $this->snakProvider() as $snak ) { diff --git a/repo/tests/phpunit/includes/Diff/ClaimDifferTest.php b/repo/tests/phpunit/includes/Diff/ClaimDifferTest.php index a05e944..aa0760f 100644 --- a/repo/tests/phpunit/includes/Diff/ClaimDifferTest.php +++ b/repo/tests/phpunit/includes/Diff/ClaimDifferTest.php @@ -31,8 +31,8 @@ public function diffClaimsProvider() { $argLists = array(); - $noValueForP42 = new Statement( new PropertyNoValueSnak( 42 ) ); - $noValueForP43 = new Statement( new PropertyNoValueSnak( 43 ) ); + $noValueForP42 = new Statement( new Claim( new PropertyNoValueSnak( 42 ) ) ); + $noValueForP43 = new Statement( new Claim( new PropertyNoValueSnak( 43 ) ) ); $argLists[] = array( $noValueForP42, diff --git a/repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php b/repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php index 047225c..1691c3b 100644 --- a/repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php +++ b/repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php @@ -152,7 +152,7 @@ null, new DiffOpChange( Statement::RANK_NORMAL, Statement::RANK_PREFERRED ) ), - new Statement( new PropertyValueSnak( new PropertyId( 'P1' ), new StringValue( 'foo' ) ) ), + new Statement( new Claim( new PropertyValueSnak( new PropertyId( 'P1' ), new StringValue( 'foo' ) ) ) ), '<tr><td colspan="2" class="diff-lineno">property / <a>PID</a>: <i>SNAK</i> / rank</td><td colspan="2" class="diff-lineno">property / <a>PID</a>: <i>SNAK</i> / rank</td></tr>'. '<tr><td class="diff-marker">-</td><td class="diff-deletedline">'. '<div><del class="diffchange diffchange-inline"><span>Normal rank</span></del></div></td>'. @@ -199,8 +199,10 @@ $visualizer = $this->newClaimDifferenceVisualizer(); $claim = new Statement( - new PropertyValueSnak( new PropertyId( 'P12' ), new StringValue( 'foo' ) ), - new SnakList( array( new PropertyNoValueSnak( 50 ) ) ), + new Claim( + new PropertyValueSnak( new PropertyId( 'P12' ), new StringValue( 'foo' ) ), + new SnakList( array( new PropertyNoValueSnak( 50 ) ) ) + ), new ReferenceList( array( new Reference( new SnakList( array( @@ -243,8 +245,10 @@ $visualizer = $this->newClaimDifferenceVisualizer(); $claim = new Statement( - new PropertyValueSnak( new PropertyId( 'P12' ), new StringValue( 'foo' ) ), - new SnakList( array( new PropertyNoValueSnak( 50 ) ) ), + new Claim( + new PropertyValueSnak( new PropertyId( 'P12' ), new StringValue( 'foo' ) ), + new SnakList( array( new PropertyNoValueSnak( 50 ) ) ) + ), new ReferenceList( array( new Reference( new SnakList( array( diff --git a/repo/tests/phpunit/includes/EntityViewTest.php b/repo/tests/phpunit/includes/EntityViewTest.php index f269dc4..2dce3bd 100644 --- a/repo/tests/phpunit/includes/EntityViewTest.php +++ b/repo/tests/phpunit/includes/EntityViewTest.php @@ -8,6 +8,7 @@ use RequestContext; use Title; use ValueFormatters\FormatterOptions; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityId; @@ -281,7 +282,7 @@ $guid = 'EntityViewTest$' . $this->guidCounter; } - $statements = new Statement( $mainSnak ); + $statements = new Statement( new Claim( $mainSnak ) ); $statements->setGuid( $guid ); return $statements; diff --git a/repo/tests/phpunit/includes/Hook/MakeGlobalVariablesScriptHandlerTest.php b/repo/tests/phpunit/includes/Hook/MakeGlobalVariablesScriptHandlerTest.php index 3fe94cb..83fce1e 100644 --- a/repo/tests/phpunit/includes/Hook/MakeGlobalVariablesScriptHandlerTest.php +++ b/repo/tests/phpunit/includes/Hook/MakeGlobalVariablesScriptHandlerTest.php @@ -6,6 +6,7 @@ use DataValues\StringValue; use RequestContext; use Title; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; @@ -172,7 +173,7 @@ $snak = new PropertyValueSnak( new PropertyId( 'P794' ), new StringValue( 'a' ) ); - $statement = new Statement( $snak ); + $statement = new Statement( new Claim( $snak ) ); $statement->setGuid( 'P794$muahahaha' ); $item->addClaim( $statement ); diff --git a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php index 493d2f8..0611677 100644 --- a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php +++ b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php @@ -4,6 +4,7 @@ use Language; use Title; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityId; @@ -144,7 +145,7 @@ new EntityIdValue( $redirect->getEntityId() ) ); - $statement = new Statement( $snak ); + $statement = new Statement( new Claim( $snak ) ); $statement->setGuid( 'P794$muahahaha' ); $item->addClaim( $statement ); diff --git a/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php b/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php index ab151d4..178dda1 100644 --- a/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php +++ b/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php @@ -70,11 +70,11 @@ $cases = array(); - $claim = new Statement( new PropertyNoValueSnak( $p1 ) ); + $claim = new Statement( new Claim( new PropertyNoValueSnak( $p1 ) ) ); $cases[] = array( $claim, 'empty claim', true ); $claim = new Statement( - new PropertyValueSnak( $p1, new StringValue( '12' ) ) + new Claim( new PropertyValueSnak( $p1, new StringValue( '12' ) ) ) ); $claim->setQualifiers( new SnakList( array( new PropertyValueSnak( $p2, new StringValue( 'abc' ) ) diff --git a/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php b/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php index 7bca358..1fdd85e 100644 --- a/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php +++ b/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php @@ -6,6 +6,7 @@ use ApiMain; use Exception; use FauxRequest; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Snak\PropertyNoValueSnak; @@ -172,7 +173,7 @@ $item = $entityRevision->getEntity(); $snak = new PropertyNoValueSnak( $propertyId->getNumericId() ); - $statement = new Statement( $snak ); + $statement = new Statement( new Claim( $snak ) ); $statement->setGuid( $item->getId()->getSerialization() . '$kittens' ); $item->addClaim( $statement ); diff --git a/repo/tests/phpunit/includes/api/RemoveClaimsTest.php b/repo/tests/phpunit/includes/api/RemoveClaimsTest.php index b88979b..bcee753 100644 --- a/repo/tests/phpunit/includes/api/RemoveClaimsTest.php +++ b/repo/tests/phpunit/includes/api/RemoveClaimsTest.php @@ -51,10 +51,10 @@ /** @var $statements Statement[] */ $statements = array( - new Statement( new PropertyNoValueSnak( self::$propertyId ) ), - new Statement( new PropertyNoValueSnak( self::$propertyId ) ), - new Statement( new PropertySomeValueSnak( self::$propertyId ) ), - new Statement( new PropertyValueSnak( self::$propertyId, new StringValue( 'o_O' ) ) ), + new Statement( new Claim( new PropertyNoValueSnak( self::$propertyId ) ) ), + new Statement( new Claim( new PropertyNoValueSnak( self::$propertyId ) ) ), + new Statement( new Claim( new PropertySomeValueSnak( self::$propertyId ) ) ), + new Statement( new Claim( new PropertyValueSnak( self::$propertyId, new StringValue( 'o_O' ) ) ) ), ); foreach( $statements as $statement ){ diff --git a/repo/tests/phpunit/includes/api/RemoveQualifiersTest.php b/repo/tests/phpunit/includes/api/RemoveQualifiersTest.php index 7d381d4..ef64d18 100644 --- a/repo/tests/phpunit/includes/api/RemoveQualifiersTest.php +++ b/repo/tests/phpunit/includes/api/RemoveQualifiersTest.php @@ -4,6 +4,7 @@ use DataValues\StringValue; use UsageException; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Snak\PropertyNoValueSnak; use Wikibase\DataModel\Snak\PropertySomeValueSnak; @@ -52,7 +53,7 @@ $statements = array(); $mainSnak = new PropertyNoValueSnak( 42 ); - $statement = new Statement( $mainSnak ); + $statement = new Statement( new Claim( $mainSnak ) ); $statements[] = $statement; foreach ( $this->snakProvider() as $snak ) { diff --git a/repo/tests/phpunit/includes/api/RemoveReferencesTest.php b/repo/tests/phpunit/includes/api/RemoveReferencesTest.php index 2f87c46..0a6c375 100644 --- a/repo/tests/phpunit/includes/api/RemoveReferencesTest.php +++ b/repo/tests/phpunit/includes/api/RemoveReferencesTest.php @@ -4,6 +4,7 @@ use DataValues\StringValue; use UsageException; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Reference; use Wikibase\DataModel\Snak\PropertyNoValueSnak; @@ -53,7 +54,7 @@ $statements = array(); $mainSnak = new PropertyNoValueSnak( 42 ); - $statement = new Statement( $mainSnak ); + $statement = new Statement( new Claim( $mainSnak ) ); $statements[] = $statement; foreach ( $this->snakProvider() as $snak ) { @@ -164,7 +165,7 @@ } public function invalidGuidProvider() { - $snak = new PropertyValueSnak( 722, new \DataValues\StringValue( 'abc') ); + $snak = new PropertyValueSnak( 722, new StringValue( 'abc') ); $hash = $snak->getHash(); return array( diff --git a/repo/tests/phpunit/includes/api/SetClaimTest.php b/repo/tests/phpunit/includes/api/SetClaimTest.php index 5a0fb5b..bdfeb4f 100644 --- a/repo/tests/phpunit/includes/api/SetClaimTest.php +++ b/repo/tests/phpunit/includes/api/SetClaimTest.php @@ -97,7 +97,7 @@ $snaks = $this->getSnaks(); $snakList = new SnakList( $snaks ); $mainSnak = $snaks[0]; - $statement = new Statement( $mainSnak ); + $statement = new Statement( new Claim( $mainSnak ) ); $statement->setRank( $ranks[array_rand( $ranks )] ); $statements[] = $statement; @@ -155,7 +155,7 @@ } $newSnak = new PropertyValueSnak( $statement->getPropertyId(), new StringValue( '\o/' ) ); - $newClaim = new Statement( $newSnak ); + $newClaim = new Statement( new Claim( $newSnak ) ); $newClaim->setGuid( $guid ); // Update request @@ -193,39 +193,39 @@ $cases = array(); - $claim = new Statement( $badSnak ); + $claim = new Statement( new Claim( $badSnak ) ); $claim->setGuid( $guidGenerator->newGuid( $q17 ) ); $cases['invalid value in main snak'] = array( $q17, $claim, 'modification-failed' ); - $claim = new Statement( $brokenSnak ); + $claim = new Statement( new Claim( $brokenSnak ) ); $claim->setGuid( $guidGenerator->newGuid( $q17 ) ); $cases['mismatching value in main snak'] = array( $q17, $claim, 'modification-failed' ); - $claim = new Statement( $obsoleteSnak ); + $claim = new Statement( new Claim( $obsoleteSnak ) ); $claim->setGuid( $guidGenerator->newGuid( $q17 ) ); $cases['obsolete snak using deleted property'] = array( $q17, $claim, 'modification-failed' ); - $claim = new Statement( $goodSnak ); + $claim = new Statement( new Claim( $goodSnak ) ); $claim->setGuid( $guidGenerator->newGuid( $qx ) ); $cases['good claim for deleted item'] = array( $qx, $claim, 'cant-load-entity-content' ); - $claim = new Statement( $goodSnak ); + $claim = new Statement( new Claim( $goodSnak ) ); $claim->setGuid( $guidGenerator->newGuid( $q17 ) ); $claim->setQualifiers( new SnakList( array( $badSnak ) ) ); $cases['bad snak in qualifiers'] = array( $q17, $claim, 'modification-failed' ); - $claim = new Statement( $goodSnak ); + $claim = new Statement( new Claim( $goodSnak ) ); $claim->setGuid( $guidGenerator->newGuid( $q17 ) ); $claim->setQualifiers( new SnakList( array( $brokenSnak ) ) ); $cases['mismatching value in qualifier'] = array( $q17, $claim, 'modification-failed' ); - $claim = new Statement( $goodSnak ); + $claim = new Statement( new Claim( $goodSnak ) ); $reference = new Reference( new SnakList( array( $badSnak ) ) ); $claim->setGuid( $guidGenerator->newGuid( $q17 ) ); $claim->setReferences( new ReferenceList( array( $reference ) ) ); $cases['bad snak in reference'] = array( $q17, $claim, 'modification-failed' ); - $claim = new Statement( $goodSnak ); + $claim = new Statement( new Claim( $goodSnak ) ); $reference = new Reference( new SnakList( array( $badSnak ) ) ); $claim->setGuid( $guidGenerator->newGuid( $q17 ) ); $claim->setReferences( new ReferenceList( array( $reference ) ) ); @@ -433,7 +433,7 @@ // add a claim $guidGenerator = new ClaimGuidGenerator(); - $claim = new Statement( new PropertyNoValueSnak( $property->getId() ) ); + $claim = new Statement( new Claim( new PropertyNoValueSnak( $property->getId() ) ) ); $claim->setGuid( $guidGenerator->newGuid( $item->getId() ) ); $item->addClaim( $claim ); @@ -443,7 +443,7 @@ $badProperty = Property::newFromType( 'string' ); $badProperty = $store->saveEntity( $badProperty, '', $GLOBALS['wgUser'], EDIT_NEW )->getEntity(); - $badClaim = new Statement( new PropertyNoValueSnak( $badProperty->getId() ) ); + $badClaim = new Statement( new Claim( new PropertyNoValueSnak( $badProperty->getId() ) ) ); $serializer = $serializerFactory->newSerializerForObject( $claim ); $serializedBadClaim = $serializer->getSerialized( $badClaim ); diff --git a/repo/tests/phpunit/includes/api/SetClaimValueTest.php b/repo/tests/phpunit/includes/api/SetClaimValueTest.php index 044dcf0..2c46c46 100644 --- a/repo/tests/phpunit/includes/api/SetClaimValueTest.php +++ b/repo/tests/phpunit/includes/api/SetClaimValueTest.php @@ -72,7 +72,7 @@ $store = WikibaseRepo::getDefaultInstance()->getEntityStore(); $store->saveEntity( $item, '', $GLOBALS['wgUser'], EDIT_NEW ); - $statement = new Statement( new PropertyValueSnak( $propertyId, new StringValue( 'o_O' ) ) ); + $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 ); diff --git a/repo/tests/phpunit/includes/api/SetQualifierTest.php b/repo/tests/phpunit/includes/api/SetQualifierTest.php index 8f83bdd..4f939e1 100644 --- a/repo/tests/phpunit/includes/api/SetQualifierTest.php +++ b/repo/tests/phpunit/includes/api/SetQualifierTest.php @@ -4,7 +4,7 @@ use DataValues\StringValue; use FormatJson; -use UsageException; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\Item; @@ -95,7 +95,7 @@ $prop = Property::newFromType( 'string' ); $propId = $this->makeProperty( $prop )->getId(); - $claim = new Statement( new PropertyValueSnak( $propId, new StringValue( '^_^' ) ) ); + $claim = new Statement( new Claim( new PropertyValueSnak( $propId, new StringValue( '^_^' ) ) ) ); $guidGenerator = new ClaimGuidGenerator(); $claim->setGuid( $guidGenerator->newGuid( $newItem->getId() ) ); diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php b/repo/tests/phpunit/includes/content/ItemContentTest.php index a5925b5..af75d1c 100644 --- a/repo/tests/phpunit/includes/content/ItemContentTest.php +++ b/repo/tests/phpunit/includes/content/ItemContentTest.php @@ -7,10 +7,10 @@ use Diff\DiffOp\DiffOpAdd; use Diff\DiffOp\DiffOpRemove; use Title; +use Wikibase\DataModel\Claim\Claim; use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\DataModel\Entity\EntityId; -use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\SiteLink; @@ -95,7 +95,7 @@ // @todo this is needed in PropertyContentTest as well // once we have statements in properties $contentWithClaim = $this->newEmpty(); - $claim = new Statement( new PropertyNoValueSnak( 83 ) ); + $claim = new Statement( new Claim( new PropertyNoValueSnak( 83 ) ) ); $claim->setGuid( '$testing$' ); $contentWithClaim->getEntity()->addClaim( $claim ); @@ -129,7 +129,7 @@ // @todo this is needed in PropertyContentTest as well // once we have statements in properties $contentWithClaim = $this->newEmpty(); - $claim = new Statement( new PropertyNoValueSnak( 83 ) ); + $claim = new Statement( new Claim( new PropertyNoValueSnak( 83 ) ) ); $claim->setGuid( '$testing$' ); $contentWithClaim->getEntity()->addClaim( $claim ); @@ -157,7 +157,7 @@ $itemContentWithClaims = $this->newEmpty(); $itemWithClaims = $itemContentWithClaims->getItem(); - $claim = new Statement( new PropertyNoValueSnak( new PropertyId( 'P11' ) ) ); + $claim = new Statement( new Claim( new PropertyNoValueSnak( new PropertyId( 'P11' ) ) ) ); $claim->setGuid( 'Whatever' ); $itemWithClaims->setClaims( new Claims( array( -- To view, visit https://gerrit.wikimedia.org/r/166285 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I97d38b057427af37e076895b12f14e61920c1c65 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bene <benestar.wikime...@gmail.com> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
