diff options
| author | alf007 <alf007@free.fr> | 2015-05-25 00:14:48 +0200 |
|---|---|---|
| committer | alf007 <alf007@free.fr> | 2015-05-25 00:14:48 +0200 |
| commit | 6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b (patch) | |
| tree | bd40622b18c3ce4d8174f2dc717ae19a12cf3d1a /build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php | |
| parent | 6a4cb42565d7e1663da4d02cd8d624b034b20afe (diff) | |
| parent | 6322970766bd9fa78327fa2ca6a6a43d73b680ee (diff) | |
| download | forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar.gz forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar.bz2 forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar.xz forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.zip | |
Merge pull request #1 from phpbb/develop-ascraeus
Develop ascraeus
Diffstat (limited to 'build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php')
| -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]])) { |