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

Merge branch 'PHP-8.1'

Browse source 
* PHP-8.1:
  Correct IntlDateFormatter::formatObject params
This commit is contained in:
Christoph M. Becker 2022-08-15 18:10:54 +02:00
commit ac9cbb7174
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
ext/intl/dateformat/dateformat_arginfo.h generated
View file

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

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

@ -181,7 +181,7 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object)
} }
} else { } else {
intl_error_set(NULL, status, "datefmt_format_object: the passed object " 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); 0);
RETURN_FALSE; RETURN_FALSE;
} }

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

@ -29,7 +29,7 @@ var_dump(IntlDateFormatter::formatObject($cal, ""));
?> ?>
--EXPECTF-- --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) bool(false)
Warning: IntlDateFormatter::formatObject(): datefmt_format_object: bad IntlCalendar instance: not initialized properly in %s on line %d Warning: IntlDateFormatter::formatObject(): datefmt_format_object: bad IntlCalendar instance: not initialized properly in %s on line %d