Commit f61da2aa72e for php.net
commit f61da2aa72e97b10aa1d1c3b3ddd1b7b4cbfe19e
Author: Gina Peter Banyard <girgias@php.net>
Date: Sat Sep 12 10:27:45 2026 +0100
intl: refactor php_converter_resolve_callback() (#23666)
Rename zend_object parameter to this_ptr to clarify meaning for FCC struct.
Remove assignment to the calling_scope field, as this is never read by zend_call_function().
diff --git a/ext/intl/converter/converter.cpp b/ext/intl/converter/converter.cpp
index 402a5048248..c2f543f2c4a 100644
--- a/ext/intl/converter/converter.cpp
+++ b/ext/intl/converter/converter.cpp
@@ -504,23 +504,20 @@ PHP_METHOD(UConverter, getDestinationType) {
}
/* }}} */
-/* {{{ php_converter_resolve_callback */
static void php_converter_resolve_callback(
zend_fcall_info_cache *fcc,
- zend_object *obj,
+ zend_object *this_ptr,
const char *callback_name,
size_t callback_name_len
) {
- zend_function *fn = reinterpret_cast<zend_function *>(zend_hash_str_find_ptr_lc(&obj->ce->function_table, callback_name, callback_name_len));
+ zend_function *fn = reinterpret_cast<zend_function *>(zend_hash_str_find_ptr_lc(&this_ptr->ce->function_table, callback_name, callback_name_len));
ZEND_ASSERT(fn != nullptr);
fcc->function_handler = fn;
- fcc->object = obj;
- fcc->called_scope = obj->ce;
- fcc->calling_scope = nullptr;
+ fcc->object = this_ptr;
+ fcc->called_scope = this_ptr->ce;
fcc->closure = nullptr;
}
-/* }}} */
/* {{{ */
PHP_METHOD(UConverter, __construct) {