diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
index 3f6c294076f..f520c576d2c 100644
--- a/dictionaries/CallMap.php
+++ b/dictionaries/CallMap.php
@@ -2111,31 +2111,18 @@
 'DOMDocument::xinclude' => ['int', 'options='=>'int'],
 'DOMDocumentFragment::__construct' => ['void'],
 'DOMDocumentFragment::appendXML' => ['bool', 'data'=>'string'],
-'DomDocumentType::entities' => ['array'],
-'DomDocumentType::internal_subset' => ['bool'],
-'DomDocumentType::name' => ['string'],
-'DomDocumentType::notations' => ['array'],
-'DomDocumentType::public_id' => ['string'],
-'DomDocumentType::system_id' => ['string'],
 'DOMElement::__construct' => ['void', 'name'=>'string', 'value='=>'string', 'uri='=>'string'],
-'DOMElement::get_attribute' => ['string', 'name'=>'string'],
-'DOMElement::get_attribute_node' => ['DomAttribute', 'name'=>'string'],
-'DOMElement::get_elements_by_tagname' => ['array', 'name'=>'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::has_attribute' => ['bool', 'name'=>'string'],
 'DOMElement::hasAttribute' => ['bool', 'name'=>'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|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'],
@@ -2143,7 +2130,6 @@
 'DOMElement::setIdAttribute' => ['void', 'name'=>'string', 'isid'=>'bool'],
 'DOMElement::setIdAttributeNode' => ['void', 'attr'=>'DOMAttr', 'isid'=>'bool'],
 'DOMElement::setIdAttributeNS' => ['void', 'namespaceuri'=>'string', 'localname'=>'string', 'isid'=>'bool'],
-'DOMElement::tagname' => ['string'],
 'DOMEntityReference::__construct' => ['void', 'name'=>'string'],
 'DOMImplementation::__construct' => ['void'],
 'DOMImplementation::createDocument' => ['DOMDocument', 'namespaceuri='=>'string', 'qualifiedname='=>'string', 'doctype='=>'DOMDocumentType'],
@@ -2153,8 +2139,6 @@
 'DOMNamedNodeMap::getNamedItem' => ['?DOMNode', 'name'=>'string'],
 'DOMNamedNodeMap::getNamedItemNS' => ['?DOMNode', 'namespaceuri'=>'string', 'localname'=>'string'],
 'DOMNamedNodeMap::item' => ['?DOMNode', 'index'=>'int'],
-'DomNode::add_namespace' => ['bool', 'uri'=>'string', 'prefix'=>'string'],
-'DomNode::append_child' => ['DOMNode', 'newnode'=>'DOMNode'],
 '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'],
@@ -2175,8 +2159,6 @@
 'DOMNodeList::count' => ['int'],
 'DOMNodeList::item' => ['?DOMNode', 'index'=>'int'],
 'DOMProcessingInstruction::__construct' => ['void', 'name'=>'string', 'value'=>'string'],
-'DomProcessingInstruction::data' => ['string'],
-'DomProcessingInstruction::target' => ['string'],
 'DOMText::__construct' => ['void', 'value='=>'string'],
 'DOMText::isElementContentWhitespace' => ['bool'],
 'DOMText::isWhitespaceInElementContent' => ['bool'],
@@ -11356,12 +11338,10 @@
 'RedisCluster::zScan' => ['array|false', 'key'=>'string', '&iterator'=>'int', 'pattern='=>'string', 'count='=>'int'],
 'RedisCluster::zScore' => ['float', 'key'=>'string', 'member'=>'string'],
 'RedisCluster::zUnionStore' => ['int', 'Output'=>'string', 'ZSetKeys'=>'array', 'Weights='=>'?array', 'aggregateFunction='=>'string'],
-'Reflection::export' => ['?string', 'r'=>'reflector', 'return='=>'bool'],
 'Reflection::getModifierNames' => ['list<string>', 'modifiers'=>'int'],
 'ReflectionClass::__clone' => ['void'],
 'ReflectionClass::__construct' => ['void', 'argument'=>'object|class-string'],
 'ReflectionClass::__toString' => ['string'],
