refactor(zend): address review feedback

Signed-off-by: azjezz <azjezz@protonmail.com>

Author: azjezz

Zend/zend_ast.c

@@ -2109,14 +2109,14 @@ static ZEND_COLD void zend_ast_export_generic_call_type_argument_list(smart_str
 
 static ZEND_COLD void zend_ast_export_generic_type_parameter(smart_str *str, zend_ast *ast, int indent)
 {
-	switch (ast->attr) {
-		case 1:
+	switch ((zend_generic_variance) ast->attr) {
+		case ZEND_GENERIC_VARIANCE_COVARIANT:
 			smart_str_appendc(str, '+');
 			break;
-		case 2:
+		case ZEND_GENERIC_VARIANCE_CONTRAVARIANT:
 			smart_str_appendc(str, '-');
 			break;
-		default:
+		case ZEND_GENERIC_VARIANCE_INVARIANT:
 			break;
 	}
 	smart_str_append(str, zend_ast_get_str(ast->child[0]));

Zend/zend_compile.c

@@ -438,7 +438,7 @@ void zend_init_compiler_data_structures(void) /* {{{ */
 }
 /* }}} */
 
-static void zend_generic_scope_push(zend_generic_parameter_list *params, uint8_t origin) /* {{{ */
+static void zend_generic_scope_push(zend_generic_parameter_list *params, zend_generic_origin origin) /* {{{ */
 {
 	zend_generic_scope_entry *entry = emalloc(sizeof(zend_generic_scope_entry));
 	entry->params = params;
@@ -466,7 +466,7 @@ static void zend_generic_scope_pop(void) /* {{{ */
 /* }}} */
 
 static zend_generic_parameter *zend_generic_lookup_full(
-		zend_string *name, uint8_t *origin_out, uint32_t *index_out) /* {{{ */
+		zend_string *name, zend_generic_origin *origin_out, uint32_t *index_out) /* {{{ */
 {
 	zend_string *lc_name = zend_string_tolower(name);
 	for (zend_generic_scope_entry *e = CG(generic_scope); e; e = e->outer) {
@@ -497,7 +497,9 @@ static zend_generic_parameter *zend_generic_lookup_full(
 static int zend_generic_lookup_forward(const zend_string *name) /* {{{ */
 {
 	zend_generic_scope_entry *e = CG(generic_scope);
-	if (!e) return -1;
+	if (!e) {
+		return -1;
+	}
 	zend_generic_parameter_list *params = e->params;
 	for (uint32_t i = e->visible_count; i < params->count; i++) {
 		if (zend_string_equals(params->parameters[i].name, name)) {
@@ -566,12 +568,12 @@ static zend_generic_parameter_list *zend_compile_generic_type_parameter_list(zen
 		}
 
 		params->parameters[i].name = zend_string_copy(name);
-		params->parameters[i].variance = (uint8_t) param_ast->attr;
+		params->parameters[i].variance = (zend_generic_variance) param_ast->attr;
 	}
 
 	params->count = list->children;
 
-	zend_generic_scope_push(params, /* origin */ 0);
+	zend_generic_scope_push(params, ZEND_GENERIC_ORIGIN_CLASS_LIKE);
 	CG(generic_scope)->visible_count = 0;
 
 	for (uint32_t i = 0; i < list->children; i++) {
@@ -607,7 +609,9 @@ static zend_generic_parameter_list *zend_compile_generic_type_parameter_list(zen
  * reference or a named type with type arguments) that need pre-erasure capture. */
 static bool zend_type_ast_has_generic_content(zend_ast *ast)
 {
-	if (!ast) return false;
+	if (!ast) {
+		return false;
+	}
 	zend_ast_attr orig = ast->attr;
 	ast->attr &= ~ZEND_TYPE_NULLABLE;
 	bool result = false;
@@ -666,8 +670,12 @@ static zend_type zend_compile_pre_erasure_typename(zend_ast *ast)
 		if (name_ast->kind == ZEND_AST_TYPE) {
 			const char *cname;
 			switch (name_ast->attr) {
-				case IS_ARRAY:    cname = "array";    break;
-				case IS_STATIC:   cname = "static";   break;
+				case IS_ARRAY:
+					cname = "array";
+					break;
+				case IS_STATIC:
+					cname = "static";
+					break;
 				default:
 					ZEND_UNREACHABLE();
 			}
@@ -690,7 +698,7 @@ static zend_type zend_compile_pre_erasure_typename(zend_ast *ast)
 		/* Builtin pseudo-type: same as erased. */
 		result = (zend_type) ZEND_TYPE_INIT_CODE(ast->attr, 0, 0);
 	} else if (ast->kind == ZEND_AST_ZVAL) {
-		uint8_t origin;
+		zend_generic_origin origin;
 		uint32_t index;
 		zend_generic_parameter *param = NULL;
 		if ((ast->attr & ZEND_NAME_NOT_FQ) == ZEND_NAME_NOT_FQ) {
@@ -743,7 +751,7 @@ static zend_type zend_compile_pre_erasure_typename(zend_ast *ast)
 	return result;
 }
 
-/* Ensure op_array->generic_types or ce->generic_types is allocated. */
+/* Ensure op_array->generic_types is allocated, then return it. */
 static zend_generic_type_table *zend_generic_get_or_create_op_array_table(zend_op_array *op_array)
 {
 	if (!op_array->generic_types) {
@@ -752,6 +760,7 @@ static zend_generic_type_table *zend_generic_get_or_create_op_array_table(zend_o
 	return op_array->generic_types;
 }
 
+/* Ensure ce->generic_types is allocated, then return it. */
 static zend_generic_type_table *zend_generic_get_or_create_class_table(zend_class_entry *ce)
 {
 	if (!ce->generic_types) {
@@ -9302,7 +9311,7 @@ static zend_op_array *zend_compile_func_decl_ex(
 	 * See GENERICS.md §6.9. */
 	if (generic_params_ast) {
 		op_array->generic_parameters = zend_compile_generic_type_parameter_list(generic_params_ast);
-		zend_generic_scope_push(op_array->generic_parameters, /* origin */ 1);
+		zend_generic_scope_push(op_array->generic_parameters, ZEND_GENERIC_ORIGIN_FUNCTION_LIKE);
 		generic_scope_pushed = true;
 	}
 
@@ -10120,7 +10129,7 @@ static void zend_compile_class_decl(znode *result, const zend_ast *ast, bool top
 	if (decl->child[5]) {
 		ZEND_ASSERT(!(decl->flags & ZEND_ACC_ANON_CLASS));
 		ce->generic_parameters = zend_compile_generic_type_parameter_list(decl->child[5]);
-		zend_generic_scope_push(ce->generic_parameters, /* origin */ 0);
+		zend_generic_scope_push(ce->generic_parameters, ZEND_GENERIC_ORIGIN_CLASS_LIKE);
 	}
 
 	if (extends_ast) {

Zend/zend_compile.h

@@ -121,9 +121,20 @@ typedef struct _zend_file_context {
 	HashTable seen_symbols;
 } zend_file_context;
 
+C23_ENUM(zend_generic_variance, uint8_t) {
+	ZEND_GENERIC_VARIANCE_INVARIANT     = 0,
+	ZEND_GENERIC_VARIANCE_COVARIANT     = 1,
+	ZEND_GENERIC_VARIANCE_CONTRAVARIANT = 2,
+};
+
+C23_ENUM(zend_generic_origin, uint8_t) {
+	ZEND_GENERIC_ORIGIN_CLASS_LIKE    = 0, /* class, interface, trait, enum */
+	ZEND_GENERIC_ORIGIN_FUNCTION_LIKE = 1, /* function, method, closure, arrow function */
+};
+
 typedef struct _zend_generic_parameter {
 	zend_string *name;        		/* type-parameter name */
-	uint8_t variance;         		/* 0=invariant, 1=covariant, 2=contravariant */
+	zend_generic_variance variance;
 	zend_type bound;          		/* runtime erased; ZEND_TYPE_NONE if unbounded */
 	zend_type bound_pre_erasure;   	/* pre-erasure; ZEND_TYPE_NONE if same as `bound` */
 	zend_type default_type;   		/* runtime erased; ZEND_TYPE_NONE if no default */
@@ -154,7 +165,7 @@ typedef struct _zend_generic_scope_entry {
 	uint32_t visible_count; 						/* number of parameters in `params` already declared */
 	struct _zend_generic_parameter *self_compiling; /* param whose bound/default is being compiled, or NULL */
 	HashTable *shadowing_classes;                   /* lc_names of class-likes declared inside this scope; lazy-allocated */
-	uint8_t origin;  								/* 0 = class/interface/trait, 1 = function/method/closure/arrow-fn */
+	zend_generic_origin origin;
 	struct _zend_generic_scope_entry *outer;
 } zend_generic_scope_entry;
 

Zend/zend_extensions.h

@@ -43,7 +43,7 @@ You can use the following macro to check the extension API version for compatibi
 
 /* The first number is the engine version and the rest is the date (YYYYMMDD).
  * This way engine 2/3 API no. is always greater than engine 1 API no..  */
-#define ZEND_EXTENSION_API_NO	420260506
+#define ZEND_EXTENSION_API_NO	420250926
 
 typedef struct _zend_extension_version_info {
 	int zend_extension_api_no;

Zend/zend_modules.h

@@ -30,7 +30,7 @@
 #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module
 #define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module
 
-#define ZEND_MODULE_API_NO 20260506
+#define ZEND_MODULE_API_NO 20250926
 #ifdef ZTS
 #define USING_ZTS 1
 #else

Zend/zend_types.h

@@ -131,7 +131,7 @@ typedef struct {
 typedef struct _zend_type_parameter_ref {
 	zend_string *name;       /* type-parameter source name (e.g. "T") */
 	uint32_t     index;      /* position in declaring entity's parameter list */
-	uint8_t      origin;     /* 0 = class, 1 = function/method/closure/arrow-fn */
+	uint8_t      origin;     /* one of zend_generic_origin (see zend_compile.h) */
 } zend_type_parameter_ref;
 
 /* List of pre-erasure type arguments attached to a named pre-erasure zend_type. */

ext/reflection/php_reflection.c

@@ -8580,7 +8580,7 @@ ZEND_METHOD(ReflectionTypeParameterReference, getTypeParameter)
 	zval declaring_zv;
 	ZVAL_UNDEF(&declaring_zv);
 
-	if (tp->origin == 0 /* class */) {
+	if (tp->origin == ZEND_GENERIC_ORIGIN_CLASS_LIKE) {
 		if (!ref->declaring_class) {
 			zend_throw_error(NULL,
 				"Type parameter reference has no declaring class context");
@@ -8589,7 +8589,7 @@ ZEND_METHOD(ReflectionTypeParameterReference, getTypeParameter)
 
 		list = ref->declaring_class->generic_parameters;
 		zend_reflection_class_factory(ref->declaring_class, &declaring_zv);
-	} else /* function */ {
+	} else {
 		if (!ref->declaring_fn) {
 			zend_throw_error(NULL,
 				"Type parameter reference has no declaring function context");