Cleanup

Author: kukulich

SlevomatCodingStandard/Sniffs/Attributes/RequireAttributeAfterDocCommentSniff.php

@@ -48,7 +48,7 @@ public function process(File $phpcsFile, $attributeOpenerPointer): void
 		}
 
 		$docCommentStartPointer = TokenHelper::findFirstTokenOnLine($phpcsFile, $docCommentOpenerPointer);
-		$docCommentEndPointer = TokenHelper::findFirstTokenOnNextLine($phpcsFile, $tokens[$docCommentOpenerPointer]['comment_closer']) - 1;
+		$docCommentEndPointer = TokenHelper::findLastTokenOnLine($phpcsFile, $tokens[$docCommentOpenerPointer]['comment_closer']);
 		$docComment = TokenHelper::getContent($phpcsFile, $docCommentStartPointer, $docCommentEndPointer);
 
 		$firstAttributeOpenerPointer = $attributeOpenerPointer;

SlevomatCodingStandard/Sniffs/ControlStructures/AbstractLineCondition.php

@@ -110,9 +110,9 @@ protected function getCondition(File $phpcsFile, int $parenthesisOpenerPointer,
 
 	protected function getLineEnd(File $phpcsFile, int $pointer): string
 	{
-		$firstPointerOnNextLine = TokenHelper::findFirstTokenOnNextLine($phpcsFile, $pointer);
+		$lastPointerOnLine = TokenHelper::findLastTokenOnLine($phpcsFile, $pointer);
 
-		return rtrim(TokenHelper::getContent($phpcsFile, $pointer, $firstPointerOnNextLine - 1));
+		return rtrim(TokenHelper::getContent($phpcsFile, $pointer, $lastPointerOnLine));
 	}
 
 }