Aude has submitted this change and it was merged.

Change subject: Stop using EntityDiff and ItemDiff aliases
......................................................................


Stop using EntityDiff and ItemDiff aliases

... if possible. It's not possible in classes that are directly in
the Wikibase namespace.

Change-Id: I8871e1a55ad349e8b463664c497219ee90937978
---
M lib/tests/phpunit/ChangesTableTest.php
M repo/tests/phpunit/includes/EntityDiffVisualizerTest.php
M repo/tests/phpunit/includes/content/EntityContentTest.php
3 files changed, 5 insertions(+), 7 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  WikidataJenkins: Verified
  jenkins-bot: Checked



diff --git a/lib/tests/phpunit/ChangesTableTest.php 
b/lib/tests/phpunit/ChangesTableTest.php
index f302feb..85b9538 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\ItemDiff;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\ItemDiff;
 use Wikibase\PropertyNoValueSnak;
 
 /**
@@ -164,4 +164,3 @@
        }
 
 }
-
diff --git a/repo/tests/phpunit/includes/EntityDiffVisualizerTest.php 
b/repo/tests/phpunit/includes/EntityDiffVisualizerTest.php
index 705ac17..166a856 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\EntityDiffVisualizer;
+use Wikibase\Repo\Content\EntityContentDiff;
 use Wikibase\Repo\WikibaseRepo;
 
 /**
diff --git a/repo/tests/phpunit/includes/content/EntityContentTest.php 
b/repo/tests/phpunit/includes/content/EntityContentTest.php
index 90ed889..f05156d 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\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() );
                }
        }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8871e1a55ad349e8b463664c497219ee90937978
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to