Reedy has submitted this change and it was merged.
Change subject: Use phpcs to forbid short array syntax
......................................................................
Use phpcs to forbid short array syntax
This bumps mediawiki/mediawiki-codesniffer to the earliest version that
included the upstream sniff that forbade short array syntax. All failing
rules were disabled so it can be made voting immediately, but some of
these should probably be fixed (e.g. no closing PHP tags), and can
probably be auto-fixed rather easily.
Should hopefully prevent T143635 in the future, as long as phpcs is run
before tarballs are published (and not after by CI).
Change-Id: If336a4091c11228d2a2f78de11b69450f5c93874
---
M composer.json
M phpcs.xml
2 files changed, 42 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 991084e..bea1622 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,7 @@
"jakub-onderka/php-parallel-lint": "0.9",
"justinrainbow/json-schema": "~1.3",
"phpunit/phpunit": "3.7.37",
- "mediawiki/mediawiki-codesniffer": "0.3.0",
+ "mediawiki/mediawiki-codesniffer": "0.4.0",
"wikimedia/avro": "1.7.7",
"nmred/kafka-php": "0.1.4",
"monolog/monolog": "1.14.0"
@@ -62,7 +62,7 @@
},
"scripts": {
"lint": "parallel-lint --exclude vendor",
- "phpcs": "phpcs -p $PHPCS_ARGS",
+ "phpcs": "phpcs -p -s",
"test": [
"composer lint",
"composer phpcs"
diff --git a/phpcs.xml b/phpcs.xml
index 36ad394..dc5bf03 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,14 +1,52 @@
<?xml version="1.0"?>
<ruleset name="MediaWiki">
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
- <file>.</file>
+ <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment"/>
+ <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment"/>
+ <exclude name="Generic.Files.EndFileNewline.NotFound"/>
+ <exclude name="Generic.Files.LineLength.TooLong"/>
+ <exclude name="Squiz.WhiteSpace.SemicolonSpacing.Incorrect"/>
+ <exclude name="Squiz.WhiteSpace.ScopeClosingBrace.Indent"/>
+ <exclude name="Squiz.WhiteSpace.SemicolonSpacing.Incorrect"/>
+ <exclude
name="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceBeforeCloseParenthesis"/>
+ <exclude
name="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceAfterOpenParenthesis"/>
+ <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
+ <exclude
name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed"/>
+ <exclude
name="Generic.Functions.OpeningFunctionBraceKernighanRitchie.BraceOnNewLine"/>
+ <exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
+ <exclude
name="Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore"/>
+ <exclude
name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect"/>
+ <exclude
name="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines"/>
+ <exclude
name="PSR2.Methods.MethodDeclaration.StaticBeforeVisibility"/>
+ <exclude
name="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed"/>
+ <exclude
name="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed"/>
+ <exclude
name="MediaWiki.VariableAnalysis.UnusedGlobalVariables"/>
+ <exclude
name="Squiz.WhiteSpace.LogicalOperatorSpacing.TooMuchSpaceBefore"/>
+ <exclude
name="PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"/>
+ <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
+ <exclude
name="PSR2.Methods.MethodDeclaration.AbstractAfterVisibility"/>
+ <exclude name="Squiz.Scope.StaticThisUsage.Found"/>
+ <exclude name="Zend.Files.ClosingTag.NotAllowed"/>
+ </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"
/>
+ </properties>
+ </rule>
+ <rule ref="MediaWiki.NamingConventions.ValidGlobalName">
+ <properties>
+ <property name="ignoreList" type="array"
value="$IP,$messageMemc,$parserMemc" />
+ </properties>
+ </rule> <file>.</file>
<arg name="encoding" value="utf8"/>
<arg name="extensions" value="php,php5,inc,sample"/>
<rule ref="Generic.Files.LineLength">
<exclude-pattern>*/languages/messages/Messages*.php</exclude-pattern>
</rule>
+ <rule ref="Generic.Arrays.DisallowShortArraySyntax.Found"/>
<exclude-pattern>node_modules</exclude-pattern>
<exclude-pattern>vendor</exclude-pattern>
<exclude-pattern>extensions</exclude-pattern>
<exclude-pattern>skins</exclude-pattern>
+ <exclude-pattern>.git</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/306146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If336a4091c11228d2a2f78de11b69450f5c93874
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_26
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
