archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1'

Browse source
This commit is contained in:
Nikita Popov 2017-03-29 00:20:52 +02:00
commit a7c69486cd
7 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/intl/common/common_date.cpp
View file

@ -139,8 +139,8 @@ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
php_date_obj *datetime; php_date_obj *datetime;
datetime = Z_PHPDATE_P(z); datetime = Z_PHPDATE_P(z);
if (!datetime->time) { if (!datetime->time) {
spprintf(&message, 0, "%s: the DateTime object is not properly " spprintf(&message, 0, "%s: the %s object is not properly "
"initialized", func); "initialized", func, ZSTR_VAL(Z_OBJCE_P(z)->name));
intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
message, 1); message, 1);
efree(message); efree(message);
@ -199,7 +199,7 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func)
rv = U_MILLIS_PER_SECOND * Z_DVAL_P(z); rv = U_MILLIS_PER_SECOND * Z_DVAL_P(z);
break; break;
case IS_OBJECT: case IS_OBJECT:
if (instanceof_function(Z_OBJCE_P(z), php_date_get_date_ce())) { if (instanceof_function(Z_OBJCE_P(z), php_date_get_interface_ce())) {
intl_datetime_decompose(z, &rv, NULL, err, func); intl_datetime_decompose(z, &rv, NULL, err, func);
} else if (instanceof_function(Z_OBJCE_P(z), Calendar_ce_ptr)) { } else if (instanceof_function(Z_OBJCE_P(z), Calendar_ce_ptr)) {
Calendar_object *co = Z_INTL_CALENDAR_P(z); Calendar_object *co = Z_INTL_CALENDAR_P(z);
@ -222,7 +222,7 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func)
} else { } else {
/* TODO: try with cast(), get() to obtain a number */ /* TODO: try with cast(), get() to obtain a number */
spprintf(&message, 0, "%s: invalid object type for date/time " spprintf(&message, 0, "%s: invalid object type for date/time "
"(only IntlCalendar and DateTime permitted)", func); "(only IntlCalendar and DateTimeInterface permitted)", func);
intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
message, 1); message, 1);
efree(message); efree(message);

16
ext/intl/tests/dateformat_bug65683.phpt Normal file
View file

@ -0,0 +1,16 @@
--TEST--
Bug #65683 IntlDateFormatter accepts DateTimeImmutable
--SKIPIF--
<?php
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
--FILE--
<?php
$formatter = new IntlDateFormatter('en-US', IntlDateFormatter::FULL, IntlDateFormatter::NONE, new DateTimeZone("UTC"));
var_dump($formatter->format(new DateTimeImmutable('2017-03-27 00:00:00 UTC'))) . "\n";
?>
==DONE==
--EXPECTF--
string(%s) "Monday, March %d, 2017"
==DONE==

10
ext/intl/tests/dateformat_format.phpt
View file

@ -400,24 +400,24 @@ Formatted DateTime is : 20001230 05:04 PM
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'

10
ext/intl/tests/dateformat_format_variant2.phpt
View file

@ -400,24 +400,24 @@ Formatted DateTime is : 20001230 05:04 PM
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'

10
ext/intl/tests/dateformat_format_variant3.phpt
View file

@ -400,24 +400,24 @@ Formatted DateTime is : 20001230 05:04 PM
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'
------------ ------------
Date is: stdClass::__set_state(array( Date is: stdClass::__set_state(array(
)) ))
------------ ------------
Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted): U_ILLEGAL_ARGUMENT_ERROR' Error while formatting as: 'datefmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR'

3
ext/intl/tests/msgfmt_format_datetime.phpt
View file

@ -16,13 +16,16 @@ $fmt = <<<EOD
EOD; EOD;
$dt = new DateTime("2012-05-06 18:00:42", new DateTimeZone("Europe/Lisbon")); $dt = new DateTime("2012-05-06 18:00:42", new DateTimeZone("Europe/Lisbon"));
$dti = new DateTimeImmutable("2012-05-06 18:00:42", new DateTimeZone("Europe/Lisbon"));
$mf = new MessageFormatter('en_US', $fmt); $mf = new MessageFormatter('en_US', $fmt);
var_dump($mf->format(array($dt))); var_dump($mf->format(array($dt)));
var_dump($mf->format(array($dti)));
?> ?>
==DONE== ==DONE==
--EXPECTF-- --EXPECTF--
string(%s) "May %d, 2012 %d:%d:42 %s" string(%s) "May %d, 2012 %d:%d:42 %s"
string(%s) "May %d, 2012 %d:%d:42 %s"
==DONE== ==DONE==

2
ext/intl/tests/msgfmt_format_error5.phpt
View file

@ -20,7 +20,7 @@ $mf = new MessageFormatter('en_US', $fmt);
var_dump($mf->format(array("foo" => new stdclass()))); var_dump($mf->format(array("foo" => new stdclass())));
--EXPECTF-- --EXPECTF--
Warning: MessageFormatter::format(): msgfmt_format: invalid object type for date/time (only IntlCalendar and DateTime permitted) in %s on line %d Warning: MessageFormatter::format(): msgfmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted) in %s on line %d
Warning: MessageFormatter::format(): The argument for key 'foo' cannot be used as a date or time in %s on line %d Warning: MessageFormatter::format(): The argument for key 'foo' cannot be used as a date or time in %s on line %d
bool(false) bool(false)