Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401103 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
......................................................................


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: I8e271513e8d5daf4e0b1a90bf92c11c305d223ca
---
M .phpcs.xml
M composer.json
2 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Yaron Koren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index b957e41..e38ac01 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -3,8 +3,9 @@
        <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
                <exclude name="MediaWiki.Commenting.FunctionComment" />
                <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
-               <exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
+               <exclude 
name="Generic.Files.OneObjectStructurePerFile.MultipleFound" />
                <exclude name="Generic.Arrays.DisallowLongArraySyntax" />
+               <exclude name="Squiz.Scope.MethodScope.Missing" />
        </rule>
        <!-- keep support for php 5.3 -->
        <rule ref="Generic.Arrays.DisallowShortArraySyntax" />
diff --git a/composer.json b/composer.json
index 79b6d3d..6393815 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
        },
        "require-dev": {
                "jakub-onderka/php-parallel-lint": "0.9.2",
-               "mediawiki/mediawiki-codesniffer": "14.1.0",
+               "mediawiki/mediawiki-codesniffer": "15.0.0",
                "jakub-onderka/php-console-highlighter": "0.3.2",
                "mediawiki/minus-x": "0.2.1"
        },

-- 
To view, visit https://gerrit.wikimedia.org/r/401103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e271513e8d5daf4e0b1a90bf92c11c305d223ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdminLinks
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to