PSR2/ClassDeclaration: fix sniff to work with the PHP 8 identifier tokens

The existing unit tests already contain tests covering this change.

By extension, this also fixes the `PSR12.Classes.AnonClassDeclaration` and the `Squiz.Classes.ClassDeclaration` sniffs.

Includes some updated tests for those sniffs.

Author: jrfnl

src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.inc

@@ -50,15 +50,15 @@ $instance6 = new class extends \Foo
 };
 
 $instance7 = new  class  extends  \Foo implements
-    \One, \Two,
-        \Three,
+    \One, Two,
+        Partially\Three,
 \Four,
-  \Five {
+  namespace\Five {
     // Class content
 };
 
 if ($foo) {
-    $instance8 = new class extends \Foo implements
+    $instance8 = new class extends namespace\Foo implements
         \One,
         \Five {
         // Class content
@@ -68,7 +68,7 @@ if ($foo) {
 $instance9 = new class (
     $one,
     $two
-) extends \Foo implements \One {
+) extends Partially\Foo implements \One {
     // Class content
 };
 

src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.inc.fixed

@@ -50,16 +50,16 @@ $instance6 = new class extends \Foo implements \HandleableInterface {
 
 $instance7 = new  class extends \Foo implements
     \One,
-    \Two,
-    \Three,
+    Two,
+    Partially\Three,
     \Four,
-    \Five
+    namespace\Five
 {
     // Class content
 };
 
 if ($foo) {
-    $instance8 = new class extends \Foo implements
+    $instance8 = new class extends namespace\Foo implements
         \One,
         \Five
     {
@@ -70,7 +70,7 @@ if ($foo) {
 $instance9 = new class (
     $one,
     $two
-) extends \Foo implements \One {
+) extends Partially\Foo implements \One {
     // Class content
 };
 

src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php

@@ -280,10 +280,8 @@ public function processOpen(File $phpcsFile, $stackPtr)
             }
         }
 
-        $find = [
-            T_STRING,
-            $keywordTokenType,
-        ];
+        $find = Tokens::$nameTokens;
+        $find[$keywordTokenType] = $keywordTokenType;
 
         if ($className !== null) {
             $start = $className;
@@ -311,17 +309,9 @@ public function processOpen(File $phpcsFile, $stackPtr)
                 continue;
             }
 
-            if ($checkingImplements === true
-                && $multiLineImplements === true
-                && ($tokens[($className - 1)]['code'] !== T_NS_SEPARATOR
-                || ($tokens[($className - 2)]['code'] !== T_STRING
-                && $tokens[($className - 2)]['code'] !== T_NAMESPACE))
-            ) {
+            if ($checkingImplements === true && $multiLineImplements === true) {
                 $prev = $phpcsFile->findPrevious(
-                    [
-                        T_NS_SEPARATOR,
-                        T_WHITESPACE,
-                    ],
+                    T_WHITESPACE,
                     ($className - 1),
                     $implements,
                     true
@@ -400,27 +390,16 @@ public function processOpen(File $phpcsFile, $stackPtr)
                         }
                     }
                 }//end if
-            } else if ($tokens[($className - 1)]['code'] !== T_NS_SEPARATOR
-                || ($tokens[($className - 2)]['code'] !== T_STRING
-                && $tokens[($className - 2)]['code'] !== T_NAMESPACE)
-            ) {
-                // Not part of a longer fully qualified or namespace relative class name.
-                if ($tokens[($className - 1)]['code'] === T_COMMA
-                    || ($tokens[($className - 1)]['code'] === T_NS_SEPARATOR
-                    && $tokens[($className - 2)]['code'] === T_COMMA)
-                ) {
+            } else {
+                if ($tokens[($className - 1)]['code'] === T_COMMA) {
                     $error = 'Expected 1 space before "%s"; 0 found';
                     $data  = [$tokens[$className]['content']];
                     $fix   = $phpcsFile->addFixableError($error, ($nextComma + 1), 'NoSpaceBeforeName', $data);
                     if ($fix === true) {
                         $phpcsFile->fixer->addContentBefore(($nextComma + 1), ' ');
                     }
                 } else {
-                    if ($tokens[($className - 1)]['code'] === T_NS_SEPARATOR) {
-                        $prev = ($className - 2);
-                    } else {
-                        $prev = ($className - 1);
-                    }
+                    $prev = ($className - 1);
 
                     $last    = $phpcsFile->findPrevious(T_WHITESPACE, $prev, null, true);
                     $content = $phpcsFile->getTokensAsString(($last + 1), ($prev - $last));
@@ -452,7 +431,6 @@ public function processOpen(File $phpcsFile, $stackPtr)
             }//end if
 
             if ($checkingImplements === true
-                && $tokens[($className + 1)]['code'] !== T_NS_SEPARATOR
                 && $tokens[($className + 1)]['code'] !== T_COMMA
             ) {
                 if ($n !== ($classCount - 1)) {

src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.inc

@@ -56,7 +56,7 @@ class ClassOne implements ClassTwo, ClassThree
 {
 }//end class
 
-class ClassOne implements ClassFour   ,ClassFive,  ClassSix
+class ClassOne implements ClassFour   ,\ClassFive,  namespace\ClassSix
 {
 }//end class
 

src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.inc.fixed

@@ -65,7 +65,7 @@ class ClassOne implements ClassTwo, ClassThree
 {
 }//end class
 
-class ClassOne implements ClassFour, ClassFive, ClassSix
+class ClassOne implements ClassFour, \ClassFive, namespace\ClassSix
 {
 }//end class