mirror of
https://github.com/php/php-src.git
synced 2025-08-15 13:38:49 +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
78 lines
2.4 KiB
C
78 lines
2.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: Vadim Savchuk <vsavchuk@productengine.com> |
|
|
| Dmitry Lakhtyuk <dlakhtyuk@productengine.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include "php_intl.h"
|
|
#include "collator_class.h"
|
|
#include "intl_data.h"
|
|
|
|
/* {{{ */
|
|
static int collator_ctor(INTERNAL_FUNCTION_PARAMETERS)
|
|
{
|
|
char* locale;
|
|
size_t locale_len = 0;
|
|
zval* object;
|
|
Collator_object* co;
|
|
|
|
intl_error_reset( NULL );
|
|
object = return_value;
|
|
ZEND_PARSE_PARAMETERS_START(1, 1)
|
|
Z_PARAM_STRING(locale, locale_len)
|
|
ZEND_PARSE_PARAMETERS_END_EX(return FAILURE);
|
|
|
|
INTL_CHECK_LOCALE_LEN_OR_FAILURE(locale_len);
|
|
COLLATOR_METHOD_FETCH_OBJECT;
|
|
|
|
if(locale_len == 0) {
|
|
locale = (char *)intl_locale_get_default();
|
|
}
|
|
|
|
/* Open ICU collator. */
|
|
co->ucoll = ucol_open( locale, COLLATOR_ERROR_CODE_P( co ) );
|
|
INTL_CTOR_CHECK_STATUS(co, "unable to open ICU collator");
|
|
return SUCCESS;
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ Create collator. */
|
|
PHP_FUNCTION( collator_create )
|
|
{
|
|
object_init_ex( return_value, Collator_ce_ptr );
|
|
if (collator_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
|
|
zval_ptr_dtor(return_value);
|
|
RETURN_NULL();
|
|
}
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ Collator object constructor. */
|
|
PHP_METHOD( Collator, __construct )
|
|
{
|
|
const bool old_use_exception = INTL_G(use_exceptions);
|
|
const zend_long old_error_level = INTL_G(error_level);
|
|
INTL_G(use_exceptions) = true;
|
|
INTL_G(error_level) = 0;
|
|
|
|
return_value = ZEND_THIS;
|
|
if (collator_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
|
|
ZEND_ASSERT(EG(exception));
|
|
}
|
|
INTL_G(use_exceptions) = old_use_exception;
|
|
INTL_G(error_level) = old_error_level;
|
|
}
|
|
/* }}} */
|