Merge branch 'whitespace-comments-bugfix' of https://github.com/erikw…

…iffin/PHP_CodeSniffer
squizlabs · May 21, 2013 · f93ca06 · f93ca06
2 parents b63ca2e + 0e27956
commit f93ca06
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/CodeSniffer/Standards/AbstractPatternSniff.php b/CodeSniffer/Standards/AbstractPatternSniff.php
@@ -409,7 +409,9 @@ protected function processPattern(
                             // This may just be an indent that comes after a newline
                             // so check the token before to make sure. If it is a newline, we
                             // can ignore the error here.
-                            if ($tokens[($stackPtr - 1)]['content'] !== $phpcsFile->eolChar) {
+                            if (($tokens[($stackPtr - 1)]['content'] !== $phpcsFile->eolChar)
+                                && ($this->ignoreComments === true && in_array($tokens[($stackPtr - 1)]['code'], PHP_CodeSniffer_Tokens::$commentTokens) === false)
+                            ) {
                                 $hasError = true;
                             } else {
                                 $stackPtr--;