Squiz/OperatorBracket: fix sniff to work with the PHP 8 identifier tokens

Includes extra unit tests covering the change in so far it wasn't already covered.

Author: jrfnl

src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php

@@ -115,13 +115,13 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         // Tokens that are allowed inside a bracketed operation.
-        $allowed = [
+        $allowed  = Tokens::$nameTokens;
+        $allowed += Tokens::$operators;
+        $allowed += [
             T_VARIABLE                 => T_VARIABLE,
             T_LNUMBER                  => T_LNUMBER,
             T_DNUMBER                  => T_DNUMBER,
-            T_STRING                   => T_STRING,
             T_WHITESPACE               => T_WHITESPACE,
-            T_NS_SEPARATOR             => T_NS_SEPARATOR,
             T_SELF                     => T_SELF,
             T_STATIC                   => T_STATIC,
             T_PARENT                   => T_PARENT,
@@ -134,8 +134,6 @@ public function process(File $phpcsFile, $stackPtr)
             T_BITWISE_NOT              => T_BITWISE_NOT,
         ];
 
-        $allowed += Tokens::$operators;
-
         $lastBracket = false;
         if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
             $parenthesis = array_reverse($tokens[$stackPtr]['nested_parenthesis'], true);
@@ -149,7 +147,10 @@ public function process(File $phpcsFile, $stackPtr)
                     break;
                 }
 
-                if ($prevCode === T_STRING || $prevCode === T_SWITCH || $prevCode === T_MATCH) {
+                if (isset(Tokens::$nameTokens[$prevCode]) === true
+                    || $prevCode === T_SWITCH
+                    || $prevCode === T_MATCH
+                ) {
                     // We allow simple operations to not be bracketed.
                     // For example, ceil($one / $two).
                     for ($prev = ($stackPtr - 1); $prev > $bracket; $prev--) {
@@ -260,11 +261,9 @@ public function addMissingBracketsError($phpcsFile, $stackPtr)
             T_VARIABLE                 => true,
             T_LNUMBER                  => true,
             T_DNUMBER                  => true,
-            T_STRING                   => true,
             T_CONSTANT_ENCAPSED_STRING => true,
             T_DOUBLE_QUOTED_STRING     => true,
             T_WHITESPACE               => true,
-            T_NS_SEPARATOR             => true,
             T_SELF                     => true,
             T_STATIC                   => true,
             T_OBJECT_OPERATOR          => true,
@@ -281,6 +280,7 @@ public function addMissingBracketsError($phpcsFile, $stackPtr)
             if (isset(Tokens::$emptyTokens[$tokens[$before]['code']]) === true
                 || isset(Tokens::$operators[$tokens[$before]['code']]) === true
                 || isset(Tokens::$castTokens[$tokens[$before]['code']]) === true
+                || isset(Tokens::$nameTokens[$tokens[$before]['code']]) === true
                 || isset($allowed[$tokens[$before]['code']]) === true
             ) {
                 continue;
@@ -315,6 +315,7 @@ public function addMissingBracketsError($phpcsFile, $stackPtr)
             if (isset(Tokens::$emptyTokens[$tokens[$after]['code']]) === true
                 || isset(Tokens::$operators[$tokens[$after]['code']]) === true
                 || isset(Tokens::$castTokens[$tokens[$after]['code']]) === true
+                || isset(Tokens::$nameTokens[$tokens[$after]['code']]) === true
                 || isset($allowed[$tokens[$after]['code']]) === true
             ) {
                 continue;

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.1.inc

@@ -146,7 +146,7 @@ $cntPages = ceil(count($items) / self::ON_PAGE);
 
 error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 error_reporting(E_ALL & ~E_NOTICE | ~E_WARNING);
-$results = $stmt->fetchAll(\PDO::FETCH_ASSOC | \PDO::FETCH_GROUP | \PDO::FETCH_UNIQUE);
+$results = $stmt->fetchAll(\PDO::FETCH_ASSOC | Relative\PDO::FETCH_GROUP | namespace\PDO::FETCH_UNIQUE);
 $di = new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS);
 foo(1 + 2 + 3);
 
@@ -201,3 +201,7 @@ match ($a) {
 };
 
 $cntPages = ceil(count($items) / parent::ON_PAGE);
+
+$nsRelative = namespace\doSomething($items + 10);
+$nsRelative = Partially\qualified($items + 10);
+$nsRelative = \Fully\qualified($items + 10);

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.1.inc.fixed

@@ -146,7 +146,7 @@ $cntPages = ceil(count($items) / self::ON_PAGE);
 
 error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 error_reporting(E_ALL & ~E_NOTICE | ~E_WARNING);
-$results = $stmt->fetchAll(\PDO::FETCH_ASSOC | \PDO::FETCH_GROUP | \PDO::FETCH_UNIQUE);
+$results = $stmt->fetchAll(\PDO::FETCH_ASSOC | Relative\PDO::FETCH_GROUP | namespace\PDO::FETCH_UNIQUE);
 $di = new \RecursiveDirectoryIterator($path, (\RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS));
 foo(1 + 2 + 3);
 
@@ -201,3 +201,7 @@ match ($a) {
 };
 
 $cntPages = ceil(count($items) / parent::ON_PAGE);
+
+$nsRelative = namespace\doSomething($items + 10);
+$nsRelative = Partially\qualified($items + 10);
+$nsRelative = \Fully\qualified($items + 10);