diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-28 19:59:15 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-28 19:59:15 +0100 |
| commit | 96cc24c211d53305af32c069f04e93ba1495def1 (patch) | |
| tree | 9a33acae2d1fc46cb802bb50006903348d410871 | |
| parent | c7116f1a542c7ef91e3e30ce1c9302a50ecb29c2 (diff) | |
| parent | 8f1a1874a9fa6043e27d297ee14d5e622e177002 (diff) | |
| download | forums-96cc24c211d53305af32c069f04e93ba1495def1.tar forums-96cc24c211d53305af32c069f04e93ba1495def1.tar.gz forums-96cc24c211d53305af32c069f04e93ba1495def1.tar.bz2 forums-96cc24c211d53305af32c069f04e93ba1495def1.tar.xz forums-96cc24c211d53305af32c069f04e93ba1495def1.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php b/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php index fa7d3b40c1..8337cf02ee 100644 --- a/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php @@ -84,12 +84,12 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff $line = $tokens[$i]['content']; // Check that each line starts with a '*' - if (substr($line, 0, 1) !== '*') + if (substr($line, 0, 1) !== '*' && substr($line, 0, 2) !== ' *') { - $message = 'The file doc comment should not be idented.'; + $message = 'The file doc comment should not be indented.'; $phpcsFile->addWarning($message, $i); } - else if (preg_match('/^\*\s+@([\w]+)\s+(.*)$/', $line, $match) !== 0) + else if (preg_match('/^[ ]?\*\s+@([\w]+)\s+(.*)$/', $line, $match) !== 0) { if (!isset($tags[$match[1]])) { |