diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-29 20:40:06 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-29 20:40:06 +0200 |
| commit | 417a0d0ea62c29ad616e75bcbf132a9017c9cfd2 (patch) | |
| tree | 32132483f24f6aaf760794b3a4d3b5723351fadf /build | |
| parent | 40351fae96de34312ca960abc5048c835f50e3ef (diff) | |
| parent | 89391dec089e8085f486b768ad7654f62166f4a2 (diff) | |
| download | forums-417a0d0ea62c29ad616e75bcbf132a9017c9cfd2.tar forums-417a0d0ea62c29ad616e75bcbf132a9017c9cfd2.tar.gz forums-417a0d0ea62c29ad616e75bcbf132a9017c9cfd2.tar.bz2 forums-417a0d0ea62c29ad616e75bcbf132a9017c9cfd2.tar.xz forums-417a0d0ea62c29ad616e75bcbf132a9017c9cfd2.zip | |
Merge pull request #2366 from bantu/ticket/12458
[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code
* bantu/ticket/12458:
[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
Diffstat (limited to 'build')
| -rw-r--r-- | build/code_sniffer/ruleset-php-legacy.xml | 12 | ||||
| -rw-r--r-- | build/code_sniffer/ruleset-php-strict.xml | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/build/code_sniffer/ruleset-php-legacy.xml b/build/code_sniffer/ruleset-php-legacy.xml index 550c919b5d..65eb0a8622 100644 --- a/build/code_sniffer/ruleset-php-legacy.xml +++ b/build/code_sniffer/ruleset-php-legacy.xml @@ -41,6 +41,18 @@ </rule> <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint" /> + <!-- There MUST NOT be trailing whitespace at the end of lines. --> + <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" /> + + <!-- There MUST NOT be whitespace before the first content of a file --> + <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile" /> + + <!-- There MUST NOT be whitespace after the last content of a file --> + <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile" /> + + <!-- Functions MUST NOT contain multiple empty lines in a row --> + <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines" /> + <!-- The ?> closing tag MUST be omitted from files containing only PHP. --> <rule ref="Zend.Files.ClosingTag" /> diff --git a/build/code_sniffer/ruleset-php-strict.xml b/build/code_sniffer/ruleset-php-strict.xml index 5e3c26a616..f2d5b86dd1 100644 --- a/build/code_sniffer/ruleset-php-strict.xml +++ b/build/code_sniffer/ruleset-php-strict.xml @@ -22,18 +22,6 @@ <!-- PHP keywords MUST be in lower case. --> <rule ref="Generic.PHP.LowerCaseKeyword" /> - <!-- There MUST NOT be trailing whitespace at the end of lines. --> - <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" /> - - <!-- There MUST NOT be whitespace before the first content of a file --> - <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile" /> - - <!-- There MUST NOT be whitespace after the last content of a file --> - <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile" /> - - <!-- Functions MUST NOT contain multiple empty lines in a row --> - <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines" /> - <!-- Classes etc. MUST be namespaced --> <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace" /> |