diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-28 19:58:56 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-28 19:58:56 +0100 |
| commit | 8f1a1874a9fa6043e27d297ee14d5e622e177002 (patch) | |
| tree | 05fcaf04438f30e703197eb28c743ca56e114acd | |
| parent | d43e8c94f578f1e8e57b2b78c59c2169b9c5f789 (diff) | |
| parent | 79ce924bc10cd528b3d9287bfcfaa96f96b88bc2 (diff) | |
| download | forums-8f1a1874a9fa6043e27d297ee14d5e622e177002.tar forums-8f1a1874a9fa6043e27d297ee14d5e622e177002.tar.gz forums-8f1a1874a9fa6043e27d297ee14d5e622e177002.tar.bz2 forums-8f1a1874a9fa6043e27d297ee14d5e622e177002.tar.xz forums-8f1a1874a9fa6043e27d297ee14d5e622e177002.zip | |
Merge pull request #3194 from Nicofuma/ticket/13381
[ticket/13381] Allow ' *' in the doc blocks (especially the header files)
| -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]])) { |