mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01: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
55 lines
1.6 KiB
PHP
55 lines
1.6 KiB
PHP
--TEST--
|
|
IntlCalendar::toDateTime(): bad arguments
|
|
--EXTENSIONS--
|
|
intl
|
|
--FILE--
|
|
<?php
|
|
ini_set("intl.error_level", E_WARNING);
|
|
ini_set('date.timezone', 'Europe/Lisbon');
|
|
|
|
$cal = new IntlGregorianCalendar("Etc/Unknown");
|
|
try {
|
|
var_dump($cal->toDateTime());
|
|
} catch (Exception $e) {
|
|
var_dump("exception: {$e->getMessage()}");
|
|
}
|
|
|
|
try {
|
|
var_dump(intlcal_to_date_time($cal));
|
|
} catch (\Exception $e) {
|
|
var_dump($e->getMessage());
|
|
}
|
|
|
|
$cal = IntlCalendar::createInstance("Etc/Unknown");
|
|
try {
|
|
var_dump($cal->toDateTime());
|
|
} catch (\Exception $e) {
|
|
var_dump($e->getMessage());
|
|
}
|
|
|
|
try {
|
|
var_dump(intlcal_to_date_time($cal));
|
|
} catch (\Exception $e) {
|
|
var_dump($e->getMessage());
|
|
}
|
|
|
|
try {
|
|
var_dump(intlcal_to_date_time(3));
|
|
} catch (\TypeError $e) {
|
|
echo $e->getMessage() . \PHP_EOL;
|
|
}
|
|
?>
|
|
--EXPECTF--
|
|
Warning: IntlCalendar::toDateTime(): DateTimeZone constructor threw exception in %s on line %d
|
|
string(77) "exception: DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
|
|
|
|
Warning: intlcal_to_date_time(): DateTimeZone constructor threw exception in %s on line %d
|
|
string(66) "DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
|
|
|
|
Warning: IntlCalendar::toDateTime(): DateTimeZone constructor threw exception in %s on line %d
|
|
string(66) "DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
|
|
|
|
Warning: intlcal_to_date_time(): DateTimeZone constructor threw exception in %s on line %d
|
|
string(66) "DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
|
|
intlcal_to_date_time(): Argument #1 ($calendar) must be of type IntlCalendar, int given
|