Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368157 )
Change subject: Add jakub-onderka/php-console-highlighter
......................................................................
Add jakub-onderka/php-console-highlighter
Organize phpcs.xml
Change-Id: Ibc7852e0e077b350aee372b06978bd62246e0561
---
M .gitignore
M composer.json
M phpcs.xml
3 files changed, 20 insertions(+), 21 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance
refs/changes/57/368157/1
diff --git a/.gitignore b/.gitignore
index 5daed6e..a45b924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
/node_modules
/vendor
+/composer.lock
.svn
*~
diff --git a/composer.json b/composer.json
index f498b4c..f677d3a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,11 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
+ "jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
- "lint": "parallel-lint --exclude vendor --ignore-fails .",
+ "lint": "parallel-lint --exclude vendor --exclude node_modules
--ignore-fails .",
"phpcs": "phpcs -p -s",
"fix": "phpcbf",
"test": [
diff --git a/phpcs.xml b/phpcs.xml
index 41bf1f4..dc46632 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<ruleset>
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
@@ -8,27 +8,24 @@
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
<exclude
name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures"
/>
- <exclude
name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.wfPrefix" />
- <exclude
name="MediaWiki.NamingConventions.ValidGlobalName.wgPrefix" />
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
+ <exclude name="Generic.Classes.DuplicateClassName.Found" />
+ <exclude
name="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed" />
+ <exclude name="Generic.Files.LineLength.TooLong" />
+ <exclude name="Generic.PHP.BacktickOperator.Found" />
+ <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
+ </rule>
+ <rule ref="MediaWiki.NamingConventions.PrefixedGlobalFunctions">
+ <properties>
+ <property name="ignoreList" type="array"
value="doSanityCheck,purgeStaleMemcachedText,fixBug41778,assertCanAlter" />
+ </properties>
+ </rule>
+ <rule ref="MediaWiki.NamingConventions.ValidGlobalName">
+ <properties>
+ <property name="ignoreList" type="array"
value="$IP,$wmfRealm,$wmgVersionNumber,$wmgAddWikiNotify" />
+ </properties>
</rule>
<file>.</file>
- <arg name="encoding" value="utf8"/>
+ <arg name="encoding" value="UTF-8"/>
<arg name="extensions" value="php,php5,inc,sample"/>
-
- <rule ref="Generic.Classes.DuplicateClassName.Found">
- <severity>0</severity>
- </rule>
- <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed">
- <severity>0</severity>
- </rule>
- <rule ref="Generic.Files.LineLength.TooLong">
- <severity>0</severity>
- </rule>
- <rule ref="Generic.PHP.BacktickOperator.Found">
- <severity>0</severity>
- </rule>
- <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
- <severity>0</severity>
- </rule>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/368157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc7852e0e077b350aee372b06978bd62246e0561
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
