diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-12-20 23:07:34 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-12-20 23:07:34 +0100 |
| commit | 78bdbfc24a9cfb410569b51a98d0a0abc6c2c117 (patch) | |
| tree | 93adb3a55918db97f5af15aa8fddcbbd901a990b /ext | |
| parent | dccaaa956a604d558b19a1c6eaf4d059333642d6 (diff) | |
| parent | 32c6c29d791e592954e8173e64479962e2ba15c6 (diff) | |
| download | php-git-78bdbfc24a9cfb410569b51a98d0a0abc6c2c117.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Revert "DateTime:: and DateTimeImmutable::getTimestamp() may return false"
Diffstat (limited to 'ext')
| -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 c25a9a6539..3bd6c70a88 100644 --- a/ext/date/php_date.stub.php +++ b/ext/date/php_date.stub.php @@ -232,7 +232,7 @@ class DateTime implements DateTimeInterface public function setTimestamp(int $timestamp) {} /** - * @return int|false + * @return int * @alias date_timestamp_get */ public function getTimestamp() {} @@ -285,7 +285,7 @@ class DateTimeImmutable implements DateTimeInterface public function getOffset() {} /** - * @return int|false + * @return int * @alias date_timestamp_get */ public function getTimestamp() {} diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h index 522fd800cd..5f02e7dd78 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: 1e51225485aa1a03fd2f58c9c85625b340de3d9d */ + * Stub hash: 65e429036ef2ee45f31688bc2af94dc26a1b973a */ 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) |