diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-12-28 14:46:00 +0100 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-12-28 14:46:00 +0100 |
| commit | 74e39ce06cc6cab284de39fbc29073dc68c75983 (patch) | |
| tree | b9265bad6551195c6cecba178c06fbdab249fd88 /ext/date | |
| parent | e4e318bad392a7da350d1525f33819fc79740b35 (diff) | |
| parent | 46a2c6a8d7d7d48e7f32c2738cdbae46ced0c65b (diff) | |
| download | php-git-74e39ce06cc6cab284de39fbc29073dc68c75983.tar.gz | |
Merge branch 'PHP-8.0'
Diffstat (limited to 'ext/date')
| -rw-r--r-- | ext/date/php_date.stub.php | 2 | ||||
| -rw-r--r-- | ext/date/php_date_arginfo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php index 2519e4ed5d..fef4ffb02f 100644 --- a/ext/date/php_date.stub.php +++ b/ext/date/php_date.stub.php @@ -251,7 +251,7 @@ class DateTimeImmutable implements DateTimeInterface /** @return void */ public function __wakeup() {} - /** @return DateTimeZone */ + /** @return DateTimeImmutable */ public static function __set_state(array $array) {} /** diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h index 49b97a2ac6..7be0de2e02 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: 7b23a03d3c4941fb9a614de62d80fa5b0e11d14b */ + * Stub hash: 339c2c91f38eeaafac6134ac04573243069502f5 */ 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) |