archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1'

Browse source 
* PHP-8.1:
  getTimestamp does not return false
This commit is contained in:
Kamil Tekiela 2021-09-30 09:16:25 +01:00
commit ca07cf3079
No known key found for this signature in database
GPG key ID: 0760BDAB1E89A1E3
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/date/php_date.stub.php
View file

@ -198,7 +198,7 @@ interface DateTimeInterface
public function getOffset(): int;
/** @tentative-return-type */
public function getTimestamp(): int|false;
public function getTimestamp(): int;
/** @tentative-return-type */
public function diff(DateTimeInterface $targetObject, bool $absolute = false): DateInterval;

5
ext/date/php_date_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: e4585948a8767182f38b553b603e06555e92c372 */
* Stub hash: ea354510fbf64c42ee1cdd6fd786ab937516226c */
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)
@ -235,8 +235,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_DateTimeInterface_getOffset, 0, 0, IS_LONG, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_DateTimeInterface_getTimestamp, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_END_ARG_INFO()
#define arginfo_class_DateTimeInterface_getTimestamp arginfo_class_DateTimeInterface_getOffset
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_DateTimeInterface_diff, 0, 1, DateInterval, 0)
ZEND_ARG_OBJ_INFO(0, targetObject, DateTimeInterface, 0)