PHP 8.1: Enum case name should be always tokenized as T_STRING

Author: kukulich

src/Tokenizers/PHP.php

@@ -477,6 +477,7 @@ class PHP extends Tokenizer
         T_INTERFACE                => true,
         T_TRAIT                    => true,
         T_ENUM                     => true,
+        T_ENUM_CASE                => true,
         T_EXTENDS                  => true,
         T_IMPLEMENTS               => true,
         T_ATTRIBUTE                => true,

tests/Core/Tokenizer/EnumCaseTest.inc

@@ -76,3 +76,20 @@ switch ($x) {
         enum Bar {}
         break;
 }
+
+enum Foo: string {
+    /* testKeywordAsEnumCaseNameShouldBeString1 */
+    case INTERFACE = 'interface';
+    /* testKeywordAsEnumCaseNameShouldBeString2 */
+    case TRAIT = 'trait';
+    /* testKeywordAsEnumCaseNameShouldBeString3 */
+    case ENUM = 'enum';
+    /* testKeywordAsEnumCaseNameShouldBeString4 */
+    case FUNCTION = 'function';
+    /* testKeywordAsEnumCaseNameShouldBeString5 */
+    case FALSE = 'false';
+    /* testKeywordAsEnumCaseNameShouldBeString6 */
+    case DEFAULT = 'default';
+    /* testKeywordAsEnumCaseNameShouldBeString7 */
+    case ARRAY = 'array';
+}

tests/Core/Tokenizer/EnumCaseTest.php

@@ -113,4 +113,45 @@ public function dataNotEnumCases()
     }//end dataNotEnumCases()
 
 
+    /**
+     * Test that "case" that is not enum case is still tokenized as `T_CASE`.
+     *
+     * @param string $testMarker The comment which prefaces the target token in the test file.
+     *
+     * @dataProvider dataKeywordAsEnumCaseNameShouldBeString
+     * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
+     *
+     * @return void
+     */
+    public function testKeywordAsEnumCaseNameShouldBeString($testMarker)
+    {
+        $tokens = self::$phpcsFile->getTokens();
+
+        $enumCaseName = $this->getTargetToken($testMarker, [T_STRING, T_INTERFACE, T_TRAIT, T_ENUM, T_FUNCTION, T_FALSE, T_DEFAULT, T_ARRAY]);
+
+        $this->assertSame(T_STRING, $tokens[$enumCaseName]['code']);
+        $this->assertSame('T_STRING', $tokens[$enumCaseName]['type']);
+
+    }//end testKeywordAsEnumCaseNameShouldBeString()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testKeywordAsEnumCaseNameShouldBeString()
+     *
+     * @return array
+     */
+    public function dataKeywordAsEnumCaseNameShouldBeString()
+    {
+        return [
+            ['/* testKeywordAsEnumCaseNameShouldBeString1 */'],
+            ['/* testKeywordAsEnumCaseNameShouldBeString2 */'],
+            ['/* testKeywordAsEnumCaseNameShouldBeString3 */'],
+            ['/* testKeywordAsEnumCaseNameShouldBeString4 */'],
+        ];
+
+    }//end dataKeywordAsEnumCaseNameShouldBeString()
+
+
 }//end class