From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 26 Sep 2015 15:19:16 +0000 (+0000)
Subject: Merge "Re-enable PSR2.Methods.MethodDeclaration.StaticBeforeVisibility"
X-Git-Tag: 1.31.0-rc.0~9804
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=831fdbea370609f19c0527ddf13bfad49aa89672;p=lhc%2Fweb%2Fwiklou.git

Merge "Re-enable PSR2.Methods.MethodDeclaration.StaticBeforeVisibility"
---

831fdbea370609f19c0527ddf13bfad49aa89672
diff --cc phpcs.xml
index 4334d7170a,5123c0b98a..2f99807964
--- a/phpcs.xml
+++ b/phpcs.xml
@@@ -12,8 -12,9 +12,7 @@@
  		<exclude name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect"/>
  		<exclude name="PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"/>
  		<exclude name="PSR2.Methods.MethodDeclaration.AbstractAfterVisibility"/>
 -		<exclude name="Generic.Files.EndFileNewline.NotFound"/>
  		<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"/>