php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct IntlDateFormatter::formatObject params

Browse Source 
Closes GH-9341.
This commit is contained in:
Gert de Pagter
2022-08-15 14:25:59 +02:00
committed by Christoph M. Becker
parent b8d07451d4
commit 05ed47ef12
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -10,6 +10,9 @@ PHP NEWS
. Fixed bug GH-9155 (dba_open("non-existing", "c-", "flatfile") segfaults).
(cmb)
- Intl:
. Fixed IntlDateFormatter::formatObject() parameter type. (Gert de Pagter)
- OPcache:
. Fixed bug GH-9033 (Loading blacklist file can fail due to negative length).
(cmb)

2
ext/intl/dateformat/dateformat.stub.php
View File

@@ -104,7 +104,7 @@ class IntlDateFormatter
public function format($datetime) {}
/**
* @param IntlCalendar|DateTime $datetime
* @param IntlCalendar|DateTimeInterface $datetime
* @param array|int|string|null $format
* @return string|false
* @alias datefmt_format_object

2
ext/intl/dateformat/dateformat_arginfo.h
View File

@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: faeef90c9c1324c6a25f0df36c7239ddc2b43ee4 */
* Stub hash: 425a285b704e175ccd0313fe1be85c8abaf820b7 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter___construct, 0, 0, 3)
ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)

2
ext/intl/dateformat/dateformat_format_object.cpp
View File

@@ -190,7 +190,7 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object)
}
} else {
intl_error_set(NULL, status, "datefmt_format_object: the passed object "
"must be an instance of either IntlCalendar or DateTime",
"must be an instance of either IntlCalendar or DateTimeInterface",
0);
RETURN_FALSE;
}

2
ext/intl/tests/dateformat_formatObject_error.phpt
View File

@@ -31,7 +31,7 @@ var_dump(IntlDateFormatter::formatObject($cal, ""));
?>
--EXPECTF--
Warning: IntlDateFormatter::formatObject(): datefmt_format_object: the passed object must be an instance of either IntlCalendar or DateTime in %s on line %d
Warning: IntlDateFormatter::formatObject(): datefmt_format_object: the passed object must be an instance of either IntlCalendar or DateTimeInterface in %s on line %d
bool(false)
Warning: IntlDateFormatter::formatObject(): datefmt_format_object: bad IntlCalendar instance: not initialized properly in %s on line %d