mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +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
60 lines
1.9 KiB
C
60 lines
1.9 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_convert.h"
|
|
|
|
#include <zend_API.h>
|
|
|
|
/* {{{ Gets the locale name of the collator. */
|
|
PHP_FUNCTION( collator_get_locale )
|
|
{
|
|
zend_long type = 0;
|
|
char* locale_name = NULL;
|
|
|
|
COLLATOR_METHOD_INIT_VARS
|
|
|
|
/* Parse parameters. */
|
|
if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
|
|
&object, Collator_ce_ptr, &type ) == FAILURE )
|
|
{
|
|
RETURN_THROWS();
|
|
}
|
|
|
|
/* Fetch the object. */
|
|
COLLATOR_METHOD_FETCH_OBJECT;
|
|
|
|
if (!co || !co->ucoll) {
|
|
intl_error_set_code( NULL, COLLATOR_ERROR_CODE( co ) );
|
|
intl_errors_set_custom_msg( COLLATOR_ERROR_P( co ), "Object not initialized");
|
|
zend_throw_error(NULL, "Object not initialized");
|
|
|
|
RETURN_THROWS();
|
|
}
|
|
|
|
/* Get locale by specified type. */
|
|
locale_name = (char*) ucol_getLocaleByType(
|
|
co->ucoll, type, COLLATOR_ERROR_CODE_P( co ) );
|
|
COLLATOR_CHECK_STATUS( co, "Error getting locale by type" );
|
|
|
|
/* Return it. */
|
|
RETVAL_STRINGL( locale_name, strlen(locale_name) );
|
|
}
|
|
/* }}} */
|