Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/229625
Change subject: Optimized Wikibase Client imports
......................................................................
Optimized Wikibase Client imports
Change-Id: I853ac0a0c03d86b0610e7260226bd903744c88ca
---
M
client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M client/includes/DataAccess/SnaksFinder.php
M client/includes/ParserOutputDataUpdater.php
M client/includes/api/PageTerms.php
M client/includes/serializers/ClientEntitySerializer.php
M client/tests/phpunit/MockClientStore.php
M client/tests/phpunit/includes/CachingOtherProjectsSitesProviderTest.php
M client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
M
client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
M client/tests/phpunit/includes/DataAccess/SnaksFinderTest.php
M
client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
M client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
M client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
M client/tests/phpunit/includes/ParserOutputDataUpdaterTest.php
M client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M client/tests/phpunit/includes/Usage/UsageTrackingSnakFormatterTest.php
M client/tests/phpunit/includes/Usage/UsageTrackingTermLookupTest.php
M client/tests/phpunit/includes/api/PageTermsTest.php
21 files changed, 18 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/25/229625/1
diff --git
a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
index 7ac84ab..a16628d 100644
---
a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
+++
b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
@@ -11,8 +11,8 @@
use Wikibase\Client\Usage\UsageAccumulator;
use Wikibase\Client\Usage\UsageTrackingSnakFormatter;
use Wikibase\DataAccess\PropertyIdResolver;
-use Wikibase\DataAccess\StatementTransclusionInteractor;
use Wikibase\DataAccess\SnaksFinder;
+use Wikibase\DataAccess\StatementTransclusionInteractor;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\FormatterLabelDescriptionLookupFactory;
use Wikibase\Lib\OutputFormatSnakFormatterFactory;
diff --git
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
index 443d9c8..620ac02 100644
---
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
+++
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
@@ -8,13 +8,13 @@
use ValueFormatters\FormatterOptions;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
use Wikibase\Client\Usage\UsageTrackingSnakFormatter;
-use Wikibase\DataAccess\StatementTransclusionInteractor;
+use Wikibase\Client\WikibaseClient;
use Wikibase\DataAccess\PropertyIdResolver;
use Wikibase\DataAccess\SnaksFinder;
-use Wikibase\Client\WikibaseClient;
+use Wikibase\DataAccess\StatementTransclusionInteractor;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\PropertyLabelNotResolvedException;
+use Wikibase\Lib\SnakFormatter;
/**
* Registers and defines functions to access Wikibase through the Scribunto
extension
diff --git a/client/includes/DataAccess/SnaksFinder.php
b/client/includes/DataAccess/SnaksFinder.php
index 851b2d7..37a0907 100644
--- a/client/includes/DataAccess/SnaksFinder.php
+++ b/client/includes/DataAccess/SnaksFinder.php
@@ -4,8 +4,8 @@
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\Snak;
-use Wikibase\DataModel\Statement\StatementListProvider;
use Wikibase\DataModel\Statement\StatementList;
+use Wikibase\DataModel\Statement\StatementListProvider;
/**
* Find Snaks for claims in a given Entity, based on PropertyId.
diff --git a/client/includes/ParserOutputDataUpdater.php
b/client/includes/ParserOutputDataUpdater.php
index 90fb5a6..bf5bb99 100644
--- a/client/includes/ParserOutputDataUpdater.php
+++ b/client/includes/ParserOutputDataUpdater.php
@@ -8,7 +8,6 @@
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\Store\SiteLinkLookup;
/**
diff --git a/client/includes/api/PageTerms.php
b/client/includes/api/PageTerms.php
index 73cc4f6..d7f2a63 100644
--- a/client/includes/api/PageTerms.php
+++ b/client/includes/api/PageTerms.php
@@ -9,8 +9,8 @@
use Title;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Store\EntityIdLookup;
-use Wikibase\TermIndexEntry;
use Wikibase\TermIndex;
+use Wikibase\TermIndexEntry;
/**
* Provides wikibase terms (labels, descriptions, aliases, etc.) for local
pages.
diff --git a/client/includes/serializers/ClientEntitySerializer.php
b/client/includes/serializers/ClientEntitySerializer.php
index c8ab68e..4cdb86b 100644
--- a/client/includes/serializers/ClientEntitySerializer.php
+++ b/client/includes/serializers/ClientEntitySerializer.php
@@ -5,8 +5,8 @@
use DataValues\Serializers\DataValueSerializer;
use Serializers\Exceptions\SerializationException;
use Wikibase\DataModel\Entity\EntityDocument;
-use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\DataModel\SerializerFactory;
+use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\Serialization\CallbackFactory;
use Wikibase\Lib\Serialization\SerializationModifier;
diff --git a/client/tests/phpunit/MockClientStore.php
b/client/tests/phpunit/MockClientStore.php
index edf4f11..7167089 100644
--- a/client/tests/phpunit/MockClientStore.php
+++ b/client/tests/phpunit/MockClientStore.php
@@ -7,9 +7,6 @@
use Wikibase\Client\Usage\NullSubscriptionManager;
use Wikibase\Client\Usage\NullUsageTracker;
use Wikibase\ClientStore;
-use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\EntityPrefetcher;
-use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\NullEntityPrefetcher;
use Wikibase\PropertyInfoStore;
use Wikibase\Store\EntityIdLookup;
diff --git
a/client/tests/phpunit/includes/CachingOtherProjectsSitesProviderTest.php
b/client/tests/phpunit/includes/CachingOtherProjectsSitesProviderTest.php
index 77a7bb8..20b2fd0 100644
--- a/client/tests/phpunit/includes/CachingOtherProjectsSitesProviderTest.php
+++ b/client/tests/phpunit/includes/CachingOtherProjectsSitesProviderTest.php
@@ -3,8 +3,8 @@
namespace Wikibase\Client\Tests;
use HashBagOStuff;
-use Wikibase\Client\OtherProjectsSitesProvider;
use Wikibase\Client\CachingOtherProjectsSitesProvider;
+use Wikibase\Client\OtherProjectsSitesProvider;
/**
* @covers Wikibase\Client\CachingOtherProjectsSitesProvider
diff --git a/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
b/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
index 0613afd..a0d4b1d 100644
--- a/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
+++ b/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
@@ -11,7 +11,6 @@
use Wikibase\Client\Usage\SiteLinkUsageLookup;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\SiteLink;
use Wikibase\ItemChange;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Test\TestChanges;
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
index 425603a..b4678f0 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
@@ -5,7 +5,6 @@
use DataValues\StringValue;
use Language;
use Wikibase\Client\Usage\EntityUsage;
-use Wikibase\Client\Usage\HashUsageAccumulator;
use Wikibase\DataAccess\PropertyIdResolver;
use Wikibase\DataAccess\PropertyParserFunction\LanguageAwareRenderer;
use Wikibase\DataAccess\SnaksFinder;
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
index d7ac895..9e5630f 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php
@@ -2,14 +2,14 @@
namespace Wikibase\Client\Tests\DataAccess\PropertyParserFunction;
-use MediaWikiTestCase;
use Language;
+use MediaWikiTestCase;
use Parser;
use ParserOptions;
use Title;
+use Wikibase\Client\Tests\DataAccess\WikibaseDataAccessTestItemSetUpHelper;
use Wikibase\Client\WikibaseClient;
use Wikibase\Test\MockClientStore;
-use Wikibase\Client\Tests\DataAccess\WikibaseDataAccessTestItemSetUpHelper;
/**
* Simple integration test for the {{#property:…}} parser function.
diff --git
a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
index 0983e85..9bf245a 100644
---
a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
+++
b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
@@ -16,8 +16,8 @@
use Language;
use Title;
-use Wikibase\Client\WikibaseClient;
use Wikibase\Client\Tests\DataAccess\WikibaseDataAccessTestItemSetUpHelper;
+use Wikibase\Client\WikibaseClient;
use Wikibase\Test\MockClientStore;
/**
diff --git a/client/tests/phpunit/includes/DataAccess/SnaksFinderTest.php
b/client/tests/phpunit/includes/DataAccess/SnaksFinderTest.php
index a882514..2f945b9 100644
--- a/client/tests/phpunit/includes/DataAccess/SnaksFinderTest.php
+++ b/client/tests/phpunit/includes/DataAccess/SnaksFinderTest.php
@@ -8,8 +8,8 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\DataModel\Statement\StatementListProvider;
use Wikibase\DataModel\Statement\Statement;
+use Wikibase\DataModel\Statement\StatementListProvider;
/**
* @covers Wikibase\DataAccess\SnaksFinder
diff --git
a/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
b/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
index 61c90c2..86c1cbf 100644
---
a/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
+++
b/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php
@@ -6,7 +6,6 @@
use Language;
use PHPUnit_Framework_TestCase;
use Wikibase\Client\Usage\EntityUsage;
-use Wikibase\Client\Usage\HashUsageAccumulator;
use Wikibase\DataAccess\PropertyIdResolver;
use Wikibase\DataAccess\SnaksFinder;
use Wikibase\DataAccess\StatementTransclusionInteractor;
diff --git a/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
b/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
index ac761a8..f69fdc6 100644
--- a/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
+++ b/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
@@ -3,7 +3,6 @@
namespace Wikibase\Client\Tests\Hooks;
use JobQueueGroup;
-use JobSpecification;
use ParserOutput;
use Title;
use Wikibase\Client\Hooks\DataUpdateHookHandlers;
diff --git
a/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
b/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
index e76a546..0f94e46 100644
--- a/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
+++ b/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
@@ -2,9 +2,9 @@
namespace Wikibase\Client\Tests\Hooks;
-use Title;
-use SiteStore;
use MediaWikiSite;
+use SiteStore;
+use Title;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
diff --git a/client/tests/phpunit/includes/ParserOutputDataUpdaterTest.php
b/client/tests/phpunit/includes/ParserOutputDataUpdaterTest.php
index f59a5c0..6186af2 100644
--- a/client/tests/phpunit/includes/ParserOutputDataUpdaterTest.php
+++ b/client/tests/phpunit/includes/ParserOutputDataUpdaterTest.php
@@ -11,7 +11,6 @@
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\SiteLink;
use Wikibase\Test\MockRepository;
/**
diff --git a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
index 36291bc..fac2798 100644
--- a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
+++ b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
@@ -6,7 +6,6 @@
use Diff\DiffOp\DiffOpChange;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\SiteLink;
use Wikibase\ItemChange;
use Wikibase\SiteLinkCommentCreator;
use Wikibase\Test\TestChanges;
diff --git
a/client/tests/phpunit/includes/Usage/UsageTrackingSnakFormatterTest.php
b/client/tests/phpunit/includes/Usage/UsageTrackingSnakFormatterTest.php
index f47f221..ded228e 100644
--- a/client/tests/phpunit/includes/Usage/UsageTrackingSnakFormatterTest.php
+++ b/client/tests/phpunit/includes/Usage/UsageTrackingSnakFormatterTest.php
@@ -3,8 +3,8 @@
namespace Wikibase\Client\Tests\Usage;
use DataValues\StringValue;
-use Wikibase\Client\Usage\UsageTrackingSnakFormatter;
use Wikibase\Client\Usage\HashUsageAccumulator;
+use Wikibase\Client\Usage\UsageTrackingSnakFormatter;
use Wikibase\DataModel\Entity\EntityIdValue;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
diff --git
a/client/tests/phpunit/includes/Usage/UsageTrackingTermLookupTest.php
b/client/tests/phpunit/includes/Usage/UsageTrackingTermLookupTest.php
index 935d765..a903845 100644
--- a/client/tests/phpunit/includes/Usage/UsageTrackingTermLookupTest.php
+++ b/client/tests/phpunit/includes/Usage/UsageTrackingTermLookupTest.php
@@ -2,8 +2,8 @@
namespace Wikibase\Client\Tests\Usage;
-use Wikibase\Client\Usage\UsageTrackingTermLookup;
use Wikibase\Client\Usage\HashUsageAccumulator;
+use Wikibase\Client\Usage\UsageTrackingTermLookup;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Lib\Store\TermLookup;
diff --git a/client/tests/phpunit/includes/api/PageTermsTest.php
b/client/tests/phpunit/includes/api/PageTermsTest.php
index ad8b04a..520a24f 100644
--- a/client/tests/phpunit/includes/api/PageTermsTest.php
+++ b/client/tests/phpunit/includes/api/PageTermsTest.php
@@ -9,12 +9,12 @@
use RequestContext;
use Title;
use Wikibase\Client\Api\PageTerms;
-use Wikibase\Store\EntityIdLookup;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\TermIndexEntry;
+use Wikibase\Store\EntityIdLookup;
use Wikibase\TermIndex;
+use Wikibase\TermIndexEntry;
/**
* @covers Wikibase\Client\Api\PageTerms
--
To view, visit https://gerrit.wikimedia.org/r/229625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I853ac0a0c03d86b0610e7260226bd903744c88ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
