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
49 lines
2.1 KiB
C
49 lines
2.1 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> |
|
|
| Stanislav Malyshev <stas@zend.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifndef INTL_ERROR_H
|
|
#define INTL_ERROR_H
|
|
|
|
#include <unicode/utypes.h>
|
|
#include <unicode/parseerr.h>
|
|
#include <zend_smart_str.h>
|
|
|
|
#define INTL_ERROR_CODE(e) (e).code
|
|
|
|
typedef struct {
|
|
zend_string *custom_error_message;
|
|
UErrorCode code;
|
|
} intl_error;
|
|
|
|
intl_error* intl_error_create( void );
|
|
void intl_error_init( intl_error* err );
|
|
void intl_error_reset( intl_error* err );
|
|
void intl_error_set_code( intl_error* err, UErrorCode err_code );
|
|
void intl_error_set_custom_msg( intl_error* err, const char* msg);
|
|
void intl_error_set( intl_error* err, UErrorCode code, const char* msg);
|
|
UErrorCode intl_error_get_code( intl_error* err );
|
|
zend_string* intl_error_get_message( intl_error* err );
|
|
|
|
// Wrappers to synchonize object's and global error structures.
|
|
void intl_errors_reset( intl_error* err );
|
|
void intl_errors_set_custom_msg( intl_error* err, const char* msg);
|
|
void intl_errors_set_code( intl_error* err, UErrorCode err_code );
|
|
void intl_errors_set( intl_error* err, UErrorCode code, const char* msg);
|
|
|
|
// Other error helpers
|
|
smart_str intl_parse_error_to_string( UParseError* pe );
|
|
|
|
#endif // INTL_ERROR_H
|