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/dateformat/dateformat.stub.php | |
| 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/dateformat/dateformat.stub.php')
| -rw-r--r-- | ext/intl/dateformat/dateformat.stub.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/dateformat/dateformat.stub.php b/ext/intl/dateformat/dateformat.stub.php index 032a04c6fa..22ece903c1 100644 --- a/ext/intl/dateformat/dateformat.stub.php +++ b/ext/intl/dateformat/dateformat.stub.php @@ -48,7 +48,7 @@ class IntlDateFormatter public function getTimeZoneId() {} /** - * @return IntlCalendar|null|false + * @return IntlCalendar|false|null * @alias datefmt_get_calendar_object */ public function getCalendarObject() {} |