Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/85844
Change subject: (bug 54319) Show diff when order of snaks changed
......................................................................
(bug 54319) Show diff when order of snaks changed
This needs Ie60368122fd1db5b1d80107ab017be0686dfd05e in Diff
Change-Id: I82b84e866ed3bc2aac037219b25e11a231728e20
---
M lib/tests/phpunit/claim/ClaimDifferTest.php
M repo/includes/EntityContentDiffView.php
M repo/includes/actions/EditEntityAction.php
M repo/includes/api/SetClaim.php
M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
5 files changed, 16 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/44/85844/3
diff --git a/lib/tests/phpunit/claim/ClaimDifferTest.php
b/lib/tests/phpunit/claim/ClaimDifferTest.php
index 90a08f7..b119d61 100644
--- a/lib/tests/phpunit/claim/ClaimDifferTest.php
+++ b/lib/tests/phpunit/claim/ClaimDifferTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\Test;
-use Diff\CallbackListDiffer;
+use Diff\CallbackOrderedListDiffer;
use Diff\Diff;
use Diff\DiffOpAdd;
use Diff\DiffOpChange;
@@ -140,7 +140,7 @@
return $old->equals( $new );
};
- $differ = new ClaimDiffer( new CallbackListDiffer( $comparer )
);
+ $differ = new ClaimDiffer( new CallbackOrderedListDiffer(
$comparer ) );
$actual = $differ->diffClaims( $oldClaim, $newClaim );
$this->assertInstanceOf( 'Wikibase\ClaimDifference', $actual );
diff --git a/repo/includes/EntityContentDiffView.php
b/repo/includes/EntityContentDiffView.php
index 252658e..4946fdb 100644
--- a/repo/includes/EntityContentDiffView.php
+++ b/repo/includes/EntityContentDiffView.php
@@ -1,9 +1,9 @@
<?php
namespace Wikibase;
-use Diff\CallbackListDiffer;
-use Diff\ListDiffer;
+use Diff\CallbackOrderedListDiffer;
+use Diff\ListDiffer;
use Content, Html;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
@@ -150,10 +150,10 @@
return $old->equals( $new );
};
- // TODO: derp inject the EntityDiffVisualizer
+ // TODO: deep inject the EntityDiffVisualizer
$diffVisualizer = new EntityDiffVisualizer(
$this->getContext(),
- new ClaimDiffer( new CallbackListDiffer( $comparer ) ),
+ new ClaimDiffer( new CallbackOrderedListDiffer(
$comparer ) ),
new ClaimDifferenceVisualizer(
$this->propertyNameFormatter,
$this->snakValueFormatter
diff --git a/repo/includes/actions/EditEntityAction.php
b/repo/includes/actions/EditEntityAction.php
index c1f9451..db16328 100644
--- a/repo/includes/actions/EditEntityAction.php
+++ b/repo/includes/actions/EditEntityAction.php
@@ -1,8 +1,9 @@
<?php
namespace Wikibase;
-use Diff\CallbackListDiffer;
-use Html, Linker, Skin, Status, Revision;
+
+use Diff\CallbackOrderedListDiffer;
+use Html, Linker, Skin, Status, Revision;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
use Wikibase\Lib\EntityIdLabelFormatter;
@@ -454,10 +455,10 @@
return $old->equals( $new );
};
- // TODO: derp inject the EntityDiffVisualizer
+ // TODO: deep inject the EntityDiffVisualizer
$diffVisualizer = new EntityDiffVisualizer(
$this->getContext(),
- new ClaimDiffer( new CallbackListDiffer( $comparer ) ),
+ new ClaimDiffer( new CallbackOrderedListDiffer(
$comparer ) ),
new ClaimDifferenceVisualizer(
$this->propertyNameFormatter,
$this->snakValueFormatter
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index e312f77..3ba4951 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -4,7 +4,7 @@
use DataValues\IllegalValueException;
use ApiMain;
-use Diff\CallbackListDiffer;
+use Diff\CallbackOrderedListDiffer;
use MWException;
use ApiBase;
use Diff\ListDiffer;
@@ -87,7 +87,7 @@
return $old->equals( $new );
};
- $claimDiffer = new ClaimDiffer( new CallbackListDiffer(
$comparer ) );
+ $claimDiffer = new ClaimDiffer( new CallbackOrderedListDiffer(
$comparer ) );
$options = new FormatterOptions( array(
//TODO: fallback chain
diff --git a/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
b/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
index a9f5551..67e94c8 100644
--- a/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
+++ b/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\Test;
-use Diff\CallbackListDiffer;
+use Diff\CallbackOrderedListDiffer;
use Diff\ListDiffer;
use Wikibase\ClaimDiffer;
use Wikibase\Claim;
@@ -154,7 +154,7 @@
$claimSummaryBuilder = new ClaimSummaryBuilder(
'wbsetclaim',
- new ClaimDiffer( new CallbackListDiffer( $comparer ) ),
+ new ClaimDiffer( new CallbackOrderedListDiffer(
$comparer ) ),
$snakFormatter
);
@@ -192,7 +192,7 @@
$claimSummaryBuilder = new ClaimSummaryBuilder(
'wbsetclaim',
- new ClaimDiffer( new CallbackListDiffer( $comparer ) ),
+ new ClaimDiffer( new CallbackOrderedListDiffer(
$comparer ) ),
$snakFormatter
);
--
To view, visit https://gerrit.wikimedia.org/r/85844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82b84e866ed3bc2aac037219b25e11a231728e20
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
