com php-src: Revert "DateTime:: and DateTimeImmutable::getTimestamp() may return false": ext/date/php_date.stub.php ext/date/php _date_arginfo.h

Commit: 32c6c29d791e592954e8173e64479962e2ba15c6 Author: Christoph M. Becker <cmbecker69@gmx.de> Sun, 20 Dec 2020 23:07:02 +0100 Parents: b67c23218950eae0a153b093dcefbe14b3b40901 Branches: PHP-8.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=32c6c29d791e592954e8173e64479962e2ba15c6 Log: Revert "DateTime:: and DateTimeImmutable::getTimestamp() may return false" This reverts commit b67c23218950eae0a153b093dcefbe14b3b40901. Changed paths: M ext/date/php_date.stub.php M ext/date/php_date_arginfo.h Diff: diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php index c25a9a65399..3bd6c70a884 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 522fd800cdd..5f02e7dd788 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)