Added missing T_EXIT to LanguageConstructWithParenthesesSniff

slevomat · Aug 14, 2017 · a7010a8 · a7010a8
1 parent bdecdad
commit a7010a8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/SlevomatCodingStandard/Sniffs/ControlStructures/LanguageConstructWithParenthesesSniff.php b/SlevomatCodingStandard/Sniffs/ControlStructures/LanguageConstructWithParenthesesSniff.php
@@ -18,6 +18,7 @@ public function register(): array
 			T_BREAK,
 			T_CONTINUE,
 			T_ECHO,
+			T_EXIT,
 			T_INCLUDE,
 			T_INCLUDE_ONCE,
 			T_PRINT,
@@ -48,11 +49,19 @@ public function process(\PHP_CodeSniffer\Files\File $phpcsFile, $languageConstru
 			return;
 		}
 
+		$containsContentBetweenParentheses = TokenHelper::findNextEffective($phpcsFile, $openParenthesisPointer + 1, $closeParenthesisPointer) !== null;
+		if ($tokens[$languageConstructPointer]['code'] === T_EXIT && $containsContentBetweenParentheses) {
+			return;
+		}
+
 		$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->replaceToken($openParenthesisPointer, '');
+			if ($tokens[$openParenthesisPointer - 1]['code'] !== T_WHITESPACE && $containsContentBetweenParentheses) {
+				$phpcsFile->fixer->addContent($openParenthesisPointer, ' ');
+			}
+			$phpcsFile->fixer->replaceToken($closeParenthesisPointer, '');
 			$phpcsFile->fixer->endChangeset();
 		}
 	}

diff --git a/tests/Sniffs/ControlStructures/LanguageConstructWithParenthesesSniffTest.php b/tests/Sniffs/ControlStructures/LanguageConstructWithParenthesesSniffTest.php
@@ -14,7 +14,7 @@ public function testErrors()
 	{
 		$report = $this->checkFile(__DIR__ . '/data/languageConstructWithParenthesesErrors.php', [], [LanguageConstructWithParenthesesSniff::CODE_USED_WITH_PARENTHESES]);
 
-		$this->assertSame(11, $report->getErrorCount());
+		$this->assertSame(13, $report->getErrorCount());
 
 		$this->assertSniffError($report, 5, LanguageConstructWithParenthesesSniff::CODE_USED_WITH_PARENTHESES, 'Usage of language construct "continue" with parentheses is disallowed.');
 		$this->assertSniffError($report, 8, LanguageConstructWithParenthesesSniff::CODE_USED_WITH_PARENTHESES, 'Usage of language construct "break" with parentheses is disallowed.');
@@ -27,6 +27,8 @@ public function testErrors()
 		$this->assertSniffError($report, 22, LanguageConstructWithParenthesesSniff::CODE_USED_WITH_PARENTHESES, 'Usage of language construct "return" with parentheses is disallowed.');
 		$this->assertSniffError($report, 27, LanguageConstructWithParenthesesSniff::CODE_USED_WITH_PARENTHESES, 'Usage of language construct "yield" with parentheses is disallowed.');
 		$this->assertSniffError($report, 31, LanguageConstructWithParenthesesSniff::CODE_USED_WITH_PARENTHESES, 'Usage of language construct "throw" with parentheses is disallowed.');
+		$this->assertSniffError($report, 36, LanguageConstructWithParenthesesSniff::CODE_USED_WITH_PARENTHESES, 'Usage of language construct "die" with parentheses is disallowed.');
+		$this->assertSniffError($report, 37, LanguageConstructWithParenthesesSniff::CODE_USED_WITH_PARENTHESES, 'Usage of language construct "exit" with parentheses is disallowed.');
 
 		$this->assertAllFixedInFile($report);
 	}

diff --git a/tests/Sniffs/ControlStructures/data/languageConstructWithParenthesesErrors.fixed.php b/tests/Sniffs/ControlStructures/data/languageConstructWithParenthesesErrors.fixed.php
@@ -32,3 +32,6 @@ function boo()
 } catch (\Throwable $e) {
 
 }
+
+die;
+exit;
diff --git a/tests/Sniffs/ControlStructures/data/languageConstructWithParenthesesErrors.php b/tests/Sniffs/ControlStructures/data/languageConstructWithParenthesesErrors.php
@@ -32,3 +32,6 @@ function boo()
 } catch (\Throwable $e) {
 
 }
+
+die();
+exit();
diff --git a/tests/Sniffs/ControlStructures/data/languageConstructWithParenthesesNoErrors.php b/tests/Sniffs/ControlStructures/data/languageConstructWithParenthesesNoErrors.php
@@ -47,3 +47,8 @@ function returnConditions(): bool
 {
 	return (null === true) || (null === false);
 }
+
+die(0);
+die('Error');
+exit(0);
+exit('Error');
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,3 +32,6 @@ function boo() @@
     } catch (\Throwable $e) {
     }
+    die;
+    exit;