UselessVariableSniff: Fixed false positive

slevomat · May 17, 2019 · f392053 · f392053
1 parent 307fcc2
commit f392053
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/SlevomatCodingStandard/Sniffs/Variables/UselessVariableSniff.php b/SlevomatCodingStandard/Sniffs/Variables/UselessVariableSniff.php
@@ -293,7 +293,7 @@ private function hasVariableVarAnnotation(File $phpcsFile, int $variablePointer)
 		}
 
 		$docCommentContent = TokenHelper::getContent($phpcsFile, $tokens[$pointerBeforeVariable]['comment_opener'], $pointerBeforeVariable);
-		return preg_match('~@var\\s+\\S+\\s+' . preg_quote($tokens[$variablePointer]['content'], '~') . '~', $docCommentContent) !== 0;
+		return preg_match('~@var\\s+.+\\s+' . preg_quote($tokens[$variablePointer]['content'], '~') . '(?:\\s|$)~', $docCommentContent) !== 0;
 	}
 
 	private function hasAnotherAssigmentBefore(File $phpcsFile, int $variablePointer, string $variableName): bool

diff --git a/tests/Sniffs/Variables/data/uselessVariableNoErrors.php b/tests/Sniffs/Variables/data/uselessVariableNoErrors.php
@@ -60,6 +60,12 @@ function withDocComment() {
 	return $h;
 }
 
+function withGenericDocComment() {
+	/** @var array<int, string> $hh */
+	$hh = [];
+	return $hh;
+}
+
 function moreAssigments() {
 	$i = 'i';
 	$i .= 'ii';