EarlyExitSniff: fixed internal exception

kukulich · kukulich · commit 9c4c42a2943c · 2018-02-06T22:21:14.000+01:00
diff --git a/SlevomatCodingStandard/Sniffs/ControlStructures/EarlyExitSniff.php b/SlevomatCodingStandard/Sniffs/ControlStructures/EarlyExitSniff.php
@@ -130,7 +130,7 @@ private function processIf(\PHP_CodeSniffer\Files\File $phpcsFile, int $ifPointe
 		$tokens = $phpcsFile->getTokens();
 
 		$nextPointer = TokenHelper::findNextExcluding($phpcsFile, T_WHITESPACE, $tokens[$ifPointer]['scope_closer'] + 1);
-		if ($tokens[$nextPointer]['code'] !== T_CLOSE_CURLY_BRACKET) {
+		if ($nextPointer === null || $tokens[$nextPointer]['code'] !== T_CLOSE_CURLY_BRACKET) {
 			return;
 		}
 
diff --git a/tests/Sniffs/ControlStructures/data/earlyExitNoErrors.php b/tests/Sniffs/ControlStructures/data/earlyExitNoErrors.php
@@ -139,3 +139,7 @@ function () {
 		break;
 	}
 }
+
+if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
+    define('PHPUNIT_COMPOSER_INSTALL', __DIR__ . '/autoload.php');
+}

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ private function processIf(\PHP_CodeSniffer\Files\File $phpcsFile, int $ifPointe`
`130`	`130`	`$tokens = $phpcsFile->getTokens();`
`131`	`131`
`132`	`132`	`$nextPointer = TokenHelper::findNextExcluding($phpcsFile, T_WHITESPACE, $tokens[$ifPointer]['scope_closer'] + 1);`
`133`		`- if ($tokens[$nextPointer]['code'] !== T_CLOSE_CURLY_BRACKET) {`
	`133`	`+ if ($nextPointer === null \|\| $tokens[$nextPointer]['code'] !== T_CLOSE_CURLY_BRACKET) {`
`134`	`134`	`return;`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -139,3 +139,7 @@ function () {`
`139`	`139`	`break;`
`140`	`140`	`}`
`141`	`141`	`}`
	`142`	`+`
	`143`	`+if (!defined('PHPUNIT_COMPOSER_INSTALL')) {`
	`144`	`+ define('PHPUNIT_COMPOSER_INSTALL', __DIR__ . '/autoload.php');`
	`145`	`+}`