Merge pull request #1848 from JPry/bug/issue_1847

jrfnl · web-flow · commit b82bc3eb3f7f · 2019-12-15T01:14:55.000+01:00
Fix off-by-one error when $treat_files_as_scoped is true
diff --git a/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php b/WordPress/Sniffs/WP/GlobalVariablesOverrideSniff.php
@@ -351,7 +351,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {
 			$end = $this->tokens[ $scope_cond ]['scope_closer'];
 		} else {
 			// Global statement in the global namespace with file is being treated as scoped.
-			$end = ( $this->phpcsFile->numTokens + 1 );
+			$end = $this->phpcsFile->numTokens;
 		}
 
 		for ( $ptr = $start; $ptr < $end; $ptr++ ) {
diff --git a/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.6.inc b/WordPress/Tests/WP/GlobalVariablesOverrideUnitTest.6.inc
@@ -0,0 +1,7 @@
+<?php
+
+// phpcs:set WordPress.WP.GlobalVariablesOverride treat_files_as_scoped true
+
+global $post;
+
+// phpcs:set WordPress.WP.GlobalVariablesOverride treat_files_as_scoped false

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ protected function process_global_statement( $stackPtr, $in_function_scope ) {`
`351`	`351`	`$end = $this->tokens[ $scope_cond ]['scope_closer'];`
`352`	`352`	`} else {`
`353`	`353`	`// Global statement in the global namespace with file is being treated as scoped.`
`354`		`- $end = ( $this->phpcsFile->numTokens + 1 );`
	`354`	`+ $end = $this->phpcsFile->numTokens;`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`for ( $ptr = $start; $ptr < $end; $ptr++ ) {`