jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367134 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected
* MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.MissingReturn
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.Commenting.FunctionComment.WrongStyle
The following sniffs now pass and were enabled:
* MediaWiki.Commenting.FunctionComment
Change-Id: I0874c547ef2bc8a7c3fa4ca72738aa3320f2bdbe
---
M composer.json
M includes/AbuseFilter.class.php
M phpcs.xml
3 files changed, 16 insertions(+), 9 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index c420e4b..485f881 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0",
+ "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 224a982..1713d99 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -1204,7 +1204,7 @@
$vars->setVar( 'local_log_ids', $local_log_ids );
// Check for emergency disabling.
- $total = $stash->get( AbuseFilter::filterUsedKey( $group ) );
+ $total = $stash->get( self::filterUsedKey( $group ) );
self::checkEmergencyDisable( $group, $logged_local_filters,
$total );
wfProfileOut( __METHOD__ . '-hitstats' );
@@ -1531,7 +1531,7 @@
* @param bool $isAutoBlock
*/
protected static function doAbuseFilterBlock( array $rule, $target,
$expiry, $isAutoBlock ) {
- $filterUser = AbuseFilter::getFilterUser();
+ $filterUser = self::getFilterUser();
$reason = wfMessage(
'abusefilter-blockreason',
$rule['desc'], $rule['number']
@@ -2173,9 +2173,9 @@
$newTitle = Title::newFromText( $params[0] );
$vars = AbuseFilterVariableHolder::merge(
- AbuseFilter::generateUserVars( $user ),
- AbuseFilter::generateTitleVars( $oldTitle, 'MOVED_FROM'
),
- AbuseFilter::generateTitleVars( $newTitle, 'MOVED_TO' )
+ self::generateUserVars( $user ),
+ self::generateTitleVars( $oldTitle, 'MOVED_FROM' ),
+ self::generateTitleVars( $newTitle, 'MOVED_TO' )
);
$vars->setVar( 'SUMMARY', $row->rc_comment );
@@ -2371,9 +2371,9 @@
/** @var $wgLang Language */
global $wgLang;
if ( count( $parameters ) == 0 ) {
- $displayAction = AbuseFilter::getActionDisplay( $action
);
+ $displayAction = self::getActionDisplay( $action );
} else {
- $displayAction = AbuseFilter::getActionDisplay( $action
) .
+ $displayAction = self::getActionDisplay( $action ) .
wfMessage( 'colon-separator' )->escaped() .
$wgLang->semicolonList( $parameters );
}
diff --git a/phpcs.xml b/phpcs.xml
index d551fa6..22e6f9d 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,15 @@
<?xml version="1.0"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+ <exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle"
/>
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
- <exclude name="MediaWiki.Commenting.FunctionComment"/>
</rule>
<rule ref="Generic.Files.LineLength">
<exclude-pattern>AbuseFilter.alias.php</exclude-pattern>
--
To view, visit https://gerrit.wikimedia.org/r/367134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0874c547ef2bc8a7c3fa4ca72738aa3320f2bdbe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
