diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
index bcdd10cdb39..e16876d5ea3 100644
--- a/dictionaries/CallMap.php
+++ b/dictionaries/CallMap.php
@@ -2094,18 +2094,18 @@
 'DOMComment::__construct' => ['void', 'value='=>'string'],
 'DOMDocument::__construct' => ['void', 'version='=>'string', 'encoding='=>'string'],
 'DOMDocument::createAttribute' => ['DOMAttr|false', 'name'=>'string'],
-'DOMDocument::createAttributeNS' => ['DOMAttr|false', 'namespaceuri'=>'string', 'qualifiedname'=>'string'],
+'DOMDocument::createAttributeNS' => ['DOMAttr|false', 'namespaceuri'=>'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', 'qualifiedname'=>'string', 'value='=>'string'],
+'DOMDocument::createElementNS' => ['DOMElement|false', 'namespaceuri'=>'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', 'localname'=>'string'],
+'DOMDocument::getElementsByTagNameNS' => ['DOMNodeList', 'namespaceuri'=>'string|null', 'localname'=>'string'],
 'DOMDocument::importNode' => ['DOMNode|false', 'importednode'=>'DOMNode', 'deep='=>'bool'],
 'DOMDocument::load' => ['DOMDocument|bool', 'filename'=>'string', 'options='=>'int'],
 'DOMDocument::loadHTML' => ['bool', 'source'=>'string', 'options='=>'int'],
@@ -2137,23 +2137,23 @@
 'DOMElement::get_elements_by_tagname' => ['array', 'name'=>'string'],
 'DOMElement::getAttribute' => ['string', 'name'=>'string'],
 'DOMElement::getAttributeNode' => ['DOMAttr', 'name'=>'string'],
-'DOMElement::getAttributeNodeNS' => ['DOMAttr', 'namespaceuri'=>'string', 'localname'=>'string'],
-'DOMElement::getAttributeNS' => ['string', 'namespaceuri'=>'string', 'localname'=>'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', 'localname'=>'string'],
+'DOMElement::getElementsByTagNameNS' => ['DOMNodeList', 'namespaceuri'=>'string|null', 'localname'=>'string'],
 'DOMElement::has_attribute' => ['bool', 'name'=>'string'],
 'DOMElement::hasAttribute' => ['bool', 'name'=>'string'],
-'DOMElement::hasAttributeNS' => ['bool', 'namespaceuri'=>'string', 'localname'=>'string'],
+'DOMElement::hasAttributeNS' => ['bool', 'namespaceuri'=>'string|null', 'localname'=>'string'],
 'DOMElement::remove_attribute' => ['bool', 'name'=>'string'],
 'DOMElement::removeAttribute' => ['bool', 'name'=>'string'],
 'DOMElement::removeAttributeNode' => ['bool', 'oldnode'=>'DOMAttr'],
-'DOMElement::removeAttributeNS' => ['bool', 'namespaceuri'=>'string', 'localname'=>'string'],
+'DOMElement::removeAttributeNS' => ['bool', 'namespaceuri'=>'string|null', 'localname'=>'string'],
 'DOMElement::set_attribute' => ['DomAttribute', 'name'=>'string', 'value'=>'string'],
 'DOMElement::set_attribute_node' => ['DomNode', 'attr'=>'DOMNode'],
 'DOMElement::setAttribute' => ['DOMAttr|false', 'name'=>'string', 'value'=>'string'],
 'DOMElement::setAttributeNode' => ['?DOMAttr', 'attr'=>'DOMAttr'],
 'DOMElement::setAttributeNodeNS' => ['DOMAttr', 'attr'=>'DOMAttr'],
-'DOMElement::setAttributeNS' => ['void', 'namespaceuri'=>'string', 'qualifiedname'=>'string', 'value'=>'string'],
+'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'],
diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
index b0fb9eebf43..997fc467be1 100644
--- a/dictionaries/CallMap_historical.php
+++ b/dictionaries/CallMap_historical.php
@@ -925,18 +925,18 @@
     'DOMComment::__construct' => ['void', 'value='=>'string'],
     'DOMDocument::__construct' => ['void', 'version='=>'string', 'encoding='=>'string'],
     'DOMDocument::createAttribute' => ['DOMAttr|false', 'name'=>'string'],
