Merge "update mediawiki-codesniffer to 0.11.0 and fix issues"

[lhc/web/wiklou.git] / phpcs.xml

diff --git a/phpcs.xml b/phpcs.xml
index d2e4fcc..b1ad8d2 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,8 +2,6 @@
 <ruleset name="MediaWiki">
        <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
                <exclude name="Generic.ControlStructures.InlineControlStructure" />
-               <!-- Rule will pass in 0.10.0 but update depends on T167168 -->
-               <exclude name="MediaWiki.WhiteSpace.SpaceBeforeClassBrace.NoSpaceBeforeBrace" />
                <!-- Disable rules added in 0.8.0 that don't pass yet -->
                <exclude name="MediaWiki.Commenting.FunctionComment.ExtraParamComment" />
                <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
@@ -12,7 +10,6 @@
                <exclude name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
                <exclude name="MediaWiki.Commenting.FunctionComment.Missing.Protected" />
                <exclude name="MediaWiki.Commenting.FunctionComment.Missing.Public" />
-               <exclude name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
                <exclude name="MediaWiki.Commenting.FunctionComment.SpacingAfter" />
                <exclude name="MediaWiki.Commenting.FunctionComment.SpacingAfterParamName" />
                <exclude name="MediaWiki.Commenting.FunctionComment.SpacingAfterParamType" />