diff --git a/src/Psalm/CallMap.php b/src/Psalm/CallMap.php
index b5ecfe0e3..fdddfda1b 100644
--- a/src/Psalm/CallMap.php
+++ b/src/Psalm/CallMap.php
@@ -515,8 +515,8 @@ return [
 'CachingIterator::key' => ['int|string|float|bool'],
 'CachingIterator::next' => ['void'],
 'CachingIterator::offsetExists' => ['bool', 'index'=>'string'],
-'CachingIterator::offsetGet' => ['string', 'index'=>'string'],
-'CachingIterator::offsetSet' => ['void', 'index'=>'string', 'newval'=>'string'],
+'CachingIterator::offsetGet' => ['mixed', 'index'=>'string'],
+'CachingIterator::offsetSet' => ['void', 'index'=>'string', 'newval'=>'mixed'],
 'CachingIterator::offsetUnset' => ['void', 'index'=>'string'],
 'CachingIterator::rewind' => ['void'],
 'CachingIterator::setFlags' => ['void', 'flags'=>'int'],
@@ -1590,10 +1590,10 @@ return [
 'cyrus_unbind' => ['bool', 'connection'=>'resource', 'trigger_name'=>'string'],
 'date' => ['string', 'format'=>'string', 'timestamp='=>'int'],
 'date_add' => ['DateTime|false', 'object'=>'DateTime', 'interval'=>'DateInterval'],
-'date_create' => ['DateTime|false', 'time='=>'string', 'timezone='=>'?\DateTimeZone'],
+'date_create' => ['DateTime|false', 'time='=>'string', 'timezone='=>'?DateTimeZone'],
 'date_create_from_format' => ['DateTime|false', 'format'=>'string', 'time'=>'string', 'timezone='=>'DateTimeZone'],
-'date_create_immutable' => ['DateTimeImmutable|false', 'time='=>'string', 'timezone='=>'?\DateTimeZone'],
-'date_create_immutable_from_format' => ['DateTimeImmutable', 'format'=>'string', 'time'=>'string', 'timezone='=>'?\DateTimeZone'],
+'date_create_immutable' => ['DateTimeImmutable|false', 'time='=>'string', 'timezone='=>'?DateTimeZone'],
+'date_create_immutable_from_format' => ['DateTimeImmutable', 'format'=>'string', 'time'=>'string', 'timezone='=>'?DateTimeZone'],
 'date_date_set' => ['DateTime|false', 'object'=>'DateTime', 'year'=>'int', 'month'=>'int', 'day'=>'int'],
 'date_default_timezone_get' => ['string'],
 'date_default_timezone_set' => ['bool', 'timezone_identifier'=>'string'],
@@ -3256,7 +3256,7 @@ return [
 'Generator::next' => [''],
 'Generator::rewind' => [''],
 'Generator::send' => ['', 'value'=>''],
-'Generator::throw' => ['', 'exception'=>'exception'],
+'Generator::throw' => ['', 'exception'=>'Exception|Throwable'],
 'Generator::valid' => ['bool'],
 'geoip_asnum_by_name' => ['string', 'hostname'=>'string'],
 'geoip_continent_code_by_name' => ['string', 'hostname'=>'string'],
@@ -3285,18 +3285,18 @@ return [
 'get_class_methods' => ['array', 'class'=>'mixed'],
 'get_class_vars' => ['array', 'class_name'=>'string'],
 'get_current_user' => ['string'],
-'get_declared_classes' => ['array'],
-'get_declared_interfaces' => ['array'],
-'get_declared_traits' => ['array'],
-'get_defined_constants' => ['array', 'categorize='=>'bool'],
+'get_declared_classes' => ['array<int,string>'],
+'get_declared_interfaces' => ['array<int,string>'],
+'get_declared_traits' => ['array<int,string>'],
+'get_defined_constants' => ['array<string,int|string|float|bool|null|array|resource>', 'categorize='=>'bool'],
 'get_defined_functions' => ['array<string,array<string,string>>', 'exclude_disabled='=>'bool'],
 'get_defined_vars' => ['array'],
-'get_extension_funcs' => ['array', 'extension_name'=>'string'],
+'get_extension_funcs' => ['array<int,string>', 'extension_name'=>'string'],
 'get_headers' => ['array|false', 'url'=>'string', 'format='=>'int'],
 'get_html_translation_table' => ['array', 'table='=>'int', 'flags='=>'int', 'encoding='=>'string'],
 'get_include_path' => ['string'],
-'get_included_files' => ['array'],
-'get_loaded_extensions' => ['array', 'zend_extensions='=>'bool'],
+'get_included_files' => ['array<int,string>'],
+'get_loaded_extensions' => ['array<int,string>', 'zend_extensions='=>'bool'],
 'get_magic_quotes_gpc' => ['bool'],
 'get_magic_quotes_runtime' => ['bool'],
 'get_meta_tags' => ['array', 'filename'=>'string', 'use_include_path='=>'bool'],
@@ -3304,7 +3304,7 @@ return [
 'get_parent_class' => ['string|false', 'object='=>'mixed'],
 'get_required_files' => ['string[]'],
 'get_resource_type' => ['string', 'res'=>'resource'],
-'get_resources' => ['resource[]', 'resource_type'=>'string'],
+'get_resources' => ['array<int,resource>', 'resource_type'=>'string'],
 'getallheaders' => ['array'],
 'getcwd' => ['string|false'],
 'getdate' => ['array', 'timestamp='=>'int'],
@@ -6015,7 +6015,7 @@ return [
 'libxml_clear_errors' => ['void'],
 'libxml_disable_entity_loader' => ['bool', 'disable='=>'bool'],
 'libxml_get_errors' => ['array<int,libXMLError>'],
-'libxml_get_last_error' => ['object'],
+'libxml_get_last_error' => ['libXMLError|false'],
 'libxml_set_external_entity_loader' => ['bool', 'resolver_function'=>'callable'],
 'libxml_set_streams_context' => ['void', 'streams_context'=>'resource'],
 'libxml_use_internal_errors' => ['bool', 'use_errors='=>'bool'],
@@ -6035,7 +6035,7 @@ return [
 'lineObj::ms_newLineObj' => ['lineObj'],
 'lineObj::point' => ['pointObj', 'i'=>'int'],
 'lineObj::project' => ['int', 'in'=>'projectionObj', 'out'=>'projectionObj'],
-'link' => ['int', 'target'=>'string', 'link'=>'string'],
+'link' => ['bool', 'target'=>'string', 'link'=>'string'],
 'linkinfo' => ['int', 'filename'=>'string'],
 'litespeed_request_headers' => ['array'],
 'litespeed_response_headers' => ['array'],
@@ -8689,7 +8689,7 @@ return [
 'pg_client_encoding' => ['string', 'connection='=>'resource'],
 'pg_close' => ['bool', 'connection='=>'resource'],
 'pg_connect' => ['resource', 'connection_string'=>'string', 'connect_type='=>'int'],
-'pg_connect_poll' => ['resource', 'connection'=>'resource'],
+'pg_connect_poll' => ['int', 'connection'=>'resource'],
 'pg_connection_busy' => ['bool', 'connection'=>'resource'],
 'pg_connection_reset' => ['bool', 'connection'=>'resource'],
 'pg_connection_status' => ['int', 'connection'=>'resource'],
@@ -8712,13 +8712,13 @@ return [
 'pg_execute\'1' => ['resource', 'stmtname'=>'string', 'params'=>'array'],
 'pg_fetch_all' => ['array', 'result'=>'resource', 'result_type='=>'int'],
 'pg_fetch_all_columns' => ['array', 'result'=>'resource', 'column_number='=>'int'],
-'pg_fetch_array' => ['array', 'result'=>'resource', 'row='=>'int', 'result_type='=>'int'],
-'pg_fetch_assoc' => ['array', 'result'=>'resource', 'row='=>'int'],
-'pg_fetch_object' => ['object', 'result'=>'', 'row='=>'int', 'result_type='=>'int'],
-'pg_fetch_object\'1' => ['object', 'result'=>'', 'row='=>'int', 'class_name='=>'string', 'ctor_params='=>'array'],
+'pg_fetch_array' => ['array', 'result'=>'resource', 'row='=>'?int', 'result_type='=>'int'],
+'pg_fetch_assoc' => ['array', 'result'=>'resource', 'row='=>'?int'],
+'pg_fetch_object' => ['object', 'result'=>'', 'row='=>'?int', 'result_type='=>'int'],
+'pg_fetch_object\'1' => ['object', 'result'=>'', 'row='=>'?int', 'class_name='=>'string', 'ctor_params='=>'array'],
 'pg_fetch_result' => ['', 'result'=>'', 'field_name'=>'string|int'],
-'pg_fetch_result\'1' => ['', 'result'=>'', 'row_number'=>'int', 'field_name'=>'string|int'],
-'pg_fetch_row' => ['array', 'result'=>'resource', 'row='=>'int', 'result_type='=>'int'],
+'pg_fetch_result\'1' => ['', 'result'=>'', 'row'=>'?int', 'field_name'=>'string|int'],
+'pg_fetch_row' => ['array', 'result'=>'resource', 'row='=>'?int', 'result_type='=>'int'],
 'pg_field_is_null' => ['int', 'result'=>'', 'field_name_or_number'=>'string|int'],
 'pg_field_is_null\'1' => ['int', 'result'=>'', 'row'=>'int', 'field_name_or_number'=>'string|int'],
 'pg_field_name' => ['string', 'result'=>'resource', 'field_number'=>'int'],