Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153612
Change subject: Optimized client imports
......................................................................
Optimized client imports
Change-Id: I71c2f0b560004065a6768fb4b910dd0b758fdb97
---
M client/WikibaseClient.hooks.php
M client/includes/ChangeHandler.php
M client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
M client/includes/DataAccess/PropertyParserFunction/Runner.php
M client/includes/WikibaseClient.php
M client/includes/hooks/InfoActionHookHandler.php
M client/includes/hooks/LanguageLinkBadgeDisplay.php
M client/includes/hooks/MovePageNotice.php
M client/includes/store/sql/DirectSqlStore.php
M client/tests/phpunit/MockClientStore.php
M client/tests/phpunit/includes/ChangeHandlerTest.php
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php
M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
M client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php
M client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php
17 files changed, 23 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/12/153612/1
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 42ed48c..fa7101d 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -32,10 +32,8 @@
use Wikibase\Client\Hooks\BeforePageDisplayHandler;
use Wikibase\Client\Hooks\InfoActionHookHandler;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
-use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
use Wikibase\Client\Hooks\SpecialWatchlistQueryHandler;
use Wikibase\Client\MovePageNotice;
-use Wikibase\Client\OtherProjectsSitesProvider;
use Wikibase\Client\WikibaseClient;
/**
diff --git a/client/includes/ChangeHandler.php
b/client/includes/ChangeHandler.php
index 8dd11ec..9601647 100644
--- a/client/includes/ChangeHandler.php
+++ b/client/includes/ChangeHandler.php
@@ -8,7 +8,6 @@
use Title;
use Wikibase\Client\WikibaseClient;
use Wikibase\Lib\Changes\EntityChangeFactory;
-use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\EntityRevisionLookup;
/**
diff --git
a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
index 11a7f8a..76ce090 100644
---
a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
@@ -5,16 +5,9 @@
use InvalidArgumentException;
use Language;
use Status;
-use Wikibase\Client\WikibaseClient;
-use Wikibase\DataModel\Claim\Claims;
-use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdParsingException;
-use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\Lib\PropertyLabelNotResolvedException;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\PropertyLabelResolver;
/**
* Renderer of the {{#property}} parser function.
diff --git a/client/includes/DataAccess/PropertyParserFunction/Runner.php
b/client/includes/DataAccess/PropertyParserFunction/Runner.php
index f95b8cb..f62122c 100644
--- a/client/includes/DataAccess/PropertyParserFunction/Runner.php
+++ b/client/includes/DataAccess/PropertyParserFunction/Runner.php
@@ -4,7 +4,6 @@
use Parser;
use Wikibase\Client\WikibaseClient;
-use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\Store\SiteLinkLookup;
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index a442b67..cc338c5 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -15,37 +15,37 @@
use SiteStore;
use ValueFormatters\FormatterOptions;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
-use Wikibase\ClientStore;
use Wikibase\Client\Hooks\ParserFunctionRegistrant;
+use Wikibase\ClientStore;
use Wikibase\DataAccess\PropertyParserFunction\RendererFactory;
use Wikibase\DataAccess\PropertyParserFunction\Runner;
use Wikibase\DataAccess\PropertyParserFunction\SnaksFinder;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\DispatchingEntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParser;
-use Wikibase\InternalSerialization\DeserializerFactory;
-use Wikibase\Lib\Changes\EntityChangeFactory;
-use Wikibase\Lib\Serializers\ForbiddenSerializer;
-use Wikibase\Lib\Store\EntityLookup;
use Wikibase\DataModel\Entity\Item;
-use Wikibase\DirectSqlStore;
use Wikibase\DataModel\Entity\Property;
+use Wikibase\DirectSqlStore;
use Wikibase\EntityFactory;
+use Wikibase\InternalSerialization\DeserializerFactory;
use Wikibase\LangLinkHandler;
use Wikibase\LanguageFallbackChainFactory;
+use Wikibase\Lib\Changes\EntityChangeFactory;
use Wikibase\Lib\EntityIdLabelFormatter;
use Wikibase\Lib\EntityRetrievingDataTypeLookup;
use Wikibase\Lib\OutputFormatSnakFormatterFactory;
use Wikibase\Lib\OutputFormatValueFormatterFactory;
use Wikibase\Lib\PropertyDataTypeLookup;
use Wikibase\Lib\PropertyInfoDataTypeLookup;
+use Wikibase\Lib\Serializers\ForbiddenSerializer;
use Wikibase\Lib\SnakFormatter;
+use Wikibase\Lib\Store\EntityContentDataCodec;
+use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\WikibaseDataTypeBuilders;
use Wikibase\Lib\WikibaseSnakFormatterBuilders;
use Wikibase\Lib\WikibaseValueFormatterBuilders;
use Wikibase\NamespaceChecker;
use Wikibase\RepoLinker;
-use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\Settings;
use Wikibase\SettingsArray;
use Wikibase\StringNormalizer;
diff --git a/client/includes/hooks/InfoActionHookHandler.php
b/client/includes/hooks/InfoActionHookHandler.php
index 34fbcef..2f0f7a1 100644
--- a/client/includes/hooks/InfoActionHookHandler.php
+++ b/client/includes/hooks/InfoActionHookHandler.php
@@ -6,9 +6,9 @@
use Title;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
+use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\NamespaceChecker;
use Wikibase\RepoLinker;
-use Wikibase\Lib\Store\SiteLinkLookup;
/**
* @since 0.5
diff --git a/client/includes/hooks/LanguageLinkBadgeDisplay.php
b/client/includes/hooks/LanguageLinkBadgeDisplay.php
index de54a0f..db2c8ad 100644
--- a/client/includes/hooks/LanguageLinkBadgeDisplay.php
+++ b/client/includes/hooks/LanguageLinkBadgeDisplay.php
@@ -2,13 +2,13 @@
namespace Wikibase\Client\Hooks;
-use Title;
use Language;
-use SiteList;
use Sanitizer;
-use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\DataModel\Entity\ItemId;
+use SiteList;
+use Title;
use Wikibase\Client\ClientSiteLinkLookup;
+use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\Lib\Store\EntityLookup;
/**
* Provides access to the badges of the current page's sitelinks
diff --git a/client/includes/hooks/MovePageNotice.php
b/client/includes/hooks/MovePageNotice.php
index 411b666..7c63a0e 100644
--- a/client/includes/hooks/MovePageNotice.php
+++ b/client/includes/hooks/MovePageNotice.php
@@ -5,8 +5,8 @@
use Html;
use Title;
use Wikibase\DataModel\SiteLink;
-use Wikibase\RepoLinker;
use Wikibase\Lib\Store\SiteLinkLookup;
+use Wikibase\RepoLinker;
/**
* Adds a notice about the Wikibase Item belonging to the current page
diff --git a/client/includes/store/sql/DirectSqlStore.php
b/client/includes/store/sql/DirectSqlStore.php
index dd047b7..c3365f1 100644
--- a/client/includes/store/sql/DirectSqlStore.php
+++ b/client/includes/store/sql/DirectSqlStore.php
@@ -6,12 +6,12 @@
use ObjectCache;
use Site;
use Wikibase\Client\WikibaseClient;
-use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\Lib\Store\CachingEntityRevisionLookup;
+use Wikibase\Lib\Store\EntityContentDataCodec;
+use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\RevisionBasedEntityLookup;
use Wikibase\Lib\Store\RedirectResolvingEntityLookup;
+use Wikibase\Lib\Store\RevisionBasedEntityLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Lib\Store\SiteLinkTable;
use Wikibase\Lib\Store\WikiPageEntityRevisionLookup;
diff --git a/client/tests/phpunit/MockClientStore.php
b/client/tests/phpunit/MockClientStore.php
index 08468fb..a5ce8a4 100644
--- a/client/tests/phpunit/MockClientStore.php
+++ b/client/tests/phpunit/MockClientStore.php
@@ -3,8 +3,8 @@
namespace Wikibase\Test;
use Wikibase\ClientStore;
-use Wikibase\PropertyInfoStore;
use Wikibase\Lib\Store\SiteLinkLookup;
+use Wikibase\PropertyInfoStore;
/**
* (Incomplete) ClientStore mock
diff --git a/client/tests/phpunit/includes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/ChangeHandlerTest.php
index ca2df57..1698a9e 100644
--- a/client/tests/phpunit/includes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/ChangeHandlerTest.php
@@ -7,11 +7,11 @@
use Wikibase\Change;
use Wikibase\ChangeHandler;
use Wikibase\Client\WikibaseClient;
+use Wikibase\DataModel\Entity\EntityDiff;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\EntityChange;
-use Wikibase\DataModel\Entity\EntityDiff;
-use Wikibase\DataModel\Entity\Item;
use Wikibase\ItemUsageIndex;
/**
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
index b0878c7..991774e 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
@@ -8,9 +8,7 @@
use Wikibase\DataAccess\PropertyParserFunction\SnaksFinder;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Item;
use Wikibase\Lib\PropertyLabelNotResolvedException;
-use Wikibase\Property;
use Wikibase\PropertyValueSnak;
/**
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php
index 86a602f..ac9b52f 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php
@@ -8,9 +8,6 @@
use Title;
use User;
use Wikibase\DataAccess\PropertyParserFunction\RendererFactory;
-use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\SnakFormatter;
/**
* @covers Wikibase\DataAccess\PropertyParserFunction\RendererFactory
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
index d3867b1..df8c464 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
@@ -4,18 +4,9 @@
use Language;
use Parser;
-use ParserOptions;
-use Status;
use Title;
-use User;
-use Wikibase\DataAccess\PropertyParserFunction\Renderer;
use Wikibase\DataAccess\PropertyParserFunction\Runner;
-use Wikibase\DataModel\Entity\Entity;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Test\MockPropertyLabelResolver;
-use Wikibase\Test\MockRepository;
/**
* @covers Wikibase\DataAccess\PropertyParserFunction\Runner
diff --git a/client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php
b/client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php
index 292cc03..79bdaef 100644
--- a/client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php
+++ b/client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php
@@ -5,9 +5,7 @@
use MediaWikiSite;
use Site;
use SiteList;
-use SiteStore;
use Wikibase\Client\OtherProjectsSitesProvider;
-use Wikibase\Client\WikibaseClient;
use Wikibase\Test\MockSiteStore;
/**
diff --git a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
index c0b0a00..4835540 100644
--- a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
+++ b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
@@ -4,9 +4,9 @@
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpChange;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
-use Wikibase\DataModel\Entity\Item;
use Wikibase\ItemChange;
use Wikibase\SiteLinkCommentCreator;
diff --git
a/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php
b/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php
index 1813b3e..80cab92 100644
--- a/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php
+++ b/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php
@@ -2,11 +2,11 @@
namespace Wikibase\Test;
-use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
-use Wikibase\Client\ClientSiteLinkLookup;
-use Wikibase\DataModel\Entity\Item;
use Language;
use Title;
+use Wikibase\Client\ClientSiteLinkLookup;
+use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
/**
--
To view, visit https://gerrit.wikimedia.org/r/153612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71c2f0b560004065a6768fb4b910dd0b758fdb97
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
