Try to fix PHP 8.1 const in enums bug (php/php-src#8418)

Kirill Nesmeyanov · Kirill Nesmeyanov · commit e05480dbd729 · 2024-04-06T12:54:49.000+03:00
diff --git a/src/Node/Literal/LiteralKind.php b/src/Node/Literal/LiteralKind.php
@@ -6,6 +6,8 @@
 
 use TypeLang\Parser\Node\Kind;
 
+const LITERAL_KIND = Kind::LITERAL_KIND;
+
 enum LiteralKind: int implements \JsonSerializable
 {
     /**
@@ -14,39 +16,39 @@ enum LiteralKind: int implements \JsonSerializable
      *
      * @internal
      */
-    case UNKNOWN = Kind::LITERAL_KIND;
+    case UNKNOWN = LITERAL_KIND;
 
     /**
      * Denotes any {@see bool} type consisting of the
      * literal {@see true} and {@see false} values.
      */
-    case BOOL_KIND = Kind::LITERAL_KIND + 1;
+    case BOOL_KIND = LITERAL_KIND + 1;
 
     /**
      * Denotes any {@see float} type.
      */
-    case FLOAT_KIND = Kind::LITERAL_KIND + 2;
+    case FLOAT_KIND = LITERAL_KIND + 2;
 
     /**
      * Denotes any {@see int} type.
      */
-    case INT_KIND = Kind::LITERAL_KIND + 3;
+    case INT_KIND = LITERAL_KIND + 3;
 
     /**
      * Denotes any {@see null} type.
      */
-    case NULL_KIND = Kind::LITERAL_KIND + 4;
+    case NULL_KIND = LITERAL_KIND + 4;
 
     /**
      * Denotes any {@see string} type.
      */
-    case STRING_KIND = Kind::LITERAL_KIND + 5;
+    case STRING_KIND = LITERAL_KIND + 5;
 
     /**
      * Denotes any variable (for example function
      * argument/parameter) type.
      */
-    case VARIABLE_KIND = Kind::LITERAL_KIND + 6;
+    case VARIABLE_KIND = LITERAL_KIND + 6;
 
     /**
      * @return int<0, max>
diff --git a/src/Node/Stmt/Condition/ConditionKind.php b/src/Node/Stmt/Condition/ConditionKind.php
@@ -6,6 +6,8 @@
 
 use TypeLang\Parser\Node\Kind;
 
+const CONDITION_KIND = Kind::CONDITION_KIND;
+
 enum ConditionKind: int implements \JsonSerializable
 {
     /**
@@ -14,17 +16,17 @@ enum ConditionKind: int implements \JsonSerializable
      *
      * @internal
      */
-    case UNKNOWN = Kind::CONDITION_KIND;
+    case UNKNOWN = CONDITION_KIND;
 
     /**
      * Indicates an equivalent comparison condition.
      */
-    case KIND_EQUAL = Kind::CONDITION_KIND + 1;
+    case KIND_EQUAL = CONDITION_KIND + 1;
 
     /**
      * Indicates an non-equivalent comparison condition.
      */
-    case KIND_NOT_EQUAL = Kind::CONDITION_KIND + 2;
+    case KIND_NOT_EQUAL = CONDITION_KIND + 2;
 
     /**
      * @return int<0, max>
diff --git a/src/Node/Stmt/Shape/ShapeFieldKind.php b/src/Node/Stmt/Shape/ShapeFieldKind.php
@@ -6,6 +6,8 @@
 
 use TypeLang\Parser\Node\Kind;
 
+const SHAPE_FIELD_KIND = Kind::SHAPE_FIELD_KIND;
+
 enum ShapeFieldKind: int implements \JsonSerializable
 {
     /**
@@ -14,27 +16,27 @@ enum ShapeFieldKind: int implements \JsonSerializable
      *
      * @internal
      */
-    case UNKNOWN = Kind::SHAPE_FIELD_KIND;
+    case UNKNOWN = SHAPE_FIELD_KIND;
 
     /**
      * Defines a field with a key of the form `key`.
      */
-    case NAMED_FIELD_KIND = Kind::SHAPE_FIELD_KIND + 1;
+    case NAMED_FIELD_KIND = SHAPE_FIELD_KIND + 1;
 
     /**
      * Defines a field with a key of the form `"key"`.
      */
-    case STRING_FIELD_KIND = Kind::SHAPE_FIELD_KIND + 2;
+    case STRING_FIELD_KIND = SHAPE_FIELD_KIND + 2;
 
     /**
      * Defines a field with a key of the form `42`.
      */
-    case NUMERIC_FIELD_KIND = Kind::SHAPE_FIELD_KIND + 3;
+    case NUMERIC_FIELD_KIND = SHAPE_FIELD_KIND + 3;
 
     /**
      * Defines a field without key.
      */
-    case IMPLICIT_FIELD_KIND = Kind::SHAPE_FIELD_KIND + 4;
+    case IMPLICIT_FIELD_KIND = SHAPE_FIELD_KIND + 4;
 
     /**
      * @return int<0, max>
diff --git a/src/Node/Stmt/TypeKind.php b/src/Node/Stmt/TypeKind.php
@@ -6,6 +6,8 @@
 
 use TypeLang\Parser\Node\Kind;
 
+const TYPE_KIND = Kind::TYPE_KIND;
+
 enum TypeKind: int implements \JsonSerializable
 {
     /**
@@ -14,7 +16,7 @@ enum TypeKind: int implements \JsonSerializable
      *
      * @internal
      */
-    case UNKNOWN = Kind::TYPE_KIND;
+    case UNKNOWN = TYPE_KIND;
 
     /**
      * Denotes any named type, which may be a reference to a class,
@@ -24,7 +26,7 @@ enum TypeKind: int implements \JsonSerializable
      * Path\To\SomeClass<T, Y>
      * ```
      */
-    case TYPE_KIND = Kind::TYPE_KIND + 1;
+    case TYPE_KIND = TYPE_KIND + 1;
 
     /**
      * Denotes any callable type that can contain parameters
@@ -34,7 +36,7 @@ enum TypeKind: int implements \JsonSerializable
      * example(T, U): V
      * ```
      */
-    case CALLABLE_KIND = Kind::TYPE_KIND + 2;
+    case CALLABLE_KIND = TYPE_KIND + 2;
 
     /**
      * Denotes a constant mask for a class.
@@ -43,7 +45,7 @@ enum TypeKind: int implements \JsonSerializable
      * Path\To\SomeClass::CONST_*
      * ```
      */
-    case CLASS_CONST_MASK_KIND = Kind::TYPE_KIND + 3;
+    case CLASS_CONST_MASK_KIND = TYPE_KIND + 3;
 
     /**
      * Denotes a reference to a specific class constant.
@@ -52,7 +54,7 @@ enum TypeKind: int implements \JsonSerializable
      * Path\To\SomeClass::CONST_NAME
      * ```
      */
-    case CLASS_CONST_KIND = Kind::TYPE_KIND + 4;
+    case CLASS_CONST_KIND = TYPE_KIND + 4;
 
     /**
      * Denotes a global constant mask.
@@ -61,7 +63,7 @@ enum TypeKind: int implements \JsonSerializable
      * JSON_ERROR_*
      * ```
      */
-    case CONST_MASK_KIND = Kind::TYPE_KIND + 5;
+    case CONST_MASK_KIND = TYPE_KIND + 5;
 
     /**
      * Denotes the logical intersection type.
@@ -70,7 +72,7 @@ enum TypeKind: int implements \JsonSerializable
      * T & U
      * ```
      */
-    case LOGICAL_INTERSECTION_KIND = Kind::TYPE_KIND + 6;
+    case LOGICAL_INTERSECTION_KIND = TYPE_KIND + 6;
 
     /**
      * Denotes the logical union type.
@@ -79,7 +81,7 @@ enum TypeKind: int implements \JsonSerializable
      * T | U
      * ```
      */
-    case LOGICAL_UNION_KIND = Kind::TYPE_KIND + 7;
+    case LOGICAL_UNION_KIND = TYPE_KIND + 7;
 
     /**
      * Denotes the nullable type.
@@ -88,7 +90,7 @@ enum TypeKind: int implements \JsonSerializable
      * ?T
      * ```
      */
-    case NULLABLE_KIND = Kind::TYPE_KIND + 8;
+    case NULLABLE_KIND = TYPE_KIND + 8;
 
     /**
      * Denotes the logical ternary type.
@@ -97,7 +99,7 @@ enum TypeKind: int implements \JsonSerializable
      * T ? U : V
      * ```
      */
-    case TERNARY_KIND = Kind::TYPE_KIND + 9;
+    case TERNARY_KIND = TYPE_KIND + 9;
 
     /**
      * Indicates a list type in the "legacy" syntax format.
@@ -106,7 +108,7 @@ enum TypeKind: int implements \JsonSerializable
      * T[]
      * ```
      */
-    case LIST_KIND = Kind::TYPE_KIND + 10;
+    case LIST_KIND = TYPE_KIND + 10;
 
     /**
      * @return int<0, max>
diff --git a/tests/Unit/Serialization/JsonSerializationTest/typelang_parser_node_stmt_uniontypenode.5e0599b8.json b/tests/Unit/Serialization/JsonSerializationTest/typelang_parser_node_stmt_uniontypenode.5e0599b8.json
@@ -0,0 +1,13 @@
+{
+    "kind": 263,
+    "items": [
+        {
+            "kind": 257,
+            "name": "int"
+        },
+        {
+            "kind": 257,
+            "name": "float"
+        }
+    ]
+}
diff --git a/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_uniontypenode.5e0599b8.txt b/tests/Unit/Serialization/PhpSerializationTest/typelang_parser_node_stmt_uniontypenode.5e0599b8.txt
@@ -0,0 +1 @@
+O:39:"TypeLang\Parser\Node\Stmt\UnionTypeNode":2:{i:0;i:0;i:1;a:2:{i:0;O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}i:1;O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:5:"float";}}}s:9:"arguments";N;s:6:"fields";N;}}}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+O:39:"TypeLang\Parser\Node\Stmt\UnionTypeNode":2:{i:0;i:0;i:1;a:2:{i:0;O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:3:"int";}}}s:9:"arguments";N;s:6:"fields";N;}i:1;O:39:"TypeLang\Parser\Node\Stmt\NamedTypeNode":4:{s:6:"offset";i:0;s:4:"name";O:25:"TypeLang\Parser\Node\Name":2:{i:0;i:0;i:1;a:1:{i:0;O:31:"TypeLang\Parser\Node\Identifier":2:{i:0;i:0;i:1;s:5:"float";}}}s:9:"arguments";N;s:6:"fields";N;}}}