jenkins-bot has submitted this change and it was merged.

Change subject: Remove redundant MediaWiki code sniffer rules
......................................................................


Remove redundant MediaWiki code sniffer rules

All these rules are enabled by default in the MediaWiki rule set.

Change-Id: I181a776492e6cd8c097e13b9cd33a6a60bfb1852
---
M phpcs.xml
1 file changed, 0 insertions(+), 38 deletions(-)

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



diff --git a/phpcs.xml b/phpcs.xml
index 0e790a3..dbba1b6 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,20 +7,13 @@
                
<exclude-pattern>DataAccess*Scribunto*Scribunto_LuaWikibaseLibraryTestCase\.php</exclude-pattern>
        </rule>
 
-       <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" />
-       <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall" />
-       <rule ref="Generic.CodeAnalysis.JumbledIncrementer" />
-       <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier" />
        <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement">
                <exclude-pattern>WikibaseClient\.example\.php</exclude-pattern>
        </rule>
 
        <rule ref="Generic.ControlStructures" />
 
-       <rule ref="Generic.Files.ByteOrderMark" />
-       <rule ref="Generic.Files.EndFileNewline" />
        <rule ref="Generic.Files.InlineHTML" />
-       <rule ref="Generic.Files.LineEndings" />
        <rule ref="Generic.Files.LineLength">
                <properties>
                        <property name="lineLimit" value="140" />
@@ -32,25 +25,7 @@
        <rule ref="Generic.Files.OneInterfacePerFile" />
        <rule ref="Generic.Files.OneTraitPerFile" />
 
-       <rule ref="Generic.Formatting.DisallowMultipleStatements" />
-       <rule ref="Generic.Formatting.MultipleStatementAlignment" />
-       <rule 
ref="Generic.Formatting.MultipleStatementAlignment.NotSameWarning">
-               <severity>0</severity>
-       </rule>
-
-       <rule ref="Generic.Functions.FunctionCallArgumentSpacing" />
-       <rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie" />
-
-       <rule ref="Generic.NamingConventions.ConstructorName" />
-
        <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
-       <rule ref="Generic.PHP.DeprecatedFunctions" />
-       <rule ref="Generic.PHP.DisallowShortOpenTag" />
-       <rule ref="Generic.PHP.ForbiddenFunctions" />
-       <rule ref="Generic.PHP.LowerCaseConstant" />
-       <rule ref="Generic.PHP.LowerCaseKeyword" />
-       <rule ref="Generic.PHP.NoSilencedErrors" />
-       <rule ref="Generic.PHP.SAPIUsage" />
 
        <!-- FIXME: This is part of the MediaWiki rule set and should be fixed. 
-->
        <rule ref="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed">
@@ -86,11 +61,7 @@
                <exclude-pattern>tests*phpunit*Test*\.php</exclude-pattern>
        </rule>
 
-       <rule ref="PSR2.Classes.PropertyDeclaration" />
-       <rule ref="PSR2.ControlStructures.ElseIfDeclaration" />
        <rule ref="PSR2.Files" />
-       <rule ref="PSR2.Methods.MethodDeclaration" />
-       <rule ref="PSR2.Namespaces" />
 
        <!-- This sniff is included in PSR1 but needs an exception. -->
        <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
@@ -102,18 +73,9 @@
                <!-- FIXME: This indicates an error in the QueryPage base class 
that should be fixed. -->
                <exclude-pattern>SpecialUnconnectedPages\.php</exclude-pattern>
        </rule>
-       <rule ref="Squiz.WhiteSpace.CastSpacing" />
        <rule ref="Squiz.WhiteSpace.FunctionSpacing">
                <properties>
                        <property name="spacing" value="1" />
                </properties>
        </rule>
-       <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing" />
-       <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing" />
-       <rule ref="Squiz.WhiteSpace.ScopeClosingBrace" />
-       <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing" />
-       <rule ref="Squiz.WhiteSpace.SemicolonSpacing" />
-       <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
-
-       <rule ref="Zend.Files" />
 </ruleset>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I181a776492e6cd8c097e13b9cd33a6a60bfb1852
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to