Commit b8278fdf56c for php.net
commit b8278fdf56c55564d8364f35276034dee06554cc
Author: Weilin Du <weilindu@php.net>
Date: Mon Jun 22 13:36:56 2026 +0800
ext/intl: Fix Spoofchecker build after double construction change (#22386)
PHP-8.5 no longer declares a zend_error_handling variable in
Spoofchecker::__construct(). The previous merge from PHP-8.4 carried forward a
zend_replace_error_handling() call that references the removed local variable.
Remove the stale call so PHP-8.5 and branches merged from it build again.
diff --git a/ext/intl/spoofchecker/spoofchecker_create.c b/ext/intl/spoofchecker/spoofchecker_create.c
index 4305aec6f5f..196886ad4ec 100644
--- a/ext/intl/spoofchecker/spoofchecker_create.c
+++ b/ext/intl/spoofchecker/spoofchecker_create.c
@@ -36,8 +36,6 @@ 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,