From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 26 Sep 2015 15:28:00 +0000 (+0000)
Subject: Merge "Re-enable PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"
X-Git-Tag: 1.31.0-rc.0~9802
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=ad2a484630d3fcbca003de125531ba0e7a37a252;p=lhc%2Fweb%2Fwiklou.git

Merge "Re-enable PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"
---

ad2a484630d3fcbca003de125531ba0e7a37a252
diff --cc phpcs.xml
index 69e988bf3d,829ea49686..7bd87cd61a
--- a/phpcs.xml
+++ b/phpcs.xml
@@@ -10,11 -10,12 +10,10 @@@
  		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
  		<exclude name="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed"/>
  		<exclude name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect"/>
- 		<exclude name="PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"/>
  		<exclude name="PSR2.Methods.MethodDeclaration.AbstractAfterVisibility"/>
  		<exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed"/>
 -		<exclude name="PSR2.Methods.MethodDeclaration.StaticBeforeVisibility"/>
  		<exclude name="Squiz.WhiteSpace.ScopeClosingBrace.Indent"/>
  		<exclude name="Squiz.WhiteSpace.SemicolonSpacing.Incorrect"/>
 -		<exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines"/>
  	</rule>
  	<file>.</file>
  	<arg name="encoding" value="utf8"/>