mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
6600d0e00f
This is a comprehensive refactoring of the error mechanism of the Intl extension. By moving the prefixing of the current method/function being executed to actual error message creation by accessing the execution context, we get the following benefits: - Accurate error messages indicating *what* call caused the error - As we *always* "copy" the message, the `copyMsg` arg becomes unused, meaning we can reduce the size of the `intl_error` struct by 4 bytes. - Saving it as a zend_string means we know the length of the message - Remove the need to pass around a "function name" `char*` across multiple calls - Use Intl's exception mechanism to generate exceptions for constructor call - This removes the need for replacing the error handler - Which didn't do anything anyway in silent mode, which required throwing non-descriptive exceptions
138 lines
4 KiB
C
138 lines
4 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| 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 |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Stanislav Malyshev <stas@zend.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include <unicode/ustring.h>
|
|
|
|
#include "php_intl.h"
|
|
#include "msgformat_class.h"
|
|
#include "msgformat_data.h"
|
|
#include "msgformat_helpers.h"
|
|
#include "intl_convert.h"
|
|
|
|
/* {{{ */
|
|
static void msgfmt_do_parse(MessageFormatter_object *mfo, char *source, size_t src_len, zval *return_value)
|
|
{
|
|
zval *fargs;
|
|
int count = 0;
|
|
int i;
|
|
UChar *usource = NULL;
|
|
int usrc_len = 0;
|
|
|
|
intl_convert_utf8_to_utf16(&usource, &usrc_len, source, src_len, &INTL_DATA_ERROR_CODE(mfo));
|
|
INTL_METHOD_CHECK_STATUS(mfo, "Converting parse string failed");
|
|
|
|
umsg_parse_helper(MSG_FORMAT_OBJECT(mfo), &count, &fargs, usource, usrc_len, &INTL_DATA_ERROR_CODE(mfo));
|
|
if (usource) {
|
|
efree(usource);
|
|
}
|
|
INTL_METHOD_CHECK_STATUS(mfo, "Parsing failed");
|
|
|
|
array_init_size(return_value, count);
|
|
zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
|
|
for(i=0;i<count;i++) {
|
|
add_next_index_zval(return_value, &fargs[i]);
|
|
}
|
|
efree(fargs);
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ Parse a message */
|
|
PHP_FUNCTION( msgfmt_parse )
|
|
{
|
|
char *source;
|
|
size_t source_len;
|
|
MSG_FORMAT_METHOD_INIT_VARS;
|
|
|
|
|
|
/* Parse parameters. */
|
|
if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
|
|
&object, MessageFormatter_ce_ptr, &source, &source_len ) == FAILURE )
|
|
{
|
|
RETURN_THROWS();
|
|
}
|
|
|
|
/* Fetch the object. */
|
|
MSG_FORMAT_METHOD_FETCH_OBJECT;
|
|
|
|
msgfmt_do_parse(mfo, source, source_len, return_value);
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ Parse a message. */
|
|
PHP_FUNCTION( msgfmt_parse_message )
|
|
{
|
|
UChar *spattern = NULL;
|
|
int spattern_len = 0;
|
|
char *pattern = NULL;
|
|
size_t pattern_len = 0;
|
|
char *slocale = NULL;
|
|
size_t slocale_len = 0;
|
|
char *source = NULL;
|
|
size_t src_len = 0;
|
|
MessageFormatter_object mf;
|
|
MessageFormatter_object *mfo = &mf;
|
|
|
|
ZEND_PARSE_PARAMETERS_START(3, 3)
|
|
Z_PARAM_STRING(slocale, slocale_len)
|
|
Z_PARAM_STRING(pattern, pattern_len)
|
|
Z_PARAM_STRING(source, src_len)
|
|
ZEND_PARSE_PARAMETERS_END();
|
|
|
|
INTL_CHECK_LOCALE_LEN(slocale_len);
|
|
memset(mfo, 0, sizeof(*mfo));
|
|
msgformat_data_init(&mfo->mf_data);
|
|
|
|
if(pattern && pattern_len) {
|
|
intl_convert_utf8_to_utf16(&spattern, &spattern_len, pattern, pattern_len, &INTL_DATA_ERROR_CODE(mfo));
|
|
if( U_FAILURE(INTL_DATA_ERROR_CODE((mfo))) )
|
|
{
|
|
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
|
|
"error converting pattern to UTF-16");
|
|
RETURN_FALSE;
|
|
}
|
|
} else {
|
|
spattern_len = 0;
|
|
spattern = NULL;
|
|
}
|
|
|
|
if(slocale_len == 0) {
|
|
slocale = (char *)intl_locale_get_default();
|
|
}
|
|
|
|
#ifdef MSG_FORMAT_QUOTE_APOS
|
|
if(msgformat_fix_quotes(&spattern, &spattern_len, &INTL_DATA_ERROR_CODE(mfo)) != SUCCESS) {
|
|
intl_error_set( NULL, U_INVALID_FORMAT_ERROR,
|
|
"msgfmt_parse_message: error converting pattern to quote-friendly format", 0 );
|
|
RETURN_FALSE;
|
|
}
|
|
#endif
|
|
|
|
/* Create an ICU message formatter. */
|
|
MSG_FORMAT_OBJECT(mfo) = umsg_open(spattern, spattern_len, slocale, NULL, &INTL_DATA_ERROR_CODE(mfo));
|
|
if(spattern && spattern_len) {
|
|
efree(spattern);
|
|
}
|
|
INTL_METHOD_CHECK_STATUS_OR_GOTO(mfo, "Creating message formatter failed", clean);
|
|
|
|
msgfmt_do_parse(mfo, source, src_len, return_value);
|
|
|
|
clean:
|
|
/* drop the temporary formatter */
|
|
msgformat_data_free(&mfo->mf_data);
|
|
}
|
|
/* }}} */
|