Jeroen De Dauw has submitted this change and it was merged.
Change subject: Move Diff-related classes into namespace
......................................................................
Move Diff-related classes into namespace
Change-Id: If16ddd6f7b4840cb38e6f448e17cf23c3c6ea536
---
M repo/includes/ClaimSummaryBuilder.php
R repo/includes/Diff/ClaimDiffer.php
R repo/includes/Diff/ClaimDifference.php
R repo/includes/Diff/ClaimDifferenceVisualizer.php
R repo/includes/Diff/DiffOpValueFormatter.php
R repo/includes/Diff/DiffView.php
R repo/includes/Diff/EntityContentDiffView.php
R repo/includes/Diff/EntityDiffVisualizer.php
M repo/includes/actions/EditEntityAction.php
M repo/includes/api/SetClaim.php
M repo/includes/content/EntityHandler.php
M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
R repo/tests/phpunit/includes/Diff/ClaimDifferTest.php
R repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php
R repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
R repo/tests/phpunit/includes/Diff/DiffOpValueFormatterTest.php
R repo/tests/phpunit/includes/Diff/DiffViewTest.php
R repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php
R repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
19 files changed, 49 insertions(+), 36 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
diff --git a/repo/includes/ClaimSummaryBuilder.php
b/repo/includes/ClaimSummaryBuilder.php
index 5e98795..04c56b1 100644
--- a/repo/includes/ClaimSummaryBuilder.php
+++ b/repo/includes/ClaimSummaryBuilder.php
@@ -3,6 +3,7 @@
namespace Wikibase;
use InvalidArgumentException;
+use Wikibase\Repo\Diff\ClaimDiffer;
/**
* EditSummary-Builder for claim operations
diff --git a/repo/includes/ClaimDiffer.php b/repo/includes/Diff/ClaimDiffer.php
similarity index 94%
rename from repo/includes/ClaimDiffer.php
rename to repo/includes/Diff/ClaimDiffer.php
index bd01646..ad30474 100644
--- a/repo/includes/ClaimDiffer.php
+++ b/repo/includes/Diff/ClaimDiffer.php
@@ -1,10 +1,14 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Diff;
use Diff\Differ\Differ;
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpChange;
+use Wikibase\DataModel\Claim\Claim;
+use Wikibase\DataModel\ReferenceList;
+use Wikibase\DataModel\Snak\SnakList;
+use Wikibase\DataModel\Statement\Statement;
/**
* Class for generating a ClaimDifference given two claims.
diff --git a/repo/includes/ClaimDifference.php
b/repo/includes/Diff/ClaimDifference.php
similarity index 98%
rename from repo/includes/ClaimDifference.php
rename to repo/includes/Diff/ClaimDifference.php
index a05fc0f..8d0fd65 100644
--- a/repo/includes/ClaimDifference.php
+++ b/repo/includes/Diff/ClaimDifference.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Diff;
use Comparable;
use Diff\DiffOp\Diff\Diff;
diff --git a/repo/includes/ClaimDifferenceVisualizer.php
b/repo/includes/Diff/ClaimDifferenceVisualizer.php
similarity index 98%
rename from repo/includes/ClaimDifferenceVisualizer.php
rename to repo/includes/Diff/ClaimDifferenceVisualizer.php
index 021507c..808dc24 100644
--- a/repo/includes/ClaimDifferenceVisualizer.php
+++ b/repo/includes/Diff/ClaimDifferenceVisualizer.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Diff;
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
@@ -13,6 +13,10 @@
use RuntimeException;
use ValueFormatters\FormattingException;
use ValueFormatters\ValueFormatter;
+use Wikibase\DataModel\Claim\Claim;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Snak\Snak;
+use Wikibase\DataModel\Snak\SnakList;
use Wikibase\Lib\Serializers\ClaimSerializer;
use Wikibase\Lib\SnakFormatter;
diff --git a/repo/includes/DiffOpValueFormatter.php
b/repo/includes/Diff/DiffOpValueFormatter.php
similarity index 99%
rename from repo/includes/DiffOpValueFormatter.php
rename to repo/includes/Diff/DiffOpValueFormatter.php
index 24c956c..1bfb0c2 100644
--- a/repo/includes/DiffOpValueFormatter.php
+++ b/repo/includes/Diff/DiffOpValueFormatter.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Diff;
use Diff;
use Html;
diff --git a/repo/includes/DiffView.php b/repo/includes/Diff/DiffView.php
similarity index 99%
rename from repo/includes/DiffView.php
rename to repo/includes/Diff/DiffView.php
index 2d63337..8b15c61 100644
--- a/repo/includes/DiffView.php
+++ b/repo/includes/Diff/DiffView.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Diff;
use ContextSource;
use Diff\DiffOp\Diff\Diff;
diff --git a/repo/includes/EntityContentDiffView.php
b/repo/includes/Diff/EntityContentDiffView.php
similarity index 99%
rename from repo/includes/EntityContentDiffView.php
rename to repo/includes/Diff/EntityContentDiffView.php
index a6c204d..8cd7d2e 100644
--- a/repo/includes/EntityContentDiffView.php
+++ b/repo/includes/Diff/EntityContentDiffView.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Diff;
use Content;
use Diff\Comparer\ComparableComparer;
diff --git a/repo/includes/EntityDiffVisualizer.php
b/repo/includes/Diff/EntityDiffVisualizer.php
similarity index 98%
rename from repo/includes/EntityDiffVisualizer.php
rename to repo/includes/Diff/EntityDiffVisualizer.php
index 56bd8ec..0c73e69 100644
--- a/repo/includes/EntityDiffVisualizer.php
+++ b/repo/includes/Diff/EntityDiffVisualizer.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Diff;
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp;
@@ -10,6 +10,7 @@
use IContextSource;
use MWException;
use SiteStore;
+use Wikibase\DataModel\Entity\Diff\EntityDiff;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\Content\EntityContentDiff;
diff --git a/repo/includes/actions/EditEntityAction.php
b/repo/includes/actions/EditEntityAction.php
index d6ddfcd..b5980d8 100644
--- a/repo/includes/actions/EditEntityAction.php
+++ b/repo/includes/actions/EditEntityAction.php
@@ -18,6 +18,9 @@
use Wikibase\Lib\EscapingValueFormatter;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Repo\Content\EntityContentDiff;
+use Wikibase\Repo\Diff\ClaimDiffer;
+use Wikibase\Repo\Diff\ClaimDifferenceVisualizer;
+use Wikibase\Repo\Diff\EntityDiffVisualizer;
use Wikibase\Repo\WikibaseRepo;
/**
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index aa3af6d..443b2cc 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -13,12 +13,12 @@
use OutOfBoundsException;
use UsageException;
use Wikibase\ChangeOp\ClaimChangeOpFactory;
-use Wikibase\ClaimDiffer;
use Wikibase\ClaimSummaryBuilder;
use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Claim\Claims;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\Lib\Serializers\SerializerFactory;
+use Wikibase\Repo\Diff\ClaimDiffer;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Summary;
diff --git a/repo/includes/content/EntityHandler.php
b/repo/includes/content/EntityHandler.php
index c74ce31..ef24453 100644
--- a/repo/includes/content/EntityHandler.php
+++ b/repo/includes/content/EntityHandler.php
@@ -136,7 +136,7 @@
* @return string
*/
protected function getDiffEngineClass() {
- return '\Wikibase\EntityContentDiffView';
+ return '\Wikibase\Repo\Diff\EntityContentDiffView';
}
/**
diff --git a/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
b/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
index 7ca014c..a365c9a 100644
--- a/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
+++ b/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
@@ -5,7 +5,6 @@
use DataValues\StringValue;
use Diff\Comparer\ComparableComparer;
use Diff\Differ\OrderedListDiffer;
-use Wikibase\ClaimDiffer;
use Wikibase\ClaimSummaryBuilder;
use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Claim\Claims;
@@ -16,6 +15,7 @@
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\DataModel\Snak\SnakList;
+use Wikibase\Repo\Diff\ClaimDiffer;
/**
* @covers Wikibase\ClaimSummaryBuilder
diff --git a/repo/tests/phpunit/includes/ClaimDifferTest.php
b/repo/tests/phpunit/includes/Diff/ClaimDifferTest.php
similarity index 93%
rename from repo/tests/phpunit/includes/ClaimDifferTest.php
rename to repo/tests/phpunit/includes/Diff/ClaimDifferTest.php
index e371eb8..8f6760f 100644
--- a/repo/tests/phpunit/includes/ClaimDifferTest.php
+++ b/repo/tests/phpunit/includes/Diff/ClaimDifferTest.php
@@ -8,16 +8,16 @@
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;
use Diff\Differ\OrderedListDiffer;
-use Wikibase\ClaimDiffer;
-use Wikibase\ClaimDifference;
use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Claim\Statement;
use Wikibase\DataModel\ReferenceList;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\SnakList;
+use Wikibase\Repo\Diff\ClaimDiffer;
+use Wikibase\Repo\Diff\ClaimDifference;
/**
- * @covers Wikibase\ClaimDiffer
+ * @covers Wikibase\Repo\Diff\ClaimDiffer
*
* @group Wikibase
* @group WikibaseRepo
@@ -119,7 +119,7 @@
$differ = new ClaimDiffer( new OrderedListDiffer( new
ComparableComparer() ) );
$actual = $differ->diffClaims( $oldClaim, $newClaim );
- $this->assertInstanceOf( 'Wikibase\ClaimDifference', $actual );
+ $this->assertInstanceOf( 'Wikibase\Repo\Diff\ClaimDifference',
$actual );
if ( !$expected->equals( $actual ) ) {
$this->assertEquals($expected, $actual);
diff --git a/repo/tests/phpunit/includes/ClaimDifferenceTest.php
b/repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php
similarity index 92%
rename from repo/tests/phpunit/includes/ClaimDifferenceTest.php
rename to repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php
index 426b991..59d75cf 100644
--- a/repo/tests/phpunit/includes/ClaimDifferenceTest.php
+++ b/repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php
@@ -5,13 +5,13 @@
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
-use Wikibase\ClaimDifference;
use Wikibase\DataModel\Claim\Statement;
use Wikibase\DataModel\Reference;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
+use Wikibase\Repo\Diff\ClaimDifference;
/**
- * @covers Wikibase\ClaimDifference
+ * @covers Wikibase\Repo\Diff\ClaimDifference
*
* @group Wikibase
* @group WikibaseRepo
@@ -32,7 +32,7 @@
$actual = $difference->getReferenceChanges();
- $this->assertInstanceOf( 'Diff\Diff', $actual );
+ $this->assertInstanceOf( 'Diff\DiffOp\Diff\Diff', $actual );
$this->assertEquals( $expected, $actual );
}
@@ -45,7 +45,7 @@
$actual = $difference->getQualifierChanges();
- $this->assertInstanceOf( 'Diff\Diff', $actual );
+ $this->assertInstanceOf( 'Diff\DiffOp\Diff\Diff', $actual );
$this->assertEquals( $expected, $actual );
}
@@ -59,7 +59,7 @@
$actual = $difference->getMainSnakChange();
- $this->assertInstanceOf( 'Diff\DiffOpChange', $actual );
+ $this->assertInstanceOf( 'Diff\DiffOp\DiffOpChange', $actual );
$this->assertEquals( $expected, $actual );
}
@@ -73,7 +73,7 @@
$actual = $difference->getRankChange();
- $this->assertInstanceOf( 'Diff\DiffOpChange', $actual );
+ $this->assertInstanceOf( 'Diff\DiffOp\DiffOpChange', $actual );
$this->assertEquals( $expected, $actual );
}
diff --git a/repo/tests/phpunit/includes/ClaimDifferenceVisualizerTest.php
b/repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
similarity index 97%
rename from repo/tests/phpunit/includes/ClaimDifferenceVisualizerTest.php
rename to repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
index 3a75ed7..96361c2 100644
--- a/repo/tests/phpunit/includes/ClaimDifferenceVisualizerTest.php
+++ b/repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
@@ -7,8 +7,6 @@
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;
-use Wikibase\ClaimDifference;
-use Wikibase\ClaimDifferenceVisualizer;
use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Claim\Statement;
use Wikibase\DataModel\Entity\PropertyId;
@@ -19,9 +17,11 @@
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\SnakList;
use Wikibase\Lib\SnakFormatter;
+use Wikibase\Repo\Diff\ClaimDifference;
+use Wikibase\Repo\Diff\ClaimDifferenceVisualizer;
/**
- * @covers Wikibase\ClaimDifferenceVisualizer
+ * @covers Wikibase\Repo\Diff\ClaimDifferenceVisualizer
*
* @group Wikibase
* @group WikibaseRepo
@@ -70,7 +70,7 @@
public function testConstruction(){
$instance = $this->newClaimDifferenceVisualizer();
- $this->assertInstanceOf( 'Wikibase\ClaimDifferenceVisualizer',
$instance );
+ $this->assertInstanceOf(
'Wikibase\Repo\Diff\ClaimDifferenceVisualizer', $instance );
}
public function testConstructionWithBadDetailsFormatter(){
diff --git a/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
b/repo/tests/phpunit/includes/Diff/DiffOpValueFormatterTest.php
similarity index 93%
rename from repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
rename to repo/tests/phpunit/includes/Diff/DiffOpValueFormatterTest.php
index 39d65e4..5942478 100644
--- a/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
+++ b/repo/tests/phpunit/includes/Diff/DiffOpValueFormatterTest.php
@@ -2,10 +2,10 @@
namespace Wikibase\Test;
-use Wikibase\DiffOpValueFormatter;
+use Wikibase\Repo\Diff\DiffOpValueFormatter;
/**
- * @covers Wikibase\DiffOpValueFormatter
+ * @covers Wikibase\Repo\Diff\DiffOpValueFormatter
*
* @group Wikibase
* @group WikibaseRepo
diff --git a/repo/tests/phpunit/includes/DiffViewTest.php
b/repo/tests/phpunit/includes/Diff/DiffViewTest.php
similarity index 97%
rename from repo/tests/phpunit/includes/DiffViewTest.php
rename to repo/tests/phpunit/includes/Diff/DiffViewTest.php
index de3f104..d86f7d7 100644
--- a/repo/tests/phpunit/includes/DiffViewTest.php
+++ b/repo/tests/phpunit/includes/Diff/DiffViewTest.php
@@ -6,12 +6,12 @@
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;
-use Wikibase\DiffView;
+use Wikibase\Repo\Diff\DiffView;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\DataModel\Entity\ItemId;
/**
- * @covers Wikibase\DiffView
+ * @covers Wikibase\Repo\Diff\DiffView
*
* @group WikibaseRepo
* @group Wikibase
diff --git a/repo/tests/phpunit/includes/EntityContentDiffViewTest.php
b/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php
similarity index 98%
rename from repo/tests/phpunit/includes/EntityContentDiffViewTest.php
rename to repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php
index 2892f80..0b9179b 100644
--- a/repo/tests/phpunit/includes/EntityContentDiffViewTest.php
+++ b/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php
@@ -8,12 +8,12 @@
use Title;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\EntityContentDiffView;
use Wikibase\ItemContent;
use Wikibase\Lib\Store\EntityRedirect;
+use Wikibase\Repo\Diff\EntityContentDiffView;
/**
- * @covers Wikibase\EntityContentDiffView
+ * @covers Wikibase\Repo\Diff\EntityContentDiffView
*
* @group Wikibase
* @group WikibaseRepo
diff --git a/repo/tests/phpunit/includes/EntityDiffVisualizerTest.php
b/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
similarity index 92%
rename from repo/tests/phpunit/includes/EntityDiffVisualizerTest.php
rename to repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
index 69dd4ef..cc3dc85 100644
--- a/repo/tests/phpunit/includes/EntityDiffVisualizerTest.php
+++ b/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
@@ -8,15 +8,15 @@
use IContextSource;
use Language;
use Site;
-use Wikibase\ClaimDiffer;
-use Wikibase\ClaimDifferenceVisualizer;
use Wikibase\DataModel\Entity\EntityDiff;
-use Wikibase\EntityDiffVisualizer;
use Wikibase\Repo\Content\EntityContentDiff;
+use Wikibase\Repo\Diff\ClaimDiffer;
+use Wikibase\Repo\Diff\ClaimDifferenceVisualizer;
+use Wikibase\Repo\Diff\EntityDiffVisualizer;
use Wikibase\Repo\WikibaseRepo;
/**
- * @covers Wikibase\EntityDiffVisualizer
+ * @covers Wikibase\Repo\Diff\EntityDiffVisualizer
*
* @group Wikibase
* @group WikibaseRepo
@@ -98,7 +98,7 @@
* @return ClaimDiffer
*/
protected function getMockClaimDiffer() {
- $mock = $this->getMockBuilder( 'Wikibase\ClaimDiffer' )
+ $mock = $this->getMockBuilder( 'Wikibase\Repo\Diff\ClaimDiffer'
)
->disableOriginalConstructor()
->getMock();
return $mock;
@@ -108,7 +108,7 @@
* @return ClaimDifferenceVisualizer
*/
protected function getMockClaimDiffVisualizer() {
- $mock = $this->getMockBuilder(
'Wikibase\ClaimDifferenceVisualizer' )
+ $mock = $this->getMockBuilder(
'Wikibase\Repo\Diff\ClaimDifferenceVisualizer' )
->disableOriginalConstructor()
->getMock();
return $mock;
--
To view, visit https://gerrit.wikimedia.org/r/162628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If16ddd6f7b4840cb38e6f448e17cf23c3c6ea536
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Bene <benestar.wikime...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
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
