Merge pull request #840 from Automattic/feature/fix-problematic-token-comparisons

Author: GaryJones

WordPressVIPMinimum/Sniffs/Hooks/AlwaysReturnInFilterSniff.php

@@ -76,7 +76,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		if ( $this->tokens[ $callbackPtr ]['code'] === 'PHPCS_T_CLOSURE' ) {
+		if ( $this->tokens[ $callbackPtr ]['code'] === T_CLOSURE ) {
 			$this->processFunctionBody( $callbackPtr );
 		} elseif ( $this->tokens[ $callbackPtr ]['code'] === T_ARRAY
 			|| $this->tokens[ $callbackPtr ]['code'] === T_OPEN_SHORT_ARRAY
@@ -262,7 +262,7 @@ private function isInsideIfConditonal( $stackPtr ) {
 		}
 
 		// Similar case may be a conditional closure.
-		if ( end( $this->tokens[ $stackPtr ]['conditions'] ) === 'PHPCS_T_CLOSURE' ) {
+		if ( end( $this->tokens[ $stackPtr ]['conditions'] ) === T_CLOSURE ) {
 			return false;
 		}
 

WordPressVIPMinimum/Sniffs/Hooks/PreGetPostsSniff.php

@@ -76,7 +76,7 @@ public function process_token( $stackPtr ) {
 			return;
 		}
 
-		if ( $this->tokens[ $callbackPtr ]['code'] === 'PHPCS_T_CLOSURE' ) {
+		if ( $this->tokens[ $callbackPtr ]['code'] === T_CLOSURE ) {
 			$this->processClosure( $callbackPtr );
 		} elseif ( $this->tokens[ $callbackPtr ]['code'] === T_ARRAY
 			|| $this->tokens[ $callbackPtr ]['code'] === T_OPEN_SHORT_ARRAY
@@ -388,7 +388,7 @@ private function isWPQueryMethodCall( $stackPtr, $method = null ) {
 			true
 		);
 
-		if ( ! $next || $this->tokens[ $next ]['type'] !== 'T_OBJECT_OPERATOR' ) {
+		if ( ! $next || $this->tokens[ $next ]['code'] !== T_OBJECT_OPERATOR ) {
 			return false;
 		}