Merge branch 'PHP-8.5'

LamentXU123 · LamentXU123 · commit d1028301d45a · 2026-06-22T13:44:42.000+08:00
* PHP-8.5: ext/intl: Fix Spoofchecker build after double construction change (php#22386)
diff --git a/ext/intl/spoofchecker/spoofchecker_create.cpp b/ext/intl/spoofchecker/spoofchecker_create.cpp
@@ -43,8 +43,6 @@ U_CFUNC PHP_METHOD(Spoofchecker, __construct)
 		RETURN_THROWS();
 	}
 
-	zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &error_handling);
-
 	co->uspoof = uspoof_open(SPOOFCHECKER_ERROR_CODE_P(co));
 	if (U_FAILURE(INTL_DATA_ERROR_CODE(co))) {
 		zend_throw_exception(IntlException_ce_ptr,

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@ U_CFUNC PHP_METHOD(Spoofchecker, __construct)`
`43`	`43`	`RETURN_THROWS();`
`44`	`44`	`}`
`45`	`45`
`46`		`- zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &error_handling);`
`47`		`-`
`48`	`46`	`co->uspoof = uspoof_open(SPOOFCHECKER_ERROR_CODE_P(co));`
`49`	`47`	`if (U_FAILURE(INTL_DATA_ERROR_CODE(co))) {`
`50`	`48`	`zend_throw_exception(IntlException_ce_ptr,`