Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155515
Change subject: Stop using EntityDiff and ItemDiff aliases
......................................................................
Stop using EntityDiff and ItemDiff aliases
Change-Id: I8871e1a55ad349e8b463664c497219ee90937978
---
M client/includes/ChangeHandler.php
M client/tests/phpunit/includes/ChangeHandlerTest.php
M lib/includes/WikibaseDiffOpFactory.php
M lib/includes/changes/ItemChange.php
M lib/tests/phpunit/ChangesTableTest.php
M lib/tests/phpunit/changes/ItemChangeTest.php
M repo/includes/EntityDiffVisualizer.php
M repo/includes/content/EntityContentDiff.php
M repo/tests/phpunit/includes/EntityDiffVisualizerTest.php
M repo/tests/phpunit/includes/content/EntityContentDiffTest.php
M repo/tests/phpunit/includes/content/EntityContentTest.php
M repo/tests/phpunit/includes/content/ItemContentTest.php
12 files changed, 20 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/15/155515/1
diff --git a/client/includes/ChangeHandler.php
b/client/includes/ChangeHandler.php
index 9601647..eb36d79 100644
--- a/client/includes/ChangeHandler.php
+++ b/client/includes/ChangeHandler.php
@@ -7,6 +7,8 @@
use SiteList;
use Title;
use Wikibase\Client\WikibaseClient;
+use Wikibase\DataModel\Entity\Diff\EntityDiff;
+use Wikibase\DataModel\Entity\Diff\ItemDiff;
use Wikibase\Lib\Changes\EntityChangeFactory;
use Wikibase\Lib\Store\EntityRevisionLookup;
diff --git a/client/tests/phpunit/includes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/ChangeHandlerTest.php
index 8b601fa..b6226fc 100644
--- a/client/tests/phpunit/includes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/ChangeHandlerTest.php
@@ -8,7 +8,7 @@
use Wikibase\Change;
use Wikibase\ChangeHandler;
use Wikibase\Client\WikibaseClient;
-use Wikibase\DataModel\Entity\EntityDiff;
+use Wikibase\DataModel\Entity\Diff\EntityDiff;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
@@ -1236,4 +1236,5 @@
$this->assertArrayEquals( $exp, $up );
}
}
+
}
diff --git a/lib/includes/WikibaseDiffOpFactory.php
b/lib/includes/WikibaseDiffOpFactory.php
index 6ef9748..ea4fdfb 100644
--- a/lib/includes/WikibaseDiffOpFactory.php
+++ b/lib/includes/WikibaseDiffOpFactory.php
@@ -3,6 +3,7 @@
namespace Wikibase;
use Diff\DiffOpFactory;
+use Wikibase\DataModel\Entity\Diff\EntityDiff;
/**
* Class for changes that can be represented as a Diff.
diff --git a/lib/includes/changes/ItemChange.php
b/lib/includes/changes/ItemChange.php
index f5959f2..a494d12 100644
--- a/lib/includes/changes/ItemChange.php
+++ b/lib/includes/changes/ItemChange.php
@@ -3,6 +3,7 @@
namespace Wikibase;
use Diff\Diff;
+use Wikibase\DataModel\Entity\Diff\ItemDiff;
/**
* @since 0.3
@@ -36,4 +37,5 @@
return $diff->getSiteLinkDiff();
}
}
+
}
diff --git a/lib/tests/phpunit/ChangesTableTest.php
b/lib/tests/phpunit/ChangesTableTest.php
index f302feb..96a22ce 100644
--- a/lib/tests/phpunit/ChangesTableTest.php
+++ b/lib/tests/phpunit/ChangesTableTest.php
@@ -7,8 +7,8 @@
use Diff\DiffOpChange;
use Wikibase\ChangesTable;
use Wikibase\Claim;
+use Wikibase\DataModel\Entity\Diff\ItemDiff;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\ItemDiff;
use Wikibase\PropertyNoValueSnak;
/**
@@ -164,4 +164,3 @@
}
}
-
diff --git a/lib/tests/phpunit/changes/ItemChangeTest.php
b/lib/tests/phpunit/changes/ItemChangeTest.php
index 05a6c72..24d6c63 100644
--- a/lib/tests/phpunit/changes/ItemChangeTest.php
+++ b/lib/tests/phpunit/changes/ItemChangeTest.php
@@ -5,9 +5,9 @@
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpChange;
use Exception;
+use Wikibase\DataModel\Entity\Diff\ItemDiff;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\Item;
-use Wikibase\DataModel\Entity\ItemDiff;
use Wikibase\EntityChange;
use Wikibase\ItemChange;
diff --git a/repo/includes/EntityDiffVisualizer.php
b/repo/includes/EntityDiffVisualizer.php
index 6af6ec8..074dea6 100644
--- a/repo/includes/EntityDiffVisualizer.php
+++ b/repo/includes/EntityDiffVisualizer.php
@@ -10,6 +10,8 @@
use IContextSource;
use MWException;
use SiteStore;
+use Wikibase\DataModel\Entity\Diff\EntityDiff;
+use Wikibase\DataModel\Entity\Diff\ItemDiff;
use Wikibase\Repo\Content\EntityContentDiff;
/**
diff --git a/repo/includes/content/EntityContentDiff.php
b/repo/includes/content/EntityContentDiff.php
index 771eb2a..07e9404 100644
--- a/repo/includes/content/EntityContentDiff.php
+++ b/repo/includes/content/EntityContentDiff.php
@@ -3,7 +3,7 @@
namespace Wikibase\Repo\Content;
use Diff\DiffOp\Diff\Diff;
-use Wikibase\DataModel\Entity\EntityDiff;
+use Wikibase\DataModel\Entity\Diff\EntityDiff;
/**
* Represents a diff between two Wikibase\EntityContent instances.
diff --git a/repo/tests/phpunit/includes/EntityDiffVisualizerTest.php
b/repo/tests/phpunit/includes/EntityDiffVisualizerTest.php
index fb6120f..1f46836 100644
--- a/repo/tests/phpunit/includes/EntityDiffVisualizerTest.php
+++ b/repo/tests/phpunit/includes/EntityDiffVisualizerTest.php
@@ -10,9 +10,9 @@
use Site;
use Wikibase\ClaimDiffer;
use Wikibase\ClaimDifferenceVisualizer;
-use Wikibase\Repo\Content\EntityContentDiff;
-use Wikibase\DataModel\Entity\EntityDiff;
+use Wikibase\DataModel\Entity\Diff\EntityDiff;
use Wikibase\EntityDiffVisualizer;
+use Wikibase\Repo\Content\EntityContentDiff;
/**
* @covers Wikibase\EntityDiffVisualizer
diff --git a/repo/tests/phpunit/includes/content/EntityContentDiffTest.php
b/repo/tests/phpunit/includes/content/EntityContentDiffTest.php
index dce7dc1..1e71c14 100644
--- a/repo/tests/phpunit/includes/content/EntityContentDiffTest.php
+++ b/repo/tests/phpunit/includes/content/EntityContentDiffTest.php
@@ -5,7 +5,7 @@
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpRemove;
-use Wikibase\DataModel\Entity\EntityDiff;
+use Wikibase\DataModel\Entity\Diff\EntityDiff;
use Wikibase\Repo\Content\EntityContentDiff;
/**
diff --git a/repo/tests/phpunit/includes/content/EntityContentTest.php
b/repo/tests/phpunit/includes/content/EntityContentTest.php
index 90ed889..2b387fe 100644
--- a/repo/tests/phpunit/includes/content/EntityContentTest.php
+++ b/repo/tests/phpunit/includes/content/EntityContentTest.php
@@ -8,16 +8,14 @@
use ParserOptions;
use RequestContext;
use Title;
-use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Entity\Diff\EntityDiff;
use Wikibase\DataModel\Entity\Entity;
-use Wikibase\DataModel\Term\Term;
-use Wikibase\Lib\Store\EntityRedirect;
-use Wikibase\DataModel\Entity\EntityDiff;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Term\Term;
use Wikibase\EntityContent;
use Wikibase\LanguageFallbackChain;
use Wikibase\LanguageWithConversion;
+use Wikibase\Lib\Store\EntityRedirect;
use Wikibase\Lib\Store\EntityStore;
use Wikibase\Repo\Content\EntityContentDiff;
use Wikibase\Repo\WikibaseRepo;
@@ -509,4 +507,5 @@
$this->assertNotNull( $content->getRedirectTarget() );
}
}
+
}
diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php
b/repo/tests/phpunit/includes/content/ItemContentTest.php
index 7d3e07e..5bb37aa 100644
--- a/repo/tests/phpunit/includes/content/ItemContentTest.php
+++ b/repo/tests/phpunit/includes/content/ItemContentTest.php
@@ -9,7 +9,7 @@
use Title;
use Wikibase\DataModel\Claim\Claims;
use Wikibase\DataModel\Claim\Statement;
-use Wikibase\DataModel\Entity\EntityDiff;
+use Wikibase\DataModel\Entity\Diff\EntityDiff;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
--
To view, visit https://gerrit.wikimedia.org/r/155515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8871e1a55ad349e8b463664c497219ee90937978
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
