Merge "Re-enable PSR2.Methods.MethodDeclaration.StaticBeforeVisibility"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 26 Sep 2015 15:19:16 +0000 (15:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 26 Sep 2015 15:19:16 +0000 (15:19 +0000)
1  2 
phpcs.xml

diff --cc 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"/>