Merge branch 'php81-enum' of https://github.com/kukulich/PHP_CodeSniffer

Author: gsherwood

package.xml

@@ -1015,6 +1015,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="ClassCommentUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.1.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.2.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.3.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FunctionCommentUnitTest.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FunctionCommentUnitTest.inc.fixed" role="test" />
@@ -1103,6 +1104,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
        <dir name="Classes">
         <file baseinstalldir="PHP/CodeSniffer" name="ClassDeclarationUnitTest.1.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ClassDeclarationUnitTest.2.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="ClassDeclarationUnitTest.3.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ClassDeclarationUnitTest.php" role="test" />
        </dir>
        <dir name="Files">
@@ -1654,6 +1656,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.6.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.7.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.8.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.9.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.1.js" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.1.js.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileCommentUnitTest.2.js" role="test" />
@@ -1771,6 +1774,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="FileExtensionUnitTest.2.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileExtensionUnitTest.3.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileExtensionUnitTest.4.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="FileExtensionUnitTest.5.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="FileExtensionUnitTest.php" role="test" />
        </dir>
        <dir name="Formatting">

src/Files/File.php

@@ -1223,7 +1223,7 @@ public function getFilename()
 
 
     /**
-     * Returns the declaration names for classes, interfaces, traits, and functions.
+     * Returns the declaration name for classes, interfaces, traits, enums, and functions.
      *
      * @param int $stackPtr The position of the declaration token which
      *                      declared the class, interface, trait, or function.
@@ -1232,7 +1232,7 @@ public function getFilename()
      *                     or NULL if the function or class is anonymous.
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified token is not of type
      *                                                      T_FUNCTION, T_CLASS, T_ANON_CLASS,
-     *                                                      T_CLOSURE, T_TRAIT, or T_INTERFACE.
+     *                                                      T_CLOSURE, T_TRAIT, T_ENUM, or T_INTERFACE.
      */
     public function getDeclarationName($stackPtr)
     {
@@ -1246,8 +1246,9 @@ public function getDeclarationName($stackPtr)
             && $tokenCode !== T_CLASS
             && $tokenCode !== T_INTERFACE
             && $tokenCode !== T_TRAIT
+            && $tokenCode !== T_ENUM
         ) {
-            throw new RuntimeException('Token type "'.$this->tokens[$stackPtr]['type'].'" is not T_FUNCTION, T_CLASS, T_INTERFACE or T_TRAIT');
+            throw new RuntimeException('Token type "'.$this->tokens[$stackPtr]['type'].'" is not T_FUNCTION, T_CLASS, T_INTERFACE, T_TRAIT or T_ENUM');
         }
 
         if ($tokenCode === T_FUNCTION

src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php

@@ -53,6 +53,7 @@ public function process(File $phpcsFile, $stackPtr)
             T_CLASS,
             T_INTERFACE,
             T_TRAIT,
+            T_ENUM,
             T_NAMESPACE,
             T_CLOSE_TAG,
         ];

src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php

@@ -27,6 +27,7 @@ public function register()
             T_CLASS,
             T_INTERFACE,
             T_TRAIT,
+            T_ENUM,
         ];
 
     }//end register()

src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php

@@ -27,6 +27,7 @@ public function register()
             T_CLASS,
             T_INTERFACE,
             T_TRAIT,
+            T_ENUM,
         ];
 
     }//end register()

src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php

@@ -50,6 +50,7 @@ public function register()
             T_ENDIF,
             T_ENDSWITCH,
             T_ENDWHILE,
+            T_ENUM,
             T_EVAL,
             T_EXIT,
             T_EXTENDS,

src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.1.inc

@@ -5,7 +5,10 @@ interface MyInterface {}
 interface YourInterface {}
 trait MyTrait {}
 trait YourTrait {}
+enum MyEnum {}
+enum YourEnum {}
 class MyClass {}
 interface MyInterface {}
 trait MyTrait {}
-?>
+enum MyEnum {}
+?>

src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.2.inc

@@ -2,4 +2,5 @@
 class MyClass {}
 interface MyInterface {}
 trait MyTrait {}
+enum MyEnum {}
 ?>

src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php

@@ -45,16 +45,18 @@ public function getWarningList($testFile='')
         switch ($testFile) {
         case 'DuplicateClassNameUnitTest.1.inc':
             return [
-                8  => 1,
-                9  => 1,
                 10 => 1,
+                11 => 1,
+                12 => 1,
+                13 => 1,
             ];
             break;
         case 'DuplicateClassNameUnitTest.2.inc':
             return [
                 2 => 1,
                 3 => 1,
                 4 => 1,
+                5 => 1,
             ];
             break;
         case 'DuplicateClassNameUnitTest.5.inc':

src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.inc

@@ -89,3 +89,7 @@ class Test_Class_Bad_G
     /*some comment*/
 {
 }
+
+enum Test_Enum
+{
+}