From 9d8be60a78458299fb06cb0cc2699b2a2d1a688b Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Sun, 19 Feb 2017 10:46:31 -0700 Subject: [PATCH] Spacing After Comment fails to fix error when comment is not a docblock Fix from https://github.com/squizlabs/PHP_CodeSniffer/commit/0434c489d21e402199fb0b4ab581af5009cb706d fix for https://github.com/squizlabs/PHP_CodeSniffer/issues/983 --- Joomla/Sniffs/WhiteSpace/MemberVarSpacingSniff.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Joomla/Sniffs/WhiteSpace/MemberVarSpacingSniff.php b/Joomla/Sniffs/WhiteSpace/MemberVarSpacingSniff.php index 7e503e98..1e067a16 100644 --- a/Joomla/Sniffs/WhiteSpace/MemberVarSpacingSniff.php +++ b/Joomla/Sniffs/WhiteSpace/MemberVarSpacingSniff.php @@ -56,6 +56,12 @@ protected function processMemberVar(PHP_CodeSniffer_File $phpcsFile, $stackPtr) { $phpcsFile->fixer->beginChangeset(); + // Inline comments have the newline included in the content but docblock do not. + if ($tokens[$prev]['code'] === T_COMMENT) + { + $phpcsFile->fixer->replaceToken($prev, rtrim($tokens[$prev]['content'])); + } + for ($i = ($prev + 1); $i <= $stackPtr; $i++) { if ($tokens[$i]['line'] === $tokens[$stackPtr]['line'])