diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
index 026c170c767..4fcfc2c3966 100644
--- a/dictionaries/CallMap.php
+++ b/dictionaries/CallMap.php
@@ -685,19 +685,19 @@
 'clusterObj::setFilter' => ['int', 'expression'=>'string'],
 'clusterObj::setGroup' => ['int', 'expression'=>'string'],
 'Collator::__construct' => ['void', 'locale'=>'string'],
-'Collator::asort' => ['bool', '&rw_arr'=>'array', 'sort_flag='=>'int'],
+'Collator::asort' => ['bool', '&rw_array'=>'array', 'flags='=>'int'],
 'Collator::compare' => ['int|false', 'string1'=>'string', 'string2'=>'string'],
 'Collator::create' => ['?Collator', 'locale'=>'string'],
-'Collator::getAttribute' => ['int|false', 'attr'=>'int'],
+'Collator::getAttribute' => ['int|false', 'attribute'=>'int'],
 'Collator::getErrorCode' => ['int'],
 'Collator::getErrorMessage' => ['string'],
 'Collator::getLocale' => ['string', 'type'=>'int'],
 'Collator::getSortKey' => ['string|false', 'string'=>'string'],
 'Collator::getStrength' => ['int'],
-'Collator::setAttribute' => ['bool', 'attr'=>'int', 'value'=>'int'],
+'Collator::setAttribute' => ['bool', 'attribute'=>'int', 'value'=>'int'],
 'Collator::setStrength' => ['bool', 'strength'=>'int'],
-'Collator::sort' => ['bool', '&rw_arr'=>'array', 'sort_flags='=>'int'],
-'Collator::sortWithSortKeys' => ['bool', '&rw_arr'=>'array'],
+'Collator::sort' => ['bool', '&rw_array'=>'array', 'flags='=>'int'],
+'Collator::sortWithSortKeys' => ['bool', '&rw_array'=>'array'],
 'collator_asort' => ['bool', 'object'=>'collator', '&rw_array'=>'array', 'flags='=>'int'],
 'collator_compare' => ['int', 'object'=>'collator', 'string1'=>'string', 'string2'=>'string'],
 'collator_create' => ['?Collator', 'locale'=>'string'],
@@ -1292,13 +1292,13 @@
 'curl_upkeep' => ['bool', 'handle'=>'CurlHandle'],
 'curl_unescape' => ['string|false', 'handle'=>'CurlHandle', 'string'=>'string'],
 'curl_version' => ['array', 'version='=>'int'],
-'CURLFile::__construct' => ['void', 'filename'=>'string', 'mimetype='=>'string', 'postfilename='=>'string'],
+'CURLFile::__construct' => ['void', 'filename'=>'string', 'mime_type='=>'?string', 'posted_filename='=>'?string'],
 'CURLFile::__wakeup' => ['void'],
 'CURLFile::getFilename' => ['string'],
 'CURLFile::getMimeType' => ['string'],
 'CURLFile::getPostFilename' => ['string'],
-'CURLFile::setMimeType' => ['void', 'mime'=>'string'],
-'CURLFile::setPostFilename' => ['void', 'name'=>'string'],
+'CURLFile::setMimeType' => ['void', 'mime_type'=>'string'],
+'CURLFile::setPostFilename' => ['void', 'posted_filename'=>'string'],
 'CURLStringFile::__construct' => ['void', 'data'=>'string', 'postname'=>'string', 'mime='=>'string'],
 'current' => ['mixed|false', 'array'=>'array|object'],
 'cyrus_authenticate' => ['void', 'connection'=>'resource', 'mechlist='=>'string', 'service='=>'string', 'user='=>'string', 'minssf='=>'int', 'maxssf='=>'int', 'authname='=>'string', 'password='=>'string'],
@@ -1355,10 +1355,10 @@
 'datefmt_set_lenient' => ['void', 'formatter'=>'IntlDateFormatter', 'lenient'=>'bool'],
 'datefmt_set_pattern' => ['bool', 'formatter'=>'IntlDateFormatter', 'pattern'=>'string'],
 'datefmt_set_timezone' => ['false|null', 'formatter'=>'IntlDateFormatter', 'timezone'=>'IntlTimeZone|DateTimeZone|string|null'],
-'DateInterval::__construct' => ['void', 'spec'=>'string'],
+'DateInterval::__construct' => ['void', 'duration'=>'string'],
 'DateInterval::__set_state' => ['DateInterval', 'array'=>'array'],
 'DateInterval::__wakeup' => ['void'],
-'DateInterval::createFromDateString' => ['DateInterval|false', 'time'=>'string'],
+'DateInterval::createFromDateString' => ['DateInterval|false', 'datetime'=>'string'],
 'DateInterval::format' => ['string', 'format'=>'string'],
 'DatePeriod::__construct' => ['void', 'start'=>'DateTimeInterface', 'interval'=>'DateInterval', 'recur'=>'int', 'options='=>'int'],
 'DatePeriod::__construct\'1' => ['void', 'start'=>'DateTimeInterface', 'interval'=>'DateInterval', 'end'=>'DateTimeInterface', 'options='=>'int'],
@@ -1371,20 +1371,20 @@
 'DateTime::__construct\'1' => ['void', 'time'=>'?string', 'timezone'=>'?DateTimeZone'],
 'DateTime::__wakeup' => ['void'],
 'DateTime::add' => ['static', 'interval'=>'DateInterval'],
-'DateTime::createFromFormat' => ['static|false', 'format'=>'string', 'time'=>'string', 'timezone='=>'?DateTimeZone'],
+'DateTime::createFromFormat' => ['static|false', 'format'=>'string', 'datetime'=>'string', 'timezone='=>'?DateTimeZone'],
 'DateTime::createFromImmutable' => ['static', 'object'=>'DateTimeImmutable'],
 'DateTime::createFromInterface' => ['static', 'object' => 'DateTimeInterface'],
-'DateTime::diff' => ['DateInterval', 'datetime2'=>'DateTimeInterface', 'absolute='=>'bool'],
+'DateTime::diff' => ['DateInterval', 'targetObject'=>'DateTimeInterface', 'absolute='=>'bool'],
 'DateTime::format' => ['string', 'format'=>'string'],
 'DateTime::getLastErrors' => ['array{warning_count:int,warnings:array<int,string>,error_count:int,errors:array<int,string>}|false'],
 'DateTime::getOffset' => ['int'],
 'DateTime::getTimestamp' => ['int'],
 'DateTime::getTimezone' => ['DateTimeZone|false'],
-'DateTime::modify' => ['static|false', 'modify'=>'string'],
+'DateTime::modify' => ['static|false', 'modifier'=>'string'],
 'DateTime::setDate' => ['static', 'year'=>'int', 'month'=>'int', 'day'=>'int'],
-'DateTime::setISODate' => ['static', 'year'=>'int', 'week'=>'int', 'day='=>'int'],
-'DateTime::setTime' => ['static', 'hour'=>'int', 'minute'=>'int', 'second='=>'int', 'microseconds='=>'int'],
-'DateTime::setTimestamp' => ['static', 'unixtimestamp'=>'int'],
+'DateTime::setISODate' => ['static', 'year'=>'int', 'week'=>'int', 'dayOfWeek='=>'int'],
+'DateTime::setTime' => ['static', 'hour'=>'int', 'minute'=>'int', 'second='=>'int', 'microsecond='=>'int'],
+'DateTime::setTimestamp' => ['static', 'timestamp'=>'int'],
 'DateTime::setTimezone' => ['static', 'timezone'=>'DateTimeZone'],
 'DateTime::sub' => ['static', 'interval'=>'DateInterval'],
 'DateTimeImmutable::__wakeup' => ['void'],
