UseSpacingSniff: Fixed internal errors

Author: kukulich

SlevomatCodingStandard/Sniffs/Namespaces/UseSpacingSniff.php

@@ -143,7 +143,10 @@ private function checkLinesAfterLastUse(File $phpcsFile, UseStatement $lastUse):
 
 		if (
 			in_array($tokens[$pointerAfterWhitespaceEnd]['code'], Tokens::$commentTokens, true)
-			&& $tokens[$useEndPointer]['line'] + 1 === $tokens[$pointerAfterWhitespaceEnd]['line']
+			&& (
+				$tokens[$useEndPointer]['line'] === $tokens[$pointerAfterWhitespaceEnd]['line']
+				|| $tokens[$useEndPointer]['line'] + 1 === $tokens[$pointerAfterWhitespaceEnd]['line']
+			)
 		) {
 			$useEndPointer = array_key_exists('comment_closer', $tokens[$pointerAfterWhitespaceEnd])
 				? $tokens[$pointerAfterWhitespaceEnd]['comment_closer']
@@ -221,6 +224,7 @@ private function checkLinesBetweenSameTypesOfUse(File $phpcsFile, array $useStat
 
 			if (
 				in_array($tokens[$pointerBeforeUse]['code'], Tokens::$commentTokens, true)
+				&& TokenHelper::findFirstNonWhitespaceOnLine($phpcsFile, $pointerBeforeUse) === $pointerBeforeUse
 				&& $tokens[$pointerBeforeUse]['line'] + 1 === $tokens[$useStartPointer]['line']
 			) {
 				$useStartPointer = array_key_exists('comment_opener', $tokens[$pointerBeforeUse])
@@ -296,6 +300,7 @@ private function checkLinesBetweenDifferentTypesOfUse(File $phpcsFile, array $us
 
 			if (
 				in_array($tokens[$pointerBeforeUse]['code'], Tokens::$commentTokens, true)
+				&& TokenHelper::findFirstNonWhitespaceOnLine($phpcsFile, $pointerBeforeUse) === $pointerBeforeUse
 				&& $tokens[$pointerBeforeUse]['line'] + 1 === $tokens[$useStartPointer]['line']
 			) {
 				$useStartPointer = array_key_exists('comment_opener', $tokens[$pointerBeforeUse])

tests/Sniffs/Namespaces/data/useSpacingWithDefaultSettingsNoErrors.php

@@ -1,8 +1,11 @@
 <?php declare(strict_types = 1);
 
-use DateTimeImmutable;
-use function phpversion;
-use const PHP_VERSION_ID;
+use DateTimeImmutable; // WTF comment
+use DateTimeInterface;
+use DateTime; // WTF comment
+use function phpversion; // WTF comment
+use function phpinfo; // WTF comment
+use const PHP_VERSION_ID; // WTF comment
 
 ?><?php