Fixed some errors in LanguageConstructWithParenthesesSniff

Author: kukulich

SlevomatCodingStandard/Sniffs/ControlStructures/LanguageConstructWithParenthesesSniff.php

@@ -37,16 +37,23 @@ public function register(): array
 	public function process(\PHP_CodeSniffer\Files\File $phpcsFile, $languageConstructPointer)
 	{
 		$tokens = $phpcsFile->getTokens();
+		$openParenthesisPointer = TokenHelper::findNextEffective($phpcsFile, $languageConstructPointer + 1);
+		if ($tokens[$openParenthesisPointer]['code'] !== T_OPEN_PARENTHESIS) {
+			return;
+		}
+
+		$closeParenthesisPointer = $tokens[$openParenthesisPointer]['parenthesis_closer'];
+		$afterCloseParenthesisPointer = TokenHelper::findNextEffective($phpcsFile, $closeParenthesisPointer + 1);
+		if ($tokens[$afterCloseParenthesisPointer]['code'] !== T_SEMICOLON) {
+			return;
+		}
 
-		$nextTokenPointer = TokenHelper::findNextEffective($phpcsFile, $languageConstructPointer + 1);
-		if ($tokens[$nextTokenPointer]['code'] === T_OPEN_PARENTHESIS) {
-			$fix = $phpcsFile->addFixableError(sprintf('Usage of language construct "%s" with parentheses is disallowed.', $tokens[$languageConstructPointer]['content']), $languageConstructPointer, self::CODE_USED_WITH_PARENTHESES);
-			if ($fix) {
-				$phpcsFile->fixer->beginChangeset();
-				$phpcsFile->fixer->replaceToken($nextTokenPointer, $tokens[$nextTokenPointer - 1]['code'] === T_WHITESPACE ? '' : ' ');
-				$phpcsFile->fixer->replaceToken($tokens[$nextTokenPointer]['parenthesis_closer'], '');
-				$phpcsFile->fixer->endChangeset();
-			}
+		$fix = $phpcsFile->addFixableError(sprintf('Usage of language construct "%s" with parentheses is disallowed.', $tokens[$languageConstructPointer]['content']), $languageConstructPointer, self::CODE_USED_WITH_PARENTHESES);
+		if ($fix) {
+			$phpcsFile->fixer->beginChangeset();
+			$phpcsFile->fixer->replaceToken($openParenthesisPointer, $tokens[$openParenthesisPointer - 1]['code'] === T_WHITESPACE ? '' : ' ');
+			$phpcsFile->fixer->replaceToken($tokens[$openParenthesisPointer]['parenthesis_closer'], '');
+			$phpcsFile->fixer->endChangeset();
 		}
 	}
 

tests/Sniffs/ControlStructures/data/languageConstructWithParenthesesNoErrors.php

@@ -32,3 +32,18 @@ function boo()
 } catch (\Throwable $e) {
 
 }
+
+function returnCalculationOnStart(): bool
+{
+	return (10 + 5) === 15;
+}
+
+function returnCalculationOnEnd(): bool
+{
+	return 15 === (10 + 5);
+}
+
+function returnConditions(): bool
+{
+	return (null === true) || (null === false);
+}