UselessVariableSniff: Improved fixer

Author: kukulich

SlevomatCodingStandard/Sniffs/Variables/UselessVariableSniff.php

@@ -16,6 +16,7 @@
 use function sprintf;
 use const T_AND_EQUAL;
 use const T_BITWISE_AND;
+use const T_CLOSE_CURLY_BRACKET;
 use const T_CONCAT_EQUAL;
 use const T_DIV_EQUAL;
 use const T_DO;
@@ -130,7 +131,7 @@ public function process(File $phpcsFile, $returnPointer): void
 		}
 
 		if (
-			!in_array($tokens[$pointerBeforePreviousVariable]['code'], [T_SEMICOLON, T_OPEN_CURLY_BRACKET], true)
+			!in_array($tokens[$pointerBeforePreviousVariable]['code'], [T_SEMICOLON, T_OPEN_CURLY_BRACKET, T_CLOSE_CURLY_BRACKET], true)
 			&& TokenHelper::findNextEffective($phpcsFile, $returnSemicolonPointer + 1) !== null
 		) {
 			$phpcsFile->addError(...$errorParameters);

tests/Sniffs/Variables/UselessVariableSniffTest.php

@@ -17,7 +17,7 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/uselessVariableErrors.php');
 
-		self::assertSame(18, $report->getErrorCount());
+		self::assertSame(19, $report->getErrorCount());
 
 		self::assertSniffError($report, 4, UselessVariableSniff::CODE_USELESS_VARIABLE, 'Useless variable $a.');
 		self::assertSniffError($report, 9, UselessVariableSniff::CODE_USELESS_VARIABLE, 'Useless variable $b.');
@@ -36,7 +36,8 @@ public function testErrors(): void
 		self::assertSniffError($report, 78, UselessVariableSniff::CODE_USELESS_VARIABLE, 'Useless variable $o.');
 		self::assertSniffError($report, 84, UselessVariableSniff::CODE_USELESS_VARIABLE, 'Useless variable $p.');
 		self::assertSniffError($report, 89, UselessVariableSniff::CODE_USELESS_VARIABLE, 'Useless variable $q.');
-		self::assertSniffError($report, 93, UselessVariableSniff::CODE_USELESS_VARIABLE, 'Useless variable $z.');
+		self::assertSniffError($report, 99, UselessVariableSniff::CODE_USELESS_VARIABLE, 'Useless variable $r.');
+		self::assertSniffError($report, 103, UselessVariableSniff::CODE_USELESS_VARIABLE, 'Useless variable $z.');
 
 		self::assertAllFixedInFile($report);
 	}

tests/Sniffs/Variables/data/uselessVariableErrors.fixed.php

@@ -73,4 +73,13 @@ function assigmentAfterAssignment() {
 	return $q;
 }
 
+function afterIfStatement(float $seconds): string
+{
+	if ($seconds < 1) {
+		return round($seconds * 1000, 2) . 'ms';
+	}
+
+	return round($seconds, 2) . 's';
+}
+
 return null;

tests/Sniffs/Variables/data/uselessVariableErrors.php

@@ -90,5 +90,15 @@ function assigmentAfterAssignment() {
 	return $q;
 }
 
+function afterIfStatement(float $seconds): string
+{
+	if ($seconds < 1) {
+		return round($seconds * 1000, 2) . 'ms';
+	}
+
+	$r = round($seconds, 2) . 's';
+	return $r;
+}
+
 $z = null;
 return $z;