Skip to content

intl: various minor refactorings (2026-10 n1) #24625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Girgias wants to merge 9 commits into from
+97 −180
Closed

intl: various minor refactorings (2026-10 n1) #24625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b13ac10
intl: refactor collator
Girgias Oct 23, 2026
766907c
intl: use C++ name mangling for BreakIterator PHP functions/methods
Girgias Oct 23, 2026
51c0bf7
intl: use C++ name mangling for common code
Girgias Oct 23, 2026
38a5376
intl: use C++ name mangling for Spoofchecker PHP methods
Girgias Oct 23, 2026
abe7483
intl: use C++ name mangling for IntlNumberRangeFormatter PHP methods
Girgias Oct 23, 2026
c6e8423
intl: use C++ name mangling for IntlNumberFormatter PHP methods
Girgias Oct 23, 2026
bc052db
intl: No need to extern C the arginfo header for IntlListFormatter
Girgias Oct 23, 2026
e7de751
intl: use C++ name mangling for resourcebundle_get_iterator
Girgias Oct 16, 2026
b2ec27a
intl: refactor intl_convertcpp.cpp
Girgias Oct 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ext/intl/breakiterator/breakiterator_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@

#define USE_BREAKITERATOR_POINTER 1
#include "breakiterator_class.h"
BEGIN_EXTERN_C()
#include "breakiterator_arginfo.h"
END_EXTERN_C()
#include <zend_exceptions.h>
#include <zend_interfaces.h>
#include <assert.h>
Expand All @@ -53,7 +51,7 @@ static void breakiterator_object_construct(zval *object,
bio->biter = biter;
}

