[phpcs] Fix blank line detection

Squiz.WhiteSpace.SuperfluousWhitespace has problems detecting blank
lines in functions when used together with the PSR2 standard.

More information: https://github.com/squizlabs/PHP_CodeSniffer/issues/600

This commit fixes that issue by restoring the original behavior.
It also adds rules for function spacing because the sniff mentioned
above does only work within functions.
This commit is contained in:
logmanoriginal 2018-12-26 21:39:36 +01:00
parent 4b22862295
commit ce65f51d91

View file

@ -79,7 +79,22 @@
<!-- Do not add a whitespace before a semicolon --> <!-- Do not add a whitespace before a semicolon -->
<rule ref="Squiz.WhiteSpace.SemicolonSpacing"/> <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
<!-- Do not add whitespace at start or end of a file or end of a line --> <!-- Do not add whitespace at start or end of a file or end of a line -->
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/> <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
<properties>
<!--
This fixes an issue in combination with PSR2
https://github.com/squizlabs/PHP_CodeSniffer/issues/600
-->
<property name="ignoreBlankLines" value="false"/>
</properties>
</rule>
<rule ref="Squiz.WhiteSpace.FunctionSpacing">
<properties>
<property name="spacing" value="1" />
<property name="spacingBeforeFirst" value="0" />
<property name="spacingAfterLast" value="0" />
</properties>
</rule>
<!-- Whenever possible use single quote strings --> <!-- Whenever possible use single quote strings -->
<rule ref="Squiz.Strings.DoubleQuoteUsage"> <rule ref="Squiz.Strings.DoubleQuoteUsage">
<exclude name="Squiz.Strings.DoubleQuoteUsage.ContainsVar" /> <exclude name="Squiz.Strings.DoubleQuoteUsage.ContainsVar" />