jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/358543 )
Change subject: Update mediawiki/codesniffer to 0.7.2
......................................................................
Update mediawiki/codesniffer to 0.7.2
Also move --ignore to phpcs.xml for use by phpcbf
Short array syntax will be used in follow ups
to keep this patch set small
Change-Id: Ib91f3768cc7cdccdc26a4d5200178ceb8e61e098
---
M api/ApiQueryAbuseLog.php
M composer.json
M includes/parser/AbuseFilterParser.php
M phpcs.xml
4 files changed, 9 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ApiQueryAbuseLog.php b/api/ApiQueryAbuseLog.php
index 28c5c6e..dcc4bcf 100644
--- a/api/ApiQueryAbuseLog.php
+++ b/api/ApiQueryAbuseLog.php
@@ -139,7 +139,7 @@
// Username normalisation
$params['user'] = $u->getName();
$userId = $u->getId();
- } elseif( IP::isIPAddress( $params['user'] ) ) {
+ } elseif ( IP::isIPAddress( $params['user'] ) ) {
// It's an IP, sanitize it
$params['user'] = IP::sanitizeIP(
$params['user'] );
$userId = 0;
diff --git a/composer.json b/composer.json
index f369bf5..c60a20f 100644
--- a/composer.json
+++ b/composer.json
@@ -11,14 +11,14 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.5.1",
+ "mediawiki/mediawiki-codesniffer": "0.7.2",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
"fix": "phpcbf",
"test": [
"parallel-lint . --exclude extensions --exclude
node_modules --exclude vendor",
- "phpcs -p -s --ignore=extensions/AntiSpoof"
+ "phpcs -p -s"
]
}
}
diff --git a/includes/parser/AbuseFilterParser.php
b/includes/parser/AbuseFilterParser.php
index 9b796cb..79747d3 100644
--- a/includes/parser/AbuseFilterParser.php
+++ b/includes/parser/AbuseFilterParser.php
@@ -842,8 +842,6 @@
$this->mVars->setVar( $name, $value );
}
-
-
// Built-in functions
/**
diff --git a/phpcs.xml b/phpcs.xml
index d81a292..301093c 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,12 @@
<?xml version="1.0"?>
<ruleset>
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude name="Generic.Arrays.DisallowLongArraySyntax.Found"/>
+ </rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
- <arg name="encoding" value="utf8"/>
+ <arg name="encoding" value="UTF-8"/>
<exclude-pattern>vendor</exclude-pattern>
+ <exclude-pattern>node_modules</exclude-pattern>
+ <exclude-pattern>extensions/AntiSpoof</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/358543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib91f3768cc7cdccdc26a4d5200178ceb8e61e098
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
