Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/271220

Change subject: build: Update mediawiki-codesniffer to 0.6.0, add "composer fix"
......................................................................

build: Update mediawiki-codesniffer to 0.6.0, add "composer fix"

* Introduce "composer fix", which uses phpcbf to automatically fix some
errors spotted by phpcs.
* Drop $PHPCS_ARGS variable that didn't work on Windows, and add -s flag
* Remove rules from phpcs.xml that are now in MW-CS ruleset.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/271220/1

diff --git a/composer.json b/composer.json
index 5bec8e4..4a7498a 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
        "require-dev": {
                "jakub-onderka/php-parallel-lint": "0.9.2",
                "justinrainbow/json-schema": "~1.3",
-               "mediawiki/mediawiki-codesniffer": "0.5.1",
+               "mediawiki/mediawiki-codesniffer": "0.6.0",
                "monolog/monolog": "~1.17.2",
                "nikic/php-parser": "1.4.1",
                "nmred/kafka-php": "0.1.5",
@@ -68,7 +68,8 @@
        },
        "scripts": {
                "lint": "parallel-lint --exclude vendor",
-               "phpcs": "phpcs -p $PHPCS_ARGS",
+               "phpcs": "phpcs -p -s",
+               "fix": "phpcbf -p -s",
                "pre-install-cmd": "ComposerHookHandler::onPreInstall",
                "pre-update-cmd": "ComposerHookHandler::onPreUpdate",
                "test": [
diff --git a/phpcs.xml b/phpcs.xml
index bbf2f46..38c7aaa 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
 <ruleset name="MediaWiki">
        <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
-       <rule ref="Generic.Arrays.DisallowLongArraySyntax" />
-       <rule ref="Generic.Functions.CallTimePassByReference.NotAllowed">
-               <!-- too many false positives, see T127163 -->
-               <severity>0</severity>
-       </rule>
        <rule ref="MediaWiki.NamingConventions.PrefixedGlobalFunctions">
                <properties>
                        <property name="ignoreList" type="array" 
value="bfNormalizeTitleStrReplace,bfNormalizeTitleStrTr,cdbShowHelp,codepointToUtf8,compare_point,cssfilter,escapeSingleString,findAuxFile,findFiles,getEscapedProfileUrl,getFileCommentFromSourceWiki,getFileUserFromSourceWiki,hexSequenceToUtf8,mccGetHelp,mccShowUsage,mimeTypeMatch,moveToExternal,NothingFunction,NothingFunctionData,resolveStub,resolveStubs,showUsage,splitFilename,utf8ToCodepoint,utf8ToHexSequence"
 />

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13e2155695918c918b67497ac65b85a03897095e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>

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

Reply via email to