SlevomatCodingStandard.Variables.UnusedVariable: Fixed missing report when option "ignoreUnusedValuesWhenOnlyKeysAreUsedInForeach" is enabled

Author: kukulich

SlevomatCodingStandard/Sniffs/Variables/UnusedVariableSniff.php

@@ -511,14 +511,21 @@ private function isUsedAsKeyOrValueInArray(File $phpcsFile, int $variablePointer
 
 	private function isValueInForeachAndErrorIsIgnored(File $phpcsFile, int $variablePointer): bool
 	{
-		if (!$this->ignoreUnusedValuesWhenOnlyKeysAreUsedInForeach) {
+		$tokens = $phpcsFile->getTokens();
+
+		$parenthesisOwnerPointer = $this->findNestedParenthesisWithOwner($phpcsFile, $variablePointer);
+		$isInForeach = $parenthesisOwnerPointer !== null && $tokens[$parenthesisOwnerPointer]['code'] === T_FOREACH;
+
+		if (!$isInForeach) {
 			return false;
 		}
 
-		$tokens = $phpcsFile->getTokens();
+		$pointerAfterVariable = TokenHelper::findNextEffective($phpcsFile, $variablePointer + 1);
+		if ($pointerAfterVariable !== null && $tokens[$pointerAfterVariable]['code'] === T_DOUBLE_ARROW) {
+			return false;
+		}
 
-		$parenthesisOwnerPointer = $this->findNestedParenthesisWithOwner($phpcsFile, $variablePointer);
-		return $parenthesisOwnerPointer !== null && $tokens[$parenthesisOwnerPointer]['code'] === T_FOREACH;
+		return $this->ignoreUnusedValuesWhenOnlyKeysAreUsedInForeach;
 	}
 
 	private function isStaticOrGlobalVariable(File $phpcsFile, int $functionPointer, string $variableName): bool

tests/Sniffs/Variables/UnusedVariableSniffTest.php

@@ -46,12 +46,15 @@ public function testErrors(): void
 		self::assertSniffError($report, 128, UnusedVariableSniff::CODE_UNUSED_VARIABLE, 'Unused variable $a.');
 	}
 
-	public function testNoErrorsWithIgnoredUnusedValuesWhenOnlyKeysAreUsedInForeach(): void
+	public function testErrorsWithIgnoredUnusedValuesWhenOnlyKeysAreUsedInForeach(): void
 	{
-		$report = self::checkFile(__DIR__ . '/data/unusedVariableNoErrorsWithIgnoredUnusedValuesWhenOnlyKeysAreUsedInForeach.php', [
+		$report = self::checkFile(__DIR__ . '/data/unusedVariableErrorsWithIgnoredUnusedValuesWhenOnlyKeysAreUsedInForeach.php', [
 			'ignoreUnusedValuesWhenOnlyKeysAreUsedInForeach' => true,
 		]);
-		self::assertNoSniffErrorInFile($report);
+
+		self::assertSame(1, $report->getErrorCount());
+
+		self::assertSniffError($report, 18, UnusedVariableSniff::CODE_UNUSED_VARIABLE, 'Unused variable $someKey.');
 	}
 
 }

…edValuesWhenOnlyKeysAreUsedInForeach.php …edValuesWhenOnlyKeysAreUsedInForeach.phptests/Sniffs/Variables/data/unusedVariableNoErrorsWithIgnoredUnusedValuesWhenOnlyKeysAreUsedInForeach.php renamed to tests/Sniffs/Variables/data/unusedVariableErrorsWithIgnoredUnusedValuesWhenOnlyKeysAreUsedInForeach.php tests/Sniffs/Variables/data/unusedVariableNoErrorsWithIgnoredUnusedValuesWhenOnlyKeysAreUsedInForeach.php renamed to tests/Sniffs/Variables/data/unusedVariableErrorsWithIgnoredUnusedValuesWhenOnlyKeysAreUsedInForeach.php

@@ -14,3 +14,7 @@
 foreach (range(0, 5) as $otherKey => $otherValue) {
 	echo $otherKey;
 }
+
+foreach (range(0, 5) as $someKey => $someValue) {
+	// Key and value are not used
+}