jenkins-bot has submitted this change and it was merged. Change subject: Standardize namespace/use syntax and spacing ......................................................................
Standardize namespace/use syntax and spacing The codebase was split in two ways, primarily using the syntax of namespace, blank line, use statements without leading \. Finish standardizing on this syntax so it's the same everywhere. Bug: T132625 Change-Id: I6b16e69d7c4fcafa9a191ba08bb745d13ef3e616 --- M includes/Connection.php M includes/InterwikiSearcher.php M includes/NearMatchPicker.php M includes/OtherIndexes.php M includes/Sanity/QueueingRemediator.php M includes/Sanity/Remediator.php M includes/Search/ResultsType.php M includes/Version.php M tests/jenkins/deleteBrowserTestPages.php M tests/unit/CompletionSuggesterTest.php M tests/unit/HooksTest.php M tests/unit/Job/MassIndexTest.php M tests/unit/Search/EscaperTest.php M tests/unit/UtilTest.php 14 files changed, 23 insertions(+), 15 deletions(-) Approvals: Smalyshev: Looks good to me, approved Cindy-the-browser-test-bot: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/Connection.php b/includes/Connection.php index e620f2b..5d06cf4 100644 --- a/includes/Connection.php +++ b/includes/Connection.php @@ -1,8 +1,9 @@ <?php namespace CirrusSearch; -use \ElasticaConnection; -use \MWNamespace; + +use ElasticaConnection; +use MWNamespace; /** * Forms and caches connection to Elasticsearch as well as client objects diff --git a/includes/InterwikiSearcher.php b/includes/InterwikiSearcher.php index 326ea9e..4b906d9 100644 --- a/includes/InterwikiSearcher.php +++ b/includes/InterwikiSearcher.php @@ -1,6 +1,7 @@ <?php namespace CirrusSearch; + use CirrusSearch\Search\InterwikiResultsType; use ObjectCache; use User; diff --git a/includes/NearMatchPicker.php b/includes/NearMatchPicker.php index c464d50..38be036 100644 --- a/includes/NearMatchPicker.php +++ b/includes/NearMatchPicker.php @@ -1,6 +1,7 @@ <?php namespace CirrusSearch; + use Language; use MediaWiki\Logger\LoggerFactory; use Title; diff --git a/includes/OtherIndexes.php b/includes/OtherIndexes.php index 5f1670a..50c5645 100644 --- a/includes/OtherIndexes.php +++ b/includes/OtherIndexes.php @@ -1,8 +1,9 @@ <?php namespace CirrusSearch; + use MediaWiki\Logger\LoggerFactory; -use \Title; +use Title; /** * Tracks whether a Title is known on other indexes. diff --git a/includes/Sanity/QueueingRemediator.php b/includes/Sanity/QueueingRemediator.php index 50d018f..98f9c2e 100644 --- a/includes/Sanity/QueueingRemediator.php +++ b/includes/Sanity/QueueingRemediator.php @@ -1,6 +1,7 @@ <?php namespace CirrusSearch\Sanity; + use CirrusSearch\Job\DeletePages; use CirrusSearch\Job\LinksUpdate; use JobQueueGroup; diff --git a/includes/Sanity/Remediator.php b/includes/Sanity/Remediator.php index 695caa4..261329c 100644 --- a/includes/Sanity/Remediator.php +++ b/includes/Sanity/Remediator.php @@ -1,6 +1,7 @@ <?php namespace CirrusSearch\Sanity; + use Title; use WikiPage; diff --git a/includes/Search/ResultsType.php b/includes/Search/ResultsType.php index c12cfef..50e11c0 100644 --- a/includes/Search/ResultsType.php +++ b/includes/Search/ResultsType.php @@ -2,9 +2,9 @@ namespace CirrusSearch\Search; -use \CirrusSearch\Searcher; +use CirrusSearch\Searcher; use MediaWiki\Logger\LoggerFactory; -use \Title; +use Title; /** * Lightweight classes to describe specific result types we can return. diff --git a/includes/Version.php b/includes/Version.php index 61bacd1..85dc1e2 100644 --- a/includes/Version.php +++ b/includes/Version.php @@ -1,6 +1,7 @@ <?php namespace CirrusSearch; + use ObjectCache; use Status; diff --git a/tests/jenkins/deleteBrowserTestPages.php b/tests/jenkins/deleteBrowserTestPages.php index 1b62e46..b2f915a 100644 --- a/tests/jenkins/deleteBrowserTestPages.php +++ b/tests/jenkins/deleteBrowserTestPages.php @@ -1,7 +1,8 @@ <?php namespace CirrusSearch\Jenkins; -use \Maintenance; + +use Maintenance; /** * Deletes pages created by the browser test suite. cleanSetup.php diff --git a/tests/unit/CompletionSuggesterTest.php b/tests/unit/CompletionSuggesterTest.php index 42097f3..0972bf4 100644 --- a/tests/unit/CompletionSuggesterTest.php +++ b/tests/unit/CompletionSuggesterTest.php @@ -2,9 +2,9 @@ namespace CirrusSearch; -use \CirrusSearch\Test\HashSearchConfig; -use \CirrusSearch\Test\DummyConnection; -use \CirrusSearch\BuildDocument\SuggestBuilder; +use CirrusSearch\Test\HashSearchConfig; +use CirrusSearch\Test\DummyConnection; +use CirrusSearch\BuildDocument\SuggestBuilder; /** * Completion Suggester Tests diff --git a/tests/unit/HooksTest.php b/tests/unit/HooksTest.php index de54834..2302392 100644 --- a/tests/unit/HooksTest.php +++ b/tests/unit/HooksTest.php @@ -2,7 +2,7 @@ namespace CirrusSearch; -use \PHPUnit_Framework_TestCase; +use PHPUnit_Framework_TestCase; /** * Make sure cirrus doens't break any hooks. diff --git a/tests/unit/Job/MassIndexTest.php b/tests/unit/Job/MassIndexTest.php index 1aff6a2..5827e06 100644 --- a/tests/unit/Job/MassIndexTest.php +++ b/tests/unit/Job/MassIndexTest.php @@ -2,8 +2,8 @@ namespace CirrusSearch\Job; -use \PHPUnit_Framework_TestCase; -use \Title; +use PHPUnit_Framework_TestCase; +use Title; /** * Test for MassIndex job. diff --git a/tests/unit/Search/EscaperTest.php b/tests/unit/Search/EscaperTest.php index 98a750a..c4690a4 100644 --- a/tests/unit/Search/EscaperTest.php +++ b/tests/unit/Search/EscaperTest.php @@ -2,7 +2,7 @@ namespace CirrusSearch\Search; -use \PHPUnit_Framework_TestCase; +use PHPUnit_Framework_TestCase; /** * Test escaping search strings. diff --git a/tests/unit/UtilTest.php b/tests/unit/UtilTest.php index ee16331..4d3ee0c 100644 --- a/tests/unit/UtilTest.php +++ b/tests/unit/UtilTest.php @@ -2,8 +2,8 @@ namespace CirrusSearch; -use \MediaWikiTestCase; -use \Elastica\Exception\InvalidException; +use MediaWikiTestCase; +use Elastica\Exception\InvalidException; /** * Test Util functions. -- To view, visit https://gerrit.wikimedia.org/r/284362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b16e69d7c4fcafa9a191ba08bb745d13ef3e616 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: EBernhardson <[email protected]> Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]> Gerrit-Reviewer: DCausse <[email protected]> Gerrit-Reviewer: Gehel <[email protected]> Gerrit-Reviewer: Manybubbles <[email protected]> Gerrit-Reviewer: Smalyshev <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