@@ -1403,7 +1403,7 @@
 'DateTimeZone::getLocation' => ['array|false'],
 'DateTimeZone::getName' => ['string'],
 '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::getTransitions' => ['list<array{ts: int, time: string, offset: int, isdst: bool, abbr: string}>|false', 'timestampBegin='=>'int', 'timestampEnd='=>'int'],
 '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' => ['0|1|bool', 'connection'=>'resource', 'value='=>'0|1'],
@@ -1651,48 +1651,48 @@
 'DOMAttr::getNodePath' => ['?string'],
 'DOMAttr::hasAttributes' => ['bool'],
 'DOMAttr::hasChildNodes' => ['bool'],
-'DOMAttr::insertBefore' => ['DOMNode', 'newnode'=>'DOMNode', 'refnode='=>'DOMNode'],
-'DOMAttr::isDefaultNamespace' => ['bool', 'namespaceuri'=>'string'],
+'DOMAttr::insertBefore' => ['DOMNode|false', 'node'=>'DOMNode', 'child='=>'?DOMNode'],
+'DOMAttr::isDefaultNamespace' => ['bool', 'namespace'=>'string'],
 'DOMAttr::isId' => ['bool'],
-'DOMAttr::isSameNode' => ['bool', 'node'=>'DOMNode'],
+'DOMAttr::isSameNode' => ['bool', 'otherNode'=>'DOMNode'],
 'DOMAttr::isSupported' => ['bool', 'feature'=>'string', 'version'=>'string'],
 'DOMAttr::lookupNamespaceUri' => ['string|null', 'prefix'=>'string|null'],
-'DOMAttr::lookupPrefix' => ['string|null', 'namespaceuri'=>'string'],
+'DOMAttr::lookupPrefix' => ['string|null', 'namespace'=>'string'],
 'DOMAttr::normalize' => ['void'],
-'DOMAttr::removeChild' => ['DOMNode', 'oldnode'=>'DOMNode'],
-'DOMAttr::replaceChild' => ['DOMNode', 'newnode'=>'DOMNode', 'oldnode'=>'DOMNode'],
+'DOMAttr::removeChild' => ['DOMNode|false', 'child'=>'DOMNode'],
+'DOMAttr::replaceChild' => ['DOMNode|false', 'node'=>'DOMNode', 'child'=>'DOMNode'],
 'DomAttribute::name' => ['string'],
 'DomAttribute::set_value' => ['bool', 'content'=>'string'],
 'DomAttribute::specified' => ['bool'],
 'DomAttribute::value' => ['string'],
-'DOMCdataSection::__construct' => ['void', 'value'=>'string'],
+'DOMCdataSection::__construct' => ['void', 'data'=>'string'],
 'DOMCharacterData::appendData' => ['true', 'data'=>'string'],
 'DOMCharacterData::deleteData' => ['bool', 'offset'=>'int', 'count'=>'int'],
 'DOMCharacterData::insertData' => ['bool', 'offset'=>'int', 'data'=>'string'],
 'DOMCharacterData::replaceData' => ['bool', 'offset'=>'int', 'count'=>'int', 'data'=>'string'],
 'DOMCharacterData::substringData' => ['string', 'offset'=>'int', 'count'=>'int'],
-'DOMComment::__construct' => ['void', 'value='=>'string'],
+'DOMComment::__construct' => ['void', 'data='=>'string'],
 'DOMDocument::__construct' => ['void', 'version='=>'string', 'encoding='=>'string'],
-'DOMDocument::createAttribute' => ['DOMAttr|false', 'name'=>'string'],
-'DOMDocument::createAttributeNS' => ['DOMAttr|false', 'namespaceuri'=>'string|null', 'qualifiedname'=>'string'],
+'DOMDocument::createAttribute' => ['DOMAttr|false', 'localName'=>'string'],
+'DOMDocument::createAttributeNS' => ['DOMAttr|false', 'namespace'=>'string|null', 'qualifiedName'=>'string'],
 'DOMDocument::createCDATASection' => ['DOMCDATASection|false', 'data'=>'string'],
 'DOMDocument::createComment' => ['DOMComment', 'data'=>'string'],
 'DOMDocument::createDocumentFragment' => ['DOMDocumentFragment'],
-'DOMDocument::createElement' => ['DOMElement|false', 'name'=>'string', 'value='=>'string'],
-'DOMDocument::createElementNS' => ['DOMElement|false', 'namespaceuri'=>'string|null', 'qualifiedname'=>'string', 'value='=>'string'],
+'DOMDocument::createElement' => ['DOMElement|false', 'localName'=>'string', 'value='=>'string'],
+'DOMDocument::createElementNS' => ['DOMElement|false', 'namespace'=>'string|null', 'qualifiedName'=>'string', 'value='=>'string'],
 'DOMDocument::createEntityReference' => ['DOMEntityReference|false', 'name'=>'string'],
 'DOMDocument::createProcessingInstruction' => ['DOMProcessingInstruction|false', 'target'=>'string', 'data='=>'string'],
