From b9668d6d805b1c63dab865199fef5048f76c62e6 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Wed, 17 Feb 2016 02:31:52 -0800 Subject: [PATCH] build: Update mediawiki-codesniffer to 0.6.0, add "composer fix" * Fix errors spotted by new release * Introduce "composer fix", which uses phpcbf to automatically fix some errors spotted by phpcs. * Drop $PHPCS_ARGS variable that didn't work on Windows, and add -s flag * Remove rules from phpcs.xml that are now in MW-CS ruleset. Change-Id: I13e2155695918c918b67497ac65b85a03897095e --- composer.json | 5 +++-- includes/WebStart.php | 1 - includes/libs/MemoizedCallable.php | 4 ++-- includes/libs/XmlTypeCheck.php | 1 - includes/page/Article.php | 1 - includes/resourceloader/ResourceLoader.php | 6 +++--- includes/resourceloader/ResourceLoaderModule.php | 4 ++-- includes/search/SearchSuggestionSet.php | 1 - languages/messages/MessagesFur.php | 1 - languages/messages/MessagesHy.php | 1 - languages/messages/MessagesKk_arab.php | 1 - languages/messages/MessagesKk_cyrl.php | 1 - languages/messages/MessagesKk_latn.php | 1 - languages/messages/MessagesKm.php | 1 - languages/messages/MessagesLi.php | 1 - languages/messages/MessagesMk.php | 1 - languages/messages/MessagesNds.php | 1 - languages/messages/MessagesNn.php | 1 - languages/messages/MessagesOs.php | 1 - languages/messages/MessagesRu.php | 1 - languages/messages/MessagesSr_el.php | 1 - languages/messages/MessagesVi.php | 1 - phpcs.xml | 5 ----- tests/phpunit/includes/PrefixSearchTest.php | 8 ++++---- tests/phpunit/includes/search/SearchEnginePrefixTest.php | 8 ++++---- 25 files changed, 18 insertions(+), 40 deletions(-) diff --git a/composer.json b/composer.json index 5bec8e41c9..f1149149b0 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "justinrainbow/json-schema": "~1.3", - "mediawiki/mediawiki-codesniffer": "0.5.1", + "mediawiki/mediawiki-codesniffer": "0.6.0", "monolog/monolog": "~1.17.2", "nikic/php-parser": "1.4.1", "nmred/kafka-php": "0.1.5", @@ -68,7 +68,8 @@ }, "scripts": { "lint": "parallel-lint --exclude vendor", - "phpcs": "phpcs -p $PHPCS_ARGS", + "phpcs": "phpcs -p -s", + "fix": "phpcbf", "pre-install-cmd": "ComposerHookHandler::onPreInstall", "pre-update-cmd": "ComposerHookHandler::onPreUpdate", "test": [ diff --git a/includes/WebStart.php b/includes/WebStart.php index 739c9eb867..29ad456c12 100644 --- a/includes/WebStart.php +++ b/includes/WebStart.php @@ -26,7 +26,6 @@ * @file */ - # bug 15461: Make IE8 turn off content sniffing. Everybody else should ignore this # We're adding it here so that it's *always* set, even for alternate entry # points and when $wgOut gets disabled or overridden. diff --git a/includes/libs/MemoizedCallable.php b/includes/libs/MemoizedCallable.php index 39faf3d08f..50e9732b80 100644 --- a/includes/libs/MemoizedCallable.php +++ b/includes/libs/MemoizedCallable.php @@ -102,7 +102,7 @@ class MemoizedCallable { * @param array $args Parameters for memoized function or method. * @return mixed The memoized callable's return value. */ - public function invokeArgs( Array $args = [] ) { + public function invokeArgs( array $args = [] ) { foreach ( $args as $arg ) { if ( $arg !== null && !is_scalar( $arg ) ) { throw new InvalidArgumentException( @@ -144,7 +144,7 @@ class MemoizedCallable { * @param array $args * @param int $ttl */ - public static function call( $callable, Array $args = [], $ttl = 3600 ) { + public static function call( $callable, array $args = [], $ttl = 3600 ) { $instance = new self( $callable, $ttl ); return $instance->invokeArgs( $args ); } diff --git a/includes/libs/XmlTypeCheck.php b/includes/libs/XmlTypeCheck.php index b3ea08da9c..f057140a6b 100644 --- a/includes/libs/XmlTypeCheck.php +++ b/includes/libs/XmlTypeCheck.php @@ -132,7 +132,6 @@ class XmlTypeCheck { return $this->rootElement; } - /** * @param string $fname the filename */ diff --git a/includes/page/Article.php b/includes/page/Article.php index 4e4b2d7e65..d6e73818d8 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -2653,7 +2653,6 @@ class Article implements Page { ); } - /** * @param array $limit * @param array $expiry diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index a2ff294b08..c68997905b 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -172,7 +172,7 @@ class ResourceLoader implements LoggerAwareInterface { * - (bool) cache: Whether to allow caching this data. Default: true. * @return string Filtered data, or a comment containing an error message */ - public static function filter( $filter, $data, Array $options = [] ) { + public static function filter( $filter, $data, array $options = [] ) { if ( strpos( $data, ResourceLoader::FILTER_NOMIN ) !== false ) { return $data; } @@ -614,7 +614,7 @@ class ResourceLoader implements LoggerAwareInterface { * @param array $modules List of ResourceLoaderModule objects * @return string Hash */ - public function getCombinedVersion( ResourceLoaderContext $context, Array $modules ) { + public function getCombinedVersion( ResourceLoaderContext $context, array $modules ) { if ( !$modules ) { return ''; } @@ -1241,7 +1241,7 @@ MESSAGE; * * @param Array $array */ - private static function trimArray( Array &$array ) { + private static function trimArray( array &$array ) { $i = count( $array ); while ( $i-- ) { if ( $array[$i] === null diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php index 8da1e2139b..13f13e68bf 100644 --- a/includes/resourceloader/ResourceLoaderModule.php +++ b/includes/resourceloader/ResourceLoaderModule.php @@ -472,7 +472,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface { * @param array $filePaths * @return array */ - public static function getRelativePaths( Array $filePaths ) { + public static function getRelativePaths( array $filePaths ) { global $IP; return array_map( function ( $path ) use ( $IP ) { return RelPath\getRelativePath( $path, $IP ); @@ -486,7 +486,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface { * @param array $filePaths * @return array */ - public static function expandRelativePaths( Array $filePaths ) { + public static function expandRelativePaths( array $filePaths ) { global $IP; return array_map( function ( $path ) use ( $IP ) { return RelPath\joinPath( $IP, $path ); diff --git a/includes/search/SearchSuggestionSet.php b/includes/search/SearchSuggestionSet.php index 4750181285..5a24fd6d75 100644 --- a/includes/search/SearchSuggestionSet.php +++ b/includes/search/SearchSuggestionSet.php @@ -203,7 +203,6 @@ class SearchSuggestionSet { return new SearchSuggestionSet( $suggestions ); } - /** * @return SearchSuggestionSet an empty suggestion set */ diff --git a/languages/messages/MessagesFur.php b/languages/messages/MessagesFur.php index bdd90282ca..8bb6c6c87d 100644 --- a/languages/messages/MessagesFur.php +++ b/languages/messages/MessagesFur.php @@ -10,7 +10,6 @@ $fallback = 'it'; - $namespaceNames = [ NS_MEDIA => 'Media', NS_SPECIAL => 'Speciâl', diff --git a/languages/messages/MessagesHy.php b/languages/messages/MessagesHy.php index dbe119d36f..28c3a4da90 100644 --- a/languages/messages/MessagesHy.php +++ b/languages/messages/MessagesHy.php @@ -40,7 +40,6 @@ $namespaceAliases = [ 'Սպասարկող' => NS_SPECIAL, ]; - $datePreferences = [ 'default', 'mdy', diff --git a/languages/messages/MessagesKk_arab.php b/languages/messages/MessagesKk_arab.php index 83606c0cbd..a589ac23d0 100644 --- a/languages/messages/MessagesKk_arab.php +++ b/languages/messages/MessagesKk_arab.php @@ -112,7 +112,6 @@ $namespaceAliases = [ 'ٴۇلگٴى_تالقىلاۋى' => NS_TEMPLATE_TALK, ]; - $datePreferences = [ 'default', 'mdy', diff --git a/languages/messages/MessagesKk_cyrl.php b/languages/messages/MessagesKk_cyrl.php index 9cacf5ac68..37b4a15c50 100644 --- a/languages/messages/MessagesKk_cyrl.php +++ b/languages/messages/MessagesKk_cyrl.php @@ -98,7 +98,6 @@ $namespaceAliases = [ 'سانات_تالقىلاۋى' => NS_CATEGORY_TALK, ]; - $datePreferences = [ 'default', 'mdy', diff --git a/languages/messages/MessagesKk_latn.php b/languages/messages/MessagesKk_latn.php index f60696c763..1f1289d2ec 100644 --- a/languages/messages/MessagesKk_latn.php +++ b/languages/messages/MessagesKk_latn.php @@ -93,7 +93,6 @@ $namespaceAliases = [ 'سانات_تالقىلاۋى' => NS_CATEGORY_TALK, ]; - $datePreferences = [ 'default', 'mdy', diff --git a/languages/messages/MessagesKm.php b/languages/messages/MessagesKm.php index 53d07bfe7e..6ae2e88ec3 100644 --- a/languages/messages/MessagesKm.php +++ b/languages/messages/MessagesKm.php @@ -60,7 +60,6 @@ $namespaceAliases = [ 'ការពិភាក្សាអំពីចំនាត់ថ្នាក់ក្រុម' => NS_CATEGORY_TALK, ]; - $digitTransformTable = [ '0' => '០', # ០ '1' => '១', # ១ diff --git a/languages/messages/MessagesLi.php b/languages/messages/MessagesLi.php index fd8f7c488f..fe512b2b89 100644 --- a/languages/messages/MessagesLi.php +++ b/languages/messages/MessagesLi.php @@ -23,7 +23,6 @@ $fallback = 'nl'; - $namespaceNames = [ NS_MEDIA => 'Media', NS_SPECIAL => 'Speciaal', diff --git a/languages/messages/MessagesMk.php b/languages/messages/MessagesMk.php index 61f318c309..cc76c619f0 100644 --- a/languages/messages/MessagesMk.php +++ b/languages/messages/MessagesMk.php @@ -47,7 +47,6 @@ $namespaceAliases = [ 'Разговор_за_слика' => NS_FILE_TALK, ]; - $datePreferences = [ 'default', 'dmy mk', diff --git a/languages/messages/MessagesNds.php b/languages/messages/MessagesNds.php index 2274d1107c..8a18f2f3b0 100644 --- a/languages/messages/MessagesNds.php +++ b/languages/messages/MessagesNds.php @@ -85,7 +85,6 @@ $magicWords = [ 'grammar' => [ '0', 'GRAMMATIK:', 'GRAMMAR:' ], ]; - $bookstoreList = [ 'Verteken vun leverbore Böker' => 'http://www.buchhandel.de/sixcms/list.php?page=buchhandel_profisuche_frameset&suchfeld=isbn&suchwert=$1=0&y=0', 'abebooks.de' => 'http://www.abebooks.de/servlet/BookSearchPL?ph=2&isbn=$1', diff --git a/languages/messages/MessagesNn.php b/languages/messages/MessagesNn.php index 2e5ce84c36..49987ad458 100644 --- a/languages/messages/MessagesNn.php +++ b/languages/messages/MessagesNn.php @@ -42,7 +42,6 @@ * @see http://nn.wikipedia.org/w/index.php?title=Brukar:Dittaeva/LanguageNn.php&action=history */ - $datePreferences = [ 'default', 'dmyt', diff --git a/languages/messages/MessagesOs.php b/languages/messages/MessagesOs.php index 0ee5b311ff..26b3832c3e 100644 --- a/languages/messages/MessagesOs.php +++ b/languages/messages/MessagesOs.php @@ -148,7 +148,6 @@ $specialPageAliases = [ 'Withoutinterwiki' => [ 'ÆнæИнтервики' ], ]; - $magicWords = [ 'redirect' => [ '0', '#ÆРВИТÆН', '#ÆРВЫСТ', '#РАРВЫСТ', '#перенаправление', '#перенапр', '#REDIRECT' ], 'notoc' => [ '0', '__ÆНÆСÆР__', '__БЕЗ_ОГЛАВЛЕНИЯ__', '__БЕЗ_ОГЛ__', '__NOTOC__' ], diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php index c9841a28d6..c27365474d 100644 --- a/languages/messages/MessagesRu.php +++ b/languages/messages/MessagesRu.php @@ -388,7 +388,6 @@ $magicWords = [ 'pagesincategory_files' => [ '0', 'файлы', 'files' ], ]; - $dateFormats = [ 'mdy time' => 'H:i', 'mdy date' => 'xg j, Y', diff --git a/languages/messages/MessagesSr_el.php b/languages/messages/MessagesSr_el.php index 4c625b4fce..b03a482863 100644 --- a/languages/messages/MessagesSr_el.php +++ b/languages/messages/MessagesSr_el.php @@ -157,7 +157,6 @@ $dateFormats = [ 'h:mm d mon y both' => 'G:i, j M Y', ]; - /* NOT USED IN STABLE VERSION */ $magicWords = [ 'redirect' => [ '0', '#Preusmeri', '#preusmeri', '#PREUSMERI', '#Preusmjeri', '#preusmjeri', '#PREUSMJERI', '#redirect', '#REDIRECT' ], diff --git a/languages/messages/MessagesVi.php b/languages/messages/MessagesVi.php index 9eb65f178e..593f61a4a5 100644 --- a/languages/messages/MessagesVi.php +++ b/languages/messages/MessagesVi.php @@ -349,7 +349,6 @@ $datePreferenceMigrationMap = [ 'vi normal', ]; - $linkTrail = "/^([a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]+)(.*)$/sDu"; $separatorTransformTable = [ ',' => '.', '.' => ',' ]; diff --git a/phpcs.xml b/phpcs.xml index bbf2f46865..38c7aaa96c 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,11 +1,6 @@ - - - - 0 - diff --git a/tests/phpunit/includes/PrefixSearchTest.php b/tests/phpunit/includes/PrefixSearchTest.php index 55a23a6cc0..6f4c300a4c 100644 --- a/tests/phpunit/includes/PrefixSearchTest.php +++ b/tests/phpunit/includes/PrefixSearchTest.php @@ -43,7 +43,7 @@ class PrefixSearchTest extends MediaWikiLangTestCase { $this->setMwGlobals( 'wgSpecialPages', [] ); } - protected function searchProvision( Array $results = null ) { + protected function searchProvision( array $results = null ) { if ( $results === null ) { $this->setMwGlobals( 'wgHooks', [] ); } else { @@ -149,7 +149,7 @@ class PrefixSearchTest extends MediaWikiLangTestCase { * @covers PrefixSearch::search * @covers PrefixSearch::searchBackend */ - public function testSearch( Array $case ) { + public function testSearch( array $case ) { $this->searchProvision( null ); $searcher = new StringPrefixSearch; $results = $searcher->search( $case['query'], 3 ); @@ -165,7 +165,7 @@ class PrefixSearchTest extends MediaWikiLangTestCase { * @covers PrefixSearch::search * @covers PrefixSearch::searchBackend */ - public function testSearchWithOffset( Array $case ) { + public function testSearchWithOffset( array $case ) { $this->searchProvision( null ); $searcher = new StringPrefixSearch; $results = $searcher->search( $case['query'], 3, [], 1 ); @@ -298,7 +298,7 @@ class PrefixSearchTest extends MediaWikiLangTestCase { * @dataProvider provideSearchBackend * @covers PrefixSearch::searchBackend */ - public function testSearchBackend( Array $case ) { + public function testSearchBackend( array $case ) { $this->searchProvision( $case['provision'] ); $searcher = new StringPrefixSearch; $results = $searcher->search( $case['query'], 3 ); diff --git a/tests/phpunit/includes/search/SearchEnginePrefixTest.php b/tests/phpunit/includes/search/SearchEnginePrefixTest.php index af6d70fd58..2a3a5fe9cf 100644 --- a/tests/phpunit/includes/search/SearchEnginePrefixTest.php +++ b/tests/phpunit/includes/search/SearchEnginePrefixTest.php @@ -50,7 +50,7 @@ class SearchEnginePrefixTest extends MediaWikiLangTestCase { $this->search->setNamespaces( [] ); } - protected function searchProvision( Array $results = null ) { + protected function searchProvision( array $results = null ) { if ( $results === null ) { $this->setMwGlobals( 'wgHooks', [] ); } else { @@ -155,7 +155,7 @@ class SearchEnginePrefixTest extends MediaWikiLangTestCase { * @dataProvider provideSearch * @covers SearchEngine::defaultPrefixSearch */ - public function testSearch( Array $case ) { + public function testSearch( array $case ) { $this->search->setLimitOffset( 3 ); $results = $this->search->defaultPrefixSearch( $case['query'] ); $results = array_map( function( Title $t ) { @@ -172,7 +172,7 @@ class SearchEnginePrefixTest extends MediaWikiLangTestCase { * @dataProvider provideSearch * @covers SearchEngine::defaultPrefixSearch */ - public function testSearchWithOffset( Array $case ) { + public function testSearchWithOffset( array $case ) { $this->search->setLimitOffset( 3, 1 ); $results = $this->search->defaultPrefixSearch( $case['query'] ); $results = array_map( function( Title $t ) { @@ -308,7 +308,7 @@ class SearchEnginePrefixTest extends MediaWikiLangTestCase { * @dataProvider provideSearchBackend * @covers PrefixSearch::searchBackend */ - public function testSearchBackend( Array $case ) { + public function testSearchBackend( array $case ) { $search = $stub = $this->getMockBuilder( 'SearchEngine' ) ->setMethods( [ 'completionSearchBackend' ] )->getMock(); -- 2.20.1