jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367317 )

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


build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: Idbd145e671ab87bb2e363b6f195db3c5fe211a55
---
M composer.json
M phpcs.xml
2 files changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/composer.json b/composer.json
index f537847..8d05f89 100644
--- a/composer.json
+++ b/composer.json
@@ -15,12 +15,12 @@
        "require-dev": {
                "jakub-onderka/php-parallel-lint": "0.9.2",
                "jakub-onderka/php-console-highlighter": "0.3.2",
-               "mediawiki/mediawiki-codesniffer": "0.8.1"
+               "mediawiki/mediawiki-codesniffer": "0.10.1"
        },
        "scripts": {
                "fix": "phpcbf",
                "test": [
-                       "parallel-lint . --exclude vendor",
+                       "parallel-lint . --exclude vendor --exclude 
node_modules",
                        "phpcs -p -s"
                ]
        }
diff --git a/phpcs.xml b/phpcs.xml
index 4f04c1a..9b9ed4f 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,10 +6,10 @@
                <exclude name="MediaWiki.Commenting.FunctionComment"/>
        </rule>
        <rule ref="Generic.Files.LineLength">
-               <exclude-pattern>*/templates/*.php</exclude-pattern>
+               <exclude-pattern>*/templates/*\.php</exclude-pattern>
        </rule>
        <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
-               <exclude-pattern>*/templates/*.php</exclude-pattern>
+               <exclude-pattern>*/templates/*\.php</exclude-pattern>
        </rule>
        <rule ref="MediaWiki.NamingConventions.PrefixedGlobalFunctions">
                <properties>
@@ -19,6 +19,4 @@
        <file>.</file>
        <arg name="extensions" value="php,php5,inc"/>
        <arg name="encoding" value="UTF-8"/>
-       <exclude-pattern>vendor</exclude-pattern>
-       <exclude-pattern>node_modules</exclude-pattern>
 </ruleset>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idbd145e671ab87bb2e363b6f195db3c5fe211a55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: C. Scott Ananian <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to