From 8e01a12033b26e9a426f418f7929cb784a70f20d Mon Sep 17 00:00:00 2001 From: Daniel Kemper Date: Mon, 11 Apr 2022 22:44:36 +0200 Subject: [PATCH 1/3] Resolve #7855 remove false from return type, in php8.0 and further versions there is a ValueError returned instead --- dictionaries/CallMap_80_delta.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index 77845ced038..b3559230472 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -41,10 +41,18 @@ 'old' => ['string|false', 'format'=>'string'], 'new' => ['string', 'format'=>'string'], ], + 'DateTime::getTimestamp' => [ + 'old' => ['int|false'], + 'new' => ['int'], + ], 'DateTimeImmutable::format' => [ 'old' => ['string|false', 'format'=>'string'], 'new' => ['string', 'format'=>'string'], ], + 'DateTimeImmutable::getTimestamp' => [ + 'old' => ['int|false'], + 'new' => ['int'], + ], 'DateTimeZone::listIdentifiers' => [ 'old' => ['list|false', 'timezoneGroup='=>'int', 'countryCode='=>'string|null'], 'new' => ['list', 'timezoneGroup='=>'int', 'countryCode='=>'string|null'], From 114aad4c23daf6d99c534c61de08206a05953afa Mon Sep 17 00:00:00 2001 From: Daniel Kemper Date: Mon, 11 Apr 2022 22:48:13 +0200 Subject: [PATCH 2/3] Resolve #7855 remove false from return type, in php8.0 and further versions there is a ValueError returned instead --- dictionaries/CallMap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index 43ea1900bae..e21c14afb07 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -1783,7 +1783,7 @@ 'DateTime::format' => ['string', 'format'=>'string'], 'DateTime::getLastErrors' => ['array{warning_count:int,warnings:array,error_count:int,errors:array}'], 'DateTime::getOffset' => ['int'], -'DateTime::getTimestamp' => ['int|false'], +'DateTime::getTimestamp' => ['int'], 'DateTime::getTimezone' => ['DateTimeZone|false'], 'DateTime::modify' => ['static|false', 'modify'=>'string'], 'DateTime::setDate' => ['static', 'year'=>'int', 'month'=>'int', 'day'=>'int'], @@ -1816,7 +1816,7 @@ 'DateTimeInterface::diff' => ['DateInterval', 'datetime2'=>'DateTimeInterface', 'absolute='=>'bool'], 'DateTimeInterface::format' => ['string', 'format'=>'string'], 'DateTimeInterface::getOffset' => ['int'], -'DateTimeInterface::getTimestamp' => ['int|false'], +'DateTimeInterface::getTimestamp' => ['int'], 'DateTimeInterface::getTimezone' => ['DateTimeZone|false'], 'DateTimeZone::__construct' => ['void', 'timezone'=>'string'], 'DateTimeZone::__set_state' => ['DateTimeZone', 'array'=>'array'], From 2ee7ba32c708b281e7c29de2c8609150361101d4 Mon Sep 17 00:00:00 2001 From: Daniel Kemper Date: Tue, 12 Apr 2022 08:49:40 +0200 Subject: [PATCH 3/3] changed return types of callmap --- dictionaries/CallMap.php | 2 +- dictionaries/CallMap_80_delta.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index e21c14afb07..7589b227215 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -1804,7 +1804,7 @@ 'DateTimeImmutable::format' => ['string', 'format'=>'string'], 'DateTimeImmutable::getLastErrors' => ['array{warning_count:int,warnings:array,error_count:int,errors:array}'], 'DateTimeImmutable::getOffset' => ['int'], -'DateTimeImmutable::getTimestamp' => ['int|false'], +'DateTimeImmutable::getTimestamp' => ['int'], 'DateTimeImmutable::getTimezone' => ['DateTimeZone|false'], 'DateTimeImmutable::modify' => ['static', 'modify'=>'string'], 'DateTimeImmutable::setDate' => ['static|false', 'year'=>'int', 'month'=>'int', 'day'=>'int'], diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index b3559230472..4331bc68d4c 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -45,6 +45,10 @@ 'old' => ['int|false'], 'new' => ['int'], ], + 'DateTimeInterface::getTimestamp' => [ + 'old' => ['int|false'], + 'new' => ['int'], + ], 'DateTimeImmutable::format' => [ 'old' => ['string|false', 'format'=>'string'], 'new' => ['string', 'format'=>'string'],