diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-28 22:59:33 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-28 22:59:33 -0700 |
| commit | d437f1f133b17568c4bfa1e7e014b29351e9e2ed (patch) | |
| tree | b8b1c42680288658272ff4a37a34e7b8f4f83097 /build/code_sniffer | |
| parent | 59e3c2d16e5fa3eb6f1a872657454b437b72ae63 (diff) | |
| parent | 99fccb6f19e3945156ba74b67602a4a5b88e7434 (diff) | |
| download | forums-d437f1f133b17568c4bfa1e7e014b29351e9e2ed.tar forums-d437f1f133b17568c4bfa1e7e014b29351e9e2ed.tar.gz forums-d437f1f133b17568c4bfa1e7e014b29351e9e2ed.tar.bz2 forums-d437f1f133b17568c4bfa1e7e014b29351e9e2ed.tar.xz forums-d437f1f133b17568c4bfa1e7e014b29351e9e2ed.zip | |
Merge pull request #1835 from bantu/task/code-sniffer
[task/code-sniffer] Require PHP Code Sniffer to pass
Diffstat (limited to 'build/code_sniffer')
| -rw-r--r-- | build/code_sniffer/ruleset-php-legacy.xml | 4 | ||||
| -rw-r--r-- | build/code_sniffer/ruleset-php-strict.xml | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/build/code_sniffer/ruleset-php-legacy.xml b/build/code_sniffer/ruleset-php-legacy.xml index ebc85c4fef..ed8c7e98a0 100644 --- a/build/code_sniffer/ruleset-php-legacy.xml +++ b/build/code_sniffer/ruleset-php-legacy.xml @@ -7,9 +7,7 @@ <!-- The body of each structure MUST be enclosed by braces. --> <rule ref="Generic.ControlStructures.InlineControlStructure" /> - - <!-- All PHP files MUST end with a single blank line. --> - + <!-- Class constants MUST be declared in all upper case with underscore separators. --> <rule ref="Generic.NamingConventions.UpperCaseConstantName" /> diff --git a/build/code_sniffer/ruleset-php-strict.xml b/build/code_sniffer/ruleset-php-strict.xml index 8580090c69..65b6763c57 100644 --- a/build/code_sniffer/ruleset-php-strict.xml +++ b/build/code_sniffer/ruleset-php-strict.xml @@ -24,13 +24,13 @@ <!-- 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" /> |