Merge branch 'PHP-8.5' of github.com:php/php-src

bwoebi · bwoebi · commit f905950ba507 · 2025-10-07T22:14:10.000+02:00
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -36,7 +36,6 @@
 #define ZEND_EXCEPTION_LINE_OFF 4
 #define ZEND_EXCEPTION_TRACE_OFF 5
 #define ZEND_EXCEPTION_PREVIOUS_OFF 6
-#define ZEND_EXCEPTION_SEVERITY_OFF 7
 
 ZEND_API zend_class_entry *zend_ce_throwable;
 ZEND_API zend_class_entry *zend_ce_exception;
@@ -415,7 +414,7 @@ ZEND_METHOD(ErrorException, __construct)
 	}
 
 	ZVAL_LONG(&tmp, severity);
-	zend_update_property_num_checked(NULL, Z_OBJ_P(object), ZEND_EXCEPTION_SEVERITY_OFF, ZSTR_KNOWN(ZEND_STR_SEVERITY), &tmp);
+	zend_update_property_ex(zend_ce_exception, Z_OBJ_P(object), ZSTR_KNOWN(ZEND_STR_SEVERITY), &tmp);
 	if (UNEXPECTED(EG(exception))) {
 		RETURN_THROWS();
 	}

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@`
`36`	`36`	`#define ZEND_EXCEPTION_LINE_OFF 4`
`37`	`37`	`#define ZEND_EXCEPTION_TRACE_OFF 5`
`38`	`38`	`#define ZEND_EXCEPTION_PREVIOUS_OFF 6`
`39`		`-#define ZEND_EXCEPTION_SEVERITY_OFF 7`
`40`	`39`
`41`	`40`	`ZEND_API zend_class_entry *zend_ce_throwable;`
`42`	`41`	`ZEND_API zend_class_entry *zend_ce_exception;`
`@@ -415,7 +414,7 @@ ZEND_METHOD(ErrorException, __construct)`
`415`	`414`	`}`
`416`	`415`
`417`	`416`	`ZVAL_LONG(&tmp, severity);`
`418`		`- zend_update_property_num_checked(NULL, Z_OBJ_P(object), ZEND_EXCEPTION_SEVERITY_OFF, ZSTR_KNOWN(ZEND_STR_SEVERITY), &tmp);`
	`417`	`+ zend_update_property_ex(zend_ce_exception, Z_OBJ_P(object), ZSTR_KNOWN(ZEND_STR_SEVERITY), &tmp);`
`419`	`418`	`if (UNEXPECTED(EG(exception))) {`
`420`	`419`	`RETURN_THROWS();`
`421`	`420`	`}`