jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375517 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.12.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.12.0
The following sniffs are failing and were disabled:
* MediaWiki.Files.ClassMatchesFilename.NotMatch
* MediaWiki.Files.ClassMatchesFilename.WrongCase
* MediaWiki.Files.OneClassPerFile.MultipleFound
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName
* MediaWiki.Usage.DbrQueryUsage.DbrQueryFound
The following sniffs now pass and were enabled:
* MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart
* MediaWiki.NamingConventions.LowerCamelFunctionsName
* MediaWiki.Usage.DbrQueryUsage
Change-Id: I1f75f41fdccb7be13c407601282a4f00e1092df2
---
M Autoload.php
M composer.json
M phpcs.xml
3 files changed, 7 insertions(+), 39 deletions(-)
Approvals:
Umherirrender: Looks good to me, but someone else must approve
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/Autoload.php b/Autoload.php
index 3606941..ca55f44 100644
--- a/Autoload.php
+++ b/Autoload.php
@@ -13,7 +13,6 @@
/**
* @name "Core Translate classes"
- * @{
*/
$al['FatMessage'] = "$dir/Message.php";
$al['MediaWikiMessageChecker'] = "$dir/MediaWikiMessageChecker.php";
@@ -29,12 +28,10 @@
$al['TranslateHooks'] = "$dir/TranslateHooks.php";
$al['TranslateTasks'] = "$dir/TranslateTasks.php";
$al['TranslateUtils'] = "$dir/TranslateUtils.php";
-/**@}*/
/**
* @name "Special pages"
* There are few more special pages in page translation section.
- * @{
*/
$al['CompatibleLinkRenderer'] = "$dir/specials/CompatibleLinkRenderer.php";
$al['SpecialAggregateGroups'] = "$dir/specials/SpecialAggregateGroups.php";
@@ -52,11 +49,9 @@
$al['SpecialTranslationStats'] = "$dir/specials/SpecialTranslationStats.php";
$al['SpecialTranslations'] = "$dir/specials/SpecialTranslations.php";
$al['SpecialTranslationStash'] = "$dir/specials/SpecialTranslationStash.php";
-/**@}*/
/**
* @name "Various utilities"
- * @{
*/
$al['ArrayFlattener'] = "$dir/utils/ArrayFlattener.php";
$al['CDBMessageIndex'] = "$dir/utils/MessageIndex.php";
@@ -108,30 +103,24 @@
$al['TranslationStatsBase'] = "$dir/specials/SpecialTranslationStats.php";
$al['TranslationStatsInterface'] = "$dir/specials/SpecialTranslationStats.php";
$al['TuxMessageTable'] = "$dir/utils/TuxMessageTable.php";
-/**@}*/
/**
* @name "Classes for predefined non-managed message groups"
- * @{
*/
$al['PremadeMediawikiExtensionGroups'] = "$dir/ffs/MediaWikiExtensions.php";
$al['PremadeIntuitionTextdomains'] = "$dir/ffs/IntuitionTextdomains.php";
-/**@}*/
/**
* @name "Support for MediaWiki non-message features"
- * @{
*/
$al['ComplexMessages'] = "$dir/ffs/MediaWikiComplexMessages.php";
$al['MagicWordsCM'] = "$dir/ffs/MediaWikiComplexMessages.php";
$al['NamespaceCM'] = "$dir/ffs/MediaWikiComplexMessages.php";
$al['SpecialPageAliasesCM'] = "$dir/ffs/MediaWikiComplexMessages.php";
-/**@}*/
/**
* @name "Classes for page translation feature"
* @ingroup PageTranslation
- * @{
*/
$al['TranslatablePageMoveJob'] = "$dir/tag/TranslatablePageMoveJob.php";
$al['TranslateDeleteJob'] = "$dir/tag/TranslateDeleteJob.php";
@@ -151,12 +140,10 @@
$al['TPParse'] = "$dir/tag/TPParse.php";
$al['TPSection'] = "$dir/tag/TPSection.php";
$al['TranslatablePage'] = "$dir/tag/TranslatablePage.php";
-/**@}*/
/**
* @name "Classes for TTMServer"
* @ingroup TTMServer
- * @{
*/
$al['ReadableTTMServer'] = "$dir/ttmserver/Interfaces.php";
$al['SearchableTTMServer'] = "$dir/ttmserver/Interfaces.php";
@@ -174,11 +161,9 @@
$al['TTMServerMessageUpdateJob'] =
"$dir/ttmserver/TTMServerMessageUpdateJob.php";
$al['CrossLanguageTranslationSearchQuery'] =
"$dir/ttmserver/CrossLanguageTranslationSearchQuery.php";
-/**@}*/
/**
* @name "Classes for file format support (FFS)"
- * @{
*/
$al['AmdFFS'] = "$dir/ffs/AmdFFS.php";
$al['AndroidXmlFFS'] = "$dir/ffs/AndroidXmlFFS.php";
@@ -197,11 +182,9 @@
$al['SimpleFFS'] = "$dir/ffs/SimpleFFS.php";
$al['XliffFFS'] = "$dir/ffs/XliffFFS.php";
$al['YamlFFS'] = "$dir/ffs/YamlFFS.php";
-/**@}*/
/**
* @name "API modules"
- * @{
*/
$al['ApiAggregateGroups'] = "$dir/api/ApiAggregateGroups.php";
$al['ApiGroupReview'] = "$dir/api/ApiGroupReview.php";
@@ -217,11 +200,9 @@
$al['ApiTranslationAids'] = "$dir/api/ApiQueryTranslationAids.php";
$al['ApiTranslationReview'] = "$dir/api/ApiTranslationReview.php";
$al['ApiTranslationStash'] = "$dir/api/ApiTranslationStash.php";
-/**@}*/
/**
* @name "Task classes"
- * @{
*/
$al['AcceptQueueMessagesTask'] = "$dir/TranslateTasks.php";
$al['CustomFilteredMessagesTask'] = "$dir/TranslateTasks.php";
@@ -231,11 +212,9 @@
$al['ViewMessagesTask'] = "$dir/TranslateTasks.php";
$al['ViewOptionalTask'] = "$dir/TranslateTasks.php";
$al['ViewUntranslatedTask'] = "$dir/TranslateTasks.php";
-/**@}*/
/**
* @name "Message group classes"
- * @{
*/
$al['AggregateMessageGroup'] = "$dir/messagegroups/AggregateMessageGroup.php";
$al['FileBasedMessageGroup'] = "$dir/messagegroups/FileBasedMessageGroup.php";
@@ -252,19 +231,15 @@
$al['WikiPageMessageGroup'] = "$dir/messagegroups/WikiPageMessageGroup.php";
$al['WorkflowStatesMessageGroup'] =
"$dir/messagegroups/WorkflowStatesMessageGroup.php";
-/**@}*/
/**
* @name "Stash"
- * @{
*/
$al['StashedTranslation'] = "$dir/stash/StashedTranslation.php";
$al['TranslationStashStorage'] = "$dir/stash/TranslationStashStorage.php";
-/**@}*/
/**
* @name "Test classes"
- * @{
*/
$al['MockFileBasedMessageGroup'] =
"$dir/tests/phpunit/MockFileBasedMessageGroup.php";
@@ -273,11 +248,8 @@
$al['MockSuperUser'] = "$dir/tests/phpunit/MockSuperUser.php";
$al['MockWikiMessageGroup'] = "$dir/tests/phpunit/MockWikiMessageGroup.php";
-/**@}*/
-
/**
* @name "Translation aids"
- * @{
*/
$al['CurrentTranslationAid'] =
"$dir/translationaids/CurrentTranslationAid.php";
$al['DocumentationAid'] = "$dir/translationaids/DocumentationAid.php";
@@ -294,11 +266,9 @@
$al['UnsupportedTranslationAid'] =
"$dir/translationaids/UnsupportedTranslationAid.php";
$al['UpdatedDefinitionAid'] = "$dir/translationaids/UpdatedDefinitionAid.php";
-/**@}*/
/**
* @name "Translation web services"
- * @{
*/
$al['ApertiumWebService'] = "$dir/webservices/ApertiumWebService.php";
$al['CaighdeanWebService'] = "$dir/webservices/CaighdeanWebService.php";
@@ -317,11 +287,9 @@
$al['QueryAggregator'] = "$dir/webservices/QueryAggregator.php";
$al['QueryAggregatorAware'] = "$dir/webservices/QueryAggregatorAware.php";
$al['YandexWebService'] = "$dir/webservices/YandexWebService.php";
-/**@}*/
/**
* @name "Insertables"
- * @{
*/
$al['Insertable'] = "$dir/insertables/Insertable.php";
$al['InsertablesSuggester'] = "$dir/insertables/InsertablesSuggester.php";
@@ -332,15 +300,12 @@
"$dir/insertables/NumericalParameterInsertablesSuggester.php";
$al['TranslatablePageInsertablesSuggester'] =
"$dir/insertables/TranslatablePageInsertablesSuggester.php";
-/**@}*/
/**
* @name "StringMangler"
- * @{
*/
$al['StringMangler'] = "$dir/stringmangler/StringMangler.php";
$al['StringMatcher'] = "$dir/stringmangler/StringMatcher.php";
-/**@}*/
global $wgAutoloadClasses;
$wgAutoloadClasses = array_merge( $wgAutoloadClasses, $al );
diff --git a/composer.json b/composer.json
index 73481ac..03efcf7 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.11.1",
+ "mediawiki/mediawiki-codesniffer": "0.12.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"suggest": {
diff --git a/phpcs.xml b/phpcs.xml
index c02f2fa..9789b19 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,9 +8,12 @@
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamName"/>
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag"/>
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingReturn"/>
- <exclude
name="MediaWiki.Commenting.FunctionComment.WrongStyle"/>
- <exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName"/>
- <exclude name="MediaWiki.Usage.DbrQueryUsage"/>
+ <exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle"
/>
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.WrongCase"
/>
+ <exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
+ <exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
+ <exclude name="MediaWiki.Usage.DbrQueryUsage.DbrQueryFound" />
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
</rule>
<rule ref="Generic.Files.LineLength">
--
To view, visit https://gerrit.wikimedia.org/r/375517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f75f41fdccb7be13c407601282a4f00e1092df2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
