Merge branch 'php8.1/tokenizer-php-bugfix-enum-name-vs-goto-label' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

src/Tokenizers/PHP.php

@@ -1905,6 +1905,7 @@ function return types. We want to keep the parenthesis map clean,
                     T_OPEN_TAG           => true,
                     T_OPEN_CURLY_BRACKET => true,
                     T_INLINE_THEN        => true,
+                    T_ENUM               => true,
                 ];
 
                 for ($x = ($newStackPtr - 1); $x > 0; $x--) {
@@ -1915,6 +1916,7 @@ function return types. We want to keep the parenthesis map clean,
 
                 if ($finalTokens[$x]['code'] !== T_CASE
                     && $finalTokens[$x]['code'] !== T_INLINE_THEN
+                    && $finalTokens[$x]['code'] !== T_ENUM
                 ) {
                     $finalTokens[$newStackPtr] = [
                         'content' => $token[1].':',

tests/Core/Tokenizer/BackfillEnumTest.inc

@@ -13,7 +13,7 @@ enum Boo: int {
 }
 
 /* testBackedStringEnum */
-enum Hoo: string
+enum Hoo : string
 {
     case ONE = 'one';
     case TWO = 'two';

tests/Core/Tokenizer/BackfillEnumTest.php

@@ -87,20 +87,20 @@ public function dataEnums()
             [
                 '/* testBackedIntEnum */',
                 'enum',
-                6,
-                28,
+                7,
+                29,
             ],
             [
                 '/* testBackedStringEnum */',
                 'enum',
-                6,
-                28,
+                8,
+                30,
             ],
             [
                 '/* testComplexEnum */',
                 'enum',
-                10,
-                71,
+                11,
+                72,
             ],
             [
                 '/* testEnumWithEnumAsClassName */',

tests/Core/Tokenizer/GotoLabelTest.inc

@@ -51,3 +51,6 @@ switch (true) {
         // Do something.
         break;
 }
+
+/* testNotGotoDeclarationEnumWithType */
+enum Suit: string implements Colorful, CardGame {}

tests/Core/Tokenizer/GotoLabelTest.php

@@ -163,6 +163,10 @@ public function dataNotAGotoDeclaration()
                 '/* testNotGotoDeclarationGlobalConstantInTernary */',
                 'CONST_B',
             ],
+            [
+                '/* testNotGotoDeclarationEnumWithType */',
+                'Suit',
+            ],
         ];
 
     }//end dataNotAGotoDeclaration()