-'ReflectionClass::export' => ['?string', 'argument'=>'string|object', 'return='=>'bool'],
 'ReflectionClass::getAttributes' => ['list<ReflectionAttribute>', 'name='=>'?string', 'flags='=>'int'],
 'ReflectionClass::getConstant' => ['mixed', 'name'=>'string'],
 'ReflectionClass::getConstants' => ['array<string,mixed>', 'filter=' => '?int'],
@@ -11416,7 +11396,6 @@
 'ReflectionClass::setStaticPropertyValue' => ['void', 'name'=>'string', 'value'=>'mixed'],
 'ReflectionClassConstant::__construct' => ['void', 'class'=>'mixed', 'name'=>'string'],
 'ReflectionClassConstant::__toString' => ['string'],
-'ReflectionClassConstant::export' => ['string', 'class'=>'mixed', 'name'=>'string', 'return='=>'bool'],
 'ReflectionClassConstant::getAttributes' => ['list<ReflectionAttribute>', 'name='=>'?string', 'flags='=>'int'],
 'ReflectionClassConstant::getDeclaringClass' => ['ReflectionClass'],
 'ReflectionClassConstant::getDocComment' => ['string|false'],
@@ -11437,7 +11416,6 @@
 'ReflectionExtension::__clone' => ['void'],
 'ReflectionExtension::__construct' => ['void', 'name'=>'string'],
 'ReflectionExtension::__toString' => ['string'],
-'ReflectionExtension::export' => ['?string', 'name'=>'string', 'return='=>'bool'],
 'ReflectionExtension::getClasses' => ['array<class-string,ReflectionClass>'],
 'ReflectionExtension::getClassNames' => ['list<class-string>'],
 'ReflectionExtension::getConstants' => ['array<string,mixed>'],
@@ -11451,7 +11429,6 @@
 'ReflectionExtension::isTemporary' => ['bool'],
 'ReflectionFunction::__construct' => ['void', 'name'=>'callable-string|Closure'],
 'ReflectionFunction::__toString' => ['string'],
-'ReflectionFunction::export' => ['?string', 'name'=>'string', 'return='=>'bool'],
 'ReflectionFunction::getClosure' => ['?Closure'],
 'ReflectionFunction::getClosureScopeClass' => ['ReflectionClass'],
 'ReflectionFunction::getClosureThis' => ['bool'],
@@ -11483,7 +11460,6 @@
 'ReflectionFunction::returnsReference' => ['bool'],
 'ReflectionFunctionAbstract::__clone' => ['void'],
 'ReflectionFunctionAbstract::__toString' => ['string'],
-'ReflectionFunctionAbstract::export' => ['?string'],
 'ReflectionFunctionAbstract::getAttributes' => ['list<ReflectionAttribute>', 'name='=>'?string', 'flags='=>'int'],
 'ReflectionFunctionAbstract::getClosureScopeClass' => ['ReflectionClass|null'],
 'ReflectionFunctionAbstract::getClosureThis' => ['object|null'],
@@ -11523,7 +11499,6 @@
 'ReflectionMethod::__construct' => ['void', 'class'=>'class-string|object', 'name'=>'string'],
 'ReflectionMethod::__construct\'1' => ['void', 'class_method'=>'string'],
 'ReflectionMethod::__toString' => ['string'],
-'ReflectionMethod::export' => ['?string', 'class'=>'string', 'name'=>'string', 'return='=>'bool'],
 'ReflectionMethod::getClosure' => ['?Closure', 'object='=>'object'],
 'ReflectionMethod::getClosureScopeClass' => ['ReflectionClass'],
 'ReflectionMethod::getClosureThis' => ['object'],
@@ -11571,7 +11546,6 @@
 'ReflectionObject::__clone' => ['void'],
 'ReflectionObject::__construct' => ['void', 'argument'=>'object'],
 'ReflectionObject::__toString' => ['string'],
-'ReflectionObject::export' => ['?string', 'argument'=>'object', 'return='=>'bool'],
 'ReflectionObject::getConstant' => ['mixed', 'name'=>'string'],
 'ReflectionObject::getConstants' => ['array<string,mixed>'],
 'ReflectionObject::getConstructor' => ['?ReflectionMethod'],
@@ -11628,7 +11602,6 @@
 'ReflectionParameter::__toString' => ['string'],
 'ReflectionParameter::allowsNull' => ['bool'],
 'ReflectionParameter::canBePassedByValue' => ['bool'],
