Merge pull request #613 from PHPCSStandards/feature/controlstructures-minor-simplification

jrfnl · web-flow · commit 4a305210f0dd · 2024-06-09T14:33:11.000+02:00
ControlStructures::hasBody(): minor simplification
diff --git a/PHPCSUtils/Utils/ControlStructures.php b/PHPCSUtils/Utils/ControlStructures.php
@@ -78,7 +78,7 @@ public static function hasBody(File $phpcsFile, $stackPtr, $allowEmpty = true)
 
             // Check whether the body is empty.
             $start = ($tokens[$stackPtr]['scope_opener'] + 1);
-            $end   = ($phpcsFile->numTokens + 1);
+            $end   = $phpcsFile->numTokens;
             if (isset($tokens[$stackPtr]['scope_closer']) === true) {
                 $end = $tokens[$stackPtr]['scope_closer'];
             }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static function hasBody(File $phpcsFile, $stackPtr, $allowEmpty = true)`
`78`	`78`
`79`	`79`	`// Check whether the body is empty.`
`80`	`80`	`$start = ($tokens[$stackPtr]['scope_opener'] + 1);`
`81`		`- $end = ($phpcsFile->numTokens + 1);`
	`81`	`+ $end = $phpcsFile->numTokens;`
`82`	`82`	`if (isset($tokens[$stackPtr]['scope_closer']) === true) {`
`83`	`83`	`$end = $tokens[$stackPtr]['scope_closer'];`
`84`	`84`	`}`