From 1a67dbc0712313f76a3fecf86cf5267fe85c0c54 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Tue, 14 Dec 2021 16:53:17 +0100 Subject: [PATCH 1/3] More specific return types for some `DateTimeZone` methods. --- resources/functionMap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/functionMap.php b/resources/functionMap.php index f4aad773fe..c75b96f90b 100644 --- a/resources/functionMap.php +++ b/resources/functionMap.php @@ -1638,12 +1638,12 @@ 'DateTimeZone::__construct' => ['void', 'timezone'=>'string'], 'DateTimeZone::__set_state' => ['DateTimeZone', 'array'=>'array'], 'DateTimeZone::__wakeup' => ['void'], -'DateTimeZone::getLocation' => ['array'], +'DateTimeZone::getLocation' => ['array{country_code: string, latitude: float, longitude: float, comments: string}'], 'DateTimeZone::getName' => ['string'], 'DateTimeZone::getOffset' => ['int', 'datetime'=>'DateTimeInterface'], 'DateTimeZone::getTransitions' => ['array', 'timestamp_begin='=>'int', 'timestamp_end='=>'int'], 'DateTimeZone::listAbbreviations' => ['array'], -'DateTimeZone::listIdentifiers' => ['array', 'what='=>'int', 'country='=>'string'], +'DateTimeZone::listIdentifiers' => ['array', 'what='=>'int', 'country='=>'string'], 'db2_autocommit' => ['mixed', 'connection'=>'resource', 'value='=>'int'], 'db2_bind_param' => ['bool', 'stmt'=>'resource', 'parameter_number'=>'int', 'variable_name'=>'string', 'parameter_type='=>'int', 'data_type='=>'int', 'precision='=>'int', 'scale='=>'int'], 'db2_client_info' => ['object|false', 'connection'=>'resource'], From c984dc30a9c569a32c24f20df8574852e0b1f0ef Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Tue, 14 Dec 2021 18:21:52 +0100 Subject: [PATCH 2/3] This can return false too. --- resources/functionMap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/functionMap.php b/resources/functionMap.php index c75b96f90b..092a1f08b8 100644 --- a/resources/functionMap.php +++ b/resources/functionMap.php @@ -1638,7 +1638,7 @@ 'DateTimeZone::__construct' => ['void', 'timezone'=>'string'], 'DateTimeZone::__set_state' => ['DateTimeZone', 'array'=>'array'], 'DateTimeZone::__wakeup' => ['void'], -'DateTimeZone::getLocation' => ['array{country_code: string, latitude: float, longitude: float, comments: string}'], +'DateTimeZone::getLocation' => ['array{country_code: string, latitude: float, longitude: float, comments: string}|false'], 'DateTimeZone::getName' => ['string'], 'DateTimeZone::getOffset' => ['int', 'datetime'=>'DateTimeInterface'], 'DateTimeZone::getTransitions' => ['array', 'timestamp_begin='=>'int', 'timestamp_end='=>'int'], From 2e025809aa1a11b8e862477d7526a7ba68092fa8 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Tue, 14 Dec 2021 18:22:44 +0100 Subject: [PATCH 3/3] Return types for the procedural counterparts. --- resources/functionMap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/functionMap.php b/resources/functionMap.php index 092a1f08b8..983e5edf56 100644 --- a/resources/functionMap.php +++ b/resources/functionMap.php @@ -12302,8 +12302,8 @@ 'time_nanosleep' => ['array{0:0|positive-int,1:0|positive-int}|bool', 'seconds'=>'int', 'nanoseconds'=>'int'], 'time_sleep_until' => ['bool', 'timestamp'=>'float'], 'timezone_abbreviations_list' => ['array'], -'timezone_identifiers_list' => ['array', 'what='=>'int', 'country='=>'?string'], -'timezone_location_get' => ['array|false', 'object'=>'DateTimeZone'], +'timezone_identifiers_list' => ['array', 'what='=>'int', 'country='=>'?string'], +'timezone_location_get' => ['array{country_code: string, latitude: float, longitude: float, comments: string}|false', 'object'=>'DateTimeZone'], 'timezone_name_from_abbr' => ['string|false', 'abbr'=>'string', 'gmtoffset='=>'int', 'isdst='=>'int'], 'timezone_name_get' => ['string', 'object'=>'DateTimeZone'], 'timezone_offset_get' => ['int', 'object'=>'DateTimeZone', 'datetime'=>'DateTime'],