-    'DOMDocument::createAttributeNS' => ['DOMAttr|false', 'namespaceuri'=>'string', 'qualifiedname'=>'string'],
+    'DOMDocument::createAttributeNS' => ['DOMAttr|false', 'namespaceuri'=>'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', 'qualifiedname'=>'string', 'value='=>'string'],
+    'DOMDocument::createElementNS' => ['DOMElement|false', 'namespaceuri'=>'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', 'localname'=>'string'],
+    'DOMDocument::getElementsByTagNameNS' => ['DOMNodeList', 'namespaceuri'=>'string|null', 'localname'=>'string'],
     'DOMDocument::importNode' => ['DOMNode|false', 'importednode'=>'DOMNode', 'deep='=>'bool'],
     'DOMDocument::load' => ['DOMDocument|bool', 'filename'=>'string', 'options='=>'int'],
     'DOMDocument::loadHTML' => ['bool', 'source'=>'string', 'options='=>'int'],
@@ -958,23 +958,23 @@
     'DOMDocumentFragment::appendXML' => ['bool', 'data'=>'string'],
     'DOMElement::__construct' => ['void', 'name'=>'string', 'value='=>'string', 'uri='=>'string'],
     'DOMElement::getAttribute' => ['string', 'name'=>'string'],
-    'DOMElement::getAttributeNS' => ['string', 'namespaceuri'=>'string', 'localname'=>'string'],
+    'DOMElement::getAttributeNS' => ['string', 'namespaceuri'=>'string|null', 'localname'=>'string'],
     'DOMElement::getAttributeNode' => ['DOMAttr', 'name'=>'string'],
-    'DOMElement::getAttributeNodeNS' => ['DOMAttr', 'namespaceuri'=>'string', 'localname'=>'string'],
+    'DOMElement::getAttributeNodeNS' => ['DOMAttr', 'namespaceuri'=>'string|null', 'localname'=>'string'],
     'DOMElement::getElementsByTagName' => ['DOMNodeList', 'name'=>'string'],
-    'DOMElement::getElementsByTagNameNS' => ['DOMNodeList', 'namespaceuri'=>'string', 'localname'=>'string'],
+    'DOMElement::getElementsByTagNameNS' => ['DOMNodeList', 'namespaceuri'=>'string|null', 'localname'=>'string'],
     'DOMElement::get_attribute' => ['string', 'name'=>'string'],
     'DOMElement::get_attribute_node' => ['DomAttribute', 'name'=>'string'],
     'DOMElement::get_elements_by_tagname' => ['array', 'name'=>'string'],
     'DOMElement::hasAttribute' => ['bool', 'name'=>'string'],
-    'DOMElement::hasAttributeNS' => ['bool', 'namespaceuri'=>'string', 'localname'=>'string'],
+    'DOMElement::hasAttributeNS' => ['bool', 'namespaceuri'=>'string|null', 'localname'=>'string'],
     'DOMElement::has_attribute' => ['bool', 'name'=>'string'],
     'DOMElement::removeAttribute' => ['bool', 'name'=>'string'],
-    'DOMElement::removeAttributeNS' => ['bool', 'namespaceuri'=>'string', 'localname'=>'string'],
+    'DOMElement::removeAttributeNS' => ['bool', 'namespaceuri'=>'string|null', 'localname'=>'string'],
     'DOMElement::removeAttributeNode' => ['bool', 'oldnode'=>'DOMAttr'],
     'DOMElement::remove_attribute' => ['bool', 'name'=>'string'],
     'DOMElement::setAttribute' => ['DOMAttr|false', 'name'=>'string', 'value'=>'string'],
-    'DOMElement::setAttributeNS' => ['void', 'namespaceuri'=>'string', 'qualifiedname'=>'string', 'value'=>'string'],
+    'DOMElement::setAttributeNS' => ['void', 'namespaceuri'=>'string|null', 'qualifiedname'=>'string', 'value'=>'string'],
     'DOMElement::setAttributeNode' => ['?DOMAttr', 'attr'=>'DOMAttr'],
     'DOMElement::setAttributeNodeNS' => ['DOMAttr', 'attr'=>'DOMAttr'],
     'DOMElement::setIdAttribute' => ['void', 'name'=>'string', 'isid'=>'bool'],