jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360115 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.MissingReturn
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.FunctionComment.Missing.Protected
* MediaWiki.FunctionComment.Missing.Public
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
Change-Id: I7f0a852fdcac3df96cefdbf568d4489a19da8312
---
M .gitignore
M SpoofUser.php
M api/ApiAntiSpoof.php
M composer.json
M maintenance/BatchAntiSpoofClass.php
M phpcs.xml
6 files changed, 20 insertions(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index 4bf4869..bee951e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
*.kate-swp
.*.swp
node_modules/
+vendor/
+composer.lock
diff --git a/SpoofUser.php b/SpoofUser.php
index 6bea606..630e0b6 100644
--- a/SpoofUser.php
+++ b/SpoofUser.php
@@ -140,7 +140,7 @@
$dbw = $this->getDBMaster();
// Avoid user rename triggered deadlocks
$dbw->onTransactionPreCommitOrIdle(
- function() use ( $dbw, $that, $method, $oldName ) {
+ function () use ( $dbw, $that, $method, $oldName ) {
if ( $that->record() ) {
$dbw->delete(
'spoofuser',
diff --git a/api/ApiAntiSpoof.php b/api/ApiAntiSpoof.php
index 0ea4db1..e7d09d1 100644
--- a/api/ApiAntiSpoof.php
+++ b/api/ApiAntiSpoof.php
@@ -25,8 +25,7 @@
} else {
$hasSuppressed = false;
$conflicts = [];
- foreach ( $unfilteredConflicts as $conflict )
- {
+ foreach ( $unfilteredConflicts as $conflict ) {
if ( !User::newFromName( $conflict
)->isHidden() ) {
$conflicts[] = $conflict;
} else {
diff --git a/composer.json b/composer.json
index f1b31da..394fb45 100644
--- a/composer.json
+++ b/composer.json
@@ -3,15 +3,14 @@
"type": "mediawiki-extension",
"description": "The AntiSpoof extension is an extension for preventing
confusable usernames from being created. It blocks the creation of accounts
with mixed-script, confusing and similar usernames.",
"homepage": "https://www.mediawiki.org/wiki/Extension:AntiSpoof";,
- "license" : "GPL-2.0+",
-
+ "license": "GPL-2.0+",
"require": {
- "composer/installers" : "*"
+ "composer/installers": "*"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "mediawiki/mediawiki-codesniffer": "0.7.2"
+ "mediawiki/mediawiki-codesniffer": "0.9.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/maintenance/BatchAntiSpoofClass.php
b/maintenance/BatchAntiSpoofClass.php
index d3f477d..c4092ee 100644
--- a/maintenance/BatchAntiSpoofClass.php
+++ b/maintenance/BatchAntiSpoofClass.php
@@ -81,4 +81,3 @@
$this->output( "$n user(s) done.\n" );
}
}
-
diff --git a/phpcs.xml b/phpcs.xml
index d2ddd68..f6cd7fe 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
<ruleset>
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <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.FunctionComment.Missing.Protected" />
+ <exclude name="MediaWiki.FunctionComment.Missing.Public" />
+ <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
+ </rule>
<file>.</file>
- <arg name="extensions" value="php,php5,inc"/>
- <arg name="encoding" value="utf8"/>
+ <arg name="extensions" value="php,php5,inc" />
+ <arg name="encoding" value="utf8" />
<exclude-pattern>equivset.php</exclude-pattern>
<exclude-pattern>vendor</exclude-pattern>
<exclude-pattern>node_modules</exclude-pattern>
--
To view, visit https://gerrit.wikimedia.org/r/360115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f0a852fdcac3df96cefdbf568d4489a19da8312
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
