Add typedef for [class] constants

Author: iluuu1994

Zend/zend_API.c

@@ -4702,7 +4702,7 @@ ZEND_API void zend_declare_property_stringl(zend_class_entry *ce, const char *na
 }
 /* }}} */
 
-ZEND_API zend_class_constant *zend_declare_typed_class_constant(zend_class_entry *ce, zend_string *name, zval *value, int flags, zend_string *doc_comment, zend_type type) /* {{{ */
+ZEND_API zend_class_constant *zend_declare_typed_class_constant(zend_class_entry *ce, zend_string *name, zval *value, zend_class_const_flags flags, zend_string *doc_comment, zend_type type) /* {{{ */
 {
 	zend_class_constant *c;
 
@@ -4752,7 +4752,7 @@ ZEND_API zend_class_constant *zend_declare_typed_class_constant(zend_class_entry
 	return c;
 }
 
-ZEND_API zend_class_constant *zend_declare_class_constant_ex(zend_class_entry *ce, zend_string *name, zval *value, int flags, zend_string *doc_comment)
+ZEND_API zend_class_constant *zend_declare_class_constant_ex(zend_class_entry *ce, zend_string *name, zval *value, zend_class_const_flags flags, zend_string *doc_comment)
 {
 	return zend_declare_typed_class_constant(ce, name, value, flags, doc_comment, (zend_type) ZEND_TYPE_INIT_NONE(0));
 }

Zend/zend_API.h

@@ -433,8 +433,8 @@ ZEND_API void zend_declare_property_double(zend_class_entry *ce, const char *nam
 ZEND_API void zend_declare_property_string(zend_class_entry *ce, const char *name, size_t name_length, const char *value, zend_prop_flags access_type);
 ZEND_API void zend_declare_property_stringl(zend_class_entry *ce, const char *name, size_t name_length, const char *value, size_t value_len, zend_prop_flags access_type);
 
-ZEND_API zend_class_constant *zend_declare_typed_class_constant(zend_class_entry *ce, zend_string *name, zval *value, int access_type, zend_string *doc_comment, zend_type type);
-ZEND_API zend_class_constant *zend_declare_class_constant_ex(zend_class_entry *ce, zend_string *name, zval *value, int access_type, zend_string *doc_comment);
+ZEND_API zend_class_constant *zend_declare_typed_class_constant(zend_class_entry *ce, zend_string *name, zval *value, zend_class_const_flags access_type, zend_string *doc_comment, zend_type type);
+ZEND_API zend_class_constant *zend_declare_class_constant_ex(zend_class_entry *ce, zend_string *name, zval *value, zend_class_const_flags access_type, zend_string *doc_comment);
 ZEND_API void zend_declare_class_constant(zend_class_entry *ce, const char *name, size_t name_length, zval *value);
 ZEND_API void zend_declare_class_constant_null(zend_class_entry *ce, const char *name, size_t name_length);
 ZEND_API void zend_declare_class_constant_long(zend_class_entry *ce, const char *name, size_t name_length, zend_long value);

Zend/zend_compile.c

@@ -7994,7 +7994,7 @@ static void zend_check_trait_alias_modifiers(uint32_t attr) /* {{{ */
 }
 /* }}} */
 
-static void zend_compile_class_const_decl(zend_ast *ast, uint32_t flags, zend_ast *attr_ast, zend_ast *type_ast)
+static void zend_compile_class_const_decl(zend_ast *ast, zend_class_const_flags flags, zend_ast *attr_ast, zend_ast *type_ast)
 {
 	zend_ast_list *list = zend_ast_get_list(ast);
 	zend_class_entry *ce = CG(active_class_entry);

Zend/zend_compile.h

@@ -420,6 +420,8 @@ typedef struct _zend_property_info {
 #define OBJ_PROP_TO_NUM(offset) \
 	((offset - OBJ_PROP_TO_OFFSET(0)) / sizeof(zval))
 
+typedef uint32_t zend_class_const_flags;
+
 typedef struct _zend_class_constant {
 	zval value; /* flags are stored in u2 */
 	zend_string *doc_comment;

Zend/zend_constants.c

@@ -116,7 +116,7 @@ void zend_register_standard_constants(void)
 	null_const = zend_hash_str_find_ptr(EG(zend_constants), "NULL", sizeof("NULL")-1);
 }
 
-ZEND_API void zend_register_null_constant(const char *name, size_t name_len, int flags, int module_number)
+ZEND_API void zend_register_null_constant(const char *name, size_t name_len, zend_const_flags flags, int module_number)
 {
 	zend_constant c;
 
@@ -126,7 +126,7 @@ ZEND_API void zend_register_null_constant(const char *name, size_t name_len, int
 	zend_register_constant(&c);
 }
 
-ZEND_API void zend_register_bool_constant(const char *name, size_t name_len, bool bval, int flags, int module_number)
+ZEND_API void zend_register_bool_constant(const char *name, size_t name_len, bool bval, zend_const_flags flags, int module_number)
 {
 	zend_constant c;
 
@@ -136,7 +136,7 @@ ZEND_API void zend_register_bool_constant(const char *name, size_t name_len, boo
 	zend_register_constant(&c);
 }
 
-ZEND_API void zend_register_long_constant(const char *name, size_t name_len, zend_long lval, int flags, int module_number)
+ZEND_API void zend_register_long_constant(const char *name, size_t name_len, zend_long lval, zend_const_flags flags, int module_number)
 {
 	zend_constant c;
 
@@ -147,7 +147,7 @@ ZEND_API void zend_register_long_constant(const char *name, size_t name_len, zen
 }
 
 
-ZEND_API void zend_register_double_constant(const char *name, size_t name_len, double dval, int flags, int module_number)
+ZEND_API void zend_register_double_constant(const char *name, size_t name_len, double dval, zend_const_flags flags, int module_number)
 {
 	zend_constant c;
 
@@ -158,7 +158,7 @@ ZEND_API void zend_register_double_constant(const char *name, size_t name_len, d
 }
 
 
-ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len, const char *strval, size_t strlen, int flags, int module_number)
+ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len, const char *strval, size_t strlen, zend_const_flags flags, int module_number)
 {
 	zend_constant c;
 
@@ -169,7 +169,7 @@ ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len,
 }
 
 
-ZEND_API void zend_register_string_constant(const char *name, size_t name_len, const char *strval, int flags, int module_number)
+ZEND_API void zend_register_string_constant(const char *name, size_t name_len, const char *strval, zend_const_flags flags, int module_number)
 {
 	zend_register_stringl_constant(name, name_len, strval, strlen(strval), flags, module_number);
 }

Zend/zend_constants.h

@@ -30,6 +30,8 @@
 
 #define	PHP_USER_CONSTANT   0x7fffff /* a constant defined in user space */
 
+typedef uint32_t zend_const_flags;
+
 typedef struct _zend_constant {
 	zval value;
 	zend_string *name;
@@ -75,14 +77,14 @@ void zend_register_standard_constants(void);
 ZEND_API bool zend_verify_const_access(zend_class_constant *c, zend_class_entry *ce);
 ZEND_API zval *zend_get_constant(zend_string *name);
 ZEND_API zval *zend_get_constant_str(const char *name, size_t name_len);
-ZEND_API zval *zend_get_constant_ex(zend_string *name, zend_class_entry *scope, uint32_t flags);
-ZEND_API zval *zend_get_class_constant_ex(zend_string *class_name, zend_string *constant_name, zend_class_entry *scope, uint32_t flags);
-ZEND_API void zend_register_bool_constant(const char *name, size_t name_len, bool bval, int flags, int module_number);
-ZEND_API void zend_register_null_constant(const char *name, size_t name_len, int flags, int module_number);
-ZEND_API void zend_register_long_constant(const char *name, size_t name_len, zend_long lval, int flags, int module_number);
-ZEND_API void zend_register_double_constant(const char *name, size_t name_len, double dval, int flags, int module_number);
-ZEND_API void zend_register_string_constant(const char *name, size_t name_len, const char *strval, int flags, int module_number);
-ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len, const char *strval, size_t strlen, int flags, int module_number);
+ZEND_API zval *zend_get_constant_ex(zend_string *name, zend_class_entry *scope, zend_const_flags flags);
+ZEND_API zval *zend_get_class_constant_ex(zend_string *class_name, zend_string *constant_name, zend_class_entry *scope, zend_const_flags flags);
+ZEND_API void zend_register_bool_constant(const char *name, size_t name_len, bool bval, zend_const_flags flags, int module_number);
+ZEND_API void zend_register_null_constant(const char *name, size_t name_len, zend_const_flags flags, int module_number);
+ZEND_API void zend_register_long_constant(const char *name, size_t name_len, zend_long lval, zend_const_flags flags, int module_number);
+ZEND_API void zend_register_double_constant(const char *name, size_t name_len, double dval, zend_const_flags flags, int module_number);
+ZEND_API void zend_register_string_constant(const char *name, size_t name_len, const char *strval, zend_const_flags flags, int module_number);
+ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len, const char *strval, size_t strlen, zend_const_flags flags, int module_number);
 ZEND_API zend_result zend_register_constant(zend_constant *c);
 #ifdef ZTS
 void zend_copy_constants(HashTable *target, HashTable *source);

ext/reflection/php_reflection.c

@@ -3894,7 +3894,7 @@ ZEND_METHOD(ReflectionClassConstant, hasType)
 	RETVAL_BOOL(ZEND_TYPE_IS_SET(ref->type));
 }
 
-static void _class_constant_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) /* {{{ */
+static void _class_constant_check_flag(INTERNAL_FUNCTION_PARAMETERS, zend_class_const_flags mask) /* {{{ */
 {
 	reflection_object *intern;
 	zend_class_constant *ref;
@@ -3939,7 +3939,7 @@ ZEND_METHOD(ReflectionClassConstant, getModifiers)
 {
 	reflection_object *intern;
 	zend_class_constant *ref;
-	uint32_t keep_flags = ZEND_ACC_FINAL | ZEND_ACC_PPP_MASK;
+	zend_class_const_flags keep_flags = ZEND_ACC_FINAL | ZEND_ACC_PPP_MASK;
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		RETURN_THROWS();