mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 11:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0' into PHP-8.1

Browse Source 
* PHP-8.0:
  Correct IntlDateFormatter::formatObject params
This commit is contained in:
Christoph M. Becker 2022-08-15 17:58:52 +02:00
commit 306da80f56
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -26,6 +26,9 @@ PHP NEWS
. Fixed bug GH-9309 (Segfault when connection is used after imap_close()).
(cmb)
- Intl:
. Fixed IntlDateFormatter::formatObject() parameter type. (Gert de Pagter)
- MBString:
. Fixed bug GH-9008 (mb_detect_encoding(): wrong results with null $encodings).
(cmb)

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

@ -118,7 +118,7 @@ class IntlDateFormatter
public function format($datetime): string|false {}
/**
* @param IntlCalendar|DateTime $datetime
* @param IntlCalendar|DateTimeInterface $datetime
* @param array|int|string|null $format
* @tentative-return-type
* @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: 82f90e7b0528b2b3515c086763dba4de0f92dfa7 */
* Stub hash: 57ca7800d524c47a2f4e5203d4b439adfbdecb35 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter___construct, 0, 0, 1)
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

@ -29,7 +29,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