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=d2e4fcc5f04e7b25d8c2dac7354cd9d9c11003ff;hb=6c30fab96071a68907814e9ba3ce9e9429601c24;hp=7eca9ea505fd0356452007a4038a805de4acaa7a;hpb=c0fbb42dff1fca3d342228fc37f63eaa911b9b2d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/phpcs.xml b/phpcs.xml
index 7eca9ea505..d2e4fcc5f0 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <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" />
@@ -17,9 +20,6 @@
 		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd" />
 		<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
 		<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
-		<exclude name="MediaWiki.WhiteSpace.DisallowEmptyLineFunctions.NoEmptyLine" />
-		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeControlStructureBrace.EmptyLines" />
-		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeClassBrace.NoSpaceBeforeBrace" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment" />
 		<exclude name="MediaWiki.Usage.DbrQueryUsage.DbrQueryFound" />
@@ -36,24 +36,19 @@
 			<property name="ignoreList" type="array" value="$IP,$messageMemc,$parserMemc" />
 		</properties>
 	</rule>
-	<file>.</file>
-	<arg name="encoding" value="UTF-8"/>
-	<arg name="extensions" value="php,php5,inc,sample"/>
 	<rule ref="Generic.Files.LineLength">
 		<exclude-pattern>*/languages/messages/Messages*.php</exclude-pattern>
 	</rule>
 	<rule ref="PSR2.Methods.MethodDeclaration.Underscore">
 		<exclude-pattern>*/includes/StubObject.php</exclude-pattern>
 	</rule>
-	<rule ref="Generic.ControlStructures.InlineControlStructure.NotAllowed">
-		<severity>0</severity>
-	</rule>
-	<exclude-pattern>node_modules/</exclude-pattern>
-	<exclude-pattern>vendor/</exclude-pattern>
+	<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>
 	<exclude-pattern type="relative">^skins/</exclude-pattern>
-	<exclude-pattern>.git</exclude-pattern>
-	<exclude-pattern>AdminSettings.php</exclude-pattern>
-	<exclude-pattern>LocalSettings.php</exclude-pattern>
-	<exclude-pattern>StartProfiler.php</exclude-pattern>
+	<exclude-pattern>AdminSettings\.php</exclude-pattern>
+	<exclude-pattern>LocalSettings\.php</exclude-pattern>
+	<exclude-pattern>StartProfiler\.php</exclude-pattern>
 </ruleset>