AbstractVariableRestrictions: use PHPCSUtils for retrieving tokens as string

jrfnl · jrfnl · commit 4b5b0774d3c6 · 2023-08-24T17:16:08.000+02:00
diff --git a/WordPressVIPMinimum/Sniffs/AbstractVariableRestrictionsSniff.php b/WordPressVIPMinimum/Sniffs/AbstractVariableRestrictionsSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressVIPMinimum\Sniffs;
 
+use PHPCSUtils\Utils\GetTokensAsString;
 use PHPCSUtils\Utils\MessageHelper;
 
 /**
@@ -179,7 +180,7 @@ public function process_token( $stackPtr ) {
 
 				if ( isset( $token['bracket_closer'] ) ) {
 					$owner  = $this->phpcsFile->findPrevious( \T_VARIABLE, $stackPtr );
-					$inside = $this->phpcsFile->getTokensAsString( $stackPtr, $token['bracket_closer'] - $stackPtr + 1 );
+					$inside = GetTokensAsString::normal( $this->phpcsFile, $stackPtr, $token['bracket_closer'] );
 					$var    = implode( '', [ $this->tokens[ $owner ]['content'], $inside ] );
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace WordPressVIPMinimum\Sniffs;`
`11`	`11`
	`12`	`+use PHPCSUtils\Utils\GetTokensAsString;`
`12`	`13`	`use PHPCSUtils\Utils\MessageHelper;`
`13`	`14`
`14`	`15`	`/**`
`@@ -179,7 +180,7 @@ public function process_token( $stackPtr ) {`
`179`	`180`
`180`	`181`	`if ( isset( $token['bracket_closer'] ) ) {`
`181`	`182`	`$owner = $this->phpcsFile->findPrevious( \T_VARIABLE, $stackPtr );`
`182`		`- $inside = $this->phpcsFile->getTokensAsString( $stackPtr, $token['bracket_closer'] - $stackPtr + 1 );`
	`183`	`+ $inside = GetTokensAsString::normal( $this->phpcsFile, $stackPtr, $token['bracket_closer'] );`
`183`	`184`	`$var = implode( '', [ $this->tokens[ $owner ]['content'], $inside ] );`
`184`	`185`	`}`
`185`	`186`	`}`