Merge pull request #366 from PHPCSStandards/php-8.2/add-support-const…

…ants-in-traits

PHP 8.2 | Scopes::isOOConstant(): add support for constants in traits

PHPCSUtils/Tokens/Collections.php

@@ -401,10 +401,11 @@ class Collections
     /**
      * DEPRECATED: OO scopes in which constants can be declared.
      *
-     * Note: traits can not declare constants.
+     * Note: traits can only declare constants since PHP 8.2.
      *
      * @since 1.0.0-alpha1
      * @since 1.0.0-alpha4 Added the PHP 8.1 T_ENUM token.
+     * @since 1.0.0-alpha4 Added the T_TRAIT token for PHP 8.2 constants in traits.
      *
      * @deprecated 1.0.0-alpha4 Use the {@see Collections::ooConstantScopes()} method instead.
      *
@@ -415,6 +416,7 @@ class Collections
         \T_ANON_CLASS => \T_ANON_CLASS,
         \T_INTERFACE  => \T_INTERFACE,
         \T_ENUM       => \T_ENUM,
+        \T_TRAIT      => \T_TRAIT,
     ];
 
     /**
@@ -846,10 +848,11 @@ public static function ooCanImplement()
     /**
      * OO scopes in which constants can be declared.
      *
-     * Note: traits can not declare constants.
+     * Note: traits can only declare constants since PHP 8.2.
      *
      * @since 1.0.0-alpha4 This method replaces the {@see Collections::$OOConstantScopes} property.
      * @since 1.0.0-alpha4 Added the PHP 8.1 T_ENUM token.
+     * @since 1.0.0-alpha4 Added the T_TRAIT token for PHP 8.2 constants in traits.
      *
      * @return array <int|string> => <int|string>
      */

PHPCSUtils/Utils/Scopes.php

@@ -56,10 +56,11 @@ public static function validDirectScope(File $phpcsFile, $stackPtr, $validScopes
     }
 
     /**
-     * Check whether a T_CONST token is a class/interface/enum constant declaration.
+     * Check whether a T_CONST token is a class/interface/trait/enum constant declaration.
      *
      * @since 1.0.0
      * @since 1.0.0-alpha4 Added support for PHP 8.1 enums.
+     * @since 1.0.0-alpha4 Added support for PHP 8.2 constants in traits.
      *
      * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
      * @param int                         $stackPtr  The position in the stack of the

Tests/Utils/Scopes/IsOOConstantTest.inc

@@ -33,7 +33,7 @@ interface MyInterface {
 }
 
 trait MyTrait {
-    // Intentional parse error. Constants are not allowed in traits.
+    // Prior to PHP 8.2, this was a parse error. Since PHP 8.2, constants are allowed in traits.
     /* testTraitConst */
     const BAR = false;
 }

Tests/Utils/Scopes/IsOOConstantTest.php

@@ -107,7 +107,7 @@ public function dataIsOOConstant()
             ],
             'trait-const' => [
                 'testMarker' => '/* testTraitConst */',
-                'expected'   => false,
+                'expected'   => true,
             ],
             'enum-const' => [
                 'testMarker' => '/* testEnumConst */',