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
40 lines
1.1 KiB
PHP
40 lines
1.1 KiB
PHP
--TEST--
|
|
Collator creation errors
|
|
--EXTENSIONS--
|
|
intl
|
|
--FILE--
|
|
<?php
|
|
|
|
$locales = [
|
|
'uk-ua_CALIFORNIA@currency=;currency=GRN',
|
|
str_repeat('a', 160),
|
|
];
|
|
|
|
foreach ($locales as $locale) {
|
|
try {
|
|
$c = new Collator($locale);
|
|
} catch (Throwable $e) {
|
|
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
|
|
}
|
|
|
|
$c = Collator::create($locale);
|
|
var_dump($c);
|
|
var_dump(intl_get_error_message());
|
|
|
|
$c = collator_create($locale);
|
|
var_dump($c);
|
|
var_dump(intl_get_error_message());
|
|
}
|
|
|
|
?>
|
|
--EXPECT--
|
|
IntlException: Collator::__construct(): unable to open ICU collator
|
|
NULL
|
|
string(73) "Collator::create(): unable to open ICU collator: U_ILLEGAL_ARGUMENT_ERROR"
|
|
NULL
|
|
string(72) "collator_create(): unable to open ICU collator: U_ILLEGAL_ARGUMENT_ERROR"
|
|
IntlException: Collator::__construct(): Locale string too long, should be no longer than 156 characters
|
|
NULL
|
|
string(109) "Collator::create(): Locale string too long, should be no longer than 156 characters: U_ILLEGAL_ARGUMENT_ERROR"
|
|
NULL
|
|
string(108) "collator_create(): Locale string too long, should be no longer than 156 characters: U_ILLEGAL_ARGUMENT_ERROR"
|