diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-18 14:39:51 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-18 14:39:51 +0100 |
| commit | 49e030d551472143d7f3ac47d8d710105d5db958 (patch) | |
| tree | b97b5aab3e8c6fad5c23787de7920f849b5987ae /ext/intl/calendar | |
| parent | 0f26f9b34058239d0ed1e270163081f2acbecffb (diff) | |
| parent | ebf461a025411834cf417e50163c2b334123f66e (diff) | |
| download | php-git-49e030d551472143d7f3ac47d8d710105d5db958.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Sync datefmt_get_calendar_object signature
Sync intlcal_create_instance() and IntlCalendar::createInstance()
Sync date_diff and DateTime::diff return type
Diffstat (limited to 'ext/intl/calendar')
| -rw-r--r-- | ext/intl/calendar/calendar.stub.php | 2 | ||||
| -rw-r--r-- | ext/intl/calendar/calendar_arginfo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/calendar/calendar.stub.php b/ext/intl/calendar/calendar.stub.php index ded7dfe45d..3da6ebb1d0 100644 --- a/ext/intl/calendar/calendar.stub.php +++ b/ext/intl/calendar/calendar.stub.php @@ -8,7 +8,7 @@ class IntlCalendar /** * @param IntlTimeZone|DateTimeZone|string|null $timezone - * @return IntlCalendar|IntlGregorianCalendar|null + * @return IntlCalendar|null * @alias intlcal_create_instance */ public static function createInstance($timezone = null, ?string $locale = null) {} diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h index 29e0d4f908..8537836d5b 100644 --- a/ext/intl/calendar/calendar_arginfo.h +++ b/ext/intl/calendar/calendar_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: ee755d4a500e2d1ba4d589c233b7d09a06b5cce8 */ + * Stub hash: 18a92d3af801f11e5c3b90e5d272fd98b3515c40 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar___construct, 0, 0, 0) ZEND_END_ARG_INFO() |