diff --git a/CakePHP/Sniffs/Formatting/BlankLineBeforeReturnSniff.php b/CakePHP/Sniffs/Formatting/BlankLineBeforeReturnSniff.php index 39fd152..f5da302 100644 --- a/CakePHP/Sniffs/Formatting/BlankLineBeforeReturnSniff.php +++ b/CakePHP/Sniffs/Formatting/BlankLineBeforeReturnSniff.php @@ -56,17 +56,18 @@ public function process(File $phpcsFile, $stackPtr) $prevLineTokens = []; while ($current >= 0 && $tokens[$current]['line'] >= $previousLine) { + $currentTokenCode = $tokens[$current]['code']; if ( $tokens[$current]['line'] == $previousLine - && $tokens[$current]['code'] !== T_WHITESPACE - && $tokens[$current]['code'] !== T_COMMENT - && $tokens[$current]['code'] !== T_DOC_COMMENT_OPEN_TAG - && $tokens[$current]['code'] !== T_DOC_COMMENT_TAG - && $tokens[$current]['code'] !== T_DOC_COMMENT_STRING - && $tokens[$current]['code'] !== T_DOC_COMMENT_CLOSE_TAG - && $tokens[$current]['code'] !== T_DOC_COMMENT_WHITESPACE + && $currentTokenCode !== T_WHITESPACE + && $currentTokenCode !== T_COMMENT + && $currentTokenCode !== T_DOC_COMMENT_OPEN_TAG + && $currentTokenCode !== T_DOC_COMMENT_TAG + && $currentTokenCode !== T_DOC_COMMENT_STRING + && $currentTokenCode !== T_DOC_COMMENT_CLOSE_TAG + && $currentTokenCode !== T_DOC_COMMENT_WHITESPACE ) { - $prevLineTokens[] = $tokens[$current]['code']; + $prevLineTokens[] = $currentTokenCode; } $current--; }