Merge branch 'PHP-8.5'

iluuu1994 · iluuu1994 · commit e4b3ffe2ffad · 2026-03-27T15:02:05.000+01:00
* PHP-8.5:
  Fix ZEND_API mismatch on zend_ce_closure forward decl for Windows+Clang
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
@@ -248,7 +248,7 @@ static zend_always_inline void zend_cast_zval_to_object(zval *result, zval *expr
 }
 
 static zend_always_inline void zend_cast_zval_to_array(zval *result, zval *expr, uint8_t op1_type) {
-	extern zend_class_entry *zend_ce_closure;
+	extern ZEND_API zend_class_entry *zend_ce_closure;
 	if (op1_type == IS_CONST || Z_TYPE_P(expr) != IS_OBJECT || Z_OBJCE_P(expr) == zend_ce_closure) {
 		if (Z_TYPE_P(expr) != IS_NULL) {
 			if (UNEXPECTED(Z_TYPE_P(expr) == IS_DOUBLE && zend_isnan(Z_DVAL_P(expr)))) {

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ static zend_always_inline void zend_cast_zval_to_object(zval result, zval expr`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`static zend_always_inline void zend_cast_zval_to_array(zval result, zval expr, uint8_t op1_type) {`
`251`		`- extern zend_class_entry *zend_ce_closure;`
	`251`	`+ extern ZEND_API zend_class_entry *zend_ce_closure;`
`252`	`252`	`if (op1_type == IS_CONST \|\| Z_TYPE_P(expr) != IS_OBJECT \|\| Z_OBJCE_P(expr) == zend_ce_closure) {`
`253`	`253`	`if (Z_TYPE_P(expr) != IS_NULL) {`
`254`	`254`	`if (UNEXPECTED(Z_TYPE_P(expr) == IS_DOUBLE && zend_isnan(Z_DVAL_P(expr)))) {`