-
Notifications
You must be signed in to change notification settings - Fork 7.8k
Intl: Add a new IntlListFormatter class #18519
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.
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
Open
BogdanUngureanu
wants to merge
9
commits into
php:master
Choose a base branch
from
BogdanUngureanu:intl-add-list-formatter
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
ea1ee1c
Intl: Add IntlListFormatter class
BogdanUngureanu 9236166
Skip test if ICU is older than 67
BogdanUngureanu 29f0ebb
Call ZEND_PARSE_PARAMETERS_NONE in getErrorCode and getErrorMessage
BogdanUngureanu a2dd8e9
Make IntlListFormatter final, not serializable and use strict properties
BogdanUngureanu e31bfe4
Added more validation for parameters and fixed coding style
BogdanUngureanu 8524fdc
Attempt to fix the windows build failure
BogdanUngureanu a096a14
Simplify the implementation
BogdanUngureanu 7ef1380
Fix leak and simplify error handling
BogdanUngureanu 6852001
Add more tests
BogdanUngureanu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
<?php | ||
|
||
/** @generate-class-entries */ | ||
|
||
/** | ||
* @not-serializable | ||
* @strict-properties | ||
*/ | ||
final class IntlListFormatter { | ||
|
||
/** @cvalue ULISTFMT_TYPE_OR */ | ||
public const int TYPE_OR = UNKNOWN; | ||
|
||
/** @cvalue ULISTFMT_TYPE_UNITS */ | ||
public const int TYPE_UNITS = UNKNOWN; | ||
|
||
/** @cvalue ULISTFMT_TYPE_AND */ | ||
public const int TYPE_AND = UNKNOWN; | ||
|
||
/** @cvalue ULISTFMT_WIDTH_WIDE */ | ||
public const int WIDTH_WIDE = UNKNOWN; | ||
|
||
/** @cvalue ULISTFMT_WIDTH_SHORT */ | ||
public const int WIDTH_SHORT = UNKNOWN; | ||
|
||
/** @cvalue ULISTFMT_WIDTH_NARROW */ | ||
public const int WIDTH_NARROW = UNKNOWN; | ||
|
||
public function __construct(string $locale, int $type = IntlListFormatter::TYPE_AND, int $width = IntlListFormatter::WIDTH_WIDE) {} | ||
|
||
public function format(array $strings): string|false {} | ||
|
||
public function getErrorCode(): int {} | ||
|
||
public function getErrorMessage(): string {} | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,255 @@ | ||
/* | ||
+----------------------------------------------------------------------+ | ||
| This source file is subject to version 3.01 of the PHP license, | | ||
| that is bundled with this package in the file LICENSE, and is | | ||
| available through the world-wide-web at the following url: | | ||
| https://www.php.net/license/3_01.txt | | ||
| If you did not receive a copy of the PHP license and are unable to | | ||
| obtain it through the world-wide-web, please send a note to | | ||
| [email protected] so we can mail you a copy immediately. | | ||
+----------------------------------------------------------------------+ | ||
| Authors: Bogdan Ungureanu <[email protected]> | | ||
+----------------------------------------------------------------------+ | ||
*/ | ||
|
||
#include "php.h" | ||
#include "php_intl.h" | ||
#include <unicode/ulistformatter.h> | ||
#include "listformatter_arginfo.h" | ||
#include "listformatter_class.h" | ||
#include "intl_convert.h" | ||
|
||
static zend_object_handlers listformatter_handlers; | ||
|
||
/* {{{ listformatter_free_obj */ | ||
static void listformatter_free_obj(zend_object *object) | ||
{ | ||
ListFormatter_object *obj = php_intl_listformatter_fetch_object(object); | ||
|
||
if( obj->lf_data.ulistfmt ) | ||
ulistfmt_close( obj->lf_data.ulistfmt ); | ||
|
||
obj->lf_data.ulistfmt = NULL; | ||
intl_error_reset( &obj->lf_data.error ); | ||
|
||
zend_object_std_dtor(&obj->zo); | ||
} | ||
/* }}} */ | ||
|
||
/* {{{ listformatter_create_object */ | ||
static zend_object *listformatter_create_object(zend_class_entry *class_type) | ||
{ | ||
ListFormatter_object *obj; | ||
obj = zend_object_alloc(sizeof(ListFormatter_object), class_type); | ||
|
||
obj->lf_data.ulistfmt = NULL; | ||
intl_error_reset( &obj->lf_data.error ); | ||
|
||
zend_object_std_init(&obj->zo, class_type); | ||
object_properties_init(&obj->zo, class_type); | ||
obj->zo.handlers = &listformatter_handlers; | ||
return &obj->zo; | ||
} | ||
/* }}} */ | ||
|
||
/* {{{ listformatter_create_object */ | ||
PHP_METHOD(IntlListFormatter, __construct) | ||
{ | ||
ListFormatter_object *obj = Z_INTL_LISTFORMATTER_P(ZEND_THIS); | ||
char* locale; | ||
size_t locale_len = 0; | ||
zend_long type = ULISTFMT_TYPE_AND; | ||
zend_long width = ULISTFMT_WIDTH_WIDE; | ||
ZEND_PARSE_PARAMETERS_START(1, 3) | ||
Z_PARAM_STRING(locale, locale_len) | ||
Z_PARAM_OPTIONAL | ||
Z_PARAM_LONG(type) | ||
Z_PARAM_LONG(width) | ||
ZEND_PARSE_PARAMETERS_END(); | ||
|
||
if(locale_len == 0) { | ||
locale = (char *)intl_locale_get_default(); | ||
} | ||
|
||
if (locale_len > INTL_MAX_LOCALE_LEN) { | ||
zend_argument_value_error(1, "Locale string too long, should be no longer than %d characters", INTL_MAX_LOCALE_LEN); | ||
RETURN_THROWS(); | ||
} | ||
|
||
if (strlen(uloc_getISO3Language(locale)) == 0) { | ||
zend_argument_value_error(1, "\"%s\" is invalid", locale); | ||
RETURN_THROWS(); | ||
} | ||
|
||
UErrorCode status = U_ZERO_ERROR; | ||
#if U_ICU_VERSION_MAJOR_NUM >= 67 | ||
if (type != ULISTFMT_TYPE_AND && type != ULISTFMT_TYPE_OR && type != ULISTFMT_TYPE_UNITS) { | ||
zend_argument_value_error(2, "must be one of IntlListFormatter::TYPE_AND, IntlListFormatter::TYPE_OR, or IntlListFormatter::TYPE_UNITS"); | ||
RETURN_THROWS(); | ||
} | ||
|
||
if (width != ULISTFMT_WIDTH_WIDE && width != ULISTFMT_WIDTH_SHORT && width != ULISTFMT_WIDTH_NARROW) { | ||
zend_argument_value_error(3, "must be one of IntlListFormatter::WIDTH_WIDE, IntlListFormatter::WIDTH_SHORT, or IntlListFormatter::WIDTH_NARROW"); | ||
RETURN_THROWS(); | ||
} | ||
|
||
LISTFORMATTER_OBJECT(obj) = ulistfmt_openForType(locale, type, width, &status); | ||
#else | ||
if (type != ULISTFMT_TYPE_AND) { | ||
zend_argument_value_error(2, "ICU 66 and below only support IntlListFormatter::TYPE_AND"); | ||
RETURN_THROWS(); | ||
} | ||
|
||
if (width != ULISTFMT_WIDTH_WIDE) { | ||
zend_argument_value_error(3, "ICU 66 and below only support IntlListFormatter::WIDTH_WIDE"); | ||
RETURN_THROWS(); | ||
} | ||
|
||
LISTFORMATTER_OBJECT(obj) = ulistfmt_open(locale, &status); | ||
#endif | ||
|
||
if (U_FAILURE(status)) { | ||
intl_error_set(NULL, status, "Constructor failed", 0); | ||
zend_throw_exception(IntlException_ce_ptr, "Constructor failed", 0); | ||
RETURN_THROWS(); | ||
} | ||
} | ||
/* }}} */ | ||
|
||
/* {{{ listformatter_format */ | ||
PHP_METHOD(IntlListFormatter, format) | ||
{ | ||
ListFormatter_object *obj = Z_INTL_LISTFORMATTER_P(ZEND_THIS); | ||
zval *strings; | ||
|
||
ZEND_PARSE_PARAMETERS_START(1, 1) | ||
Z_PARAM_ARRAY(strings) | ||
ZEND_PARSE_PARAMETERS_END(); | ||
|
||
if (!LISTFORMATTER_OBJECT(obj)) { | ||
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "ListFormatter not properly constructed", 0); | ||
RETURN_FALSE; | ||
} | ||
|
||
HashTable *ht = Z_ARRVAL_P(strings); | ||
uint32_t count = zend_array_count(ht); | ||
if (count == 0) { | ||
RETURN_EMPTY_STRING(); | ||
} | ||
|
||
const UChar **items = (const UChar **)safe_emalloc(count, sizeof(const UChar *), 0); | ||
int32_t *itemLengths = (int32_t *)safe_emalloc(count, sizeof(int32_t), 0); | ||
uint32_t i = 0; | ||
zval *val; | ||
|
||
ZEND_HASH_FOREACH_VAL(ht, val) { | ||
zend_string *str_val; | ||
|
||
str_val = zval_get_string(val); | ||
|
||
// Convert PHP string to UTF-16 | ||
UChar *ustr = NULL; | ||
int32_t ustr_len = 0; | ||
UErrorCode status = U_ZERO_ERROR; | ||
|
||
intl_convert_utf8_to_utf16(&ustr, &ustr_len, ZSTR_VAL(str_val), ZSTR_LEN(str_val), &status); | ||
zend_string_release(str_val); | ||
|
||
if (U_FAILURE(status)) { | ||
// We can't use goto cleanup because items and itemLengths are incompletely allocated | ||
for (uint32_t j = 0; j < i; j++) { | ||
efree((void *)items[j]); | ||
} | ||
efree(items); | ||
BogdanUngureanu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
efree(itemLengths); | ||
intl_error_set(NULL, status, "Failed to convert string to UTF-16", 0); | ||
RETURN_FALSE; | ||
} | ||
|
||
items[i] = ustr; | ||
itemLengths[i] = ustr_len; | ||
i++; | ||
} ZEND_HASH_FOREACH_END(); | ||
|
||
UErrorCode status = U_ZERO_ERROR; | ||
int32_t resultLength; | ||
UChar *result = NULL; | ||
|
||
resultLength = ulistfmt_format(LISTFORMATTER_OBJECT(obj), items, itemLengths, count, NULL, 0, &status); | ||
|
||
if (U_FAILURE(status) && status != U_BUFFER_OVERFLOW_ERROR) { | ||
intl_error_set(NULL, status, "Failed to format list", 0); | ||
BogdanUngureanu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
RETVAL_FALSE; | ||
goto cleanup; | ||
} | ||
|
||
// Allocate buffer and try again | ||
status = U_ZERO_ERROR; | ||
result = (UChar *)emalloc((resultLength + 1) * sizeof(UChar)); | ||
ulistfmt_format(LISTFORMATTER_OBJECT(obj), items, itemLengths, count, result, resultLength, &status); | ||
|
||
if (U_FAILURE(status)) { | ||
if (result) { | ||
efree(result); | ||
} | ||
intl_error_set(NULL, status, "Failed to format list", 0); | ||
RETVAL_FALSE; | ||
goto cleanup; | ||
} | ||
|
||
// Convert result back to UTF-8 | ||
zend_string *ret = intl_convert_utf16_to_utf8(result, resultLength, &status); | ||
efree(result); | ||
|
||
if (!ret) { | ||
intl_error_set(NULL, status, "Failed to convert result to UTF-8", 0); | ||
RETVAL_FALSE; | ||
} else { | ||
RETVAL_NEW_STR(ret); | ||
} | ||
|
||
cleanup: | ||
for (i = 0; i < count; i++) { | ||
efree((void *)items[i]); | ||
} | ||
efree(items); | ||
efree(itemLengths); | ||
} | ||
/* }}} */ | ||
|
||
/* {{{ listformatter_getErrorCode */ | ||
PHP_METHOD(IntlListFormatter, getErrorCode) | ||
{ | ||
ZEND_PARSE_PARAMETERS_NONE(); | ||
|
||
ListFormatter_object *obj = Z_INTL_LISTFORMATTER_P(ZEND_THIS); | ||
TimWolla marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
UErrorCode status = intl_error_get_code(LISTFORMATTER_ERROR_P(obj)); | ||
|
||
RETURN_LONG(status); | ||
} | ||
/* }}} */ | ||
|
||
/* {{{ listformatter_getErrorMessage */ | ||
PHP_METHOD(IntlListFormatter, getErrorMessage) | ||
{ | ||
ZEND_PARSE_PARAMETERS_NONE(); | ||
|
||
ListFormatter_object *obj = Z_INTL_LISTFORMATTER_P(ZEND_THIS); | ||
|
||
zend_string *message = intl_error_get_message(LISTFORMATTER_ERROR_P(obj)); | ||
RETURN_STR(message); | ||
} | ||
/* }}} */ | ||
|
||
/* {{{ listformatter_register_class */ | ||
void listformatter_register_class(void) | ||
{ | ||
zend_class_entry *class_entry = register_class_IntlListFormatter(); | ||
class_entry->create_object = listformatter_create_object; | ||
|
||
memcpy(&listformatter_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); | ||
listformatter_handlers.offset = XtOffsetOf(ListFormatter_object, zo); | ||
listformatter_handlers.free_obj = listformatter_free_obj; | ||
} | ||
/* }}} */ |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: do you get a warning during your build if you remove the (void *) cast ? unsure it s really necessary.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yep, I get a warning:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the const qualifier ... can items just be mutable and eventually doing the cast at
ulistfmt_format
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm... I'm not sure if that's simpler because we also need to convert it to utf16