[MediaWiki-commits] [Gerrit] Do not pass a whole list of claims to ClaimSummaryBuilder - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/208095

Change subject: Do not pass a whole list of claims to ClaimSummaryBuilder
......................................................................

Do not pass a whole list of claims to ClaimSummaryBuilder

Change-Id: I354063978be5c16bbc6b0eae46063100de44a18c
---
M repo/includes/ClaimSummaryBuilder.php
M repo/includes/api/SetClaim.php
M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
3 files changed, 8 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/95/208095/1

diff --git a/repo/includes/ClaimSummaryBuilder.php 
b/repo/includes/ClaimSummaryBuilder.php
index 162a801..15ac93d 100644
--- a/repo/includes/ClaimSummaryBuilder.php
+++ b/repo/includes/ClaimSummaryBuilder.php
@@ -52,14 +52,13 @@
         * constructs an edit-summary based upon that information and returns
         * a Summary object holding this edit-summary
         *
-        * @param Claims $existingClaims
+        * @param Claim $oldClaim
         * @param Claim $newClaim
         *
         * @return Summary
         */
-       public function buildClaimSummary( Claims $existingClaims, Claim 
$newClaim ) {
+       public function buildClaimSummary( Claim $oldClaim, Claim $newClaim ) {
                $guid = $newClaim->getGuid();
-               $oldClaim = $existingClaims->getClaimWithGuid( $guid );
 
                $summary = new Summary( $this->apiModuleName );
                $summary->addAutoCommentArgs( 1 ); // only one claim touched, 
so we're always having singular here
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index a04b397..45bd7cb 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -104,8 +104,11 @@
                        $this->getModuleName(),
                        new ClaimDiffer( new OrderedListDiffer( new 
ComparableComparer() ) )
                );
+
+               $claims = new Claims( $entity->getClaims() );
+
                $summary = $claimSummaryBuilder->buildClaimSummary(
-                       new Claims( $entity->getClaims() ),
+                       $claims->getClaimWithGuid( $claim->getGuid() ),
                        $claim
                );
 
diff --git a/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php 
b/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
index d32b29f..ffa6791 100644
--- a/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
+++ b/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
@@ -7,7 +7,6 @@
 use Diff\Differ\OrderedListDiffer;
 use Wikibase\ClaimSummaryBuilder;
 use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Claim\Claims;
 use Wikibase\DataModel\Reference;
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 use Wikibase\DataModel\Snak\PropertySomeValueSnak;
@@ -134,11 +133,10 @@
                        new ClaimDiffer( new OrderedListDiffer( new 
ComparableComparer() ) )
                );
 
-               $claims = new Claims();
                $newClaims = $this->claimProvider();
 
                foreach ( $newClaims as $newClaim ) {
-                       $summary = $claimSummaryBuilder->buildClaimSummary( 
$claims, $newClaim );
+                       $summary = $claimSummaryBuilder->buildClaimSummary( 
null, $newClaim );
                        $this->assertInstanceOf( 'Wikibase\Summary', $summary, 
"this should return a Summary object" );
                        $this->assertEquals( 'wbsetclaim', 
$summary->getModuleName() );
                        $this->assertEquals( 'create', 
$summary->getActionName() );
@@ -158,10 +156,7 @@
                        new ClaimDiffer( new OrderedListDiffer( new 
ComparableComparer() ) )
                );
 
-               $claims = new Claims();
-               $claims->addClaim( $originalClaim );
-
-               $summary = $claimSummaryBuilder->buildClaimSummary( $claims, 
$modifiedClaim );
+               $summary = $claimSummaryBuilder->buildClaimSummary( 
$originalClaim, $modifiedClaim );
                $this->assertInstanceOf( 'Wikibase\Summary', $summary, "this 
should return a Summary object" );
                $this->assertEquals( 'wbsetclaim', $summary->getModuleName() );
                $this->assertEquals( $action, $summary->getActionName() );

-- 
To view, visit https://gerrit.wikimedia.org/r/208095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I354063978be5c16bbc6b0eae46063100de44a18c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits