jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401075 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
The following sniffs are failing and were disabled:
* Squiz.Scope.MethodScope.Missing
Also added phpcbf to "composer fix" command.
Change-Id: Ibb0d86505488338b748edb54f033af030c91336e
---
M .phpcs.xml
M composer.json
2 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.phpcs.xml b/.phpcs.xml
index a68d22b..e93e28d 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -7,7 +7,8 @@
<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
<exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName"/>
<exclude
name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.wfPrefix"/>
- <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
+ <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
+ <exclude name="Squiz.Scope.MethodScope.Missing" />
</rule>
<file>.</file>
<exclude-pattern>coverage</exclude-pattern>
diff --git a/composer.json b/composer.json
index 2144813..a80214a 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.2",
"phpunit/phpunit": "^4.8",
- "mediawiki/mediawiki-codesniffer": "14.1.0",
+ "mediawiki/mediawiki-codesniffer": "15.0.0",
"ext-mbstring": "*"
},
"scripts": {
@@ -31,7 +31,9 @@
"phpunit",
"php scripts/benchmark.php"
],
- "fix": "phpcbf"
+ "fix": [
+ "phpcbf"
+ ]
},
"config": {
"optimize-autoloader": true
--
To view, visit https://gerrit.wikimedia.org/r/401075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb0d86505488338b748edb54f033af030c91336e
Gerrit-PatchSet: 2
Gerrit-Project: utfnormal
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <tools.libraryupgra...@tools.wmflabs.org>
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
