Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252976
Change subject: Remove unused use imports
......................................................................
Remove unused use imports
Change-Id: I49ee7e7d358ebf56462dbda3ee1df80420a9747d
---
M includes/CirrusSearch.php
M includes/ElasticsearchIntermediary.php
M includes/Hooks.php
M includes/Maintenance/Reindexer.php
M includes/Maintenance/SuggesterAnalysisConfigBuilder.php
M includes/Maintenance/SuggesterMappingConfigBuilder.php
M includes/Maintenance/Validators/CacheWarmersValidator.php
M includes/Maintenance/Validators/SpecificAliasValidator.php
M includes/Sanity/Checker.php
M includes/Sanity/QueueingRemediator.php
M includes/Search/SearchContext.php
M includes/Search/SearchTextQueryBuilders.php
M includes/SearchConfig.php
M includes/Searcher.php
M includes/Updater.php
15 files changed, 12 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/76/252976/1
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 5ef82dc..aab5e56 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -3,10 +3,9 @@
use CirrusSearch\Connection;
use CirrusSearch\InterwikiSearcher;
use CirrusSearch\Search\FullTextResultsType;
-use CirrusSearch\Searcher;
use CirrusSearch\Search\ResultSet;
use CirrusSearch\SearchConfig;
-use CirrusSearch\Search\InterwikiResultsType;
+use CirrusSearch\Searcher;
/**
* SearchEngine implementation for CirrusSearch. Delegates to
diff --git a/includes/ElasticsearchIntermediary.php
b/includes/ElasticsearchIntermediary.php
index 7645014..6b46fea 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -2,7 +2,6 @@
namespace CirrusSearch;
-use ConfigFactory;
use DeferredUpdates;
use Elastica\Exception\PartialShardFailureException;
use Elastica\Exception\ResponseException;
diff --git a/includes/Hooks.php b/includes/Hooks.php
index f5ac72d..b62d5b2 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -3,28 +3,26 @@
namespace CirrusSearch;
use ApiMain;
-use BetaFeatures;
use CirrusSearch;
use CirrusSearch\Search\FancyTitleResultsType;
use CirrusSearch\Search\TitleResultsType;
use ConfigFactory;
use DeferredUpdates;
+use Html;
use JobQueueGroup;
use LinksUpdate;
use OutputPage;
-use ResourceLoader;
-use Skin;
-use SpecialSearch;
-use Title;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use RequestContext;
+use ResourceLoader;
+use SpecialSearch;
+use Title;
use UsageException;
use User;
use WebRequest;
use WikiPage;
use Xml;
-use Html;
/**
* All CirrusSearch's external hooks.
diff --git a/includes/Maintenance/Reindexer.php
b/includes/Maintenance/Reindexer.php
index cb7d1c7..8aa9940 100644
--- a/includes/Maintenance/Reindexer.php
+++ b/includes/Maintenance/Reindexer.php
@@ -1,7 +1,6 @@
<?php
namespace CirrusSearch\Maintenance;
use CirrusSearch\Connection;
-use CirrusSearch\DataSender;
use CirrusSearch\ElasticsearchIntermediary;
use CirrusSearch\Util;
use Elastica\Document;
diff --git a/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
b/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
index 7367dd5..7abd9d3 100644
--- a/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
+++ b/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
@@ -2,10 +2,6 @@
namespace CirrusSearch\Maintenance;
-use \CirrusSearch\Searcher;
-use \Hooks;
-use \Language;
-
/**
* Builds elasticsearch analysis config arrays for the completion suggester
* index.
diff --git a/includes/Maintenance/SuggesterMappingConfigBuilder.php
b/includes/Maintenance/SuggesterMappingConfigBuilder.php
index 8303693..cb5f2b7 100644
--- a/includes/Maintenance/SuggesterMappingConfigBuilder.php
+++ b/includes/Maintenance/SuggesterMappingConfigBuilder.php
@@ -1,7 +1,6 @@
<?php
namespace CirrusSearch\Maintenance;
-use \Hooks;
/**
* Builds elasticsearch mapping configuration arrays for the suggester index.
diff --git a/includes/Maintenance/Validators/CacheWarmersValidator.php
b/includes/Maintenance/Validators/CacheWarmersValidator.php
index d809051..1224613 100644
--- a/includes/Maintenance/Validators/CacheWarmersValidator.php
+++ b/includes/Maintenance/Validators/CacheWarmersValidator.php
@@ -11,7 +11,6 @@
use Elastica\Type;
use RawMessage;
use Status;
-use Title;
class CacheWarmersValidator extends Validator {
/**
diff --git a/includes/Maintenance/Validators/SpecificAliasValidator.php
b/includes/Maintenance/Validators/SpecificAliasValidator.php
index 32f8b3e..d708f01 100644
--- a/includes/Maintenance/Validators/SpecificAliasValidator.php
+++ b/includes/Maintenance/Validators/SpecificAliasValidator.php
@@ -4,7 +4,6 @@
use CirrusSearch\Maintenance\Maintenance;
use CirrusSearch\Maintenance\Reindexer;
-use CirrusSearch\Maintenance\Validators\Validator;
use Elastica\Client;
use Elastica\Index;
use RawMessage;
diff --git a/includes/Sanity/Checker.php b/includes/Sanity/Checker.php
index 72d974e..1c265f5 100644
--- a/includes/Sanity/Checker.php
+++ b/includes/Sanity/Checker.php
@@ -4,7 +4,6 @@
use CirrusSearch\Connection;
use CirrusSearch\Searcher;
-use ConfigFactory;
use Status;
use Title;
use WikiPage;
diff --git a/includes/Sanity/QueueingRemediator.php
b/includes/Sanity/QueueingRemediator.php
index 2c125f4..0ab6680 100644
--- a/includes/Sanity/QueueingRemediator.php
+++ b/includes/Sanity/QueueingRemediator.php
@@ -1,10 +1,9 @@
<?php
namespace CirrusSearch\Sanity;
-use \CirrusSearch\Job\DeletePages;
-use \CirrusSearch\Job\LinksUpdate;
-use \JobQueueGroup;
-use \WikiPage;
+use CirrusSearch\Job\DeletePages;
+use CirrusSearch\Job\LinksUpdate;
+use JobQueueGroup;
/**
* Remediator implementation that queues jobs to fix the index.
diff --git a/includes/Search/SearchContext.php
b/includes/Search/SearchContext.php
index de7dd45..b7cf204 100644
--- a/includes/Search/SearchContext.php
+++ b/includes/Search/SearchContext.php
@@ -2,8 +2,7 @@
namespace CirrusSearch\Search;
-use \CirrusSearch\SearchConfig;
-use \CirrusSearch\Util;
+use CirrusSearch\SearchConfig;
/**
* The search context, maintains the state of the current search query.
diff --git a/includes/Search/SearchTextQueryBuilders.php
b/includes/Search/SearchTextQueryBuilders.php
index 6955728..5f2817b 100644
--- a/includes/Search/SearchTextQueryBuilders.php
+++ b/includes/Search/SearchTextQueryBuilders.php
@@ -2,7 +2,6 @@
namespace CirrusSearch\Search;
-use CirrusSearch\SearchConfig;
use CirrusSearch\Util;
use RequestContext;
diff --git a/includes/SearchConfig.php b/includes/SearchConfig.php
index cb17b22..2fb7415 100644
--- a/includes/SearchConfig.php
+++ b/includes/SearchConfig.php
@@ -3,7 +3,6 @@
namespace CirrusSearch;
use RequestContext;
-use SiteConfiguration;
/**
* Configuration class encapsulating Searcher environment.
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 43222b0..f11af37 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -2,8 +2,6 @@
namespace CirrusSearch;
-use Elastica;
-use Category;
use CirrusSearch;
use CirrusSearch\Extra\Filter\SourceRegex;
use CirrusSearch\Search\Escaper;
@@ -11,9 +9,10 @@
use CirrusSearch\Search\FullTextResultsType;
use CirrusSearch\Search\ResultsType;
use CirrusSearch\Search\SearchContext;
-use CirrusSearch\Search\SearchTextQueryBuilderFactory;
-use CirrusSearch\Search\SearchTextQueryBuilder;
use ConfigFactory;
+use Elastica;
+use Elastica\Exception\ResponseException;
+use Elastica\Request;
use Language;
use MediaWiki\Logger\LoggerFactory;
use MWNamespace;
@@ -22,8 +21,6 @@
use Title;
use UsageException;
use User;
-use Elastica\Request;
-use Elastica\Exception\ResponseException;
/**
* Performs searches using Elasticsearch. Note that each instance of this
class
diff --git a/includes/Updater.php b/includes/Updater.php
index 24fdc5d..e0b71ed 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -6,12 +6,9 @@
use CirrusSearch\BuildDocument\PageDataBuilder;
use CirrusSearch\BuildDocument\PageTextBuilder;
use Hooks as MWHooks;
-use JobQueueGroup;
use MediaWiki\Logger\LoggerFactory;
-use MWTimestamp;
use ParserCache;
use ParserOutput;
-use Sanitizer;
use TextContent;
use Title;
use WikiPage;
--
To view, visit https://gerrit.wikimedia.org/r/252976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49ee7e7d358ebf56462dbda3ee1df80420a9747d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
