Try to fix PHP 8.1 const in enums bug again

Author: Kirill Nesmeyanov

src/Node/Literal/LiteralKind.php

@@ -6,49 +6,60 @@
 
 use TypeLang\Parser\Node\Kind;
 
-const LITERAL_KIND = Kind::LITERAL_KIND;
-
 enum LiteralKind: int implements \JsonSerializable
 {
     /**
      * Indicates an arbitrary and non-standard literal
      * value that has not been explicitly defined.
      *
      * @internal
+     * @see Kind::LITERAL_KIND
      */
-    case UNKNOWN = LITERAL_KIND;
+    case UNKNOWN = /*Kind::LITERAL_KIND*/0x0400;
 
     /**
      * Denotes any {@see bool} type consisting of the
      * literal {@see true} and {@see false} values.
+     *
+     * @see Kind::LITERAL_KIND
      */
-    case BOOL_KIND = LITERAL_KIND + 1;
+    case BOOL_KIND = /*Kind::LITERAL_KIND*/0x0400 + 1;
 
     /**
      * Denotes any {@see float} type.
+     *
+     * @see Kind::LITERAL_KIND
      */
-    case FLOAT_KIND = LITERAL_KIND + 2;
+    case FLOAT_KIND = /*Kind::LITERAL_KIND*/0x0400 + 2;
 
     /**
      * Denotes any {@see int} type.
+     *
+     * @see Kind::LITERAL_KIND
      */
-    case INT_KIND = LITERAL_KIND + 3;
+    case INT_KIND = /*Kind::LITERAL_KIND*/0x0400 + 3;
 
     /**
      * Denotes any {@see null} type.
+     *
+     * @see Kind::LITERAL_KIND
      */
-    case NULL_KIND = LITERAL_KIND + 4;
+    case NULL_KIND = /*Kind::LITERAL_KIND*/0x0400 + 4;
 
     /**
      * Denotes any {@see string} type.
+     *
+     * @see Kind::LITERAL_KIND
      */
-    case STRING_KIND = LITERAL_KIND + 5;
+    case STRING_KIND = /*Kind::LITERAL_KIND*/0x0400 + 5;
 
     /**
      * Denotes any variable (for example function
      * argument/parameter) type.
+     *
+     * @see Kind::LITERAL_KIND
      */
-    case VARIABLE_KIND = LITERAL_KIND + 6;
+    case VARIABLE_KIND = /*Kind::LITERAL_KIND*/0x0400 + 6;
 
     /**
      * @return int<0, max>

src/Node/Stmt/Condition/ConditionKind.php

@@ -6,27 +6,30 @@
 
 use TypeLang\Parser\Node\Kind;
 
-const CONDITION_KIND = Kind::CONDITION_KIND;
-
 enum ConditionKind: int implements \JsonSerializable
 {
     /**
      * Indicates an arbitrary and non-standard condition
      * that has not been explicitly defined.
      *
      * @internal
+     * @see Kind::CONDITION_KIND
      */
-    case UNKNOWN = CONDITION_KIND;
+    case UNKNOWN = /*Kind::CONDITION_KIND*/0x0300;
 
     /**
      * Indicates an equivalent comparison condition.
+     *
+     * @see Kind::CONDITION_KIND
      */
-    case KIND_EQUAL = CONDITION_KIND + 1;
+    case KIND_EQUAL = /*Kind::CONDITION_KIND*/0x0300 + 1;
 
     /**
      * Indicates an non-equivalent comparison condition.
+     *
+     * @see Kind::CONDITION_KIND
      */
-    case KIND_NOT_EQUAL = CONDITION_KIND + 2;
+    case KIND_NOT_EQUAL = /*Kind::CONDITION_KIND*/0x0300 + 2;
 
     /**
      * @return int<0, max>

src/Node/Stmt/Shape/ShapeFieldKind.php

@@ -6,37 +6,44 @@
 
 use TypeLang\Parser\Node\Kind;
 
-const SHAPE_FIELD_KIND = Kind::SHAPE_FIELD_KIND;
-
 enum ShapeFieldKind: int implements \JsonSerializable
 {
     /**
      * Indicates an arbitrary and non-standard shape
      * field type that has not been explicitly defined.
      *
      * @internal
+     * @see Kind::SHAPE_FIELD_KIND
      */
-    case UNKNOWN = SHAPE_FIELD_KIND;
+    case UNKNOWN = /*Kind::SHAPE_FIELD_KIND*/0x0200;
 
     /**
      * Defines a field with a key of the form `key`.
+     *
+     * @see Kind::SHAPE_FIELD_KIND
      */
-    case NAMED_FIELD_KIND = SHAPE_FIELD_KIND + 1;
+    case NAMED_FIELD_KIND = /*Kind::SHAPE_FIELD_KIND*/0x0200 + 1;
 
     /**
      * Defines a field with a key of the form `"key"`.
+     *
+     * @see Kind::SHAPE_FIELD_KIND
      */
-    case STRING_FIELD_KIND = SHAPE_FIELD_KIND + 2;
+    case STRING_FIELD_KIND = /*Kind::SHAPE_FIELD_KIND*/0x0200 + 2;
 
     /**
      * Defines a field with a key of the form `42`.
+     *
+     * @see Kind::SHAPE_FIELD_KIND
      */
-    case NUMERIC_FIELD_KIND = SHAPE_FIELD_KIND + 3;
+    case NUMERIC_FIELD_KIND = /*Kind::SHAPE_FIELD_KIND*/0x0200 + 3;
 
     /**
      * Defines a field without key.
+     *
+     * @see Kind::SHAPE_FIELD_KIND
      */
-    case IMPLICIT_FIELD_KIND = SHAPE_FIELD_KIND + 4;
+    case IMPLICIT_FIELD_KIND = /*Kind::SHAPE_FIELD_KIND*/0x0200 + 4;
 
     /**
      * @return int<0, max>

src/Node/Stmt/TypeKind.php

@@ -6,17 +6,16 @@
 
 use TypeLang\Parser\Node\Kind;
 
-const TYPE_KIND = Kind::TYPE_KIND;
-
 enum TypeKind: int implements \JsonSerializable
 {
     /**
      * Indicates an arbitrary and non-standard type
      * that has not been explicitly defined.
      *
      * @internal
+     * @see Kind::TYPE_KIND
      */
-    case UNKNOWN = TYPE_KIND;
+    case UNKNOWN = /*Kind::TYPE_KIND*/0x0100;
 
     /**
      * Denotes any named type, which may be a reference to a class,
@@ -25,8 +24,10 @@ enum TypeKind: int implements \JsonSerializable
      * ```
      * Path\To\SomeClass<T, Y>
      * ```
+     *
+     * @see Kind::TYPE_KIND
      */
-    case TYPE_KIND = TYPE_KIND + 1;
+    case TYPE_KIND = /*Kind::TYPE_KIND*/0x0100 + 1;
 
     /**
      * Denotes any callable type that can contain parameters
@@ -35,80 +36,98 @@ enum TypeKind: int implements \JsonSerializable
      * ```
      * example(T, U): V
      * ```
+     *
+     * @see Kind::TYPE_KIND
      */
-    case CALLABLE_KIND = TYPE_KIND + 2;
+    case CALLABLE_KIND = /*Kind::TYPE_KIND*/0x0100 + 2;
 
     /**
      * Denotes a constant mask for a class.
      *
      * ```
      * Path\To\SomeClass::CONST_*
      * ```
+     *
+     * @see Kind::TYPE_KIND
      */
-    case CLASS_CONST_MASK_KIND = TYPE_KIND + 3;
+    case CLASS_CONST_MASK_KIND = /*Kind::TYPE_KIND*/0x0100 + 3;
 
     /**
      * Denotes a reference to a specific class constant.
      *
      * ```
      * Path\To\SomeClass::CONST_NAME
      * ```
+     *
+     * @see Kind::TYPE_KIND
      */
-    case CLASS_CONST_KIND = TYPE_KIND + 4;
+    case CLASS_CONST_KIND = /*Kind::TYPE_KIND*/0x0100 + 4;
 
     /**
      * Denotes a global constant mask.
      *
      * ```
      * JSON_ERROR_*
      * ```
+     *
+     * @see Kind::TYPE_KIND
      */
-    case CONST_MASK_KIND = TYPE_KIND + 5;
+    case CONST_MASK_KIND = /*Kind::TYPE_KIND*/0x0100 + 5;
 
     /**
      * Denotes the logical intersection type.
      *
      * ```
      * T & U
      * ```
+     *
+     * @see Kind::TYPE_KIND
      */
-    case LOGICAL_INTERSECTION_KIND = TYPE_KIND + 6;
+    case LOGICAL_INTERSECTION_KIND = /*Kind::TYPE_KIND*/0x0100 + 6;
 
     /**
      * Denotes the logical union type.
      *
      * ```
      * T | U
      * ```
+     *
+     * @see Kind::TYPE_KIND
      */
-    case LOGICAL_UNION_KIND = TYPE_KIND + 7;
+    case LOGICAL_UNION_KIND = /*Kind::TYPE_KIND*/0x0100 + 7;
 
     /**
      * Denotes the nullable type.
      *
      * ```
      * ?T
      * ```
+     *
+     * @see Kind::TYPE_KIND
      */
-    case NULLABLE_KIND = TYPE_KIND + 8;
+    case NULLABLE_KIND = /*Kind::TYPE_KIND*/0x0100 + 8;
 
     /**
      * Denotes the logical ternary type.
      *
      * ```
      * T ? U : V
      * ```
+     *
+     * @see Kind::TYPE_KIND
      */
-    case TERNARY_KIND = TYPE_KIND + 9;
+    case TERNARY_KIND = /*Kind::TYPE_KIND*/0x0100 + 9;
 
     /**
      * Indicates a list type in the "legacy" syntax format.
      *
      * ```
      * T[]
      * ```
+     *
+     * @see Kind::TYPE_KIND
      */
-    case LIST_KIND = TYPE_KIND + 10;
+    case LIST_KIND = /*Kind::TYPE_KIND*/0x0100 + 10;
 
     /**
      * @return int<0, max>