UserExperience/AdminBarRemoval: use PHPCSUtils for retrieving tokens as string

jrfnl · jrfnl · commit 4fdb103b732a · 2023-08-24T17:16:07.000+02:00
diff --git a/WordPressVIPMinimum/Sniffs/UserExperience/AdminBarRemovalSniff.php b/WordPressVIPMinimum/Sniffs/UserExperience/AdminBarRemovalSniff.php
@@ -9,6 +9,7 @@
 
 namespace WordPressVIPMinimum\Sniffs\UserExperience;
 
+use PHPCSUtils\Utils\GetTokensAsString;
 use PHPCSUtils\Utils\TextStrings;
 use WordPressCS\WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer\Util\Tokens;
@@ -344,7 +345,7 @@ protected function process_css_style( $stackPtr ) {
 				}
 			}
 			$start    = ( $i + 1 );
-			$selector = trim( $this->phpcsFile->getTokensAsString( $start, $opener - $start ) );
+			$selector = trim( GetTokensAsString::normal( $this->phpcsFile, $start, ( $opener - 1 ) ) );
 			unset( $i );
 
 			foreach ( $this->target_css_selectors as $target_selector ) {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace WordPressVIPMinimum\Sniffs\UserExperience;`
`11`	`11`
	`12`	`+use PHPCSUtils\Utils\GetTokensAsString;`
`12`	`13`	`use PHPCSUtils\Utils\TextStrings;`
`13`	`14`	`use WordPressCS\WordPress\AbstractFunctionParameterSniff;`
`14`	`15`	`use PHP_CodeSniffer\Util\Tokens;`
`@@ -344,7 +345,7 @@ protected function process_css_style( $stackPtr ) {`
`344`	`345`	`}`
`345`	`346`	`}`
`346`	`347`	`$start = ( $i + 1 );`
`347`		`- $selector = trim( $this->phpcsFile->getTokensAsString( $start, $opener - $start ) );`
	`348`	`+ $selector = trim( GetTokensAsString::normal( $this->phpcsFile, $start, ( $opener - 1 ) ) );`
`348`	`349`	`unset( $i );`
`349`	`350`
`350`	`351`	`foreach ( $this->target_css_selectors as $target_selector ) {`