-'DOMDocument::createTextNode' => ['DOMText|false', 'content'=>'string'],
-'DOMDocument::getElementById' => ['?DOMElement', 'elementid'=>'string'],
-'DOMDocument::getElementsByTagName' => ['DOMNodeList', 'name'=>'string'],
-'DOMDocument::getElementsByTagNameNS' => ['DOMNodeList', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-'DOMDocument::importNode' => ['DOMNode|false', 'importednode'=>'DOMNode', 'deep='=>'bool'],
+'DOMDocument::createTextNode' => ['DOMText', 'data'=>'string'],
+'DOMDocument::getElementById' => ['?DOMElement', 'elementId'=>'string'],
+'DOMDocument::getElementsByTagName' => ['DOMNodeList', 'qualifiedName'=>'string'],
+'DOMDocument::getElementsByTagNameNS' => ['DOMNodeList', 'namespace'=>'?string', 'localName'=>'string'],
+'DOMDocument::importNode' => ['DOMNode|false', 'node'=>'DOMNode', 'deep='=>'bool'],
 'DOMDocument::load' => ['DOMDocument|bool', 'filename'=>'string', 'options='=>'int'],
 'DOMDocument::loadHTML' => ['bool', 'source'=>'non-empty-string', 'options='=>'int'],
 'DOMDocument::loadHTMLFile' => ['bool', 'filename'=>'string', 'options='=>'int'],
 'DOMDocument::loadXML' => ['DOMDocument|bool', 'source'=>'non-empty-string', 'options='=>'int'],
 'DOMDocument::normalizeDocument' => ['void'],
-'DOMDocument::registerNodeClass' => ['bool', 'baseclass'=>'string', 'extendedclass'=>'string'],
+'DOMDocument::registerNodeClass' => ['bool', 'baseClass'=>'string', 'extendedClass'=>'?string'],
 'DOMDocument::relaxNGValidate' => ['bool', 'filename'=>'string'],
 'DOMDocument::relaxNGValidateSource' => ['bool', 'source'=>'string'],
 'DOMDocument::save' => ['int|false', 'filename'=>'string', 'options='=>'int'],
@@ -1705,55 +1705,55 @@
 'DOMDocument::xinclude' => ['int', 'options='=>'int'],
 'DOMDocumentFragment::__construct' => ['void'],
 'DOMDocumentFragment::appendXML' => ['bool', 'data'=>'string'],
-'DOMElement::__construct' => ['void', 'name'=>'string', 'value='=>'string', 'uri='=>'string'],
-'DOMElement::getAttribute' => ['string', 'name'=>'string'],
-'DOMElement::getAttributeNode' => ['DOMAttr', 'name'=>'string'],
-'DOMElement::getAttributeNodeNS' => ['DOMAttr', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-'DOMElement::getAttributeNS' => ['string', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-'DOMElement::getElementsByTagName' => ['DOMNodeList', 'name'=>'string'],
-'DOMElement::getElementsByTagNameNS' => ['DOMNodeList', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-'DOMElement::hasAttribute' => ['bool', 'name'=>'string'],
-'DOMElement::hasAttributeNS' => ['bool', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-'DOMElement::removeAttribute' => ['bool', 'name'=>'string'],
-'DOMElement::removeAttributeNode' => ['bool', 'oldnode'=>'DOMAttr'],
-'DOMElement::removeAttributeNS' => ['bool', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-'DOMElement::setAttribute' => ['DOMAttr|false', 'name'=>'string', 'value'=>'string'],
+'DOMElement::__construct' => ['void', 'qualifiedName'=>'string', 'value='=>'?string', 'namespace='=>'string'],
+'DOMElement::getAttribute' => ['string', 'qualifiedName'=>'string'],
+'DOMElement::getAttributeNode' => ['DOMAttr', 'qualifiedName'=>'string'],
+'DOMElement::getAttributeNodeNS' => ['DOMAttr', 'namespace'=>'string|null', 'localName'=>'string'],
+'DOMElement::getAttributeNS' => ['string', 'namespace'=>'string|null', 'localName'=>'string'],
+'DOMElement::getElementsByTagName' => ['DOMNodeList', 'qualifiedName'=>'string'],
+'DOMElement::getElementsByTagNameNS' => ['DOMNodeList', 'namespace'=>'string|null', 'localName'=>'string'],
+'DOMElement::hasAttribute' => ['bool', 'qualifiedName'=>'string'],
+'DOMElement::hasAttributeNS' => ['bool', 'namespace'=>'string|null', 'localName'=>'string'],
+'DOMElement::removeAttribute' => ['bool', 'qualifiedName'=>'string'],
+'DOMElement::removeAttributeNode' => ['DOMAttr|false', 'attr'=>'DOMAttr'],
+'DOMElement::removeAttributeNS' => ['void', 'namespace'=>'string|null', 'localName'=>'string'],
+'DOMElement::setAttribute' => ['DOMAttr|false', 'qualifiedName'=>'string', 'value'=>'string'],
 'DOMElement::setAttributeNode' => ['?DOMAttr', 'attr'=>'DOMAttr'],
 'DOMElement::setAttributeNodeNS' => ['DOMAttr', 'attr'=>'DOMAttr'],
-'DOMElement::setAttributeNS' => ['void', 'namespaceuri'=>'string|null', 'qualifiedname'=>'string', 'value'=>'string'],
-'DOMElement::setIdAttribute' => ['void', 'name'=>'string', 'isid'=>'bool'],
-'DOMElement::setIdAttributeNode' => ['void', 'attr'=>'DOMAttr', 'isid'=>'bool'],
-'DOMElement::setIdAttributeNS' => ['void', 'namespaceuri'=>'string', 'localname'=>'string', 'isid'=>'bool'],
+'DOMElement::setAttributeNS' => ['void', 'namespace'=>'string|null', 'qualifiedName'=>'string', 'value'=>'string'],
+'DOMElement::setIdAttribute' => ['void', 'qualifiedName'=>'string', 'isId'=>'bool'],
+'DOMElement::setIdAttributeNode' => ['void', 'attr'=>'DOMAttr', 'isId'=>'bool'],
+'DOMElement::setIdAttributeNS' => ['void', 'namespace'=>'string', 'qualifiedName'=>'string', 'isId'=>'bool'],
 'DOMEntityReference::__construct' => ['void', 'name'=>'string'],
 'DOMImplementation::__construct' => ['void'],
-'DOMImplementation::createDocument' => ['DOMDocument', 'namespaceuri='=>'string', 'qualifiedname='=>'string', 'doctype='=>'DOMDocumentType'],
-'DOMImplementation::createDocumentType' => ['DOMDocumentType', 'qualifiedname='=>'string', 'publicid='=>'string', 'systemid='=>'string'],
+'DOMImplementation::createDocument' => ['DOMDocument|false', 'namespace='=>'?string', 'qualifiedName='=>'string', 'doctype='=>'?DOMDocumentType'],
+'DOMImplementation::createDocumentType' => ['DOMDocumentType|false', 'qualifiedName'=>'string', 'publicId='=>'string', 'systemId='=>'string'],
 'DOMImplementation::hasFeature' => ['bool', 'feature'=>'string', 'version'=>'string'],
 'DOMNamedNodeMap::count' => ['int'],
-'DOMNamedNodeMap::getNamedItem' => ['?DOMNode', 'name'=>'string'],
-'DOMNamedNodeMap::getNamedItemNS' => ['?DOMNode', 'namespaceuri'=>'string', 'localname'=>'string'],
+'DOMNamedNodeMap::getNamedItem' => ['?DOMNode', 'qualifiedName'=>'string'],
+'DOMNamedNodeMap::getNamedItemNS' => ['?DOMNode', 'namespace'=>'?string', 'localName'=>'string'],
 'DOMNamedNodeMap::item' => ['?DOMNode', 'index'=>'int'],
-'DOMNode::appendChild' => ['DOMNode', 'newnode'=>'DOMNode'],
-'DOMNode::C14N' => ['string', 'exclusive='=>'bool', 'with_comments='=>'bool', 'xpath='=>'array', 'ns_prefixes='=>'array'],
-'DOMNode::C14NFile' => ['int|false', 'uri='=>'string', 'exclusive='=>'bool', 'with_comments='=>'bool', 'xpath='=>'array', 'ns_prefixes='=>'array'],
+'DOMNode::appendChild' => ['DOMNode|false', 'node'=>'DOMNode'],
+'DOMNode::C14N' => ['string|false', 'exclusive='=>'bool', 'withComments='=>'bool', 'xpath='=>'?array', 'nsPrefixes='=>'?array'],
+'DOMNode::C14NFile' => ['int|false', 'uri'=>'string', 'exclusive='=>'bool', 'withComments='=>'bool', 'xpath='=>'?array', 'nsPrefixes='=>'?array'],
 'DOMNode::cloneNode' => ['DOMNode', 'deep='=>'bool'],
 'DOMNode::getLineNo' => ['int'],
 'DOMNode::getNodePath' => ['?string'],
 'DOMNode::hasAttributes' => ['bool'],
 'DOMNode::hasChildNodes' => ['bool'],
-'DOMNode::insertBefore' => ['DOMNode', 'newnode'=>'DOMNode', 'refnode='=>'DOMNode|null'],
-'DOMNode::isDefaultNamespace' => ['bool', 'namespaceuri'=>'string'],
-'DOMNode::isSameNode' => ['bool', 'node'=>'DOMNode'],
+'DOMNode::insertBefore' => ['DOMNode|false', 'node'=>'DOMNode', 'child='=>'?DOMNode'],
+'DOMNode::isDefaultNamespace' => ['bool', 'namespace'=>'string'],
+'DOMNode::isSameNode' => ['bool', 'otherNode'=>'DOMNode'],
 'DOMNode::isSupported' => ['bool', 'feature'=>'string', 'version'=>'string'],
 'DOMNode::lookupNamespaceURI' => ['string|null', 'prefix'=>'string|null'],
-'DOMNode::lookupPrefix' => ['string|null', 'namespaceuri'=>'string'],
+'DOMNode::lookupPrefix' => ['string|null', 'namespace'=>'string'],
 'DOMNode::normalize' => ['void'],
-'DOMNode::removeChild' => ['DOMNode', 'oldnode'=>'DOMNode'],
-'DOMNode::replaceChild' => ['DOMNode|false', 'newnode'=>'DOMNode', 'oldnode'=>'DOMNode'],
+'DOMNode::removeChild' => ['DOMNode|false', 'child'=>'DOMNode'],
+'DOMNode::replaceChild' => ['DOMNode|false', 'node'=>'DOMNode', 'child'=>'DOMNode'],
 'DOMNodeList::count' => ['int'],
 'DOMNodeList::item' => ['?DOMNode', 'index'=>'int'],
-'DOMProcessingInstruction::__construct' => ['void', 'name'=>'string', 'value'=>'string'],
-'DOMText::__construct' => ['void', 'value='=>'string'],
+'DOMProcessingInstruction::__construct' => ['void', 'name'=>'string', 'value='=>'string'],
+'DOMText::__construct' => ['void', 'data='=>'string'],
 'DOMText::isElementContentWhitespace' => ['bool'],
 'DOMText::isWhitespaceInElementContent' => ['bool'],
 'DOMText::splitText' => ['DOMText', 'offset'=>'int'],
@@ -1766,11 +1766,11 @@
 'domxml_xslt_stylesheet_doc' => ['DomXsltStylesheet', 'xsl_doc'=>'DOMDocument'],
 'domxml_xslt_stylesheet_file' => ['DomXsltStylesheet', 'xsl_file'=>'string'],
 'domxml_xslt_version' => ['int'],
-'DOMXPath::__construct' => ['void', 'doc'=>'DOMDocument'],
-'DOMXPath::evaluate' => ['mixed', 'expression'=>'string', 'contextnode='=>'?DOMNode', 'registernodens='=>'bool'],
-'DOMXPath::query' => ['DOMNodeList|false', 'expression'=>'string', 'contextnode='=>'DOMNode|null', 'registernodens='=>'bool'],
-'DOMXPath::registerNamespace' => ['bool', 'prefix'=>'string', 'namespaceuri'=>'string'],
-'DOMXPath::registerPhpFunctions' => ['void', 'restrict='=>'mixed'],
+'DOMXPath::__construct' => ['void', 'document'=>'DOMDocument', 'registerNodeNS='=>'bool'],
+'DOMXPath::evaluate' => ['mixed', 'expression'=>'string', 'contextNode='=>'?DOMNode', 'registerNodeNS='=>'bool'],
+'DOMXPath::query' => ['DOMNodeList|false', 'expression'=>'string', 'contextNode='=>'?DOMNode', 'registerNodeNS='=>'bool'],
+'DOMXPath::registerNamespace' => ['bool', 'prefix'=>'string', 'namespace'=>'string'],
+'DOMXPath::registerPhpFunctions' => ['void', 'restrict='=>'array|string|null'],
 'DomXsltStylesheet::process' => ['DomDocument', 'xml_doc'=>'DOMDocument', 'xslt_params='=>'array', 'is_xpath_param='=>'bool', 'profile_filename='=>'string'],
 'DomXsltStylesheet::result_dump_file' => ['string', 'xmldoc'=>'DOMDocument', 'filename'=>'string'],
 'DomXsltStylesheet::result_dump_mem' => ['string', 'xmldoc'=>'DOMDocument'],
diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
index c44e9604d46..3cd63b29159 100644
--- a/dictionaries/CallMap_80_delta.php
+++ b/dictionaries/CallMap_80_delta.php
@@ -41,9 +41,9 @@
       'old' => ['int|false'],
       'new' => ['int'],
     ],
-    'DateTime::diff' => [
-      'old' => ['DateInterval|false', 'datetime2'=>'DateTimeInterface', 'absolute='=>'bool'],
-      'new' => ['DateInterval', 'datetime2'=>'DateTimeInterface', 'absolute='=>'bool'],
+    'CURLFile::__construct' => [
+      'old' => ['void', 'filename'=>'string', 'mime_type='=>'string', 'posted_filename='=>'string'],
+      'new' => ['void', 'filename'=>'string', 'mime_type='=>'?string', 'posted_filename='=>'?string'],
     ],
     'DateTime::format' => [
       'old' => ['string|false', 'format'=>'string'],
@@ -53,10 +53,6 @@
       'old' => ['int|false'],
       'new' => ['int'],
     ],
-    'DateTime::setTime' => [
-      'old' => ['static|false', 'hour'=>'int', 'minute'=>'int', 'second='=>'int', 'microseconds='=>'int'],
-      'new' => ['static', 'hour'=>'int', 'minute'=>'int', 'second='=>'int', 'microseconds='=>'int'],
-    ],
     'DateTimeInterface::getTimestamp' => [
        'old' => ['int|false'],
        'new' => ['int'],
@@ -93,6 +89,14 @@
       'old' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'],
       'new' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'],
     ],
+    'DOMDocument::getElementsByTagNameNS' => [
+      'old' => ['DOMNodeList', 'namespace'=>'string', 'localName'=>'string'],
+      'new' => ['DOMNodeList', 'namespace'=>'?string', 'localName'=>'string'],
+    ],
+    'DOMImplementation::createDocument' => [
+      'old' => ['DOMDocument|false', 'namespace='=>'string', 'qualifiedName='=>'string', 'doctype='=>'DOMDocumentType'],
+      'new' => ['DOMDocument|false', 'namespace='=>'?string', 'qualifiedName='=>'string', 'doctype='=>'?DOMDocumentType'],
+    ],
     'ErrorException::__construct' => [
       'old' => ['void', 'message='=>'string', 'code='=>'int', 'severity='=>'int', 'filename='=>'string', 'line='=>'int', 'previous='=>'?Throwable'],
       'new' => ['void', 'message='=>'string', 'code='=>'int', 'severity='=>'int', 'filename='=>'?string', 'line='=>'?int', 'previous='=>'?Throwable'],
diff --git a/dictionaries/CallMap_81_delta.php b/dictionaries/CallMap_81_delta.php
index 574af5beeef..ded1f5e40db 100644
--- a/dictionaries/CallMap_81_delta.php
+++ b/dictionaries/CallMap_81_delta.php
@@ -66,6 +66,10 @@
       'old' => ['DOMDocumentFragment|false'],
       'new' => ['DOMDocumentFragment'],
     ],
+    'DOMDocument::createTextNode' => [
+      'old' => ['DOMText|false', 'data'=>'string'],
+      'new' => ['DOMText', 'data'=>'string'],
+    ],
     'Phar::buildFromDirectory' => [
       'old' => ['array|false', 'directory'=>'string', 'pattern='=>'string'],
       'new' => ['array', 'directory'=>'string', 'pattern='=>'string'],
diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
index 7d87ab099c4..ad6409eb3af 100644
--- a/dictionaries/CallMap_historical.php
+++ b/dictionaries/CallMap_historical.php
@@ -292,13 +292,13 @@
     'COMPersistHelper::SaveToFile' => ['bool', 'filename'=>'string', 'remember'=>'bool'],
     'COMPersistHelper::SaveToStream' => ['int', 'stream'=>''],
     'COMPersistHelper::__construct' => ['void', 'variant'=>'object'],
-    'CURLFile::__construct' => ['void', 'filename'=>'string', 'mimetype='=>'string', 'postfilename='=>'string'],
+    'CURLFile::__construct' => ['void', 'filename'=>'string', 'mime_type='=>'string', 'posted_filename='=>'string'],
     'CURLFile::__wakeup' => ['void'],
     'CURLFile::getFilename' => ['string'],
     'CURLFile::getMimeType' => ['string'],
     'CURLFile::getPostFilename' => ['string'],
-    'CURLFile::setMimeType' => ['void', 'mime'=>'string'],
-    'CURLFile::setPostFilename' => ['void', 'name'=>'string'],
+    'CURLFile::setMimeType' => ['void', 'mime_type'=>'string'],
+    'CURLFile::setPostFilename' => ['void', 'posted_filename'=>'string'],
     'CachingIterator::__construct' => ['void', 'iterator'=>'Iterator', 'flags='=>''],
     'CachingIterator::__toString' => ['string'],
     'CachingIterator::count' => ['int'],
@@ -339,19 +339,19 @@
     'Closure::bindTo' => ['?Closure', 'newThis'=>'?object', 'newScope='=>'object|string|null'],
     'Closure::call' => ['mixed', 'newThis'=>'object', '...args='=>'mixed'],
     'Collator::__construct' => ['void', 'locale'=>'string'],
-    'Collator::asort' => ['bool', '&rw_arr'=>'array', 'sort_flag='=>'int'],
+    'Collator::asort' => ['bool', '&rw_array'=>'array', 'flags='=>'int'],
     'Collator::compare' => ['int|false', 'string1'=>'string', 'string2'=>'string'],
     'Collator::create' => ['?Collator', 'locale'=>'string'],
-    'Collator::getAttribute' => ['int|false', 'attr'=>'int'],
+    'Collator::getAttribute' => ['int|false', 'attribute'=>'int'],
     'Collator::getErrorCode' => ['int'],
     'Collator::getErrorMessage' => ['string'],
     'Collator::getLocale' => ['string', 'type'=>'int'],
     'Collator::getSortKey' => ['string|false', 'string'=>'string'],
     'Collator::getStrength' => ['int|false'],
-    'Collator::setAttribute' => ['bool', 'attr'=>'int', 'value'=>'int'],
+    'Collator::setAttribute' => ['bool', 'attribute'=>'int', 'value'=>'int'],
     'Collator::setStrength' => ['bool', 'strength'=>'int'],
-    'Collator::sort' => ['bool', '&rw_arr'=>'array', 'sort_flags='=>'int'],
-    'Collator::sortWithSortKeys' => ['bool', '&rw_arr'=>'array'],
+    'Collator::sort' => ['bool', '&rw_array'=>'array', 'flags='=>'int'],
+    'Collator::sortWithSortKeys' => ['bool', '&rw_array'=>'array'],
     'Collectable::isGarbage' => ['bool'],
     'Collectable::setGarbage' => ['void'],
     'Cond::broadcast' => ['bool', 'condition'=>'long'],
@@ -701,44 +701,44 @@
     'DOMAttr::getNodePath' => ['?string'],
     'DOMAttr::hasAttributes' => ['bool'],
     'DOMAttr::hasChildNodes' => ['bool'],
-    'DOMAttr::insertBefore' => ['DOMNode', 'newnode'=>'DOMNode', 'refnode='=>'DOMNode'],
-    'DOMAttr::isDefaultNamespace' => ['bool', 'namespaceuri'=>'string'],
+    'DOMAttr::insertBefore' => ['DOMNode|false', 'node'=>'DOMNode', 'child='=>'?DOMNode'],
+    'DOMAttr::isDefaultNamespace' => ['bool', 'namespace'=>'string'],
     'DOMAttr::isId' => ['bool'],
-    'DOMAttr::isSameNode' => ['bool', 'node'=>'DOMNode'],
+    'DOMAttr::isSameNode' => ['bool', 'otherNode'=>'DOMNode'],
     'DOMAttr::isSupported' => ['bool', 'feature'=>'string', 'version'=>'string'],
     'DOMAttr::lookupNamespaceUri' => ['string|null', 'prefix'=>'string|null'],
-    'DOMAttr::lookupPrefix' => ['string|null', 'namespaceuri'=>'string'],
+    'DOMAttr::lookupPrefix' => ['string|null', 'namespace'=>'string'],
     'DOMAttr::normalize' => ['void'],
-    'DOMAttr::removeChild' => ['DOMNode', 'oldnode'=>'DOMNode'],
-    'DOMAttr::replaceChild' => ['DOMNode', 'newnode'=>'DOMNode', 'oldnode'=>'DOMNode'],
-    'DOMCdataSection::__construct' => ['void', 'value'=>'string'],
+    'DOMAttr::removeChild' => ['DOMNode|false', 'child'=>'DOMNode'],
+    'DOMAttr::replaceChild' => ['DOMNode|false', 'node'=>'DOMNode', 'child'=>'DOMNode'],
+    'DOMCdataSection::__construct' => ['void', 'data'=>'string'],
     'DOMCharacterData::appendData' => ['true', 'data'=>'string'],
     'DOMCharacterData::deleteData' => ['bool', 'offset'=>'int', 'count'=>'int'],
     'DOMCharacterData::insertData' => ['bool', 'offset'=>'int', 'data'=>'string'],
     'DOMCharacterData::replaceData' => ['bool', 'offset'=>'int', 'count'=>'int', 'data'=>'string'],
     'DOMCharacterData::substringData' => ['string', 'offset'=>'int', 'count'=>'int'],
-    'DOMComment::__construct' => ['void', 'value='=>'string'],
+    'DOMComment::__construct' => ['void', 'data='=>'string'],
     'DOMDocument::__construct' => ['void', 'version='=>'string', 'encoding='=>'string'],
-    'DOMDocument::createAttribute' => ['DOMAttr|false', 'name'=>'string'],
-    'DOMDocument::createAttributeNS' => ['DOMAttr|false', 'namespaceuri'=>'string|null', 'qualifiedname'=>'string'],
+    'DOMDocument::createAttribute' => ['DOMAttr|false', 'localName'=>'string'],
+    'DOMDocument::createAttributeNS' => ['DOMAttr|false', 'namespace'=>'string|null', 'qualifiedName'=>'string'],
     'DOMDocument::createCDATASection' => ['DOMCDATASection|false', 'data'=>'string'],
     'DOMDocument::createComment' => ['DOMComment|false', 'data'=>'string'],
     'DOMDocument::createDocumentFragment' => ['DOMDocumentFragment|false'],
-    'DOMDocument::createElement' => ['DOMElement|false', 'name'=>'string', 'value='=>'string'],
-    'DOMDocument::createElementNS' => ['DOMElement|false', 'namespaceuri'=>'string|null', 'qualifiedname'=>'string', 'value='=>'string'],
+    'DOMDocument::createElement' => ['DOMElement|false', 'localName'=>'string', 'value='=>'string'],
+    'DOMDocument::createElementNS' => ['DOMElement|false', 'namespace'=>'string|null', 'qualifiedName'=>'string', 'value='=>'string'],
     'DOMDocument::createEntityReference' => ['DOMEntityReference|false', 'name'=>'string'],
     'DOMDocument::createProcessingInstruction' => ['DOMProcessingInstruction|false', 'target'=>'string', 'data='=>'string'],
-    'DOMDocument::createTextNode' => ['DOMText|false', 'content'=>'string'],
-    'DOMDocument::getElementById' => ['?DOMElement', 'elementid'=>'string'],
-    'DOMDocument::getElementsByTagName' => ['DOMNodeList', 'name'=>'string'],
-    'DOMDocument::getElementsByTagNameNS' => ['DOMNodeList', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-    'DOMDocument::importNode' => ['DOMNode|false', 'importednode'=>'DOMNode', 'deep='=>'bool'],
+    'DOMDocument::createTextNode' => ['DOMText|false', 'data'=>'string'],
+    'DOMDocument::getElementById' => ['?DOMElement', 'elementId'=>'string'],
+    'DOMDocument::getElementsByTagName' => ['DOMNodeList', 'qualifiedName'=>'string'],
+    'DOMDocument::getElementsByTagNameNS' => ['DOMNodeList', 'namespace'=>'string', 'localName'=>'string'],
+    'DOMDocument::importNode' => ['DOMNode|false', 'node'=>'DOMNode', 'deep='=>'bool'],
     'DOMDocument::load' => ['DOMDocument|bool', 'filename'=>'string', 'options='=>'int'],
     'DOMDocument::loadHTML' => ['bool', 'source'=>'non-empty-string', 'options='=>'int'],
     'DOMDocument::loadHTMLFile' => ['bool', 'filename'=>'string', 'options='=>'int'],
     'DOMDocument::loadXML' => ['DOMDocument|bool', 'source'=>'non-empty-string', 'options='=>'int'],
     'DOMDocument::normalizeDocument' => ['void'],
-    'DOMDocument::registerNodeClass' => ['bool', 'baseclass'=>'string', 'extendedclass'=>'string'],
+    'DOMDocument::registerNodeClass' => ['bool', 'baseClass'=>'string', 'extendedClass'=>'?string'],
     'DOMDocument::relaxNGValidate' => ['bool', 'filename'=>'string'],
     'DOMDocument::relaxNGValidateSource' => ['bool', 'source'=>'string'],
     'DOMDocument::save' => ['int|false', 'filename'=>'string', 'options='=>'int'],
@@ -751,70 +751,70 @@
     'DOMDocument::xinclude' => ['int', 'options='=>'int'],
     'DOMDocumentFragment::__construct' => ['void'],
     'DOMDocumentFragment::appendXML' => ['bool', 'data'=>'string'],
-    'DOMElement::__construct' => ['void', 'name'=>'string', 'value='=>'string', 'uri='=>'string'],
-    'DOMElement::getAttribute' => ['string', 'name'=>'string'],
-    'DOMElement::getAttributeNS' => ['string', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-    'DOMElement::getAttributeNode' => ['DOMAttr', 'name'=>'string'],
-    'DOMElement::getAttributeNodeNS' => ['DOMAttr', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-    'DOMElement::getElementsByTagName' => ['DOMNodeList', 'name'=>'string'],
-    'DOMElement::getElementsByTagNameNS' => ['DOMNodeList', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-    'DOMElement::hasAttribute' => ['bool', 'name'=>'string'],
-    'DOMElement::hasAttributeNS' => ['bool', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-    'DOMElement::removeAttribute' => ['bool', 'name'=>'string'],
-    'DOMElement::removeAttributeNS' => ['bool', 'namespaceuri'=>'string|null', 'localname'=>'string'],
-    'DOMElement::removeAttributeNode' => ['bool', 'oldnode'=>'DOMAttr'],
-    'DOMElement::setAttribute' => ['DOMAttr|false', 'name'=>'string', 'value'=>'string'],
-    'DOMElement::setAttributeNS' => ['void', 'namespaceuri'=>'string|null', 'qualifiedname'=>'string', 'value'=>'string'],
+    'DOMElement::__construct' => ['void', 'qualifiedName'=>'string', 'value='=>'?string', 'namespace='=>'string'],
+    'DOMElement::getAttribute' => ['string', 'qualifiedName'=>'string'],
+    'DOMElement::getAttributeNS' => ['string', 'namespace'=>'string|null', 'localName'=>'string'],
+    'DOMElement::getAttributeNode' => ['DOMAttr', 'qualifiedName'=>'string'],
+    'DOMElement::getAttributeNodeNS' => ['DOMAttr', 'namespace'=>'string|null', 'localName'=>'string'],
+    'DOMElement::getElementsByTagName' => ['DOMNodeList', 'qualifiedName'=>'string'],
+    'DOMElement::getElementsByTagNameNS' => ['DOMNodeList', 'namespace'=>'string|null', 'localName'=>'string'],
+    'DOMElement::hasAttribute' => ['bool', 'qualifiedName'=>'string'],
+    'DOMElement::hasAttributeNS' => ['bool', 'namespace'=>'string|null', 'localName'=>'string'],
+    'DOMElement::removeAttribute' => ['bool', 'qualifiedName'=>'string'],
+    'DOMElement::removeAttributeNS' => ['void', 'namespace'=>'string|null', 'localName'=>'string'],
+    'DOMElement::removeAttributeNode' => ['DOMAttr|false', 'attr'=>'DOMAttr'],
+    'DOMElement::setAttribute' => ['DOMAttr|false', 'qualifiedName'=>'string', 'value'=>'string'],
+    'DOMElement::setAttributeNS' => ['void', 'namespace'=>'string|null', 'qualifiedName'=>'string', 'value'=>'string'],
     'DOMElement::setAttributeNode' => ['?DOMAttr', 'attr'=>'DOMAttr'],
     'DOMElement::setAttributeNodeNS' => ['DOMAttr', 'attr'=>'DOMAttr'],
-    'DOMElement::setIdAttribute' => ['void', 'name'=>'string', 'isid'=>'bool'],
-    'DOMElement::setIdAttributeNS' => ['void', 'namespaceuri'=>'string', 'localname'=>'string', 'isid'=>'bool'],
-    'DOMElement::setIdAttributeNode' => ['void', 'attr'=>'DOMAttr', 'isid'=>'bool'],
+    'DOMElement::setIdAttribute' => ['void', 'qualifiedName'=>'string', 'isId'=>'bool'],
+    'DOMElement::setIdAttributeNS' => ['void', 'namespace'=>'string', 'qualifiedName'=>'string', 'isId'=>'bool'],
+    'DOMElement::setIdAttributeNode' => ['void', 'attr'=>'DOMAttr', 'isId'=>'bool'],
     'DOMEntityReference::__construct' => ['void', 'name'=>'string'],
     'DOMImplementation::__construct' => ['void'],
-    'DOMImplementation::createDocument' => ['DOMDocument', 'namespaceuri='=>'string', 'qualifiedname='=>'string', 'doctype='=>'DOMDocumentType'],
-    'DOMImplementation::createDocumentType' => ['DOMDocumentType', 'qualifiedname='=>'string', 'publicid='=>'string', 'systemid='=>'string'],
+    'DOMImplementation::createDocument' => ['DOMDocument|false', 'namespace='=>'string', 'qualifiedName='=>'string', 'doctype='=>'DOMDocumentType'],
+    'DOMImplementation::createDocumentType' => ['DOMDocumentType|false', 'qualifiedName'=>'string', 'publicId='=>'string', 'systemId='=>'string'],
     'DOMImplementation::hasFeature' => ['bool', 'feature'=>'string', 'version'=>'string'],
     'DOMNamedNodeMap::count' => ['int'],
-    'DOMNamedNodeMap::getNamedItem' => ['?DOMNode', 'name'=>'string'],
-    'DOMNamedNodeMap::getNamedItemNS' => ['?DOMNode', 'namespaceuri'=>'string', 'localname'=>'string'],
+    'DOMNamedNodeMap::getNamedItem' => ['?DOMNode', 'qualifiedName'=>'string'],
+    'DOMNamedNodeMap::getNamedItemNS' => ['?DOMNode', 'namespace'=>'?string', 'localName'=>'string'],
     'DOMNamedNodeMap::item' => ['?DOMNode', 'index'=>'int'],
-    'DOMNode::C14N' => ['string', 'exclusive='=>'bool', 'with_comments='=>'bool', 'xpath='=>'array', 'ns_prefixes='=>'array'],
-    'DOMNode::C14NFile' => ['int|false', 'uri='=>'string', 'exclusive='=>'bool', 'with_comments='=>'bool', 'xpath='=>'array', 'ns_prefixes='=>'array'],
-    'DOMNode::appendChild' => ['DOMNode', 'newnode'=>'DOMNode'],
+    'DOMNode::C14N' => ['string|false', 'exclusive='=>'bool', 'withComments='=>'bool', 'xpath='=>'?array', 'nsPrefixes='=>'?array'],
+    'DOMNode::C14NFile' => ['int|false', 'uri'=>'string', 'exclusive='=>'bool', 'withComments='=>'bool', 'xpath='=>'?array', 'nsPrefixes='=>'?array'],
+    'DOMNode::appendChild' => ['DOMNode|false', 'node'=>'DOMNode'],
     'DOMNode::cloneNode' => ['DOMNode', 'deep='=>'bool'],
     'DOMNode::getLineNo' => ['int'],
     'DOMNode::getNodePath' => ['?string'],
     'DOMNode::hasAttributes' => ['bool'],
     'DOMNode::hasChildNodes' => ['bool'],
-    'DOMNode::insertBefore' => ['DOMNode', 'newnode'=>'DOMNode', 'refnode='=>'DOMNode|null'],
-    'DOMNode::isDefaultNamespace' => ['bool', 'namespaceuri'=>'string'],
-    'DOMNode::isSameNode' => ['bool', 'node'=>'DOMNode'],
+    'DOMNode::insertBefore' => ['DOMNode|false', 'node'=>'DOMNode', 'child='=>'?DOMNode'],
+    'DOMNode::isDefaultNamespace' => ['bool', 'namespace'=>'string'],
+    'DOMNode::isSameNode' => ['bool', 'otherNode'=>'DOMNode'],
     'DOMNode::isSupported' => ['bool', 'feature'=>'string', 'version'=>'string'],
     'DOMNode::lookupNamespaceURI' => ['string|null', 'prefix'=>'string|null'],
-    'DOMNode::lookupPrefix' => ['string|null', 'namespaceuri'=>'string'],
+    'DOMNode::lookupPrefix' => ['string|null', 'namespace'=>'string'],
     'DOMNode::normalize' => ['void'],
-    'DOMNode::removeChild' => ['DOMNode', 'oldnode'=>'DOMNode'],
-    'DOMNode::replaceChild' => ['DOMNode|false', 'newnode'=>'DOMNode', 'oldnode'=>'DOMNode'],
+    'DOMNode::removeChild' => ['DOMNode|false', 'child'=>'DOMNode'],
+    'DOMNode::replaceChild' => ['DOMNode|false', 'node'=>'DOMNode', 'child'=>'DOMNode'],
     'DOMNodeList::item' => ['?DOMNode', 'index'=>'int'],
-    'DOMProcessingInstruction::__construct' => ['void', 'name'=>'string', 'value'=>'string'],
-    'DOMText::__construct' => ['void', 'value='=>'string'],
+    'DOMProcessingInstruction::__construct' => ['void', 'name'=>'string', 'value='=>'string'],
+    'DOMText::__construct' => ['void', 'data='=>'string'],
     'DOMText::isElementContentWhitespace' => ['bool'],
     'DOMText::isWhitespaceInElementContent' => ['bool'],
     'DOMText::splitText' => ['DOMText', 'offset'=>'int'],
-    'DOMXPath::__construct' => ['void', 'doc'=>'DOMDocument'],
-    'DOMXPath::evaluate' => ['mixed', 'expression'=>'string', 'contextnode='=>'?DOMNode', 'registernodens='=>'bool'],
-    'DOMXPath::query' => ['DOMNodeList|false', 'expression'=>'string', 'contextnode='=>'DOMNode|null', 'registernodens='=>'bool'],
-    'DOMXPath::registerNamespace' => ['bool', 'prefix'=>'string', 'namespaceuri'=>'string'],
-    'DOMXPath::registerPhpFunctions' => ['void', 'restrict='=>'mixed'],
+    'DOMXPath::__construct' => ['void', 'document'=>'DOMDocument', 'registerNodeNS='=>'bool'],
+    'DOMXPath::evaluate' => ['mixed', 'expression'=>'string', 'contextNode='=>'?DOMNode', 'registerNodeNS='=>'bool'],
+    'DOMXPath::query' => ['DOMNodeList|false', 'expression'=>'string', 'contextNode='=>'?DOMNode', 'registerNodeNS='=>'bool'],
+    'DOMXPath::registerNamespace' => ['bool', 'prefix'=>'string', 'namespace'=>'string'],
+    'DOMXPath::registerPhpFunctions' => ['void', 'restrict='=>'array|string|null'],
     'DOTNET::__call' => ['mixed', 'name'=>'string', 'args'=>''],
     'DOTNET::__construct' => ['void', 'assembly_name'=>'string', 'datatype_name'=>'string', 'codepage='=>'int'],
     'DOTNET::__get' => ['mixed', 'name'=>'string'],
     'DOTNET::__set' => ['void', 'name'=>'string', 'value'=>''],
-    'DateInterval::__construct' => ['void', 'spec'=>'string'],
+    'DateInterval::__construct' => ['void', 'duration'=>'string'],
     'DateInterval::__set_state' => ['DateInterval', 'array'=>'array'],
     'DateInterval::__wakeup' => ['void'],
-    'DateInterval::createFromDateString' => ['DateInterval|false', 'time'=>'string'],
+    'DateInterval::createFromDateString' => ['DateInterval|false', 'datetime'=>'string'],
     'DateInterval::format' => ['string', 'format'=>'string'],
     'DatePeriod::__construct' => ['void', 'start'=>'DateTimeInterface', 'interval'=>'DateInterval', 'recur'=>'int', 'options='=>'int'],
     'DatePeriod::__construct\'1' => ['void', 'start'=>'DateTimeInterface', 'interval'=>'DateInterval', 'end'=>'DateTimeInterface', 'options='=>'int'],
@@ -827,18 +827,18 @@
     'DateTime::__construct\'1' => ['void', 'time'=>'?string', 'timezone'=>'?DateTimeZone'],
     'DateTime::__wakeup' => ['void'],
     'DateTime::add' => ['static', 'interval'=>'DateInterval'],
-    'DateTime::createFromFormat' => ['static|false', 'format'=>'string', 'time'=>'string', 'timezone='=>'?DateTimeZone'],
-    'DateTime::diff' => ['DateInterval|false', 'datetime2'=>'DateTimeInterface', 'absolute='=>'bool'],
+    'DateTime::createFromFormat' => ['static|false', 'format'=>'string', 'datetime'=>'string', 'timezone='=>'?DateTimeZone'],
+    'DateTime::diff' => ['DateInterval', 'targetObject'=>'DateTimeInterface', 'absolute='=>'bool'],
     'DateTime::format' => ['string|false', 'format'=>'string'],
     'DateTime::getLastErrors' => ['array{warning_count:int,warnings:array<int,string>,error_count:int,errors:array<int,string>}|false'],
     'DateTime::getOffset' => ['int'],
     'DateTime::getTimestamp' => ['int|false'],
     'DateTime::getTimezone' => ['DateTimeZone|false'],
-    'DateTime::modify' => ['static|false', 'modify'=>'string'],
+    'DateTime::modify' => ['static|false', 'modifier'=>'string'],
     'DateTime::setDate' => ['static', 'year'=>'int', 'month'=>'int', 'day'=>'int'],
-    'DateTime::setISODate' => ['static', 'year'=>'int', 'week'=>'int', 'day='=>'int'],
-    'DateTime::setTime' => ['static|false', 'hour'=>'int', 'minute'=>'int', 'second='=>'int', 'microseconds='=>'int'],
-    'DateTime::setTimestamp' => ['static', 'unixtimestamp'=>'int'],
+    'DateTime::setISODate' => ['static', 'year'=>'int', 'week'=>'int', 'dayOfWeek='=>'int'],
+    'DateTime::setTime' => ['static', 'hour'=>'int', 'minute'=>'int', 'second='=>'int', 'microsecond='=>'int'],
+    'DateTime::setTimestamp' => ['static', 'timestamp'=>'int'],
     'DateTime::setTimezone' => ['static', 'timezone'=>'DateTimeZone'],
     'DateTime::sub' => ['static', 'interval'=>'DateInterval'],
     'DateTimeImmutable::__wakeup' => ['void'],
@@ -854,7 +854,7 @@
     'DateTimeZone::getLocation' => ['array|false'],
     '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::getTransitions' => ['list<array{ts: int, time: string, offset: int, isdst: bool, abbr: string}>|false', 'timestampBegin='=>'int', 'timestampEnd='=>'int'],
     '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'],
diff --git a/tests/DateTimeTest.php b/tests/DateTimeTest.php
index afaede82ef3..ce9e926ff3a 100644
--- a/tests/DateTimeTest.php
+++ b/tests/DateTimeTest.php
@@ -96,7 +96,7 @@ function getString(): string
                     $b = $dateTimeImmutable->modify("+1 day")->setTime(0, 0);
                     ',
                 'assertions' => [
-                    '$a' => 'DateTime|false',
+                    '$a' => 'DateTime',
                     '$b' => 'DateTimeImmutable',
                 ],
             ],
diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
index f4fe5acb57b..6349d5a592c 100644
--- a/tests/Internal/Codebase/InternalCallMapHandlerTest.php
+++ b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -73,80 +73,8 @@ class InternalCallMapHandlerTest extends TestCase
      */
     private static array $ignoredFunctions = [
         'array_multisort',
-        'collator::asort',
-        'collator::getattribute',
-        'collator::setattribute',
-        'collator::sort',
-        'collator::sortwithsortkeys',
-        'curlfile::__construct',
-        'curlfile::setmimetype',
-        'curlfile::setpostfilename',
         'date_isodate_set',
         'datefmt_create' => ['8.0'],
-        'dateinterval::__construct',
-        'dateinterval::createfromdatestring',
-        'datetime::createfromformat',
-        'datetime::diff',
-        'datetime::modify',
-        'datetime::setisodate',
-        'datetime::settime',
-        'datetime::settimestamp',
-        'datetimezone::gettransitions',
-        'domattr::insertbefore',
-        'domattr::isdefaultnamespace',
-        'domattr::issamenode',
-        'domattr::lookupprefix',
-        'domattr::removechild',
-        'domattr::replacechild',
-        'domcdatasection::__construct',
-        'domcomment::__construct',
-        'domdocument::createattribute',
-        'domdocument::createattributens',
-        'domdocument::createelement',
-        'domdocument::createelementns',
-        'domdocument::createtextnode',
-        'domdocument::getelementbyid',
-        'domdocument::getelementsbytagname',
-        'domdocument::getelementsbytagnamens',
-        'domdocument::importnode',
-        'domdocument::registernodeclass',
-        'domelement::__construct',
-        'domelement::getattribute',
-        'domelement::getattributenode',
-        'domelement::getattributenodens',
-        'domelement::getattributens',
-        'domelement::getelementsbytagname',
-        'domelement::getelementsbytagnamens',
-        'domelement::hasattribute',
-        'domelement::hasattributens',
-        'domelement::removeattribute',
-        'domelement::removeattributenode',
-        'domelement::removeattributens',
-        'domelement::setattribute',
-        'domelement::setattributens',
-        'domelement::setidattribute',
-        'domelement::setidattributenode',
-        'domelement::setidattributens',
-        'domimplementation::createdocument',
-        'domimplementation::createdocumenttype',
-        'domnamednodemap::getnameditem',
-        'domnamednodemap::getnameditemns',
-        'domnode::appendchild',
-        'domnode::c14n',
-        'domnode::c14nfile',
-        'domnode::insertbefore',
-        'domnode::isdefaultnamespace',
-        'domnode::issamenode',
-        'domnode::lookupprefix',
-        'domnode::removechild',
-        'domnode::replacechild',
-        'domprocessinginstruction::__construct',
-        'domtext::__construct',
-        'domxpath::__construct',
-        'domxpath::evaluate',
-        'domxpath::query',
-        'domxpath::registernamespace',
-        'domxpath::registerphpfunctions',
         'easter_date',
         'fiber::start',
         'gnupg::adddecryptkey',
@@ -476,12 +404,17 @@ class InternalCallMapHandlerTest extends TestCase
         'cachingiterator::getinneriterator' => ['8.1', '8.2'],
         'callbackfilteriterator::getinneriterator' => ['8.1', '8.2'],
         'curl_multi_getcontent',
-        'datetime::add' => ['8.1', '8.2'],
+        'datetime::add' => ['8.1', '8.2'], // DateTime does not contain static
+        'datetime::modify' => ['8.1', '8.2'], // DateTime does not contain static
+        'datetime::createfromformat' => ['8.1', '8.2'], // DateTime does not contain static
         'datetime::createfromimmutable' => ['8.1'],
         'datetime::createfrominterface',
-        'datetime::setdate' => ['8.1', '8.2'],
-        'datetime::settimezone' => ['8.1', '8.2'],
-        'datetime::sub' => ['8.1', '8.2'],
+        'datetime::setdate' => ['8.1', '8.2'], // DateTime does not contain static
+        'datetime::setisodate' => ['8.1', '8.2'], // DateTime does not contain static
+        'datetime::settime' => ['8.1', '8.2'], // DateTime does not contain static
+        'datetime::settimestamp' => ['8.1', '8.2'], // DateTime does not contain static
+        'datetime::settimezone' => ['8.1', '8.2'], // DateTime does not contain static
+        'datetime::sub' => ['8.1', '8.2'], // DateTime does not contain static
         'datetimeimmutable::createfrominterface',
         'fiber::getcurrent',
         'filteriterator::getinneriterator' => ['8.1', '8.2'],