Merge pull request #373 from wmde/statementConstructor

Remove Claim from Statement constructor

Author: JeroenDeDauw

src/Entity/Item.php

@@ -208,7 +208,7 @@ public function getType() {
 	 * @return Statement
 	 */
 	public function newClaim( Snak $mainSnak ) {
-		return new Statement( new Claim( $mainSnak ) );
+		return new Statement( $mainSnak );
 	}
 
 	/**

src/Entity/Property.php

@@ -240,7 +240,7 @@ public function hasClaims() {
 	 * @return Statement
 	 */
 	public function newClaim( Snak $mainSnak ) {
-		return new Statement( new Claim( $mainSnak ) );
+		return new Statement( $mainSnak );
 	}
 
 	/**

src/Statement/Statement.php

@@ -8,6 +8,7 @@
 use Wikibase\DataModel\ReferenceList;
 use Wikibase\DataModel\Snak\Snak;
 use Wikibase\DataModel\Snak\SnakList;
+use Wikibase\DataModel\Snak\Snaks;
 
 /**
  * Class representing a Wikibase statement.
@@ -43,13 +44,17 @@ class Statement extends Claim {
 	/**
 	 * @since 2.0
 	 *
-	 * @param Claim $claim
+	 * @param Snak $mainSnak
+	 * @param Snaks|null $qualifiers
 	 * @param ReferenceList|null $references
 	 */
-	public function __construct( Claim $claim, ReferenceList $references = null ) {
-		$this->mainSnak = $claim->getMainSnak();
-		$this->qualifiers = $claim->getQualifiers();
-		$this->guid = $claim->getGuid();
+	public function __construct(
+		Snak $mainSnak,
+		Snaks $qualifiers = null,
+		ReferenceList $references = null
+	) {
+		$this->mainSnak = $mainSnak;
+		$this->qualifiers = $qualifiers ?: new SnakList();
 		$this->references = $references ?: new ReferenceList();
 	}
 

src/Statement/StatementList.php

@@ -101,7 +101,7 @@ public function addNewStatement( Snak $mainSnak, $qualifiers = null, $references
 		$qualifiers = is_array( $qualifiers ) ? new SnakList( $qualifiers ) : $qualifiers;
 		$references = is_array( $references ) ? new ReferenceList( $references ) : $references;
 
-		$statement = new Statement( new Claim( $mainSnak, $qualifiers ), $references );
+		$statement = new Statement( $mainSnak, $qualifiers, $references );
 		$statement->setGuid( $guid );
 
 		$this->addStatement( $statement );

tests/unit/ByPropertyIdArrayTest.php

@@ -80,7 +80,7 @@ function( Snak $snak ) {
 
 		$lists[] = array_map(
 			function( Snak $snak ) {
-				return new Statement( new Claim( $snak ) );
+				return new Statement( $snak );
 			},
 			$snaks
 		);

tests/unit/Claim/ClaimStandaloneTest.php

@@ -81,7 +81,7 @@ public function testGivenClaimWithDifferentGuids_equalsReturnsFalse() {
 
 	public function testGivenSimilarStatement_equalsReturnsFalse() {
 		$claim = new Claim( new PropertyNoValueSnak( 42 ) );
-		$this->assertFalse( $claim->equals( new Statement( new Claim( new PropertyNoValueSnak( 42 ) ) ) ) );
+		$this->assertFalse( $claim->equals( new Statement( new PropertyNoValueSnak( 42 ) ) ) );
 	}
 
 }

tests/unit/Claim/ClaimsTest.php

@@ -47,7 +47,7 @@ protected function makeStatement( Snak $mainSnak, $guid = null ) {
 			$guid = 'TEST$statement-' . $this->guidCounter;
 		}
 
-		$claim = new Statement( new Claim( $mainSnak ) );
+		$claim = new Statement( $mainSnak );
 		$claim->setGuid( $guid );
 
 		return $claim;

tests/unit/Entity/Diff/EntityDiffTest.php

@@ -89,12 +89,12 @@ public function diffProvider() {
 
 		$diffs[] = new EntityDiff( $diffOps );
 
-		$statement = new Statement( new Claim( new PropertyNoValueSnak( 42 ) ) );
+		$statement = new Statement( new PropertyNoValueSnak( 42 ) );
 		$statement->setGuid( 'EntityDiffTest$foo' );
 
 		$statementListDiffer = new StatementListDiffer();
 		$diffOps['claim'] = $statementListDiffer->getDiff(
-			new StatementList( array( $statement ) ),
+			new StatementList( $statement ),
 			new StatementList()
 		);
 

tests/unit/Entity/Diff/PropertyPatcherTest.php

@@ -57,13 +57,13 @@ public function testGivenNonItem_exceptionIsThrown() {
 	}
 
 	public function testStatementsArePatched() {
-		$s1337 = new Statement( new Claim( new PropertyNoValueSnak( 1337 ) ) );
+		$s1337 = new Statement( new PropertyNoValueSnak( 1337 ) );
 		$s1337->setGuid( 's1337' );
 
-		$s23 = new Statement( new Claim( new PropertyNoValueSnak( 23 ) ) );
+		$s23 = new Statement( new PropertyNoValueSnak( 23 ) );
 		$s23->setGuid( 's23' );
 
-		$s42 = new Statement( new Claim( new PropertyNoValueSnak( 42 ) ) );
+		$s42 = new Statement( new PropertyNoValueSnak( 42 ) );
 		$s42->setGuid( 's42' );
 
 		$patch = new EntityDiff( array(

tests/unit/Entity/ItemTest.php

@@ -514,10 +514,10 @@ public function testNewClaimReturnsStatementWithProvidedMainSnak() {
 	public function testSetClaims() {
 		$item = new Item();
 
-		$statement0 = new Statement( new Claim( new PropertyNoValueSnak( 42 ) ) );
+		$statement0 = new Statement( new PropertyNoValueSnak( 42 ) );
 		$statement0->setGuid( 'TEST$NVS42' );
 
-		$statement1 = new Statement( new Claim( new PropertySomeValueSnak( 42 ) ) );
+		$statement1 = new Statement( new PropertySomeValueSnak( 42 ) );
 		$statement1->setGuid( 'TEST$SVS42' );
 
 		$statements = array( $statement0, $statement1 );
@@ -583,7 +583,7 @@ public function testItemWithoutSitelinksHasNoSitelinks() {
 	}
 
 	private function newStatement() {
-		$statement = new Statement( new Claim( new PropertyNoValueSnak( 42 ) ) );
+		$statement = new Statement( new PropertyNoValueSnak( 42 ) );
 		$statement->setGuid( 'kittens' );
 		return $statement;
 	}
@@ -614,10 +614,10 @@ public function testEmptyConstructor() {
 	}
 
 	public function testCanConstructWithStatementList() {
-		$statement = new Statement( new Claim( new PropertyNoValueSnak( 42 ) ) );
+		$statement = new Statement( new PropertyNoValueSnak( 42 ) );
 		$statement->setGuid( 'meh' );
 
-		$statements = new StatementList( array( $statement ) );
+		$statements = new StatementList( $statement );
 
 		$item = new Item( null, null, null, $statements );