U_CFUNC void breakiterator_object_create(zval *object,
void breakiterator_object_create(zval *object,
BreakIterator *biter, int brand_new)
{
UClassID classId = biter->getDynamicClassID();
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/breakiterator/breakiterator_class.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ typedef struct {
RETURN_THROWS(); \
}

BEGIN_EXTERN_C()
void breakiterator_object_create(zval *object, BreakIterator *break_iter, int brand_new);

BEGIN_EXTERN_C()
void breakiterator_register_BreakIterator_class(void);

extern zend_class_entry *BreakIterator_ce_ptr,
Expand Down
6 changes: 2 additions & 4 deletions ext/intl/breakiterator/breakiterator_iterators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@

#define USE_BREAKITERATOR_POINTER
#include "breakiterator_class.h"
BEGIN_EXTERN_C()
#include "breakiterator_iterators_arginfo.h"
END_EXTERN_C()
#include "../intl_convert.h"
#include "../locale/locale.h"
#include <zend_exceptions.h>
Expand Down Expand Up @@ -253,7 +251,7 @@ void IntlIterator_from_BreakIterator_parts(zval *break_iter_zv,
((zoi_break_iter_parts*)ii->iterator)->index_right = 0;
}

U_CFUNC PHP_METHOD(IntlPartsIterator, getBreakIterator)
PHP_METHOD(IntlPartsIterator, getBreakIterator)
{
INTLITERATOR_METHOD_INIT_VARS;

Expand All @@ -264,7 +262,7 @@ U_CFUNC PHP_METHOD(IntlPartsIterator, getBreakIterator)
RETURN_COPY_DEREF(&ii->iterator->data);
}

U_CFUNC PHP_METHOD(IntlPartsIterator, getRuleStatus)
PHP_METHOD(IntlPartsIterator, getRuleStatus)
{
INTLITERATOR_METHOD_INIT_VARS;

Expand Down
1 change: 0 additions & 1 deletion ext/intl/breakiterator/breakiterator_iterators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <unicode/umachine.h>

#include <math.h>
#include <php.h>

typedef enum {
Expand Down
44 changes: 22 additions & 22 deletions ext/intl/breakiterator/breakiterator_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ using PHP::CodePointBreakIterator;
using icu::BreakIterator;
using icu::Locale;

U_CFUNC PHP_METHOD(IntlBreakIterator, __construct)
PHP_METHOD(IntlBreakIterator, __construct)
{
zend_throw_exception( NULL,
"An object of this type cannot be created with the new operator",
Expand Down Expand Up @@ -68,42 +68,42 @@ static void _breakiter_factory(
breakiterator_object_create(return_value, biter, 1);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, createWordInstance)
PHP_METHOD(IntlBreakIterator, createWordInstance)
{
_breakiter_factory(
&BreakIterator::createWordInstance,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, createLineInstance)
PHP_METHOD(IntlBreakIterator, createLineInstance)
{
_breakiter_factory(
&BreakIterator::createLineInstance,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, createCharacterInstance)
PHP_METHOD(IntlBreakIterator, createCharacterInstance)
{
_breakiter_factory(
&BreakIterator::createCharacterInstance,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, createSentenceInstance)
PHP_METHOD(IntlBreakIterator, createSentenceInstance)
{
_breakiter_factory(
&BreakIterator::createSentenceInstance,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, createTitleInstance)
PHP_METHOD(IntlBreakIterator, createTitleInstance)
{
_breakiter_factory(
&BreakIterator::createTitleInstance,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, createCodePointInstance)
PHP_METHOD(IntlBreakIterator, createCodePointInstance)
{
intl_error_reset(NULL);

Expand All @@ -113,7 +113,7 @@ U_CFUNC PHP_METHOD(IntlBreakIterator, createCodePointInstance)
breakiterator_object_create(return_value, cpbi, 1);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, getText)
PHP_METHOD(IntlBreakIterator, getText)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand All @@ -129,7 +129,7 @@ U_CFUNC PHP_METHOD(IntlBreakIterator, getText)
}
}

U_CFUNC PHP_METHOD(IntlBreakIterator, setText)
PHP_METHOD(IntlBreakIterator, setText)
{
UText *ut = NULL;
zend_string *text;
Expand Down Expand Up @@ -198,25 +198,25 @@ static void _breakiter_int32_ret_int32(
RETURN_LONG((zend_long)res);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, first)
PHP_METHOD(IntlBreakIterator, first)
{
_breakiter_no_args_ret_int32(&BreakIterator::first,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, last)
PHP_METHOD(IntlBreakIterator, last)
{
_breakiter_no_args_ret_int32(&BreakIterator::last,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, previous)
PHP_METHOD(IntlBreakIterator, previous)
{
_breakiter_no_args_ret_int32(&BreakIterator::previous,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, next)
PHP_METHOD(IntlBreakIterator, next)
{
zval *arg = NULL;

Expand All @@ -235,7 +235,7 @@ U_CFUNC PHP_METHOD(IntlBreakIterator, next)
}
}

U_CFUNC PHP_METHOD(IntlBreakIterator, current)
PHP_METHOD(IntlBreakIterator, current)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand All @@ -249,21 +249,21 @@ U_CFUNC PHP_METHOD(IntlBreakIterator, current)
RETURN_LONG((zend_long)res);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, following)
PHP_METHOD(IntlBreakIterator, following)
{
_breakiter_int32_ret_int32(
&BreakIterator::following,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, preceding)
PHP_METHOD(IntlBreakIterator, preceding)
{
_breakiter_int32_ret_int32(
&BreakIterator::preceding,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, isBoundary)
PHP_METHOD(IntlBreakIterator, isBoundary)
{
zend_long offset;
BREAKITER_METHOD_INIT_VARS;
Expand All @@ -285,7 +285,7 @@ U_CFUNC PHP_METHOD(IntlBreakIterator, isBoundary)
RETURN_BOOL((zend_long)res);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, getLocale)
PHP_METHOD(IntlBreakIterator, getLocale)
{
zend_long locale_type;
BREAKITER_METHOD_INIT_VARS;
Expand All @@ -309,7 +309,7 @@ U_CFUNC PHP_METHOD(IntlBreakIterator, getLocale)
RETURN_STRING(locale.getName());
}

U_CFUNC PHP_METHOD(IntlBreakIterator, getPartsIterator)
PHP_METHOD(IntlBreakIterator, getPartsIterator)
{
zend_long key_type = 0;
BREAKITER_METHOD_INIT_VARS;
Expand All @@ -334,7 +334,7 @@ U_CFUNC PHP_METHOD(IntlBreakIterator, getPartsIterator)
object, return_value, (parts_iter_key_type)key_type);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, getErrorCode)
PHP_METHOD(IntlBreakIterator, getErrorCode)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand All @@ -346,7 +346,7 @@ U_CFUNC PHP_METHOD(IntlBreakIterator, getErrorCode)
RETURN_LONG((zend_long)BREAKITER_ERROR_CODE(bio));
}

U_CFUNC PHP_METHOD(IntlBreakIterator, getErrorMessage)
PHP_METHOD(IntlBreakIterator, getErrorMessage)
{
zend_string* message = NULL;
BREAKITER_METHOD_INIT_VARS;
Expand All @@ -362,7 +362,7 @@ U_CFUNC PHP_METHOD(IntlBreakIterator, getErrorMessage)
RETURN_STR(message);
}

U_CFUNC PHP_METHOD(IntlBreakIterator, getIterator)
PHP_METHOD(IntlBreakIterator, getIterator)
{
ZEND_PARSE_PARAMETERS_NONE();

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/breakiterator/codepointiterator_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ static inline CodePointBreakIterator *fetch_cpbi(BreakIterator_object *bio) {
return (CodePointBreakIterator*)bio->biter;
}

U_CFUNC PHP_METHOD(IntlCodePointBreakIterator, getLastCodePoint)
PHP_METHOD(IntlCodePointBreakIterator, getLastCodePoint)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand Down
10 changes: 5 additions & 5 deletions ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
return (RuleBasedBreakIterator*)bio->biter;
}

U_CFUNC PHP_METHOD(IntlRuleBasedBreakIterator, __construct)
PHP_METHOD(IntlRuleBasedBreakIterator, __construct)
{
zend_string *rules;
bool compiled = false;
Expand Down Expand Up @@ -90,7 +90,7 @@ U_CFUNC PHP_METHOD(IntlRuleBasedBreakIterator, __construct)
}
}

U_CFUNC PHP_METHOD(IntlRuleBasedBreakIterator, getRules)
PHP_METHOD(IntlRuleBasedBreakIterator, getRules)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand All @@ -112,7 +112,7 @@ U_CFUNC PHP_METHOD(IntlRuleBasedBreakIterator, getRules)
RETVAL_STR(u8str);
}

U_CFUNC PHP_METHOD(IntlRuleBasedBreakIterator, getRuleStatus)
PHP_METHOD(IntlRuleBasedBreakIterator, getRuleStatus)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand All @@ -124,7 +124,7 @@ U_CFUNC PHP_METHOD(IntlRuleBasedBreakIterator, getRuleStatus)
RETURN_LONG(fetch_rbbi(bio)->getRuleStatus());
}

U_CFUNC PHP_METHOD(IntlRuleBasedBreakIterator, getRuleStatusVec)
PHP_METHOD(IntlRuleBasedBreakIterator, getRuleStatusVec)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand Down Expand Up @@ -154,7 +154,7 @@ U_CFUNC PHP_METHOD(IntlRuleBasedBreakIterator, getRuleStatusVec)
}
}

U_CFUNC PHP_METHOD(IntlRuleBasedBreakIterator, getBinaryRules)
PHP_METHOD(IntlRuleBasedBreakIterator, getBinaryRules)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand Down
2 changes: 0 additions & 2 deletions ext/intl/collator/collator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#ifndef COLLATOR_COLLATOR_H
#define COLLATOR_COLLATOR_H

#include <php.h>

#define COLLATOR_SORT_REGULAR 0
#define COLLATOR_SORT_STRING 1
#define COLLATOR_SORT_NUMERIC 2
Expand Down
39 changes: 17 additions & 22 deletions ext/intl/collator/collator_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,32 @@ static zend_object_handlers Collator_handlers;
* Auxiliary functions needed by objects of 'Collator' class
*/

/* {{{ Collator_objects_free */
void Collator_objects_free(zend_object *object )
/* Clean up mem allocted by internals of Collator_object */
static void collator_object_destroy( Collator_object* co )
{
if( !co )
return;

if( co->ucoll )
{
ucol_close( co->ucoll );
co->ucoll = nullptr;
}

intl_error_reset( COLLATOR_ERROR_P( co ) );
}

static void Collator_objects_free(zend_object *object )
{
Collator_object* co = php_intl_collator_fetch_object(object);

zend_object_std_dtor(&co->zo );

collator_object_destroy(co );
}
/* }}} */

/* {{{ Collator_object_create */
U_CFUNC zend_object *Collator_object_create(zend_class_entry *ce )
static zend_object *Collator_object_create(zend_class_entry *ce )
{
Collator_object *intern = reinterpret_cast<Collator_object *>(zend_object_alloc(sizeof(Collator_object), ce));
intl_error_init(COLLATOR_ERROR_P(intern));
Expand Down Expand Up @@ -82,21 +95,3 @@ U_CFUNC void collator_register_Collator_symbols(int module_number)
Collator_handlers.free_obj = Collator_objects_free;
}
/* }}} */

/* {{{ void collator_object_destroy( Collator_object* co )
* Clean up mem allocted by internals of Collator_object
*/
U_CFUNC void collator_object_destroy( Collator_object* co )
{
if( !co )
return;

if( co->ucoll )
{
ucol_close( co->ucoll );
co->ucoll = nullptr;
}

intl_error_reset( COLLATOR_ERROR_P( co ) );
}
/* }}} */
1 change: 0 additions & 1 deletion ext/intl/collator/collator_class.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ static zend_always_inline zend_result collator_check_initialized(Collator_object
}
BEGIN_EXTERN_C()
void collator_register_Collator_symbols(int module_number);
void collator_object_destroy( Collator_object* co );

extern zend_class_entry *Collator_ce_ptr;
END_EXTERN_C()
Expand Down
Loading
Loading