StaticClosureSniff: Fixed false positive

Author: kukulich

SlevomatCodingStandard/Helpers/VariableHelper.php

@@ -69,7 +69,7 @@ private static function isUsedInScopeInternal(File $phpcsFile, int $scopeOwnerPo
 
 			if (
 				in_array($tokens[$i]['code'], [T_DOUBLE_QUOTED_STRING, T_HEREDOC], true)
-				&& self::isUsedInScopeInString($phpcsFile, $variablePointer, $i)
+				&& self::isUsedInScopeInString($phpcsFile, $tokens[$variablePointer]['content'], $i)
 			) {
 				return true;
 			}
@@ -118,13 +118,12 @@ public static function isUsedInCompactFunction(File $phpcsFile, int $variablePoi
 		return false;
 	}
 
-	public static function isUsedInScopeInString(File $phpcsFile, int $variablePointer, int $stringPointer): bool
+	public static function isUsedInScopeInString(File $phpcsFile, string $variableName, int $stringPointer): bool
 	{
 		$tokens = $phpcsFile->getTokens();
 
 		$stringContent = $tokens[$stringPointer]['content'];
 
-		$variableName = $tokens[$variablePointer]['content'];
 		if (preg_match('~(\\\\)?(' . preg_quote($variableName, '~') . ')\b~', $stringContent, $matches) !== 0) {
 			if ($matches[1] === '') {
 				return true;

SlevomatCodingStandard/Sniffs/Functions/StaticClosureSniff.php

@@ -5,7 +5,9 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use SlevomatCodingStandard\Helpers\TokenHelper;
+use SlevomatCodingStandard\Helpers\VariableHelper;
 use const T_CLOSURE;
+use const T_DOUBLE_QUOTED_STRING;
 use const T_FN;
 use const T_OPEN_PARENTHESIS;
 use const T_PARENT;
@@ -58,6 +60,13 @@ public function process(File $phpcsFile, $closurePointer): void
 			return;
 		}
 
+		$stringPointers = TokenHelper::findNextAll($phpcsFile, T_DOUBLE_QUOTED_STRING, $tokens[$closurePointer]['scope_opener'] + 1, $tokens[$closurePointer]['scope_closer']);
+		foreach ($stringPointers as $stringPointer) {
+			if (VariableHelper::isUsedInScopeInString($phpcsFile, '$this', $stringPointer)) {
+				return;
+			}
+		}
+
 		$parentPointer = TokenHelper::findNext($phpcsFile, T_PARENT, $tokens[$closurePointer]['scope_opener'] + 1, $tokens[$closurePointer]['scope_closer']);
 		if ($parentPointer !== null) {
 			return;

SlevomatCodingStandard/Sniffs/Variables/UnusedVariableSniff.php

@@ -362,7 +362,7 @@ private function isUsedInLoop(File $phpcsFile, int $variablePointer, string $var
 		for ($i = $tokens[$loopPointer]['scope_opener'] + 1; $i < $tokens[$loopPointer]['scope_closer']; $i++) {
 			if (
 				in_array($tokens[$i]['code'], [T_DOUBLE_QUOTED_STRING, T_HEREDOC], true)
-				&& VariableHelper::isUsedInScopeInString($phpcsFile, $variablePointer, $i)
+				&& VariableHelper::isUsedInScopeInString($phpcsFile, $variableName, $i)
 			) {
 				return true;
 			}

tests/Sniffs/Functions/data/staticClosureNoErrors.php

@@ -30,6 +30,13 @@ public function withParent()
 		}, []);
 	}
 
+	public function withThisInString()
+	{
+		return array_map(function ($i) {
+			return "{$this->anything}{$i}";
+		}, []);
+
+	}
 }
 
 Closure::bind(function ($instance, $value) {