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/date | |
| 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/date')
| -rw-r--r-- | ext/date/php_date.stub.php | 4 | ||||
| -rw-r--r-- | ext/date/php_date_arginfo.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php index fef4ffb02f..cb01b7e073 100644 --- a/ext/date/php_date.stub.php +++ b/ext/date/php_date.stub.php @@ -238,7 +238,7 @@ class DateTime implements DateTimeInterface public function getTimestamp() {} /** - * @return DateInterval|false + * @return DateInterval * @alias date_diff */ public function diff(DateTimeInterface $targetObject, bool $absolute = false) {} @@ -291,7 +291,7 @@ class DateTimeImmutable implements DateTimeInterface public function getTimestamp() {} /** - * @return DateInterval|false + * @return DateInterval * @alias date_diff */ public function diff(DateTimeInterface $targetObject, bool $absolute = false) {} diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h index 7be0de2e02..cf50abb43f 100644 --- a/ext/date/php_date_arginfo.h +++ b/ext/date/php_date_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 339c2c91f38eeaafac6134ac04573243069502f5 */ + * Stub hash: 880a93d8a3461635447318317869fa7d3d7762dd */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0) |