mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +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
33 lines
759 B
PHP
33 lines
759 B
PHP
--TEST--
|
|
MessageFormatter::format() invalid UTF-8 for arg key or value
|
|
--EXTENSIONS--
|
|
intl
|
|
--INI--
|
|
intl.use_exceptions=On
|
|
--FILE--
|
|
<?php
|
|
|
|
$fmt = <<<EOD
|
|
{foo}
|
|
EOD;
|
|
|
|
$mf = new MessageFormatter('en_US', $fmt);
|
|
try {
|
|
var_dump($mf->format(array("foo" => 7, "\x80" => "bar")));
|
|
} catch (Throwable $e) {
|
|
var_dump($e::class === 'IntlException');
|
|
var_dump("MessageFormatter::format(): Invalid UTF-8 data in argument key: '\x80'" === $e->getMessage());
|
|
}
|
|
|
|
try {
|
|
var_dump($mf->format(array("foo" => "\x80")));
|
|
} catch (Throwable $e) {
|
|
var_dump($e::class === 'IntlException');
|
|
var_dump("MessageFormatter::format(): Invalid UTF-8 data in string argument: '\x80'" === $e->getMessage());
|
|
}
|
|
?>
|
|
--EXPECT--
|
|
bool(true)
|
|
bool(true)
|
|
bool(true)
|
|
bool(true)
|