Merge "mw.util: Add a deprecation message to escapeId()"

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

diff --git a/phpcs.xml b/phpcs.xml
index b1ad8d2..238fc98 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -3,11 +3,7 @@
        <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
                <exclude name="Generic.ControlStructures.InlineControlStructure" />
                <!-- Disable rules added in 0.8.0 that don't pass yet -->
-               <exclude name="MediaWiki.Commenting.FunctionComment.ExtraParamComment" />
                <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
-               <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
-               <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
-               <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.SpacingAfter" />
@@ -40,7 +36,6 @@
                <exclude-pattern>*/includes/StubObject.php</exclude-pattern>
        </rule>
        <file>.</file>
-       <arg name="bootstrap" value="vendor/mediawiki/mediawiki-codesniffer/utils/bootstrap-ci.php"/>
        <arg name="encoding" value="UTF-8"/>
        <arg name="extensions" value="php,php5,inc,sample"/>
        <exclude-pattern type="relative">^extensions/</exclude-pattern>