Jeroen De Dauw has uploaded a new change for review. https://gerrit.wikimedia.org/r/185086
Change subject: Optimized imports ...................................................................... Optimized imports Change-Id: I4418f26501dae804d0d735f2d7860f1d64efe0c7 --- M repo/includes/Diff/ClaimDifferenceVisualizer.php M repo/includes/Dumpers/JsonDumpGenerator.php M repo/includes/Hook/LabelPrefetchHookHandlers.php M repo/includes/Interactors/RedirectCreationInteractor.php M repo/includes/Interactors/TokenCheckInteractor.php M repo/includes/LinkedData/EntityDataRequestHandler.php M repo/includes/LinkedData/EntityDataSerializationService.php M repo/includes/UpdateRepo/UpdateRepoJob.php M repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php M repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php M repo/includes/WikibaseRepo.php M repo/includes/api/ApiHelperFactory.php M repo/includes/api/ApiWikibase.php M repo/includes/api/ClaimModificationHelper.php M repo/includes/api/LinkTitles.php M repo/includes/api/ModifyEntity.php M repo/includes/content/ItemContent.php M repo/includes/modules/TemplateModule.php M repo/maintenance/dumpJson.php M repo/maintenance/importProperties.php 20 files changed, 24 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/86/185086/1 diff --git a/repo/includes/Diff/ClaimDifferenceVisualizer.php b/repo/includes/Diff/ClaimDifferenceVisualizer.php index 808dc24..2a34f46 100644 --- a/repo/includes/Diff/ClaimDifferenceVisualizer.php +++ b/repo/includes/Diff/ClaimDifferenceVisualizer.php @@ -2,11 +2,11 @@ namespace Wikibase\Repo\Diff; +use Diff\Differ\ListDiffer; use Diff\DiffOp\Diff\Diff; use Diff\DiffOp\DiffOpAdd; use Diff\DiffOp\DiffOpChange; use Diff\DiffOp\DiffOpRemove; -use Diff\Differ\ListDiffer; use Exception; use InvalidArgumentException; use Message; diff --git a/repo/includes/Dumpers/JsonDumpGenerator.php b/repo/includes/Dumpers/JsonDumpGenerator.php index 2148591..25fc9b5 100644 --- a/repo/includes/Dumpers/JsonDumpGenerator.php +++ b/repo/includes/Dumpers/JsonDumpGenerator.php @@ -12,8 +12,8 @@ use Wikibase\Lib\Reporting\RethrowingExceptionHandler; use Wikibase\Lib\Serializers\Serializer; use Wikibase\Lib\Store\EntityLookup; -use Wikibase\Lib\Store\StorageException; use Wikibase\Lib\Store\RedirectResolvingEntityLookup; +use Wikibase\Lib\Store\StorageException; use Wikibase\Lib\Store\UnresolvedRedirectException; use Wikibase\Repo\Store\EntityIdPager; diff --git a/repo/includes/Hook/LabelPrefetchHookHandlers.php b/repo/includes/Hook/LabelPrefetchHookHandlers.php index 30b9a32..d43e4fd 100644 --- a/repo/includes/Hook/LabelPrefetchHookHandlers.php +++ b/repo/includes/Hook/LabelPrefetchHookHandlers.php @@ -8,11 +8,10 @@ use Title; use Wikibase\Client\Store\TitleFactory; use Wikibase\Lib\Store\StorageException; -use Wikibase\Store\TermBuffer; use Wikibase\Repo\WikibaseRepo; use Wikibase\Store\EntityIdLookup; +use Wikibase\Store\TermBuffer; use Wikibase\Term; - /** * Hook handlers for triggering prefetching of labels. diff --git a/repo/includes/Interactors/RedirectCreationInteractor.php b/repo/includes/Interactors/RedirectCreationInteractor.php index 10a1ca3..f992a28 100644 --- a/repo/includes/Interactors/RedirectCreationInteractor.php +++ b/repo/includes/Interactors/RedirectCreationInteractor.php @@ -2,7 +2,6 @@ namespace Wikibase\Repo\Interactors; -use Status; use User; use Wikibase\DataModel\Entity\EntityId; use Wikibase\Lib\Store\EntityRedirect; diff --git a/repo/includes/Interactors/TokenCheckInteractor.php b/repo/includes/Interactors/TokenCheckInteractor.php index ea105d5..163f664 100644 --- a/repo/includes/Interactors/TokenCheckInteractor.php +++ b/repo/includes/Interactors/TokenCheckInteractor.php @@ -5,7 +5,6 @@ use User; use WebRequest; - /** * Interactor for checking edit tokens * diff --git a/repo/includes/LinkedData/EntityDataRequestHandler.php b/repo/includes/LinkedData/EntityDataRequestHandler.php index 557ccd4..6c40395 100644 --- a/repo/includes/LinkedData/EntityDataRequestHandler.php +++ b/repo/includes/LinkedData/EntityDataRequestHandler.php @@ -11,12 +11,12 @@ use Wikibase\DataModel\Entity\EntityIdParser; use Wikibase\DataModel\Entity\EntityIdParsingException; use Wikibase\EntityRevision; -use Wikibase\UnloggedHttpError; use Wikibase\Lib\Store\BadRevisionException; use Wikibase\Lib\Store\EntityRedirectResolvingDecorator; use Wikibase\Lib\Store\EntityRevisionLookup; use Wikibase\Lib\Store\EntityTitleLookup; use Wikibase\Lib\Store\StorageException; +use Wikibase\UnloggedHttpError; /** * Request handler implementing a linked data interface for Wikibase entities. diff --git a/repo/includes/LinkedData/EntityDataSerializationService.php b/repo/includes/LinkedData/EntityDataSerializationService.php index 557ba15..ce8059b 100644 --- a/repo/includes/LinkedData/EntityDataSerializationService.php +++ b/repo/includes/LinkedData/EntityDataSerializationService.php @@ -13,10 +13,10 @@ use RequestContext; use SiteList; use Wikibase\Api\ResultBuilder; -use Wikibase\Lib\Store\EntityLookup; use Wikibase\EntityRevision; use Wikibase\Lib\Serializers\SerializationOptions; use Wikibase\Lib\Serializers\SerializerFactory; +use Wikibase\Lib\Store\EntityLookup; use Wikibase\Lib\Store\EntityTitleLookup; use Wikibase\RdfSerializer; diff --git a/repo/includes/UpdateRepo/UpdateRepoJob.php b/repo/includes/UpdateRepo/UpdateRepoJob.php index 92a3f8b..35b82c0 100644 --- a/repo/includes/UpdateRepo/UpdateRepoJob.php +++ b/repo/includes/UpdateRepo/UpdateRepoJob.php @@ -2,21 +2,21 @@ namespace Wikibase\Repo\UpdateRepo; +use InvalidArgumentException; use Job; use Title; use User; -use InvalidArgumentException; -use Wikibase\Summary; -use Wikibase\SummaryFormatter; -use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\Item; +use Wikibase\DataModel\Entity\ItemId; +use Wikibase\EditEntity; use Wikibase\Lib\Store\EntityRevisionLookup; use Wikibase\Lib\Store\EntityStore; use Wikibase\Lib\Store\EntityTitleLookup; use Wikibase\Lib\Store\StorageException; use Wikibase\Repo\Store\EntityPermissionChecker; -use Wikibase\EditEntity; use Wikibase\Repo\WikibaseRepo; +use Wikibase\Summary; +use Wikibase\SummaryFormatter; /** * Job template for updating the repo after a change in client. diff --git a/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php b/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php index 3745df3..c3be8c6 100644 --- a/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php +++ b/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php @@ -2,12 +2,9 @@ namespace Wikibase\Repo\UpdateRepo; -use Job; use OutOfBoundsException; use SiteStore; use Title; -use Wikibase\Summary; -use Wikibase\SummaryFormatter; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\SiteLink; use Wikibase\Lib\Store\EntityRevisionLookup; @@ -15,6 +12,8 @@ use Wikibase\Lib\Store\EntityTitleLookup; use Wikibase\Repo\Store\EntityPermissionChecker; use Wikibase\Repo\WikibaseRepo; +use Wikibase\Summary; +use Wikibase\SummaryFormatter; /** * Job for updating the repo after a page on the client has been deleted. diff --git a/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php b/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php index f479eb2..a5407fa 100644 --- a/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php +++ b/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php @@ -2,12 +2,9 @@ namespace Wikibase\Repo\UpdateRepo; -use Job; use OutOfBoundsException; use SiteStore; use Title; -use Wikibase\Summary; -use Wikibase\SummaryFormatter; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\SiteLink; use Wikibase\Lib\Store\EntityRevisionLookup; @@ -15,6 +12,8 @@ use Wikibase\Lib\Store\EntityTitleLookup; use Wikibase\Repo\Store\EntityPermissionChecker; use Wikibase\Repo\WikibaseRepo; +use Wikibase\Summary; +use Wikibase\SummaryFormatter; /** * Job for updating the repo after a page on the client has been moved. diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php index 36898f3..2932368 100644 --- a/repo/includes/WikibaseRepo.php +++ b/repo/includes/WikibaseRepo.php @@ -52,7 +52,6 @@ use Wikibase\Lib\Store\EntityRevisionLookup; use Wikibase\Lib\Store\EntityStore; use Wikibase\Lib\Store\EntityStoreWatcher; -use Wikibase\Lib\Store\EntityTermLookup; use Wikibase\Lib\Store\EntityTitleLookup; use Wikibase\Lib\Store\TermLookup; use Wikibase\Lib\WikibaseDataTypeBuilders; @@ -68,14 +67,14 @@ use Wikibase\Repo\Notifications\DatabaseChangeTransmitter; use Wikibase\Repo\Notifications\DummyChangeTransmitter; use Wikibase\Repo\Store\EntityPermissionChecker; -use Wikibase\Store\BufferingTermLookup; -use Wikibase\Store\EntityIdLookup; use Wikibase\Repo\View\EntityViewFactory; use Wikibase\Settings; use Wikibase\SettingsArray; use Wikibase\SnakFactory; use Wikibase\SqlStore; use Wikibase\Store; +use Wikibase\Store\BufferingTermLookup; +use Wikibase\Store\EntityIdLookup; use Wikibase\Store\TermBuffer; use Wikibase\StringNormalizer; use Wikibase\SummaryFormatter; diff --git a/repo/includes/api/ApiHelperFactory.php b/repo/includes/api/ApiHelperFactory.php index 0e6bd61..3db43d7 100644 --- a/repo/includes/api/ApiHelperFactory.php +++ b/repo/includes/api/ApiHelperFactory.php @@ -3,9 +3,9 @@ namespace Wikibase\Api; use ApiBase; +use Wikibase\DataModel\Entity\PropertyDataTypeLookup; use Wikibase\EntityFactory; use Wikibase\Lib\Localizer\ExceptionLocalizer; -use Wikibase\DataModel\Entity\PropertyDataTypeLookup; use Wikibase\Lib\Serializers\SerializationOptions; use Wikibase\Lib\Serializers\SerializerFactory; use Wikibase\Lib\Store\EntityTitleLookup; diff --git a/repo/includes/api/ApiWikibase.php b/repo/includes/api/ApiWikibase.php index 8e3ea91..386dd7a 100644 --- a/repo/includes/api/ApiWikibase.php +++ b/repo/includes/api/ApiWikibase.php @@ -12,10 +12,10 @@ use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\EntityIdParser; +use Wikibase\DataModel\Entity\PropertyDataTypeLookup; use Wikibase\EditEntity; use Wikibase\EntityRevision; use Wikibase\Lib\Localizer\ExceptionLocalizer; -use Wikibase\DataModel\Entity\PropertyDataTypeLookup; use Wikibase\Lib\Store\BadRevisionException; use Wikibase\Lib\Store\EntityRevisionLookup; use Wikibase\Lib\Store\EntityStore; diff --git a/repo/includes/api/ClaimModificationHelper.php b/repo/includes/api/ClaimModificationHelper.php index c7a108c..2d55f80 100644 --- a/repo/includes/api/ClaimModificationHelper.php +++ b/repo/includes/api/ClaimModificationHelper.php @@ -19,9 +19,9 @@ use Wikibase\DataModel\Entity\EntityIdParser; use Wikibase\DataModel\Entity\EntityIdParsingException; use Wikibase\DataModel\Entity\PropertyId; +use Wikibase\DataModel\Entity\PropertyNotFoundException; use Wikibase\DataModel\Snak\Snak; use Wikibase\Lib\ClaimGuidValidator; -use Wikibase\DataModel\Entity\PropertyNotFoundException; use Wikibase\Lib\SnakConstructionService; use Wikibase\Summary; diff --git a/repo/includes/api/LinkTitles.php b/repo/includes/api/LinkTitles.php index deddd25..99e874e 100644 --- a/repo/includes/api/LinkTitles.php +++ b/repo/includes/api/LinkTitles.php @@ -9,8 +9,8 @@ use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\SiteLink; use Wikibase\Lib\Store\EntityRevisionLookup; -use Wikibase\Repo\WikibaseRepo; use Wikibase\Repo\SiteLinkTargetProvider; +use Wikibase\Repo\WikibaseRepo; use Wikibase\Summary; /** diff --git a/repo/includes/api/ModifyEntity.php b/repo/includes/api/ModifyEntity.php index 908edf7..7274a71 100644 --- a/repo/includes/api/ModifyEntity.php +++ b/repo/includes/api/ModifyEntity.php @@ -16,10 +16,10 @@ use Wikibase\DataModel\Entity\EntityIdParsingException; use Wikibase\DataModel\Entity\ItemId; use Wikibase\EntityRevision; -use Wikibase\Repo\SiteLinkTargetProvider; use Wikibase\Lib\Store\EntityRevisionLookup; use Wikibase\Lib\Store\SiteLinkLookup; use Wikibase\Lib\Store\StorageException; +use Wikibase\Repo\SiteLinkTargetProvider; use Wikibase\Repo\WikibaseRepo; use Wikibase\StringNormalizer; use Wikibase\Summary; diff --git a/repo/includes/content/ItemContent.php b/repo/includes/content/ItemContent.php index 037a465..c35f5e7 100644 --- a/repo/includes/content/ItemContent.php +++ b/repo/includes/content/ItemContent.php @@ -5,11 +5,9 @@ use InvalidArgumentException; use LogicException; use MWException; -use RuntimeException; use Title; use Wikibase\Content\EntityHolder; use Wikibase\Content\EntityInstanceHolder; -use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\Item; use Wikibase\Lib\Store\EntityRedirect; use Wikibase\Repo\ItemSearchTextGenerator; diff --git a/repo/includes/modules/TemplateModule.php b/repo/includes/modules/TemplateModule.php index a4fbded..eba92d5 100644 --- a/repo/includes/modules/TemplateModule.php +++ b/repo/includes/modules/TemplateModule.php @@ -5,7 +5,6 @@ use FormatJson; use ResourceLoaderContext; use ResourceLoaderFileModule; -use ResourceLoaderModule; use Wikibase\Template\TemplateRegistry; /** diff --git a/repo/maintenance/dumpJson.php b/repo/maintenance/dumpJson.php index 2744cae..e8001be 100644 --- a/repo/maintenance/dumpJson.php +++ b/repo/maintenance/dumpJson.php @@ -15,11 +15,11 @@ use Wikibase\Lib\Serializers\Serializer; use Wikibase\Lib\Serializers\SerializerFactory; use Wikibase\Lib\Store\EntityLookup; -use Wikibase\Repo\Store\SQL\EntityPerPageIdPager; +use Wikibase\Lib\Store\RevisionBasedEntityLookup; use Wikibase\Repo\IO\EntityIdReader; use Wikibase\Repo\IO\LineReader; use Wikibase\Repo\Store\EntityIdPager; -use Wikibase\Lib\Store\RevisionBasedEntityLookup; +use Wikibase\Repo\Store\SQL\EntityPerPageIdPager; use Wikibase\Repo\WikibaseRepo; $basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH' ) : __DIR__ . '/../../../..'; diff --git a/repo/maintenance/importProperties.php b/repo/maintenance/importProperties.php index cfd9db9..9f185f3 100644 --- a/repo/maintenance/importProperties.php +++ b/repo/maintenance/importProperties.php @@ -1,8 +1,8 @@ <?php use Wikibase\DataModel\Entity\Property; -use Wikibase\Repo\WikibaseRepo; use Wikibase\Lib\Store\EntityStore; +use Wikibase\Repo\WikibaseRepo; /** * Maintenance script for importing properties in Wikidata. -- To view, visit https://gerrit.wikimedia.org/r/185086 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4418f26501dae804d0d735f2d7860f1d64efe0c7 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
