X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=blobdiff_plain;f=phpcs.xml;h=cabea093b29c36d616c5f043a80b7419de0a00c3;hb=3863dd231f2fdda95c28193a05e550167f023b5f;hp=d2e4fcc5f04e7b25d8c2dac7354cd9d9c11003ff;hpb=d5a7166771613dfe4ed9fb75fa5efeced6134bd1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/phpcs.xml b/phpcs.xml
index d2e4fcc5f0..cabea093b2 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,20 +2,19 @@
 <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" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
 		<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.ParamNameNoMatch" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.SpacingAfter" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.SpacingAfterParamName" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.SpacingAfterParamType" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.NotShortBoolReturn" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.NotShortIntReturn" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.NotShortBoolParam" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.NotShortIntParam" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.ExtraParamComment" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle" />
 		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart" />
 		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd" />
 		<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
@@ -43,7 +42,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>