Fix DateTimeZone::listAbbreviations return type

Also fixes DateTimeZone::getOffset return type

dictionaries/CallMap.php

@@ -1808,9 +1808,9 @@ return [
 'DateTimeZone::__wakeup' => ['void'],
 'DateTimeZone::getLocation' => ['array|false'],
 'DateTimeZone::getName' => ['string'],
-'DateTimeZone::getOffset' => ['int|false', 'datetime'=>'DateTimeInterface'],
+'DateTimeZone::getOffset' => ['int', 'datetime'=>'DateTimeInterface'],
 'DateTimeZone::getTransitions' => ['list<array{ts: int, time: string, offset: int, isdst: bool, abbr: string}>|false', 'timestamp_begin='=>'int', 'timestamp_end='=>'int'],
-'DateTimeZone::listAbbreviations' => ['array<string, list<array{dst: bool, offset: int, timezone_id: string|null}>>|false'],
+'DateTimeZone::listAbbreviations' => ['array<string, list<array{dst: bool, offset: int, timezone_id: string|null}>>'],
 'DateTimeZone::listIdentifiers' => ['list<string>', 'timezoneGroup='=>'int', 'countryCode='=>'string|null'],
 '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'],
@@ -14675,12 +14675,12 @@ return [
 'time' => ['positive-int'],
 'time_nanosleep' => ['array{0:0|positive-int,1:0|positive-int}|bool', 'seconds'=>'positive-int', 'nanoseconds'=>'positive-int'],
 'time_sleep_until' => ['bool', 'timestamp'=>'float'],
-'timezone_abbreviations_list' => ['array<string, list<array{dst: bool, offset: int, timezone_id: string|null}>>|false'],
+'timezone_abbreviations_list' => ['array<string, list<array{dst: bool, offset: int, timezone_id: string|null}>>'],
 'timezone_identifiers_list' => ['list<string>', 'timezoneGroup='=>'int', 'countryCode='=>'?string'],
 'timezone_location_get' => ['array|false', 'object'=>'DateTimeZone'],
 'timezone_name_from_abbr' => ['string|false', 'abbr'=>'string', 'utcOffset='=>'int', 'isDST='=>'int'],
 'timezone_name_get' => ['string', 'object'=>'DateTimeZone'],
-'timezone_offset_get' => ['int|false', 'object'=>'DateTimeZone', 'datetime'=>'DateTimeInterface'],
+'timezone_offset_get' => ['int', 'object'=>'DateTimeZone', 'datetime'=>'DateTimeInterface'],
 'timezone_open' => ['DateTimeZone|false', 'timezone'=>'string'],
 'timezone_transitions_get' => ['list<array{ts: int, time: string, offset: int, isdst: bool, abbr: string}>|false', 'object'=>'DateTimeZone', 'timestampBegin='=>'int', 'timestampEnd='=>'int'],
 'timezone_version_get' => ['string'],

dictionaries/CallMap_80_delta.php

@@ -49,6 +49,10 @@ return [
        'old' => ['int|false'],
        'new' => ['int'],
     ],
+    'DateTimeZone::getOffset' => [
+      'old' => ['int|false', 'datetime'=>'DateTimeInterface'],
+      'new' => ['int', 'datetime'=>'DateTimeInterface'],
+    ],
     'DateTimeZone::listIdentifiers' => [
       'old' => ['list<string>|false', 'timezoneGroup='=>'int', 'countryCode='=>'string|null'],
       'new' => ['list<string>', 'timezoneGroup='=>'int', 'countryCode='=>'string|null'],
@@ -1421,6 +1425,10 @@ return [
       'old' => ['list<string>|false', 'timezoneGroup='=>'int', 'countryCode='=>'?string'],
       'new' => ['list<string>', 'timezoneGroup='=>'int', 'countryCode='=>'?string'],
     ],
+    'timezone_offset_get' => [
+      'old' => ['int|false', 'object'=>'DateTimeZone', 'datetime'=>'DateTimeInterface'],
+      'new' => ['int', 'object'=>'DateTimeZone', 'datetime'=>'DateTimeInterface'],
+    ],
     'xml_get_current_byte_index' => [
       'old' => ['int|false', 'parser'=>'resource'],
       'new' => ['int|false', 'parser'=>'XMLParser'],

dictionaries/CallMap_historical.php

@@ -1070,7 +1070,7 @@ return [
     'DateTimeZone::getName' => ['string'],
     'DateTimeZone::getOffset' => ['int|false', 'datetime'=>'DateTimeInterface'],
     'DateTimeZone::getTransitions' => ['list<array{ts: int, time: string, offset: int, isdst: bool, abbr: string}>|false', 'timestamp_begin='=>'int', 'timestamp_end='=>'int'],
-    'DateTimeZone::listAbbreviations' => ['array<string, list<array{dst: bool, offset: int, timezone_id: string|null}>>|false'],
+    'DateTimeZone::listAbbreviations' => ['array<string, list<array{dst: bool, offset: int, timezone_id: string|null}>>'],
     'DateTimeZone::listIdentifiers' => ['list<string>|false', 'timezoneGroup='=>'int', 'countryCode='=>'string'],
     'Directory::close' => ['void', 'dir_handle='=>'resource'],
     'Directory::read' => ['string|false', 'dir_handle='=>'resource'],
@@ -15807,7 +15807,7 @@ return [
     'time' => ['positive-int'],
     'time_nanosleep' => ['array{0:0|positive-int,1:0|positive-int}|bool', 'seconds'=>'positive-int', 'nanoseconds'=>'positive-int'],
     'time_sleep_until' => ['bool', 'timestamp'=>'float'],
-    'timezone_abbreviations_list' => ['array<string, list<array{dst: bool, offset: int, timezone_id: string|null}>>|false'],
+    'timezone_abbreviations_list' => ['array<string, list<array{dst: bool, offset: int, timezone_id: string|null}>>'],
     'timezone_identifiers_list' => ['list<string>|false', 'timezoneGroup='=>'int', 'countryCode='=>'string'],
     'timezone_location_get' => ['array|false', 'object'=>'DateTimeZone'],
     'timezone_name_from_abbr' => ['string|false', 'abbr'=>'string', 'utcOffset='=>'int', 'isDST='=>'int'],

tests/Internal/Codebase/InternalCallMapHandlerTest.php

@@ -430,8 +430,6 @@ class InternalCallMapHandlerTest extends TestCase
         'stream_set_chunk_size',
         'substr',
         'substr_compare',
-        'timezone_abbreviations_list',
-        'timezone_offset_get',
         'user_error',
         'xml_get_current_byte_index',
         'xml_get_current_column_number',