-'ReflectionParameter::export' => ['?string', 'function'=>'string', 'parameter'=>'string', 'return='=>'bool'],
 'ReflectionParameter::getAttributes' => ['list<ReflectionAttribute>', 'name='=>'?string', 'flags='=>'int'],
 'ReflectionParameter::getClass' => ['?ReflectionClass'],
 'ReflectionParameter::getDeclaringClass' => ['?ReflectionClass'],
@@ -11649,7 +11622,6 @@
 'ReflectionProperty::__clone' => ['void'],
 'ReflectionProperty::__construct' => ['void', 'class'=>'', 'name'=>'string'],
 'ReflectionProperty::__toString' => ['string'],
-'ReflectionProperty::export' => ['?string', 'class'=>'mixed', 'name'=>'string', 'return='=>'bool'],
 'ReflectionProperty::getAttributes' => ['list<ReflectionAttribute>', 'name='=>'?string', 'flags='=>'int'],
 'ReflectionProperty::getDeclaringClass' => ['ReflectionClass'],
 'ReflectionProperty::getDocComment' => ['string|false'],
@@ -11673,7 +11645,6 @@
 'ReflectionZendExtension::__clone' => ['void'],
 'ReflectionZendExtension::__construct' => ['void', 'name'=>'string'],
 'ReflectionZendExtension::__toString' => ['string'],
-'ReflectionZendExtension::export' => ['?string', 'name'=>'string', 'return='=>'bool'],
 'ReflectionZendExtension::getAuthor' => ['string'],
 'ReflectionZendExtension::getCopyright' => ['string'],
 'ReflectionZendExtension::getName' => ['string'],
diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
index e3988c0f337..062d749bbb1 100644
--- a/dictionaries/CallMap_80_delta.php
+++ b/dictionaries/CallMap_80_delta.php
@@ -1832,6 +1832,17 @@
     'number_format\'1' => ['string', 'num'=>'float|int', 'decimals'=>'int', 'decimal_separator'=>'?string', 'thousands_separator'=>'?string'],
     'png2wbmp' => ['bool', 'pngname'=>'string', 'wbmpname'=>'string', 'dest_height'=>'int', 'dest_width'=>'int', 'threshold'=>'int'],
     'read_exif_data' => ['array', 'filename'=>'string', 'sections_needed='=>'string', 'sub_arrays='=>'bool', 'read_thumbnail='=>'bool'],
+    'Reflection::export' => ['?string', 'r'=>'reflector', 'return='=>'bool'],
+    'ReflectionClass::export' => ['?string', 'argument'=>'string|object', 'return='=>'bool'],
+    'ReflectionClassConstant::export' => ['string', 'class'=>'mixed', 'name'=>'string', 'return='=>'bool'],
+    'ReflectionExtension::export' => ['?string', 'name'=>'string', 'return='=>'bool'],
+    'ReflectionFunction::export' => ['?string', 'name'=>'string', 'return='=>'bool'],
+    'ReflectionFunctionAbstract::export' => ['?string'],
+    'ReflectionMethod::export' => ['?string', 'class'=>'string', 'name'=>'string', 'return='=>'bool'],
+    'ReflectionObject::export' => ['?string', 'argument'=>'object', 'return='=>'bool'],
+    'ReflectionParameter::export' => ['?string', 'function'=>'string', 'parameter'=>'string', 'return='=>'bool'],
+    'ReflectionProperty::export' => ['?string', 'class'=>'mixed', 'name'=>'string', 'return='=>'bool'],
+    'ReflectionZendExtension::export' => ['?string', 'name'=>'string', 'return='=>'bool'],
     'SimpleXMLIterator::rewind' => ['void'],
     'SimpleXMLIterator::valid' => ['bool'],
     'SimpleXMLIterator::current' => ['?SimpleXMLIterator'],
diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
index c82a0a36f15..42d230ac3ec 100644
--- a/dictionaries/CallMap_historical.php
+++ b/dictionaries/CallMap_historical.php
@@ -963,16 +963,11 @@
     'DOMElement::getAttributeNodeNS' => ['DOMAttr', 'namespaceuri'=>'string|null', 'localname'=>'string'],
     'DOMElement::getElementsByTagName' => ['DOMNodeList', 'name'=>'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|null', 'localname'=>'string'],
