Skip to content

ext/intl: Pre-size arrays created from ICU enumerations #22483

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

Merged
LamentXU123 merged 2 commits into from
Jun 27, 2026
+23 −2
Merged

ext/intl: Pre-size arrays created from ICU enumerations #22483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
644aacd
ext/intl: Pre-size arrays created from ICU enumerations
kn1g78 Jun 27, 2026
b62b82f
add UPGRADING entry
LamentXU123 Jun 27, 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: 4 additions & 0 deletions UPGRADING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,10 @@ PHP 8.6 UPGRADE NOTES
. Improved performance of indentation generation in json_encode()
when using PHP_JSON_PRETTY_PRINT.

- Intl:
. Improved performance of transliterator_list_ids() and
resourcebundle_locales() by pre-allocating their returned arrays.

- Phar:
. Reduced temporary allocations when iterating Phar directories.

Expand Down
9 changes: 8 additions & 1 deletion ext/intl/resourcebundle/resourcebundle_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ U_CFUNC PHP_FUNCTION( resourcebundle_locales )
size_t bundlename_len = 0;
const char * entry;
int entry_len;
int32_t count;
UEnumeration *icuenum;
UErrorCode icuerror = U_ZERO_ERROR;

Expand All @@ -364,7 +365,13 @@ U_CFUNC PHP_FUNCTION( resourcebundle_locales )
uenum_reset( icuenum, &icuerror );
INTL_CHECK_STATUS(icuerror, "Cannot iterate locales list");

array_init( return_value );
count = uenum_count( icuenum, &icuerror );
if (U_FAILURE(icuerror)) {
count = 0;
icuerror = U_ZERO_ERROR;
}

array_init_size( return_value, count );
while ((entry = uenum_next( icuenum, &entry_len, &icuerror ))) {
add_next_index_stringl( return_value, (char *) entry, entry_len);
}
Expand Down
12 changes: 11 additions & 1 deletion ext/intl/transliterator/transliterator_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include <unicode/unistr.h>
#endif

#include <unicode/uenum.h>

extern "C" {
#include "php_intl.h"
#include "intl_data.h"
Expand Down Expand Up @@ -226,6 +228,7 @@ U_CFUNC PHP_FUNCTION( transliterator_list_ids )
UEnumeration *en;
const UChar *elem;
int32_t elem_len;
int32_t count;
UErrorCode status = U_ZERO_ERROR;

intl_error_reset( nullptr );
Expand All @@ -236,7 +239,14 @@ U_CFUNC PHP_FUNCTION( transliterator_list_ids )
INTL_CHECK_STATUS( status,
"Failed to obtain registered transliterators" );

array_init( return_value );
count = uenum_count( en, &status );
if( U_FAILURE( status ) )
{
count = 0;
status = U_ZERO_ERROR;
}

array_init_size( return_value, count );
while( (elem = uenum_unext( en, &elem_len, &status )) )
{
zend_string *el = intl_convert_utf16_to_utf8(elem, elem_len, &status );
Expand Down
Loading