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
58 lines
1.5 KiB
PHP
58 lines
1.5 KiB
PHP
--TEST--
|
|
locale_compose_locale() errors
|
|
--EXTENSIONS--
|
|
intl
|
|
--FILE--
|
|
<?php
|
|
|
|
$parts1 = [
|
|
Locale::LANG_TAG => 45,
|
|
Locale::REGION_TAG => false,
|
|
Locale::SCRIPT_TAG => 15,
|
|
];
|
|
|
|
var_dump(Locale::composeLocale($parts1));
|
|
var_dump(intl_get_error_message());
|
|
var_dump(locale_compose($parts1));
|
|
var_dump(intl_get_error_message());
|
|
|
|
$parts2 = [
|
|
Locale::LANG_TAG => 'de',
|
|
Locale::REGION_TAG => 'DE',
|
|
'private0' => 13,
|
|
'variant1' => array(),
|
|
'extlang2' => false
|
|
];
|
|
|
|
var_dump(Locale::composeLocale($parts2));
|
|
var_dump(intl_get_error_message());
|
|
var_dump(locale_compose($parts2));
|
|
var_dump(intl_get_error_message());
|
|
|
|
$parts3 = [
|
|
Locale::REGION_TAG => 'DE',
|
|
];
|
|
|
|
try {
|
|
var_dump(Locale::composeLocale($parts3));
|
|
} catch (Throwable $e) {
|
|
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
|
|
}
|
|
try {
|
|
var_dump(locale_compose($parts3));
|
|
} catch (Throwable $e) {
|
|
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
|
|
}
|
|
|
|
?>
|
|
--EXPECT--
|
|
bool(false)
|
|
string(90) "Locale::composeLocale(): parameter array element is not a string: U_ILLEGAL_ARGUMENT_ERROR"
|
|
bool(false)
|
|
string(83) "locale_compose(): parameter array element is not a string: U_ILLEGAL_ARGUMENT_ERROR"
|
|
bool(false)
|
|
string(90) "Locale::composeLocale(): parameter array element is not a string: U_ILLEGAL_ARGUMENT_ERROR"
|
|
bool(false)
|
|
string(83) "locale_compose(): parameter array element is not a string: U_ILLEGAL_ARGUMENT_ERROR"
|
|
ValueError: Locale::composeLocale(): Argument #1 ($subtags) must contain a "language" key
|
|
ValueError: locale_compose(): Argument #1 ($subtags) must contain a "language" key
|