-    'DOMElement::has_attribute' => ['bool', 'name'=>'string'],
     'DOMElement::removeAttribute' => ['bool', 'name'=>'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|null', 'qualifiedname'=>'string', 'value'=>'string'],
     'DOMElement::setAttributeNode' => ['?DOMAttr', 'attr'=>'DOMAttr'],
@@ -980,9 +975,6 @@
     'DOMElement::setIdAttribute' => ['void', 'name'=>'string', 'isid'=>'bool'],
     'DOMElement::setIdAttributeNS' => ['void', 'namespaceuri'=>'string', 'localname'=>'string', 'isid'=>'bool'],
     'DOMElement::setIdAttributeNode' => ['void', 'attr'=>'DOMAttr', 'isid'=>'bool'],
-    'DOMElement::set_attribute' => ['DomAttribute', 'name'=>'string', 'value'=>'string'],
-    'DOMElement::set_attribute_node' => ['DomNode', 'attr'=>'DOMNode'],
-    'DOMElement::tagname' => ['string'],
     'DOMEntityReference::__construct' => ['void', 'name'=>'string'],
     'DOMImplementation::__construct' => ['void'],
     'DOMImplementation::createDocument' => ['DOMDocument', 'namespaceuri='=>'string', 'qualifiedname='=>'string', 'doctype='=>'DOMDocumentType'],
@@ -1115,16 +1107,6 @@
     'DomAttribute::set_value' => ['bool', 'content'=>'string'],
     'DomAttribute::specified' => ['bool'],
     'DomAttribute::value' => ['string'],
-    'DomDocumentType::entities' => ['array'],
-    'DomDocumentType::internal_subset' => ['bool'],
-    'DomDocumentType::name' => ['string'],
-    'DomDocumentType::notations' => ['array'],
-    'DomDocumentType::public_id' => ['string'],
-    'DomDocumentType::system_id' => ['string'],
-    'DomNode::add_namespace' => ['bool', 'uri'=>'string', 'prefix'=>'string'],
-    'DomNode::append_child' => ['DOMNode', 'newnode'=>'DOMNode'],
-    'DomProcessingInstruction::data' => ['string'],
-    'DomProcessingInstruction::target' => ['string'],
     '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/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
index 41ca8597d61..a73750c4d71 100644
--- a/tests/Internal/Codebase/InternalCallMapHandlerTest.php
+++ b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -1230,25 +1230,7 @@ class InternalCallMapHandlerTest extends TestCase
     private static $ignoredUnreflectableFunctions = [
         'closure::__invoke',
         'curlfile::__wakeup',
-        'domdocumenttype::entities',
-        'domdocumenttype::internal_subset',
-        'domdocumenttype::name',
-        'domdocumenttype::notations',
-        'domdocumenttype::public_id',
-        'domdocumenttype::system_id',
-        'domelement::get_attribute',
-        'domelement::get_attribute_node',
-        'domelement::get_elements_by_tagname',
-        'domelement::has_attribute',
-        'domelement::remove_attribute',
-        'domelement::set_attribute',
-        'domelement::set_attribute_node',
-        'domelement::tagname',
         'domimplementation::__construct',
-        'domnode::add_namespace',
-        'domnode::append_child',
-        'domprocessinginstruction::data',
-        'domprocessinginstruction::target',
         'finfo::finfo',
         'generator::__wakeup',
         'gmp::__construct',
@@ -1291,17 +1273,6 @@ class InternalCallMapHandlerTest extends TestCase
         'pharfileinfo::setcompressedbzip2',
         'pharfileinfo::setcompressedgz',
         'pharfileinfo::setuncompressed',
-        'reflection::export',
-        'reflectionclass::export',
-        'reflectionclassconstant::export',
-        'reflectionextension::export',
-        'reflectionfunction::export',
-        'reflectionfunctionabstract::export',
-        'reflectionmethod::export',
-        'reflectionobject::export',
-        'reflectionparameter::export',
-        'reflectionproperty::export',
-        'reflectionzendextension::export',
         'sessionhandler::updatetimestamp',
         'sessionhandler::validateid',
         'simplexmlelement::__get',