Skip to content

Commit 78bdbfc

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Revert "DateTime:: and DateTimeImmutable::getTimestamp() may return false"
2 parents dccaaa9 + 32c6c29 commit 78bdbfc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/date/php_date.stub.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public function setISODate(int $year, int $week, int $dayOfWeek = 1) {}
232232
public function setTimestamp(int $timestamp) {}
233233

234234
/**
235-
* @return int|false
235+
* @return int
236236
* @alias date_timestamp_get
237237
*/
238238
public function getTimestamp() {}
@@ -285,7 +285,7 @@ public function getTimezone() {}
285285
public function getOffset() {}
286286

287287
/**
288-
* @return int|false
288+
* @return int
289289
* @alias date_timestamp_get
290290
*/
291291
public function getTimestamp() {}

ext/date/php_date_arginfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 1e51225485aa1a03fd2f58c9c85625b340de3d9d */
2+
* Stub hash: 65e429036ef2ee45f31688bc2af94dc26a1b973a */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
55
ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)

0 commit comments

Comments
 (0)