From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 28 May 2015 18:28:35 +0000 (+0000)
Subject: Merge "Don't run phpcs on node_modules folder"
X-Git-Tag: 1.31.0-rc.0~11268
X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=commitdiff_plain;h=8a7e518da017e9345f86851e7c141276f5aa2693;hp=9a805b816d9aa19611a49d638fab86b7389c8618;p=lhc%2Fweb%2Fwiklou.git

Merge "Don't run phpcs on node_modules folder"
---

diff --git a/composer.json b/composer.json
index f87dbe7211..82102368bc 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
 	},
 	"scripts": {
 		"lint": "parallel-lint --exclude vendor",
-		"phpcs": "phpcs $PHPCS_ARGS -s --standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --ignore=vendor --encoding=utf-8 --extensions=php,php5,inc,sample",
+		"phpcs": "phpcs $PHPCS_ARGS -s --standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --ignore=vendor,node_modules --encoding=utf-8 --extensions=php,php5,inc,sample",
 		"test": [
 			"composer lint",
 			"composer phpcs"