From e6f77495c20c985ee0ed68d3f0751195e2a24575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Sat, 11 Apr 2020 22:01:51 +0200
Subject: [PATCH 1/2] Generate method entries for ext/dom

---
 build/gen_stub.php                      |   2 +-
 ext/dom/attr.c                          |  11 +-
 ext/dom/attr.stub.php                   |   9 -
 ext/dom/attr_arginfo.h                  |   9 -
 ext/dom/cdatasection.c                  |   8 +-
 ext/dom/cdatasection.stub.php           |   6 -
 ext/dom/cdatasection_arginfo.h          |   5 -
 ext/dom/characterdata.c                 |  32 +-
 ext/dom/characterdata.stub.php          |  30 -
 ext/dom/characterdata_arginfo.h         |  34 --
 ext/dom/comment.c                       |   8 +-
 ext/dom/comment.stub.php                |   6 -
 ext/dom/comment_arginfo.h               |   5 -
 ext/dom/document.c                      | 112 ++--
 ext/dom/document.stub.php               | 109 ----
 ext/dom/document_arginfo.h              | 154 -----
 ext/dom/documentfragment.c              |  17 +-
 ext/dom/documentfragment.stub.php       |  15 -
 ext/dom/documentfragment_arginfo.h      |  14 -
 ext/dom/dom.stub.php                    |   8 -
 ext/dom/dom_arginfo.h                   |  19 -
 ext/dom/dom_fe.h                        | 180 ------
 ext/dom/domexception.c                  |   4 -
 ext/dom/domimplementation.c             |  17 +-
 ext/dom/domimplementation.stub.php      |  17 -
 ext/dom/domimplementation_arginfo.h     |  20 -
 ext/dom/element.c                       |  81 +--
 ext/dom/element.stub.php                |  77 ---
 ext/dom/element_arginfo.h               |  85 ---
 ext/dom/entity.c                        |   4 -
 ext/dom/entityreference.c               |   8 +-
 ext/dom/entityreference.stub.php        |   6 -
 ext/dom/entityreference_arginfo.h       |   5 -
 ext/dom/namednodemap.c                  |  18 +-
 ext/dom/namednodemap.stub.php           |  16 -
 ext/dom/namednodemap_arginfo.h          |  17 -
 ext/dom/node.c                          |  65 +-
 ext/dom/node.stub.php                   |  69 ---
 ext/dom/node_arginfo.h                  |  79 ---
 ext/dom/nodelist.c                      |  11 +-
 ext/dom/nodelist.stub.php               |  10 -
 ext/dom/nodelist_arginfo.h              |   8 -
 ext/dom/notation.c                      |   4 -
 ext/dom/parentnode.c                    |   9 -
 ext/dom/parentnode.stub.php             |  10 -
 ext/dom/parentnode_arginfo.h            |   7 -
 ext/dom/php_dom.c                       |  45 +-
 ext/dom/php_dom.stub.php                | 411 +++++++++++++
 ext/dom/php_dom_arginfo.h               | 772 ++++++++++++++++++++++++
 ext/dom/processinginstruction.c         |   8 +-
 ext/dom/processinginstruction.stub.php  |   6 -
 ext/dom/processinginstruction_arginfo.h |   6 -
 ext/dom/text.c                          |  15 +-
 ext/dom/text.stub.php                   |  14 -
 ext/dom/text_arginfo.h                  |  14 -
 ext/dom/xpath.c                         |  21 +-
 ext/dom/xpath.stub.php                  |   2 +
 ext/dom/xpath_arginfo.h                 |  37 ++
 58 files changed, 1360 insertions(+), 1431 deletions(-)
 delete mode 100644 ext/dom/attr.stub.php
 delete mode 100644 ext/dom/attr_arginfo.h
 delete mode 100644 ext/dom/cdatasection.stub.php
 delete mode 100644 ext/dom/cdatasection_arginfo.h
 delete mode 100644 ext/dom/characterdata.stub.php
 delete mode 100644 ext/dom/characterdata_arginfo.h
 delete mode 100644 ext/dom/comment.stub.php
 delete mode 100644 ext/dom/comment_arginfo.h
 delete mode 100644 ext/dom/document.stub.php
 delete mode 100644 ext/dom/document_arginfo.h
 delete mode 100644 ext/dom/documentfragment.stub.php
 delete mode 100644 ext/dom/documentfragment_arginfo.h
 delete mode 100644 ext/dom/dom.stub.php
 delete mode 100644 ext/dom/dom_arginfo.h
 delete mode 100644 ext/dom/domimplementation.stub.php
 delete mode 100644 ext/dom/domimplementation_arginfo.h
 delete mode 100644 ext/dom/element.stub.php
 delete mode 100644 ext/dom/element_arginfo.h
 delete mode 100644 ext/dom/entityreference.stub.php
 delete mode 100644 ext/dom/entityreference_arginfo.h
 delete mode 100644 ext/dom/namednodemap.stub.php
 delete mode 100644 ext/dom/namednodemap_arginfo.h
 delete mode 100644 ext/dom/node.stub.php
 delete mode 100644 ext/dom/node_arginfo.h
 delete mode 100644 ext/dom/nodelist.stub.php
 delete mode 100644 ext/dom/nodelist_arginfo.h
 delete mode 100644 ext/dom/parentnode.stub.php
 delete mode 100644 ext/dom/parentnode_arginfo.h
 create mode 100644 ext/dom/php_dom.stub.php
 create mode 100644 ext/dom/php_dom_arginfo.h
 delete mode 100644 ext/dom/processinginstruction.stub.php
 delete mode 100644 ext/dom/processinginstruction_arginfo.h
 delete mode 100644 ext/dom/text.stub.php
 delete mode 100644 ext/dom/text_arginfo.h

diff --git a/build/gen_stub.php b/build/gen_stub.php
index b108191f64447..131f60bab7697 100755
--- a/build/gen_stub.php
+++ b/build/gen_stub.php
@@ -421,7 +421,7 @@ public function getFunctionEntry(): string {
                 if ($this->alias->className) {
                     return sprintf(
                         "\tZEND_MALIAS(%s, %s, %s, %s, %s)\n",
-                        $this->alias->className, $this->name, $this->alias->name, $this->getArgInfoName(), $this->getFlagsAsString()
+                        $this->alias->className, $this->name->name, $this->alias->name, $this->getArgInfoName(), $this->getFlagsAsString()
                     );
                 } else {
                     return sprintf(
diff --git a/ext/dom/attr.c b/ext/dom/attr.c
index 9c097eb8430a2..f6612e791a7d7 100644
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@@ -24,7 +24,6 @@
 #if HAVE_LIBXML && HAVE_DOM
 
 #include "php_dom.h"
-#include "attr_arginfo.h"
 
 /*
 * class DOMAttr extends DOMNode
@@ -33,14 +32,8 @@
 * Since:
 */
 
-const zend_function_entry php_dom_attr_class_functions[] = {
-	PHP_ME(domattr, isId, arginfo_class_DOMAttr_isId, ZEND_ACC_PUBLIC)
-	PHP_ME(domattr, __construct, arginfo_class_DOMAttr___construct, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 /* {{{ proto DOMAttr::__construct(string name, [string value]) */
-PHP_METHOD(domattr, __construct)
+PHP_METHOD(DOMAttr, __construct)
 {
 	xmlAttrPtr nodep = NULL;
 	xmlNodePtr oldnode = NULL;
@@ -213,7 +206,7 @@ int dom_attr_schema_type_info_read(dom_object *obj, zval *retval)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId
 Since: DOM Level 3
 */
-PHP_METHOD(domattr, isId)
+PHP_METHOD(DOMAttr, isId)
 {
 	zval *id;
 	dom_object *intern;
diff --git a/ext/dom/attr.stub.php b/ext/dom/attr.stub.php
deleted file mode 100644
index 0d8f748421ed5..0000000000000
--- a/ext/dom/attr.stub.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class DOMAttr
-{
-    public function __construct(string $name, string $value = "") {}
-
-    /** @return bool */
-    public function isId() {}
-}
diff --git a/ext/dom/attr_arginfo.h b/ext/dom/attr_arginfo.h
deleted file mode 100644
index 2a184f3d559e4..0000000000000
--- a/ext/dom/attr_arginfo.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMAttr___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "\"\"")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMAttr_isId, 0, 0, 0)
-ZEND_END_ARG_INFO()
diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c
index 613b6b9169b30..bd02af7042531 100644
--- a/ext/dom/cdatasection.c
+++ b/ext/dom/cdatasection.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "cdatasection_arginfo.h"
 
 /*
 * class DOMCdataSection extends DOMText
@@ -31,13 +30,8 @@
 * Since:
 */
 
-const zend_function_entry php_dom_cdatasection_class_functions[] = {
-	PHP_ME(domcdatasection, __construct, arginfo_class_DOMCdataSection___construct, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 /* {{{ proto DOMCdataSection::__construct(string value); */
-PHP_METHOD(domcdatasection, __construct)
+PHP_METHOD(DOMCdataSection, __construct)
 {
 	xmlNodePtr nodep = NULL, oldnode = NULL;
 	dom_object *intern;
diff --git a/ext/dom/cdatasection.stub.php b/ext/dom/cdatasection.stub.php
deleted file mode 100644
index bd56bef262653..0000000000000
--- a/ext/dom/cdatasection.stub.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class DOMCdataSection
-{
-    public function __construct(string $value) {}
-}
diff --git a/ext/dom/cdatasection_arginfo.h b/ext/dom/cdatasection_arginfo.h
deleted file mode 100644
index 33417e542642d..0000000000000
--- a/ext/dom/cdatasection_arginfo.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMCdataSection___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
-ZEND_END_ARG_INFO()
diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index d9203708f7016..ef458460f6adf 100644
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "characterdata_arginfo.h"
 
 /*
 * class DOMCharacterData extends DOMNode
@@ -31,19 +30,6 @@
 * Since:
 */
 
-const zend_function_entry php_dom_characterdata_class_functions[] = {
-	PHP_ME(domcharacterdata, substringData, arginfo_class_DOMCharacterData_substringData, ZEND_ACC_PUBLIC)
-	PHP_ME(domcharacterdata, appendData, arginfo_class_DOMCharacterData_appendData, ZEND_ACC_PUBLIC)
-	PHP_ME(domcharacterdata, insertData, arginfo_class_DOMCharacterData_insertData, ZEND_ACC_PUBLIC)
-	PHP_ME(domcharacterdata, deleteData, arginfo_class_DOMCharacterData_deleteData, ZEND_ACC_PUBLIC)
-	PHP_ME(domcharacterdata, replaceData, arginfo_class_DOMCharacterData_replaceData, ZEND_ACC_PUBLIC)
-	PHP_ME(domcharacterdata, remove, arginfo_class_DOMCharacterData_remove, ZEND_ACC_PUBLIC)
-	PHP_ME(domcharacterdata, after, arginfo_class_DOMCharacterData_after, ZEND_ACC_PUBLIC)
-	PHP_ME(domcharacterdata, before, arginfo_class_DOMCharacterData_before, ZEND_ACC_PUBLIC)
-	PHP_ME(domcharacterdata, replaceWith, arginfo_class_DOMCharacterData_replaceWith, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 /* {{{ data	string
 readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-72AB8359
@@ -126,7 +112,7 @@ int dom_characterdata_length_read(dom_object *obj, zval *retval)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
 Since:
 */
-PHP_METHOD(domcharacterdata, substringData)
+PHP_METHOD(DOMCharacterData, substringData)
 {
 	zval       *id;
 	xmlChar    *cur;
@@ -176,7 +162,7 @@ PHP_METHOD(domcharacterdata, substringData)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F
 Since:
 */
-PHP_METHOD(domcharacterdata, appendData)
+PHP_METHOD(DOMCharacterData, appendData)
 {
 	zval *id;
 	xmlNode *nodep;
@@ -199,7 +185,7 @@ PHP_METHOD(domcharacterdata, appendData)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F
 Since:
 */
-PHP_METHOD(domcharacterdata, insertData)
+PHP_METHOD(DOMCharacterData, insertData)
 {
 	zval *id;
 	xmlChar		*cur, *first, *second;
@@ -249,7 +235,7 @@ PHP_METHOD(domcharacterdata, insertData)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781
 Since:
 */
-PHP_METHOD(domcharacterdata, deleteData)
+PHP_METHOD(DOMCharacterData, deleteData)
 {
 	zval *id;
 	xmlChar    *cur, *substring, *second;
@@ -305,7 +291,7 @@ PHP_METHOD(domcharacterdata, deleteData)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB
 Since:
 */
-PHP_METHOD(domcharacterdata, replaceData)
+PHP_METHOD(DOMCharacterData, replaceData)
 {
 	zval *id;
 	xmlChar		*cur, *substring, *second = NULL;
@@ -365,7 +351,7 @@ PHP_METHOD(domcharacterdata, replaceData)
 }
 /* }}} end dom_characterdata_replace_data */
 
-PHP_METHOD(domcharacterdata, remove)
+PHP_METHOD(DOMCharacterData, remove)
 {
 	zval *id = ZEND_THIS;
 	xmlNodePtr children, child;
@@ -413,7 +399,7 @@ PHP_METHOD(domcharacterdata, remove)
 	RETURN_NULL();
 }
 
-PHP_METHOD(domcharacterdata, after)
+PHP_METHOD(DOMCharacterData, after)
 {
 	int argc;
 	zval *args, *id;
@@ -430,7 +416,7 @@ PHP_METHOD(domcharacterdata, after)
 	dom_parent_node_after(intern, args, argc);
 }
 
-PHP_METHOD(domcharacterdata, before)
+PHP_METHOD(DOMCharacterData, before)
 {
 	int argc;
 	zval *args, *id;
@@ -447,7 +433,7 @@ PHP_METHOD(domcharacterdata, before)
 	dom_parent_node_before(intern, args, argc);
 }
 
-PHP_METHOD(domcharacterdata, replaceWith)
+PHP_METHOD(DOMCharacterData, replaceWith)
 {
 	int argc;
 	zval *args, *id;
diff --git a/ext/dom/characterdata.stub.php b/ext/dom/characterdata.stub.php
deleted file mode 100644
index b7ddb6b75062c..0000000000000
--- a/ext/dom/characterdata.stub.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-class DOMCharacterData implements DOMChildNode
-{
-    /** @return bool */
-    public function appendData(string $data) {}
-
-    /** @return string|false */
-    public function substringData(int $offset, int $count) {}
-
-    /** @return bool */
-    public function insertData(int $offset, string $data) {}
-
-    /** @return bool */
-    public function deleteData(int $offset, int $count) {}
-
-    /** @return bool */
-    public function replaceData(int $offset, int $count, string $data) {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function replaceWith(...$nodes): void {}
-
-    public function remove(): void {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function before(... $nodes): void {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function after(...$nodes): void {}
-}
diff --git a/ext/dom/characterdata_arginfo.h b/ext/dom/characterdata_arginfo.h
deleted file mode 100644
index 191d934750af6..0000000000000
--- a/ext/dom/characterdata_arginfo.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMCharacterData_appendData, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMCharacterData_substringData, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMCharacterData_insertData, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMCharacterData_deleteData arginfo_class_DOMCharacterData_substringData
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMCharacterData_replaceData, 0, 0, 3)
-	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMCharacterData_replaceWith, 0, 0, IS_VOID, 0)
-	ZEND_ARG_VARIADIC_INFO(0, nodes)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMCharacterData_remove, 0, 0, IS_VOID, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMCharacterData_before arginfo_class_DOMCharacterData_replaceWith
-
-#define arginfo_class_DOMCharacterData_after arginfo_class_DOMCharacterData_replaceWith
diff --git a/ext/dom/comment.c b/ext/dom/comment.c
index d54688390e468..32d6271c38d7f 100644
--- a/ext/dom/comment.c
+++ b/ext/dom/comment.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "comment_arginfo.h"
 
 /*
 * class DOMComment extends DOMCharacterData
@@ -31,13 +30,8 @@
 * Since:
 */
 
-const zend_function_entry php_dom_comment_class_functions[] = {
-	PHP_ME(domcomment, __construct, arginfo_class_DOMComment___construct, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 /* {{{ proto DOMComment::__construct([string value]); */
-PHP_METHOD(domcomment, __construct)
+PHP_METHOD(DOMComment, __construct)
 {
 	xmlNodePtr nodep = NULL, oldnode = NULL;
 	dom_object *intern;
diff --git a/ext/dom/comment.stub.php b/ext/dom/comment.stub.php
deleted file mode 100644
index e6131ce2dcfe5..0000000000000
--- a/ext/dom/comment.stub.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class DOMComment
-{
-    public function __construct(string $value = "") {}
-}
diff --git a/ext/dom/comment_arginfo.h b/ext/dom/comment_arginfo.h
deleted file mode 100644
index 03b1a5a19fe0a..0000000000000
--- a/ext/dom/comment_arginfo.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMComment___construct, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "\"\"")
-ZEND_END_ARG_INFO()
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 389f5dc6eaa88..6d037a7f77764 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "document_arginfo.h"
 #include <libxml/SAX.h>
 #ifdef LIBXML_SCHEMAS_ENABLED
 #include <libxml/relaxng.h>
@@ -45,49 +44,6 @@ struct _idsIterator {
 * Since:
 */
 
-const zend_function_entry php_dom_document_class_functions[] = { /* {{{ */
-	PHP_ME(domdocument, createElement, arginfo_class_DOMDocument_createElement, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, createDocumentFragment, arginfo_class_DOMDocument_createDocumentFragment, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, createTextNode, arginfo_class_DOMDocument_createTextNode, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, createComment, arginfo_class_DOMDocument_createComment, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, createCDATASection, arginfo_class_DOMDocument_createCDATASection, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, createProcessingInstruction, arginfo_class_DOMDocument_createProcessingInstruction, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, createAttribute, arginfo_class_DOMDocument_createAttribute, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, createEntityReference, arginfo_class_DOMDocument_createEntityReference, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, getElementsByTagName, arginfo_class_DOMDocument_getElementsByTagName, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, importNode, arginfo_class_DOMDocument_importNode, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, createElementNS, arginfo_class_DOMDocument_createElementNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, createAttributeNS, arginfo_class_DOMDocument_createAttributeNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, getElementsByTagNameNS, arginfo_class_DOMDocument_getElementsByTagNameNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, getElementById, arginfo_class_DOMDocument_getElementById, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, adoptNode, arginfo_class_DOMDocument_adoptNode, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, normalizeDocument, arginfo_class_DOMDocument_normalizeDocument, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, load, arginfo_class_DOMDocument_load, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, save, arginfo_class_DOMDocument_save, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, loadXML, arginfo_class_DOMDocument_loadXML, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, saveXML, arginfo_class_DOMDocument_saveXML, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, __construct, arginfo_class_DOMDocument___construct, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, validate, arginfo_class_DOMDocument_validate, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, xinclude, arginfo_class_DOMDocument_xinclude, ZEND_ACC_PUBLIC)
-#if defined(LIBXML_HTML_ENABLED)
-	PHP_ME(domdocument, loadHTML, arginfo_class_DOMDocument_loadHTML, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, loadHTMLFile, arginfo_class_DOMDocument_loadHTMLFile, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, saveHTML, arginfo_class_DOMDocument_saveHTML, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, saveHTMLFile, arginfo_class_DOMDocument_saveHTMLFile, ZEND_ACC_PUBLIC)
-#endif  /* defined(LIBXML_HTML_ENABLED) */
-#if defined(LIBXML_SCHEMAS_ENABLED)
-	PHP_ME(domdocument, schemaValidate, arginfo_class_DOMDocument_schemaValidate, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, schemaValidateSource, arginfo_class_DOMDocument_schemaValidateSource, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, relaxNGValidate, arginfo_class_DOMDocument_relaxNGValidate, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, relaxNGValidateSource, arginfo_class_DOMDocument_relaxNGValidateSource, ZEND_ACC_PUBLIC)
-#endif
-	PHP_ME(domdocument, registerNodeClass, arginfo_class_DOMDocument_registerNodeClass, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, append, arginfo_class_DOMDocument_append, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocument, prepend, arginfo_class_DOMDocument_prepend, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-/* }}} */
-
 /* {{{ docType	DOMDocumentType
 readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-B63ED1A31
@@ -553,7 +509,7 @@ int dom_document_config_read(dom_object *obj, zval *retval)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547
 Since:
 */
-PHP_METHOD(domdocument, createElement)
+PHP_METHOD(DOMDocument, createElement)
 {
 	zval *id;
 	xmlNode *node;
@@ -588,7 +544,7 @@ PHP_METHOD(domdocument, createElement)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5
 Since:
 */
-PHP_METHOD(domdocument, createDocumentFragment)
+PHP_METHOD(DOMDocument, createDocumentFragment)
 {
 	zval *id;
 	xmlNode *node;
@@ -616,7 +572,7 @@ PHP_METHOD(domdocument, createDocumentFragment)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127
 Since:
 */
-PHP_METHOD(domdocument, createTextNode)
+PHP_METHOD(DOMDocument, createTextNode)
 {
 	zval *id;
 	xmlNode *node;
@@ -646,7 +602,7 @@ PHP_METHOD(domdocument, createTextNode)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328
 Since:
 */
-PHP_METHOD(domdocument, createComment)
+PHP_METHOD(DOMDocument, createComment)
 {
 	zval *id;
 	xmlNode *node;
@@ -676,7 +632,7 @@ PHP_METHOD(domdocument, createComment)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8
 Since:
 */
-PHP_METHOD(domdocument, createCDATASection)
+PHP_METHOD(DOMDocument, createCDATASection)
 {
 	zval *id;
 	xmlNode *node;
@@ -706,7 +662,7 @@ PHP_METHOD(domdocument, createCDATASection)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439
 Since:
 */
-PHP_METHOD(domdocument, createProcessingInstruction)
+PHP_METHOD(DOMDocument, createProcessingInstruction)
 {
 	zval *id;
 	xmlNode *node;
@@ -743,7 +699,7 @@ PHP_METHOD(domdocument, createProcessingInstruction)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198
 Since:
 */
-PHP_METHOD(domdocument, createAttribute)
+PHP_METHOD(DOMDocument, createAttribute)
 {
 	zval *id;
 	xmlAttrPtr node;
@@ -779,7 +735,7 @@ PHP_METHOD(domdocument, createAttribute)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE
 Since:
 */
-PHP_METHOD(domdocument, createEntityReference)
+PHP_METHOD(DOMDocument, createEntityReference)
 {
 	zval *id;
 	xmlNode *node;
@@ -814,7 +770,7 @@ PHP_METHOD(domdocument, createEntityReference)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094
 Since:
 */
-PHP_METHOD(domdocument, getElementsByTagName)
+PHP_METHOD(DOMDocument, getElementsByTagName)
 {
 	zval *id;
 	xmlDocPtr docp;
@@ -841,7 +797,7 @@ PHP_METHOD(domdocument, getElementsByTagName)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode
 Since: DOM Level 2
 */
-PHP_METHOD(domdocument, importNode)
+PHP_METHOD(DOMDocument, importNode)
 {
 	zval *id, *node;
 	xmlDocPtr docp;
@@ -897,7 +853,7 @@ PHP_METHOD(domdocument, importNode)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS
 Since: DOM Level 2
 */
-PHP_METHOD(domdocument, createElementNS)
+PHP_METHOD(DOMDocument, createElementNS)
 {
 	zval *id;
 	xmlDocPtr docp;
@@ -962,7 +918,7 @@ PHP_METHOD(domdocument, createElementNS)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS
 Since: DOM Level 2
 */
-PHP_METHOD(domdocument, createAttributeNS)
+PHP_METHOD(DOMDocument, createAttributeNS)
 {
 	zval *id;
 	xmlDocPtr docp;
@@ -1029,7 +985,7 @@ PHP_METHOD(domdocument, createAttributeNS)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS
 Since: DOM Level 2
 */
-PHP_METHOD(domdocument, getElementsByTagNameNS)
+PHP_METHOD(DOMDocument, getElementsByTagNameNS)
 {
 	zval *id;
 	xmlDocPtr docp;
@@ -1057,7 +1013,7 @@ PHP_METHOD(domdocument, getElementsByTagNameNS)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId
 Since: DOM Level 2
 */
-PHP_METHOD(domdocument, getElementById)
+PHP_METHOD(DOMDocument, getElementById)
 {
 	zval *id;
 	xmlDocPtr docp;
@@ -1089,7 +1045,7 @@ PHP_METHOD(domdocument, getElementById)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode
 Since: DOM Level 3
 */
-PHP_METHOD(domdocument, adoptNode)
+PHP_METHOD(DOMDocument, adoptNode)
 {
 	zval *nodep = NULL;
 
@@ -1105,7 +1061,7 @@ PHP_METHOD(domdocument, adoptNode)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument
 Since: DOM Level 3
 */
-PHP_METHOD(domdocument, normalizeDocument)
+PHP_METHOD(DOMDocument, normalizeDocument)
 {
 	zval *id;
 	xmlDocPtr docp;
@@ -1123,7 +1079,7 @@ PHP_METHOD(domdocument, normalizeDocument)
 /* }}} end dom_document_normalize_document */
 
 /* {{{ proto DOMDocument::__construct([string version], [string encoding]); */
-PHP_METHOD(domdocument, __construct)
+PHP_METHOD(DOMDocument, __construct)
 {
 	xmlDoc *docp = NULL, *olddoc;
 	dom_object *intern;
@@ -1411,7 +1367,7 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) {
 URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load
 Since: DOM Level 3
 */
-PHP_METHOD(domdocument, load)
+PHP_METHOD(DOMDocument, load)
 {
 	dom_parse_document(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
@@ -1421,7 +1377,7 @@ PHP_METHOD(domdocument, load)
 URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML
 Since: DOM Level 3
 */
-PHP_METHOD(domdocument, loadXML)
+PHP_METHOD(DOMDocument, loadXML)
 {
 	dom_parse_document(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
 }
@@ -1430,7 +1386,7 @@ PHP_METHOD(domdocument, loadXML)
 /* {{{ proto int dom_document_save(string file)
 Convenience method to save to file
 */
-PHP_METHOD(domdocument, save)
+PHP_METHOD(DOMDocument, save)
 {
 	zval *id;
 	xmlDoc *docp;
@@ -1476,7 +1432,7 @@ PHP_METHOD(domdocument, save)
 URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML
 Since: DOM Level 3
 */
-PHP_METHOD(domdocument, saveXML)
+PHP_METHOD(DOMDocument, saveXML)
 {
 	zval *id, *nodep = NULL;
 	xmlDoc *docp;
@@ -1587,7 +1543,7 @@ static void php_dom_remove_xinclude_nodes(xmlNodePtr cur) /* {{{ */
 
 /* {{{ proto int dom_document_xinclude([int options])
    Substitutues xincludes in a DomDocument */
-PHP_METHOD(domdocument, xinclude)
+PHP_METHOD(DOMDocument, xinclude)
 {
 	zval *id;
 	xmlDoc *docp;
@@ -1634,7 +1590,7 @@ PHP_METHOD(domdocument, xinclude)
 /* {{{ proto bool dom_document_validate()
 Since: DOM extended
 */
-PHP_METHOD(domdocument, validate)
+PHP_METHOD(DOMDocument, validate)
 {
 	zval *id;
 	xmlDoc *docp;
@@ -1754,14 +1710,14 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
 /* }}} */
 
 /* {{{ proto bool dom_document_schema_validate_file(string filename, int flags); */
-PHP_METHOD(domdocument, schemaValidate)
+PHP_METHOD(DOMDocument, schemaValidate)
 {
 	_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
 /* }}} end dom_document_schema_validate_file */
 
 /* {{{ proto bool dom_document_schema_validate(string source, int flags); */
-PHP_METHOD(domdocument, schemaValidateSource)
+PHP_METHOD(DOMDocument, schemaValidateSource)
 {
 	_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
 }
@@ -1848,14 +1804,14 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ
 /* }}} */
 
 /* {{{ proto bool dom_document_relaxNG_validate_file(string filename); */
-PHP_METHOD(domdocument, relaxNGValidate)
+PHP_METHOD(DOMDocument, relaxNGValidate)
 {
 	_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
 /* }}} end dom_document_relaxNG_validate_file */
 
 /* {{{ proto bool dom_document_relaxNG_validate_xml(string source); */
-PHP_METHOD(domdocument, relaxNGValidateSource)
+PHP_METHOD(DOMDocument, relaxNGValidateSource)
 {
 	_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
 }
@@ -1962,7 +1918,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
 /* {{{ proto DOMNode dom_document_load_html_file(string source)
 Since: DOM extended
 */
-PHP_METHOD(domdocument, loadHTMLFile)
+PHP_METHOD(DOMDocument, loadHTMLFile)
 {
 	dom_load_html(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
@@ -1971,7 +1927,7 @@ PHP_METHOD(domdocument, loadHTMLFile)
 /* {{{ proto DOMNode dom_document_load_html(string source)
 Since: DOM extended
 */
-PHP_METHOD(domdocument, loadHTML)
+PHP_METHOD(DOMDocument, loadHTML)
 {
 	dom_load_html(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
 }
@@ -1980,7 +1936,7 @@ PHP_METHOD(domdocument, loadHTML)
 /* {{{ proto int dom_document_save_html_file(string file)
 Convenience method to save to file as html
 */
-PHP_METHOD(domdocument, saveHTMLFile)
+PHP_METHOD(DOMDocument, saveHTMLFile)
 {
 	zval *id;
 	xmlDoc *docp;
@@ -2020,7 +1976,7 @@ PHP_METHOD(domdocument, saveHTMLFile)
 /* {{{ proto string dom_document_save_html()
 Convenience method to output as html
 */
-PHP_METHOD(domdocument, saveHTML)
+PHP_METHOD(DOMDocument, saveHTML)
 {
 	zval *id, *nodep = NULL;
 	xmlDoc *docp;
@@ -2108,7 +2064,7 @@ PHP_METHOD(domdocument, saveHTML)
 
 /* {{{ proto bool DOMDocument::registerNodeClass(string baseclass, string extendedclass)
    Register extended class used to create base node type */
-PHP_METHOD(domdocument, registerNodeClass)
+PHP_METHOD(DOMDocument, registerNodeClass)
 {
 	zval *id;
 	xmlDoc *docp;
@@ -2134,7 +2090,7 @@ PHP_METHOD(domdocument, registerNodeClass)
 URL: https://dom.spec.whatwg.org/#dom-parentnode-append
 Since: DOM Living Standard (DOM4)
 */
-PHP_METHOD(domdocument, append)
+PHP_METHOD(DOMDocument, append)
 {
 	int argc;
 	zval *args, *id;
@@ -2156,7 +2112,7 @@ PHP_METHOD(domdocument, append)
 URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
 Since: DOM Living Standard (DOM4)
 */
-PHP_METHOD(domdocument, prepend)
+PHP_METHOD(DOMDocument, prepend)
 {
 	int argc;
 	zval *args, *id;
diff --git a/ext/dom/document.stub.php b/ext/dom/document.stub.php
deleted file mode 100644
index fefb46f450682..0000000000000
--- a/ext/dom/document.stub.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-class DOMDocument implements DOMParentNode
-{
-    public function __construct(string $version = "1.0", string $encoding = UNKNOWN) {}
-
-    /** @return DOMAttr|false */
-    public function createAttribute(string $name) {}
-
-    /** @return DOMAttr|false */
-    public function createAttributeNS(?string $namespaceURI, string $qualifiedName) {}
-
-    /** @return DOMCdataSection|false */
-    public function createCDATASection(string $data) {}
-
-    /** @return DOMComment|false */
-    public function createComment(string $data) {}
-
-    /** @return DOMDocumentFragment|false */
-    public function createDocumentFragment() {}
-
-    /** @return DOMElement|false */
-    public function createElement(string $tagName, string $value = "") {}
-
-    /** @return DOMElement|false */
-    public function createElementNS(?string $namespaceURI, string $qualifiedName, string $value = "") {}
-
-    /** @return DOMEntityReference|false */
-    public function createEntityReference(string $name) {}
-
-    /** @return DOMProcessingInstruction|false */
-    public function createProcessingInstruction(string $target, string $data = "") {}
-
-    /** @return DOMText|false */
-    public function createTextNode(string $data) {}
-
-    /** @return DOMElement|null */
-    public function getElementById(string $elementId) {}
-
-    /** @return DOMNodeList */
-    public function getElementsByTagName(string $tagName) {}
-
-    /** @return DOMNodeList */
-    public function getElementsByTagNameNS(string $namespaceURI, string $localName) {}
-
-    /** @return DOMNode|false */
-    public function importNode(DOMNode $importedNode, bool $deep = false) {}
-
-    /** @return DOMDocument|bool */
-    public function load(string $filename, int $options = 0) {}
-
-    /** @return DOMDocument|bool */
-    public function loadXML(string $source, int $options = 0) {}
-
-    /** @return void */
-    public function normalizeDocument() {}
-
-    /** @return bool */
-    public function registerNodeClass(string $baseclass, ?string $extendedclass) {}
-
-    /** @return int|false */
-    public function save(string $filename, int $options = 0) {}
-
-#if defined(LIBXML_HTML_ENABLED)
-    /** @return DOMDocument|bool */
-    public function loadHTML(string $source, int $options = 0) {}
-
-    /** @return DOMDocument|bool */
-    public function loadHTMLFile(string $filename, int $options = 0) {}
-
-    /** @return string|false */
-    public function saveHTML(?DOMNode $node = null) {}
-
-    /** @return int|false */
-    public function saveHTMLFile(string $filename) {}
-#endif
-
-    /** @return string|false */
-    public function saveXML(?DOMNode $node = null, int $options = 0) {}
-
-#if defined(LIBXML_SCHEMAS_ENABLED)
-    /** @return bool */
-    public function schemaValidate(string $filename, int $flags = 0) {}
-
-    /** @return bool */
-    public function schemaValidateSource(string $source, int $flags = 0) {}
-
-    /** @return bool */
-    public function relaxNGValidate(string $filename) {}
-
-    /** @return bool */
-    public function relaxNGValidateSource(string $source) {}
-#endif
-
-    /** @return bool */
-    public function validate() {}
-
-    /** @return int|false */
-    public function xinclude(int $options = 0) {}
-
-    /** @return DOMNode|false */
-    public function adoptNode(DOMNode $source) {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function append(...$nodes): void {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function prepend(...$nodes): void {}
-}
diff --git a/ext/dom/document_arginfo.h b/ext/dom/document_arginfo.h
deleted file mode 100644
index 0d51410b02e57..0000000000000
--- a/ext/dom/document_arginfo.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument___construct, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, version, IS_STRING, 0, "\"1.0\"")
-	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createAttribute, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createAttributeNS, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createCDATASection, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMDocument_createComment arginfo_class_DOMDocument_createCDATASection
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createDocumentFragment, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createElement, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, tagName, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "\"\"")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createElementNS, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "\"\"")
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMDocument_createEntityReference arginfo_class_DOMDocument_createAttribute
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createProcessingInstruction, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, target, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, data, IS_STRING, 0, "\"\"")
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMDocument_createTextNode arginfo_class_DOMDocument_createCDATASection
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_getElementById, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, elementId, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_getElementsByTagName, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, tagName, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_getElementsByTagNameNS, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_importNode, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, importedNode, DOMNode, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, deep, _IS_BOOL, 0, "false")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_load, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_loadXML, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMDocument_normalizeDocument arginfo_class_DOMDocument_createDocumentFragment
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_registerNodeClass, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, baseclass, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, extendedclass, IS_STRING, 1)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMDocument_save arginfo_class_DOMDocument_load
-
-#if defined(LIBXML_HTML_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_loadHTML, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
-ZEND_END_ARG_INFO()
-#endif
-
-#if defined(LIBXML_HTML_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_loadHTMLFile, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
-ZEND_END_ARG_INFO()
-#endif
-
-#if defined(LIBXML_HTML_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_saveHTML, 0, 0, 0)
-	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, node, DOMNode, 1, "null")
-ZEND_END_ARG_INFO()
-#endif
-
-#if defined(LIBXML_HTML_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_saveHTMLFile, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-#endif
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_saveXML, 0, 0, 0)
-	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, node, DOMNode, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
-ZEND_END_ARG_INFO()
-
-#if defined(LIBXML_SCHEMAS_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_schemaValidate, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
-ZEND_END_ARG_INFO()
-#endif
-
-#if defined(LIBXML_SCHEMAS_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_schemaValidateSource, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
-ZEND_END_ARG_INFO()
-#endif
-
-#if defined(LIBXML_SCHEMAS_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_relaxNGValidate, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-#endif
-
-#if defined(LIBXML_SCHEMAS_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_relaxNGValidateSource, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-#endif
-
-#define arginfo_class_DOMDocument_validate arginfo_class_DOMDocument_createDocumentFragment
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_xinclude, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_adoptNode, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, source, DOMNode, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMDocument_append, 0, 0, IS_VOID, 0)
-	ZEND_ARG_VARIADIC_INFO(0, nodes)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMDocument_prepend arginfo_class_DOMDocument_append
diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c
index dddfc8f446149..bdef3396367d3 100644
--- a/ext/dom/documentfragment.c
+++ b/ext/dom/documentfragment.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "documentfragment_arginfo.h"
 
 /*
 * class DOMDocumentFragment extends DOMNode
@@ -31,16 +30,8 @@
 * Since:
 */
 
-const zend_function_entry php_dom_documentfragment_class_functions[] = {
-	PHP_ME(domdocumentfragment, __construct, arginfo_class_DOMDocumentFragment___construct, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocumentfragment, appendXML, arginfo_class_DOMDocumentFragment_appendXML, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocumentfragment, append, arginfo_class_DOMDocumentFragment_append, ZEND_ACC_PUBLIC)
-	PHP_ME(domdocumentfragment, prepend, arginfo_class_DOMDocumentFragment_prepend, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 /* {{{ proto DOMDocumentFragment::__construct() */
-PHP_METHOD(domdocumentfragment, __construct)
+PHP_METHOD(DOMDocumentFragment, __construct)
 {
 	xmlNodePtr nodep = NULL, oldnode = NULL;
 	dom_object *intern;
@@ -101,7 +92,7 @@ static void php_dom_xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) /* {{{ */
 /* }}} */
 
 /* {{{ proto void DOMDocumentFragment::appendXML(string data) */
-PHP_METHOD(domdocumentfragment, appendXML) {
+PHP_METHOD(DOMDocumentFragment, appendXML) {
 	zval *id;
 	xmlNode *nodep;
 	dom_object *intern;
@@ -143,7 +134,7 @@ PHP_METHOD(domdocumentfragment, appendXML) {
 URL: https://dom.spec.whatwg.org/#dom-parentnode-append
 Since: DOM Living Standard (DOM4)
 */
-PHP_METHOD(domdocumentfragment, append)
+PHP_METHOD(DOMDocumentFragment, append)
 {
 	int argc;
 	zval *args, *id;
@@ -165,7 +156,7 @@ PHP_METHOD(domdocumentfragment, append)
 URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
 Since: DOM Living Standard (DOM4)
 */
-PHP_METHOD(domdocumentfragment, prepend)
+PHP_METHOD(DOMDocumentFragment, prepend)
 {
 	int argc;
 	zval *args, *id;
diff --git a/ext/dom/documentfragment.stub.php b/ext/dom/documentfragment.stub.php
deleted file mode 100644
index dc40beea494ae..0000000000000
--- a/ext/dom/documentfragment.stub.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class DOMDocumentFragment implements DOMParentNode
-{
-    public function __construct() {}
-
-    /** @return bool */
-    public function appendXML(string $data) {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function append(...$nodes): void {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function prepend(...$nodes): void {}
-}
diff --git a/ext/dom/documentfragment_arginfo.h b/ext/dom/documentfragment_arginfo.h
deleted file mode 100644
index a74fc3dd893e7..0000000000000
--- a/ext/dom/documentfragment_arginfo.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocumentFragment___construct, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocumentFragment_appendXML, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMDocumentFragment_append, 0, 0, IS_VOID, 0)
-	ZEND_ARG_VARIADIC_INFO(0, nodes)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMDocumentFragment_prepend arginfo_class_DOMDocumentFragment_append
diff --git a/ext/dom/dom.stub.php b/ext/dom/dom.stub.php
deleted file mode 100644
index ab405bcbbf717..0000000000000
--- a/ext/dom/dom.stub.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-/** @generate-function-entries */
-
-class DOMDocumentType {
-}
-
-function dom_import_simplexml(object $node): ?DOMElement {}
diff --git a/ext/dom/dom_arginfo.h b/ext/dom/dom_arginfo.h
deleted file mode 100644
index 37fab82b8bf08..0000000000000
--- a/ext/dom/dom_arginfo.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_dom_import_simplexml, 0, 1, DOMElement, 1)
-	ZEND_ARG_TYPE_INFO(0, node, IS_OBJECT, 0)
-ZEND_END_ARG_INFO()
-
-
-ZEND_FUNCTION(dom_import_simplexml);
-
-
-static const zend_function_entry ext_functions[] = {
-	ZEND_FE(dom_import_simplexml, arginfo_dom_import_simplexml)
-	ZEND_FE_END
-};
-
-
-static const zend_function_entry class_DOMDocumentType_methods[] = {
-	ZEND_FE_END
-};
diff --git a/ext/dom/dom_fe.h b/ext/dom/dom_fe.h
index 0a66807490c23..c350045565db2 100644
--- a/ext/dom/dom_fe.h
+++ b/ext/dom/dom_fe.h
@@ -18,27 +18,6 @@
 #ifndef DOM_FE_H
 #define DOM_FE_H
 
-extern const zend_function_entry php_dom_domexception_class_functions[];
-extern const zend_function_entry php_dom_parent_node_class_functions[];
-extern const zend_function_entry php_dom_child_node_class_functions[];
-extern const zend_function_entry php_dom_domimplementation_class_functions[];
-extern const zend_function_entry php_dom_documentfragment_class_functions[];
-extern const zend_function_entry php_dom_document_class_functions[];
-extern const zend_function_entry php_dom_node_class_functions[];
-extern const zend_function_entry php_dom_nodelist_class_functions[];
-extern const zend_function_entry php_dom_namednodemap_class_functions[];
-extern const zend_function_entry php_dom_characterdata_class_functions[];
-extern const zend_function_entry php_dom_attr_class_functions[];
-extern const zend_function_entry php_dom_element_class_functions[];
-extern const zend_function_entry php_dom_text_class_functions[];
-extern const zend_function_entry php_dom_comment_class_functions[];
-extern const zend_function_entry php_dom_cdatasection_class_functions[];
-extern const zend_function_entry php_dom_notation_class_functions[];
-extern const zend_function_entry php_dom_entity_class_functions[];
-extern const zend_function_entry php_dom_entityreference_class_functions[];
-extern const zend_function_entry php_dom_processinginstruction_class_functions[];
-extern const zend_function_entry php_dom_xpath_class_functions[];
-
 /* domexception errors */
 typedef enum {
 /* PHP_ERR is non-spec code for PHP errors: */
@@ -67,163 +46,4 @@ typedef enum {
 	VALIDATION_ERR                 = 16
 } dom_exception_code;
 
-/* domimplementation methods */
-PHP_METHOD(domimplementation, hasFeature);
-PHP_METHOD(domimplementation, createDocumentType);
-PHP_METHOD(domimplementation, createDocument);
-PHP_METHOD(domimplementation, getFeature);
-
-/* domdocumentfragment methods */
-PHP_METHOD(domdocumentfragment, __construct);
-PHP_METHOD(domdocumentfragment, appendXML);
-PHP_METHOD(domdocumentfragment, append);
-PHP_METHOD(domdocumentfragment, prepend);
-
-/* domdocument methods */
-PHP_METHOD(domdocument, createElement);
-PHP_METHOD(domdocument, createDocumentFragment);
-PHP_METHOD(domdocument, createTextNode);
-PHP_METHOD(domdocument, createComment);
-PHP_METHOD(domdocument, createCDATASection);
-PHP_METHOD(domdocument, createProcessingInstruction);
-PHP_METHOD(domdocument, createAttribute);
-PHP_METHOD(domdocument, createEntityReference);
-PHP_METHOD(domdocument, getElementsByTagName);
-PHP_METHOD(domdocument, importNode);
-PHP_METHOD(domdocument, createElementNS);
-PHP_METHOD(domdocument, createAttributeNS);
-PHP_METHOD(domdocument, getElementsByTagNameNS);
-PHP_METHOD(domdocument, getElementById);
-PHP_METHOD(domdocument, adoptNode);
-PHP_METHOD(domdocument, normalizeDocument);
-PHP_METHOD(domdocument, __construct);
-	/* convenience methods */
-PHP_METHOD(domdocument, load);
-PHP_METHOD(domdocument, save);
-PHP_METHOD(domdocument, loadXML);
-PHP_METHOD(domdocument, saveXML);
-PHP_METHOD(domdocument, validate);
-PHP_METHOD(domdocument, xinclude);
-PHP_METHOD(domdocument, registerNodeClass);
-PHP_METHOD(domdocument, append);
-PHP_METHOD(domdocument, prepend);
-
-#if defined(LIBXML_HTML_ENABLED)
-PHP_METHOD(domdocument, loadHTML);
-PHP_METHOD(domdocument, loadHTMLFile);
-PHP_METHOD(domdocument, saveHTML);
-PHP_METHOD(domdocument, saveHTMLFile);
-#endif  /* defined(LIBXML_HTML_ENABLED) */
-
-#if defined(LIBXML_SCHEMAS_ENABLED)
-PHP_METHOD(domdocument, schemaValidate);
-PHP_METHOD(domdocument, schemaValidateSource);
-PHP_METHOD(domdocument, relaxNGValidate);
-PHP_METHOD(domdocument, relaxNGValidateSource);
-#endif
-
-/* domnode methods */
-PHP_METHOD(domnode, insertBefore);
-PHP_METHOD(domnode, replaceChild);
-PHP_METHOD(domnode, removeChild);
-PHP_METHOD(domnode, appendChild);
-PHP_METHOD(domnode, hasChildNodes);
-PHP_METHOD(domnode, cloneNode);
-PHP_METHOD(domnode, normalize);
-PHP_METHOD(domnode, isSupported);
-PHP_METHOD(domnode, hasAttributes);
-PHP_METHOD(domnode, isSameNode);
-PHP_METHOD(domnode, lookupPrefix);
-PHP_METHOD(domnode, isDefaultNamespace);
-PHP_METHOD(domnode, lookupNamespaceURI);
-PHP_METHOD(domnode, C14N);
-PHP_METHOD(domnode, C14NFile);
-PHP_METHOD(domnode, getNodePath);
-PHP_METHOD(domnode, getLineNo);
-
-/* domnodelist methods */
-PHP_METHOD(domnodelist, item);
-PHP_METHOD(domnodelist, count);
-
-/* domnamednodemap methods */
-PHP_METHOD(domnamednodemap, getNamedItem);
-PHP_METHOD(domnamednodemap, item);
-PHP_METHOD(domnamednodemap, getNamedItemNS);
-PHP_METHOD(domnamednodemap, count);
-
-/* domcharacterdata methods */
-PHP_METHOD(domcharacterdata, substringData);
-PHP_METHOD(domcharacterdata, appendData);
-PHP_METHOD(domcharacterdata, insertData);
-PHP_METHOD(domcharacterdata, deleteData);
-PHP_METHOD(domcharacterdata, replaceData);
-PHP_METHOD(domcharacterdata, remove);
-PHP_METHOD(domcharacterdata, after);
-PHP_METHOD(domcharacterdata, before);
-PHP_METHOD(domcharacterdata, replaceWith);
-
-/* domattr methods */
-PHP_METHOD(domattr, isId);
-PHP_METHOD(domattr, __construct);
-
-/* domelement methods */
-PHP_METHOD(domelement, getAttribute);
-PHP_METHOD(domelement, setAttribute);
-PHP_METHOD(domelement, removeAttribute);
-PHP_METHOD(domelement, getAttributeNode);
-PHP_METHOD(domelement, setAttributeNode);
-PHP_METHOD(domelement, removeAttributeNode);
-PHP_METHOD(domelement, getElementsByTagName);
-PHP_METHOD(domelement, getAttributeNS);
-PHP_METHOD(domelement, setAttributeNS);
-PHP_METHOD(domelement, removeAttributeNS);
-PHP_METHOD(domelement, getAttributeNodeNS);
-PHP_METHOD(domelement, setAttributeNodeNS);
-PHP_METHOD(domelement, getElementsByTagNameNS);
-PHP_METHOD(domelement, hasAttribute);
-PHP_METHOD(domelement, hasAttributeNS);
-PHP_METHOD(domelement, setIdAttribute);
-PHP_METHOD(domelement, setIdAttributeNS);
-PHP_METHOD(domelement, setIdAttributeNode);
-PHP_METHOD(domelement, __construct);
-PHP_METHOD(domelement, remove);
-PHP_METHOD(domelement, after);
-PHP_METHOD(domelement, before);
-PHP_METHOD(domelement, append);
-PHP_METHOD(domelement, prepend);
-PHP_METHOD(domelement, replaceWith);
-
-/* domtext methods */
-PHP_METHOD(domtext, splitText);
-PHP_METHOD(domtext, isWhitespaceInElementContent);
-PHP_METHOD(domtext, replaceWholeText);
-PHP_METHOD(domtext, __construct);
-
-/* domcomment methods */
-PHP_METHOD(domcomment, __construct);
-
-/* domcdatasection methods */
-PHP_METHOD(domcdatasection, __construct);
-
-/* domdocumenttype methods */
-
-/* domnotation methods */
-
-/* domentity methods */
-
-/* domentityreference methods */
-PHP_METHOD(domentityreference, __construct);
-
-/* domprocessinginstruction methods */
-PHP_METHOD(domprocessinginstruction, __construct);
-
-#if defined(LIBXML_XPATH_ENABLED)
-/* xpath methods */
-PHP_METHOD(domxpath, __construct);
-PHP_METHOD(domxpath, registerNamespace);
-PHP_METHOD(domxpath, query);
-PHP_METHOD(domxpath, evaluate);
-PHP_METHOD(domxpath, registerPhpFunctions);
-#endif
-
 #endif /* DOM_FE_H */
diff --git a/ext/dom/domexception.c b/ext/dom/domexception.c
index e398a8003b48a..f0f5e7d765e21 100644
--- a/ext/dom/domexception.c
+++ b/ext/dom/domexception.c
@@ -32,10 +32,6 @@
 
 extern zend_class_entry *dom_domexception_class_entry;
 
-const zend_function_entry php_dom_domexception_class_functions[] = {
-	PHP_FE_END
-};
-
 void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error) /* {{{ */
 {
 	if (strict_error == 1) {
diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c
index 51b946da2a61c..c5492356fbec9 100644
--- a/ext/dom/domimplementation.c
+++ b/ext/dom/domimplementation.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "domimplementation_arginfo.h"
 
 /*
 * class DOMImplementation
@@ -31,19 +30,11 @@
 * Since:
 */
 
-const zend_function_entry php_dom_domimplementation_class_functions[] = {
-	PHP_ME(domimplementation, getFeature, arginfo_class_DOMImplementation_getFeature, ZEND_ACC_PUBLIC)
-	PHP_ME(domimplementation, hasFeature, arginfo_class_DOMImplementation_hasFeature, ZEND_ACC_PUBLIC)
-	PHP_ME(domimplementation, createDocumentType, arginfo_class_DOMImplementation_createDocumentType, ZEND_ACC_PUBLIC)
-	PHP_ME(domimplementation, createDocument, arginfo_class_DOMImplementation_createDocument, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 /* {{{ proto bool dom_domimplementation_has_feature(string feature, string version);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5CED94D7
 Since:
 */
-PHP_METHOD(domimplementation, hasFeature)
+PHP_METHOD(DOMImplementation, hasFeature)
 {
 	size_t feature_len, version_len;
 	char *feature, *version;
@@ -64,7 +55,7 @@ PHP_METHOD(domimplementation, hasFeature)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType
 Since: DOM Level 2
 */
-PHP_METHOD(domimplementation, createDocumentType)
+PHP_METHOD(DOMImplementation, createDocumentType)
 {
 	xmlDtd *doctype;
 	int ret;
@@ -126,7 +117,7 @@ PHP_METHOD(domimplementation, createDocumentType)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument
 Since: DOM Level 2
 */
-PHP_METHOD(domimplementation, createDocument)
+PHP_METHOD(DOMImplementation, createDocument)
 {
 	zval *node = NULL;
 	xmlDoc *docp;
@@ -231,7 +222,7 @@ PHP_METHOD(domimplementation, createDocument)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature
 Since: DOM Level 3
 */
-PHP_METHOD(domimplementation, getFeature)
+PHP_METHOD(DOMImplementation, getFeature)
 {
 	size_t feature_len, version_len;
 	char *feature, *version;
diff --git a/ext/dom/domimplementation.stub.php b/ext/dom/domimplementation.stub.php
deleted file mode 100644
index 86b28d196ed6b..0000000000000
--- a/ext/dom/domimplementation.stub.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class DOMImplementation
-{
-    /** @return void */
-    public function getFeature(string $feature, string $version) {}
-
-    /** @return bool */
-    public function hasFeature(string $feature, string $version) {}
-
-    /** @return DOMDocumentType|false */
-    public function createDocumentType(
-        string $qualifiedName, string $publicId = "", string $systemId = "") {}
-
-    /** @return DOMDocument|false */
-    public function createDocument(string $namespaceURI = "", string $qualifiedName = "", DOMDocumentType $doctype = UNKNOWN) {}
-}
diff --git a/ext/dom/domimplementation_arginfo.h b/ext/dom/domimplementation_arginfo.h
deleted file mode 100644
index fabce425d1449..0000000000000
--- a/ext/dom/domimplementation_arginfo.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMImplementation_getFeature, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, feature, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, version, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMImplementation_hasFeature arginfo_class_DOMImplementation_getFeature
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMImplementation_createDocumentType, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, publicId, IS_STRING, 0, "\"\"")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, systemId, IS_STRING, 0, "\"\"")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMImplementation_createDocument, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespaceURI, IS_STRING, 0, "\"\"")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifiedName, IS_STRING, 0, "\"\"")
-	ZEND_ARG_OBJ_INFO(0, doctype, DOMDocumentType, 0)
-ZEND_END_ARG_INFO()
diff --git a/ext/dom/element.c b/ext/dom/element.c
index 012d3a088b6c4..c76592a72ae72 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "element_arginfo.h"
 
 /*
 * class DOMElement extends DOMNode
@@ -31,38 +30,8 @@
 * Since:
 */
 
-const zend_function_entry php_dom_element_class_functions[] = { /* {{{ */
-	PHP_ME(domelement, getAttribute, arginfo_class_DOMElement_getAttribute, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, setAttribute, arginfo_class_DOMElement_setAttribute, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, removeAttribute, arginfo_class_DOMElement_removeAttribute, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, getAttributeNode, arginfo_class_DOMElement_getAttributeNode, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, setAttributeNode, arginfo_class_DOMElement_setAttributeNode, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, removeAttributeNode, arginfo_class_DOMElement_removeAttributeNode, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, getElementsByTagName, arginfo_class_DOMElement_getElementsByTagName, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, getAttributeNS, arginfo_class_DOMElement_getAttributeNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, setAttributeNS, arginfo_class_DOMElement_setAttributeNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, removeAttributeNS, arginfo_class_DOMElement_removeAttributeNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, getAttributeNodeNS, arginfo_class_DOMElement_getAttributeNodeNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, setAttributeNodeNS, arginfo_class_DOMElement_setAttributeNodeNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, getElementsByTagNameNS, arginfo_class_DOMElement_getElementsByTagNameNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, hasAttribute, arginfo_class_DOMElement_hasAttribute, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, hasAttributeNS, arginfo_class_DOMElement_hasAttributeNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, setIdAttribute, arginfo_class_DOMElement_setIdAttribute, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, setIdAttributeNS, arginfo_class_DOMElement_setIdAttributeNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, setIdAttributeNode, arginfo_class_DOMElement_setIdAttributeNode, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, __construct, arginfo_class_DOMElement___construct, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, remove, arginfo_class_DOMElement_remove, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, after, arginfo_class_DOMElement_after, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, before, arginfo_class_DOMElement_before, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, replaceWith, arginfo_class_DOMElement_replaceWith, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, append, arginfo_class_DOMElement_append, ZEND_ACC_PUBLIC)
-	PHP_ME(domelement, prepend, arginfo_class_DOMElement_prepend, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-/* }}} */
-
 /* {{{ proto DOMElement::__construct(string name, [string value], [string uri]) */
-PHP_METHOD(domelement, __construct)
+PHP_METHOD(DOMElement, __construct)
 {
 	xmlNodePtr nodep = NULL, oldnode = NULL;
 	dom_object *intern;
@@ -228,7 +197,7 @@ static xmlNodePtr dom_get_dom1_attribute(xmlNodePtr elem, xmlChar *name) /* {{{
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9
 Since:
 */
-PHP_METHOD(domelement, getAttribute)
+PHP_METHOD(DOMElement, getAttribute)
 {
 	zval *id;
 	xmlNode *nodep;
@@ -272,7 +241,7 @@ PHP_METHOD(domelement, getAttribute)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082
 Since:
 */
-PHP_METHOD(domelement, setAttribute)
+PHP_METHOD(DOMElement, setAttribute)
 {
 	zval *id;
 	xmlNode *nodep;
@@ -340,7 +309,7 @@ PHP_METHOD(domelement, setAttribute)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9
 Since:
 */
-PHP_METHOD(domelement, removeAttribute)
+PHP_METHOD(DOMElement, removeAttribute)
 {
 	zval *id;
 	xmlNodePtr nodep, attrp;
@@ -389,7 +358,7 @@ PHP_METHOD(domelement, removeAttribute)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8
 Since:
 */
-PHP_METHOD(domelement, getAttributeNode)
+PHP_METHOD(DOMElement, getAttributeNode)
 {
 	zval *id;
 	xmlNodePtr nodep, attrp;
@@ -437,7 +406,7 @@ PHP_METHOD(domelement, getAttributeNode)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154
 Since:
 */
-PHP_METHOD(domelement, setAttributeNode)
+PHP_METHOD(DOMElement, setAttributeNode)
 {
 	zval *id, *node;
 	xmlNode *nodep;
@@ -504,7 +473,7 @@ PHP_METHOD(domelement, setAttributeNode)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198
 Since:
 */
-PHP_METHOD(domelement, removeAttributeNode)
+PHP_METHOD(DOMElement, removeAttributeNode)
 {
 	zval *id, *node;
 	xmlNode *nodep;
@@ -542,7 +511,7 @@ PHP_METHOD(domelement, removeAttributeNode)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D
 Since:
 */
-PHP_METHOD(domelement, getElementsByTagName)
+PHP_METHOD(DOMElement, getElementsByTagName)
 {
 	zval *id;
 	xmlNodePtr elemp;
@@ -569,7 +538,7 @@ PHP_METHOD(domelement, getElementsByTagName)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS
 Since: DOM Level 2
 */
-PHP_METHOD(domelement, getAttributeNS)
+PHP_METHOD(DOMElement, getAttributeNS)
 {
 	zval *id;
 	xmlNodePtr elemp;
@@ -650,7 +619,7 @@ static xmlNsPtr _dom_new_reconNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) /*
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS
 Since: DOM Level 2
 */
-PHP_METHOD(domelement, setAttributeNS)
+PHP_METHOD(DOMElement, setAttributeNS)
 {
 	zval *id;
 	xmlNodePtr elemp, nodep = NULL;
@@ -779,7 +748,7 @@ PHP_METHOD(domelement, setAttributeNS)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS
 Since: DOM Level 2
 */
-PHP_METHOD(domelement, removeAttributeNS)
+PHP_METHOD(DOMElement, removeAttributeNS)
 {
 	zval *id;
 	xmlNode *nodep;
@@ -837,7 +806,7 @@ PHP_METHOD(domelement, removeAttributeNS)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS
 Since: DOM Level 2
 */
-PHP_METHOD(domelement, getAttributeNodeNS)
+PHP_METHOD(DOMElement, getAttributeNodeNS)
 {
 	zval *id;
 	xmlNodePtr elemp, fakeAttrp;
@@ -893,7 +862,7 @@ PHP_METHOD(domelement, getAttributeNodeNS)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS
 Since: DOM Level 2
 */
-PHP_METHOD(domelement, setAttributeNodeNS)
+PHP_METHOD(DOMElement, setAttributeNodeNS)
 {
 	zval *id, *node;
 	xmlNode *nodep;
@@ -967,7 +936,7 @@ PHP_METHOD(domelement, setAttributeNodeNS)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942
 Since: DOM Level 2
 */
-PHP_METHOD(domelement, getElementsByTagNameNS)
+PHP_METHOD(DOMElement, getElementsByTagNameNS)
 {
 	zval *id;
 	xmlNodePtr elemp;
@@ -996,7 +965,7 @@ PHP_METHOD(domelement, getElementsByTagNameNS)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttr
 Since: DOM Level 2
 */
-PHP_METHOD(domelement, hasAttribute)
+PHP_METHOD(DOMElement, hasAttribute)
 {
 	zval *id;
 	xmlNode *nodep;
@@ -1025,7 +994,7 @@ PHP_METHOD(domelement, hasAttribute)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttrNS
 Since: DOM Level 2
 */
-PHP_METHOD(domelement, hasAttributeNS)
+PHP_METHOD(DOMElement, hasAttributeNS)
 {
 	zval *id;
 	xmlNodePtr elemp;
@@ -1083,7 +1052,7 @@ static void php_set_attribute_id(xmlAttrPtr attrp, zend_bool is_id) /* {{{ */
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr
 Since: DOM Level 3
 */
-PHP_METHOD(domelement, setIdAttribute)
+PHP_METHOD(DOMElement, setIdAttribute)
 {
 	zval *id;
 	xmlNode *nodep;
@@ -1120,7 +1089,7 @@ PHP_METHOD(domelement, setIdAttribute)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS
 Since: DOM Level 3
 */
-PHP_METHOD(domelement, setIdAttributeNS)
+PHP_METHOD(DOMElement, setIdAttributeNS)
 {
 	zval *id;
 	xmlNodePtr elemp;
@@ -1157,7 +1126,7 @@ PHP_METHOD(domelement, setIdAttributeNS)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode
 Since: DOM Level 3
 */
-PHP_METHOD(domelement, setIdAttributeNode)
+PHP_METHOD(DOMElement, setIdAttributeNode)
 {
 	zval *id, *node;
 	xmlNode *nodep;
@@ -1193,7 +1162,7 @@ PHP_METHOD(domelement, setIdAttributeNode)
 URL:
 Since:
 */
-PHP_METHOD(domelement, remove)
+PHP_METHOD(DOMElement, remove)
 {
 	zval *id;
 	xmlNodePtr child;
@@ -1210,7 +1179,7 @@ PHP_METHOD(domelement, remove)
 }
 /* }}} end DOMElement::remove */
 
-PHP_METHOD(domelement, after)
+PHP_METHOD(DOMElement, after)
 {
 	int argc;
 	zval *args, *id;
@@ -1227,7 +1196,7 @@ PHP_METHOD(domelement, after)
 	dom_parent_node_after(intern, args, argc);
 }
 
-PHP_METHOD(domelement, before)
+PHP_METHOD(DOMElement, before)
 {
 	int argc;
 	zval *args, *id;
@@ -1248,7 +1217,7 @@ PHP_METHOD(domelement, before)
 URL: https://dom.spec.whatwg.org/#dom-parentnode-append
 Since: DOM Living Standard (DOM4)
 */
-PHP_METHOD(domelement, append)
+PHP_METHOD(DOMElement, append)
 {
 	int argc;
 	zval *args, *id;
@@ -1270,7 +1239,7 @@ PHP_METHOD(domelement, append)
 URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
 Since: DOM Living Standard (DOM4)
 */
-PHP_METHOD(domelement, prepend)
+PHP_METHOD(DOMElement, prepend)
 {
 	int argc;
 	zval *args, *id;
@@ -1292,7 +1261,7 @@ PHP_METHOD(domelement, prepend)
 URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
 Since: DOM Living Standard (DOM4)
 */
-PHP_METHOD(domelement, replaceWith)
+PHP_METHOD(DOMElement, replaceWith)
 {
 	int argc;
 	zval *args, *id;
diff --git a/ext/dom/element.stub.php b/ext/dom/element.stub.php
deleted file mode 100644
index 6cf959fb819be..0000000000000
--- a/ext/dom/element.stub.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-class DOMElement implements DOMParentNode, DOMChildNode
-{
-    public function __construct(string $name, ?string $value = null, string $uri = "") {}
-
-    /** @return string */
-    public function getAttribute(string $name) {}
-
-    /** @return string */
-    public function getAttributeNS(?string $namespaceURI, string $localName) {}
-
-    /** @return DOMAttr|DOMNamespaceNode|false */
-    public function getAttributeNode(string $name) {}
-
-    /** @return DOMAttr|DOMNamespaceNode|null */
-    public function getAttributeNodeNS(?string $namespaceURI, string $localName) {}
-
-    /** @return DOMNodeList */
-    public function getElementsByTagName(string $name) {}
-
-    /** @return DOMNodeList */
-    public function getElementsByTagNameNS(string $namespaceURI, string $localName) {}
-
-    /** @return bool */
-    public function hasAttribute(string $name) {}
-
-    /** @return bool */
-    public function hasAttributeNS(?string $namespaceURI, string $localName) {}
-
-    /** @return bool */
-    public function removeAttribute(string $name) {}
-
-    /** @return DOMAttr|false */
-    public function removeAttributeNS(?string $namespaceURI, string $localName) {}
-
-    /** @return DOMAttr|false */
-    public function removeAttributeNode(string $name) {}
-
-    /** @return DOMAttr|bool */
-    public function setAttribute(string $name, string $value) {}
-
-    /** @return null|false */
-    public function setAttributeNS(?string $namespaceURI, string $localName, string $value) {}
-
-    /** @return DOMAttr|null|false */
-    public function setAttributeNode(DOMAttr $attr) {}
-
-    /** @return DOMAttr|null|false */
-    public function setAttributeNodeNS(DOMAttr $attr) {}
-
-    /** @return void */
-    public function setIdAttribute(string $name, bool $isId) {}
-
-    /** @return void */
-    public function setIdAttributeNS(string $namespaceURI, string $localName, bool $isId) {}
-
-    /** @return void */
-    public function setIdAttributeNode(DOMAttr $attr, bool $isId) {}
-
-    public function remove(): void {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function before(... $nodes): void {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function after(...$nodes): void {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function replaceWith(...$nodes): void {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function append(...$nodes): void {}
-
-    /** @var ...DOMNode|string $nodes */
-    public function prepend(...$nodes): void {}
-}
diff --git a/ext/dom/element_arginfo.h b/ext/dom/element_arginfo.h
deleted file mode 100644
index 496afd45ab683..0000000000000
--- a/ext/dom/element_arginfo.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 0, "\"\"")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_getAttribute, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_getAttributeNS, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMElement_getAttributeNode arginfo_class_DOMElement_getAttribute
-
-#define arginfo_class_DOMElement_getAttributeNodeNS arginfo_class_DOMElement_getAttributeNS
-
-#define arginfo_class_DOMElement_getElementsByTagName arginfo_class_DOMElement_getAttribute
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_getElementsByTagNameNS, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMElement_hasAttribute arginfo_class_DOMElement_getAttribute
-
-#define arginfo_class_DOMElement_hasAttributeNS arginfo_class_DOMElement_getAttributeNS
-
-#define arginfo_class_DOMElement_removeAttribute arginfo_class_DOMElement_getAttribute
-
-#define arginfo_class_DOMElement_removeAttributeNS arginfo_class_DOMElement_getAttributeNS
-
-#define arginfo_class_DOMElement_removeAttributeNode arginfo_class_DOMElement_getAttribute
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setAttribute, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setAttributeNS, 0, 0, 3)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setAttributeNode, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, attr, DOMAttr, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMElement_setAttributeNodeNS arginfo_class_DOMElement_setAttributeNode
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setIdAttribute, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, isId, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setIdAttributeNS, 0, 0, 3)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, isId, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setIdAttributeNode, 0, 0, 2)
-	ZEND_ARG_OBJ_INFO(0, attr, DOMAttr, 0)
-	ZEND_ARG_TYPE_INFO(0, isId, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMElement_remove, 0, 0, IS_VOID, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMElement_before, 0, 0, IS_VOID, 0)
-	ZEND_ARG_VARIADIC_INFO(0, nodes)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMElement_after arginfo_class_DOMElement_before
-
-#define arginfo_class_DOMElement_replaceWith arginfo_class_DOMElement_before
-
-#define arginfo_class_DOMElement_append arginfo_class_DOMElement_before
-
-#define arginfo_class_DOMElement_prepend arginfo_class_DOMElement_before
diff --git a/ext/dom/entity.c b/ext/dom/entity.c
index 6b01cb3fb2464..d00a969c086d0 100644
--- a/ext/dom/entity.c
+++ b/ext/dom/entity.c
@@ -31,10 +31,6 @@
 * Since:
 */
 
-const zend_function_entry php_dom_entity_class_functions[] = {
-	PHP_FE_END
-};
-
 /* {{{ publicId	string
 readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-D7303025
diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c
index a050b474a30b4..3b8f2dac94e92 100644
--- a/ext/dom/entityreference.c
+++ b/ext/dom/entityreference.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "entityreference_arginfo.h"
 
 /*
 * class DOMEntityReference extends DOMNode
@@ -31,13 +30,8 @@
 * Since:
 */
 
-const zend_function_entry php_dom_entityreference_class_functions[] = {
-	PHP_ME(domentityreference, __construct, arginfo_class_DOMEntityReference___construct, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 /* {{{ proto DOMEntityReference::__construct(string name) */
-PHP_METHOD(domentityreference, __construct)
+PHP_METHOD(DOMEntityReference, __construct)
 {
 	xmlNode *node;
 	xmlNodePtr oldnode = NULL;
diff --git a/ext/dom/entityreference.stub.php b/ext/dom/entityreference.stub.php
deleted file mode 100644
index ff56fafe08602..0000000000000
--- a/ext/dom/entityreference.stub.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class DOMEntityReference
-{
-    public function __construct(string $name) {}
-}
diff --git a/ext/dom/entityreference_arginfo.h b/ext/dom/entityreference_arginfo.h
deleted file mode 100644
index d09fe3cf29d86..0000000000000
--- a/ext/dom/entityreference_arginfo.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMEntityReference___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-ZEND_END_ARG_INFO()
diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c
index 3e06edd8271df..9e322d8edd0d3 100644
--- a/ext/dom/namednodemap.c
+++ b/ext/dom/namednodemap.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "namednodemap_arginfo.h"
 
 /*
 * class DOMNamedNodeMap
@@ -31,15 +30,6 @@
 * Since:
 */
 
-const zend_function_entry php_dom_namednodemap_class_functions[] = { /* {{{ */
-	PHP_ME(domnamednodemap, getNamedItem, arginfo_class_DOMNamedNodeMap_getNamedItem, ZEND_ACC_PUBLIC)
-	PHP_ME(domnamednodemap, item, arginfo_class_DOMNamedNodeMap_item, ZEND_ACC_PUBLIC)
-	PHP_ME(domnamednodemap, getNamedItemNS, arginfo_class_DOMNamedNodeMap_getNamedItemNS, ZEND_ACC_PUBLIC)
-	PHP_ME(domnamednodemap, count, arginfo_class_DOMNamedNodeMap_count, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-/* }}} */
-
 /* {{{ length	int
 readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D0FB19E
@@ -85,7 +75,7 @@ int dom_namednodemap_length_read(dom_object *obj, zval *retval)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549
 Since:
 */
-PHP_METHOD(domnamednodemap, getNamedItem)
+PHP_METHOD(DOMNamedNodeMap, getNamedItem)
 {
 	zval *id;
 	int ret;
@@ -141,7 +131,7 @@ PHP_METHOD(domnamednodemap, getNamedItem)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9
 Since:
 */
-PHP_METHOD(domnamednodemap, item)
+PHP_METHOD(DOMNamedNodeMap, item)
 {
 	zval *id;
 	zend_long index;
@@ -205,7 +195,7 @@ PHP_METHOD(domnamednodemap, item)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS
 Since: DOM Level 2
 */
-PHP_METHOD(domnamednodemap, getNamedItemNS)
+PHP_METHOD(DOMNamedNodeMap, getNamedItemNS)
 {
 	zval *id;
 	int ret;
@@ -259,7 +249,7 @@ PHP_METHOD(domnamednodemap, getNamedItemNS)
 
 /* {{{ proto int|bool dom_namednodemap_count();
 */
-PHP_METHOD(domnamednodemap, count)
+PHP_METHOD(DOMNamedNodeMap, count)
 {
 	zval *id;
 	dom_object *intern;
diff --git a/ext/dom/namednodemap.stub.php b/ext/dom/namednodemap.stub.php
deleted file mode 100644
index 701960e8a6aaf..0000000000000
--- a/ext/dom/namednodemap.stub.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-class DOMNamedNodeMap
-{
-    /** @return DOMNode|null */
-    public function getNamedItem(string $name) {}
-
-    /** @return DOMNode|null */
-    public function getNamedItemNS(?string $namespaceURI, string $localName) {}
-
-    /** @return DOMNode|null */
-    public function item(int $index) {}
-
-    /** @return int|false */
-    public function count() {}
-}
diff --git a/ext/dom/namednodemap_arginfo.h b/ext/dom/namednodemap_arginfo.h
deleted file mode 100644
index c28c433392b53..0000000000000
--- a/ext/dom/namednodemap_arginfo.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNamedNodeMap_getNamedItem, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNamedNodeMap_getNamedItemNS, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNamedNodeMap_item, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNamedNodeMap_count, 0, 0, 0)
-ZEND_END_ARG_INFO()
diff --git a/ext/dom/node.c b/ext/dom/node.c
index 6a3db3b1f58a3..fe09c1c940ad4 100644
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "node_arginfo.h"
 
 /*
 * class DOMNode
@@ -31,36 +30,6 @@
 * Since:
 */
 
-const zend_function_entry php_dom_node_class_functions[] = { /* {{{ */
-	PHP_ME(domnode, insertBefore, arginfo_class_DOMNode_insertBefore, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, replaceChild, arginfo_class_DOMNode_replaceChild, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, removeChild, arginfo_class_DOMNode_removeChild, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, appendChild, arginfo_class_DOMNode_appendChild, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, hasChildNodes, arginfo_class_DOMNode_hasChildNodes, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, cloneNode, arginfo_class_DOMNode_cloneNode, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, normalize, arginfo_class_DOMNode_normalize, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, isSupported, arginfo_class_DOMNode_isSupported, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, hasAttributes, arginfo_class_DOMNode_hasAttributes, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, isSameNode, arginfo_class_DOMNode_isSameNode, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, lookupPrefix, arginfo_class_DOMNode_lookupPrefix, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, isDefaultNamespace, arginfo_class_DOMNode_isDefaultNamespace, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, lookupNamespaceURI, arginfo_class_DOMNode_lookupNamespaceUri, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, getNodePath, arginfo_class_DOMNode_getNodePath, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, getLineNo, arginfo_class_DOMNode_getLineNo, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, C14N, arginfo_class_DOMNode_C14N, ZEND_ACC_PUBLIC)
-	PHP_ME(domnode, C14NFile, arginfo_class_DOMNode_C14NFile, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-/* }}} */
-
-const zend_function_entry php_dom_child_node_class_functions[] = { /* {{{ */
-	PHP_ABSTRACT_ME(DOMChildNode, remove, arginfo_class_DOMChildNode_remove)
-	PHP_ABSTRACT_ME(DOMChildNode, after, arginfo_class_DOMChildNode_after)
-	PHP_ABSTRACT_ME(DOMChildNode, before, arginfo_class_DOMChildNode_before)
-	PHP_FE_END
-};
-/* }}} */
-
 /* {{{ nodeName	string
 readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68D095
@@ -866,7 +835,7 @@ static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib,
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727
 Since:
 */
-PHP_METHOD(domnode, insertBefore)
+PHP_METHOD(DOMNode, insertBefore)
 {
 	zval *id, *node, *ref = NULL;
 	xmlNodePtr child, new_child, parentp, refp;
@@ -1028,7 +997,7 @@ PHP_METHOD(domnode, insertBefore)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307
 Since:
 */
-PHP_METHOD(domnode, replaceChild)
+PHP_METHOD(DOMNode, replaceChild)
 {
 	zval *id, *newnode, *oldnode;
 	xmlNodePtr children, newchild, oldchild, nodep;
@@ -1117,7 +1086,7 @@ PHP_METHOD(domnode, replaceChild)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066
 Since:
 */
-PHP_METHOD(domnode, removeChild)
+PHP_METHOD(DOMNode, removeChild)
 {
 	zval *id, *node;
 	xmlNodePtr children, child, nodep;
@@ -1169,7 +1138,7 @@ PHP_METHOD(domnode, removeChild)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107
 Since:
 */
-PHP_METHOD(domnode, appendChild)
+PHP_METHOD(DOMNode, appendChild)
 {
 	zval *id, *node;
 	xmlNodePtr child, nodep, new_child = NULL;
@@ -1271,7 +1240,7 @@ PHP_METHOD(domnode, appendChild)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-810594187
 Since:
 */
-PHP_METHOD(domnode, hasChildNodes)
+PHP_METHOD(DOMNode, hasChildNodes)
 {
 	zval *id;
 	xmlNode *nodep;
@@ -1300,7 +1269,7 @@ PHP_METHOD(domnode, hasChildNodes)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4
 Since:
 */
-PHP_METHOD(domnode, cloneNode)
+PHP_METHOD(DOMNode, cloneNode)
 {
 	zval *id;
 	xmlNode *n, *node;
@@ -1362,7 +1331,7 @@ PHP_METHOD(domnode, cloneNode)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize
 Since:
 */
-PHP_METHOD(domnode, normalize)
+PHP_METHOD(DOMNode, normalize)
 {
 	zval *id;
 	xmlNode *nodep;
@@ -1384,7 +1353,7 @@ PHP_METHOD(domnode, normalize)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Level-2-Core-Node-supports
 Since: DOM Level 2
 */
-PHP_METHOD(domnode, isSupported)
+PHP_METHOD(DOMNode, isSupported)
 {
 	size_t feature_len, version_len;
 	char *feature, *version;
@@ -1405,7 +1374,7 @@ PHP_METHOD(domnode, isSupported)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeHasAttrs
 Since: DOM Level 2
 */
-PHP_METHOD(domnode, hasAttributes)
+PHP_METHOD(DOMNode, hasAttributes)
 {
 	zval *id;
 	xmlNode *nodep;
@@ -1433,7 +1402,7 @@ PHP_METHOD(domnode, hasAttributes)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode
 Since: DOM Level 3
 */
-PHP_METHOD(domnode, isSameNode)
+PHP_METHOD(DOMNode, isSameNode)
 {
 	zval *id, *node;
 	xmlNodePtr nodeotherp, nodep;
@@ -1460,7 +1429,7 @@ PHP_METHOD(domnode, isSameNode)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix
 Since: DOM Level 3
 */
-PHP_METHOD(domnode, lookupPrefix)
+PHP_METHOD(DOMNode, lookupPrefix)
 {
 	zval *id;
 	xmlNodePtr nodep, lookupp = NULL;
@@ -1512,7 +1481,7 @@ PHP_METHOD(domnode, lookupPrefix)
 URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-isDefaultNamespace
 Since: DOM Level 3
 */
-PHP_METHOD(domnode, isDefaultNamespace)
+PHP_METHOD(DOMNode, isDefaultNamespace)
 {
 	zval *id;
 	xmlNodePtr nodep;
@@ -1546,7 +1515,7 @@ PHP_METHOD(domnode, isDefaultNamespace)
 URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI
 Since: DOM Level 3
 */
-PHP_METHOD(domnode, lookupNamespaceURI)
+PHP_METHOD(DOMNode, lookupNamespaceURI)
 {
 	zval *id;
 	xmlNodePtr nodep;
@@ -1754,7 +1723,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
 
 /* {{{ proto string DOMNode::C14N([bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]])
    Canonicalize nodes to a string */
-PHP_METHOD(domnode, C14N)
+PHP_METHOD(DOMNode, C14N)
 {
 	dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
@@ -1762,7 +1731,7 @@ PHP_METHOD(domnode, C14N)
 
 /* {{{ proto int DOMNode::C14NFile(string uri [, bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]])
    Canonicalize nodes to a file */
-PHP_METHOD(domnode, C14NFile)
+PHP_METHOD(DOMNode, C14NFile)
 {
 	dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
@@ -1770,7 +1739,7 @@ PHP_METHOD(domnode, C14NFile)
 
 /* {{{ proto string|null DOMNode::getNodePath()
    Gets an xpath for a node */
-PHP_METHOD(domnode, getNodePath)
+PHP_METHOD(DOMNode, getNodePath)
 {
 	zval *id;
 	xmlNode *nodep;
@@ -1795,7 +1764,7 @@ PHP_METHOD(domnode, getNodePath)
 
 /* {{{ proto int DOMNode::getLineNo()
    Gets line number for a node */
-PHP_METHOD(domnode, getLineNo)
+PHP_METHOD(DOMNode, getLineNo)
 {
 	zval *id;
 	xmlNode *nodep;
diff --git a/ext/dom/node.stub.php b/ext/dom/node.stub.php
deleted file mode 100644
index b3d461fd3714b..0000000000000
--- a/ext/dom/node.stub.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-interface DOMChildNode
-{
-    public function remove(): void;
-
-    /** @var ...DOMNode|string $nodes */
-    public function before(... $nodes): void;
-
-    /** @var ...DOMNode|string $nodes */
-    public function after(...$nodes): void;
-
-    /** @var ...DOMNode|string $nodes */
-    public function replaceWith(...$nodes): void;
-}
-
-class DOMNode
-{
-    /** @return DOMNode|false */
-    public function appendChild(DOMNode $newChild) {}
-
-    /** @return string|false */
-    public function C14N(bool $exclusive = false, bool $with_comments = false, ?array $xpath = null, ?array $ns_prefixes = null) {}
-
-    /** @return int|false */
-    public function C14NFile(string $uri, bool $exclusive = false, bool $with_comments = false, ?array $xpath = null, ?array $ns_prefixes = null) {}
-
-    /** @return DOMNode|false */
-    public function cloneNode(bool $recursive = false) {}
-
-    /** @return int */
-    public function getLineNo() {}
-
-    /** @return string|null */
-    public function getNodePath() {}
-
-    /** @return bool */
-    public function hasAttributes() {}
-
-    /** @return bool */
-    public function hasChildNodes() {}
-
-    /** @return DOMNode|false */
-    public function insertBefore(DOMNode $newChild, ?DOMNode $refChild = null) {}
-
-    /** @return bool */
-    public function isDefaultNamespace(string $namespaceURI) {}
-
-    /** @return bool */
-    public function isSameNode(DOMNode $other) {}
-
-    /** @return bool */
-    public function isSupported(string $feature, string $version) {}
-
-    /** @return string|null */
-    public function lookupNamespaceUri(?string $prefix) {}
-
-    /** @return string|null */
-    public function lookupPrefix(string $namespaceURI) {}
-
-    /** @return void */
-    public function normalize() {}
-
-    /** @return DOMNode|false */
-    public function removeChild(DOMNode $oldChild) {}
-
-    /** @return DOMNode|false */
-    public function replaceChild(DOMNode $newChild, DOMNode $oldChild) {}
-}
diff --git a/ext/dom/node_arginfo.h b/ext/dom/node_arginfo.h
deleted file mode 100644
index 58c5b111c2aef..0000000000000
--- a/ext/dom/node_arginfo.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMChildNode_remove, 0, 0, IS_VOID, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMChildNode_before, 0, 0, IS_VOID, 0)
-	ZEND_ARG_VARIADIC_INFO(0, nodes)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMChildNode_after arginfo_class_DOMChildNode_before
-
-#define arginfo_class_DOMChildNode_replaceWith arginfo_class_DOMChildNode_before
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_appendChild, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_C14N, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, exclusive, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, with_comments, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, xpath, IS_ARRAY, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns_prefixes, IS_ARRAY, 1, "null")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_C14NFile, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, exclusive, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, with_comments, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, xpath, IS_ARRAY, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns_prefixes, IS_ARRAY, 1, "null")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_cloneNode, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, recursive, _IS_BOOL, 0, "false")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_getLineNo, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMNode_getNodePath arginfo_class_DOMNode_getLineNo
-
-#define arginfo_class_DOMNode_hasAttributes arginfo_class_DOMNode_getLineNo
-
-#define arginfo_class_DOMNode_hasChildNodes arginfo_class_DOMNode_getLineNo
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_insertBefore, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
-	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, refChild, DOMNode, 1, "null")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_isDefaultNamespace, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_isSameNode, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_isSupported, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, feature, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, version, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_lookupNamespaceUri, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 1)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMNode_lookupPrefix arginfo_class_DOMNode_isDefaultNamespace
-
-#define arginfo_class_DOMNode_normalize arginfo_class_DOMNode_getLineNo
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_removeChild, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_replaceChild, 0, 0, 2)
-	ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
-	ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
-ZEND_END_ARG_INFO()
diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c
index 65f9887337da6..d6845c32adae5 100644
--- a/ext/dom/nodelist.c
+++ b/ext/dom/nodelist.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "nodelist_arginfo.h"
 
 /*
 * class DOMNodeList
@@ -31,12 +30,6 @@
 * Since:
 */
 
-const zend_function_entry php_dom_nodelist_class_functions[] = {
-	PHP_ME(domnodelist, item, arginfo_class_DOMNodeList_item, ZEND_ACC_PUBLIC)
-	PHP_ME(domnodelist, count, arginfo_class_DOMNodeList_count, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 /* {{{ length	int
 readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-203510337
@@ -90,7 +83,7 @@ int dom_nodelist_length_read(dom_object *obj, zval *retval)
 
 /* {{{ proto int|bool dom_nodelist_count();
 */
-PHP_METHOD(domnodelist, count)
+PHP_METHOD(DOMNodeList, count)
 {
 	zval *id;
 	dom_object *intern;
@@ -113,7 +106,7 @@ PHP_METHOD(domnodelist, count)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136
 Since:
 */
-PHP_METHOD(domnodelist, item)
+PHP_METHOD(DOMNodeList, item)
 {
 	zval *id;
 	zend_long index;
diff --git a/ext/dom/nodelist.stub.php b/ext/dom/nodelist.stub.php
deleted file mode 100644
index 57123427aa36e..0000000000000
--- a/ext/dom/nodelist.stub.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-class DOMNodeList
-{
-    /** @return int|false */
-    public function count() {}
-
-    /** @return DOMNode|null */
-    public function item(int $index) {}
-}
diff --git a/ext/dom/nodelist_arginfo.h b/ext/dom/nodelist_arginfo.h
deleted file mode 100644
index 19afdbadca48a..0000000000000
--- a/ext/dom/nodelist_arginfo.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNodeList_count, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNodeList_item, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
-ZEND_END_ARG_INFO()
diff --git a/ext/dom/notation.c b/ext/dom/notation.c
index 2256b359d8099..468bbad4e0cca 100644
--- a/ext/dom/notation.c
+++ b/ext/dom/notation.c
@@ -30,10 +30,6 @@
 * Since:
 */
 
-const zend_function_entry php_dom_notation_class_functions[] = {
-	PHP_FE_END
-};
-
 /* {{{ attribute protos, not implemented yet */
 
 /* {{{ publicId	string
diff --git a/ext/dom/parentnode.c b/ext/dom/parentnode.c
index 11dab851b751f..76263918be296 100644
--- a/ext/dom/parentnode.c
+++ b/ext/dom/parentnode.c
@@ -23,15 +23,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "parentnode_arginfo.h"
-
-/* {{{ DOMParentNode methods */
-const zend_function_entry php_dom_parent_node_class_functions[] = { /* {{{ */
-	PHP_ABSTRACT_ME(DOMParentNode, append, arginfo_class_DOMParentNode_append)
-	PHP_ABSTRACT_ME(DOMParentNode, prepend, arginfo_class_DOMParentNode_prepend)
-	PHP_FE_END
-};
-/* }}} */
 
 /* {{{ firstElementChild DomParentNode
 readonly=yes
diff --git a/ext/dom/parentnode.stub.php b/ext/dom/parentnode.stub.php
deleted file mode 100644
index fb2873d0245fc..0000000000000
--- a/ext/dom/parentnode.stub.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-interface DOMParentNode
-{
-    /** @var ...DOMNode|string $nodes */
-    public function append(...$nodes): void;
-
-    /** @var ...DOMNode|string $nodes */
-    public function prepend(...$nodes): void;
-}
diff --git a/ext/dom/parentnode_arginfo.h b/ext/dom/parentnode_arginfo.h
deleted file mode 100644
index 3bceebeca787a..0000000000000
--- a/ext/dom/parentnode_arginfo.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMParentNode_append, 0, 0, IS_VOID, 0)
-	ZEND_ARG_VARIADIC_INFO(0, nodes)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMParentNode_prepend arginfo_class_DOMParentNode_append
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 022cafc67e6e8..77887badebe1e 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -24,9 +24,12 @@
 #if HAVE_LIBXML && HAVE_DOM
 #include "ext/standard/php_rand.h"
 #include "php_dom.h"
-#include "dom_arginfo.h"
+#include "php_dom_arginfo.h"
 #include "dom_properties.h"
 #include "zend_interfaces.h"
+#if defined(LIBXML_XPATH_ENABLED)
+#include "xpath_arginfo.h"
+#endif
 
 #include "ext/standard/info.h"
 #define PHP_XPATH 1
@@ -578,20 +581,20 @@ PHP_MINIT_FUNCTION(dom)
 
 	zend_hash_init(&classes, 0, NULL, NULL, 1);
 
-	INIT_CLASS_ENTRY(ce, "DOMException", php_dom_domexception_class_functions);
+	INIT_CLASS_ENTRY(ce, "DOMException", class_DOMException_methods);
 	dom_domexception_class_entry = zend_register_internal_class_ex(&ce, zend_ce_exception);
 	dom_domexception_class_entry->ce_flags |= ZEND_ACC_FINAL;
 	zend_declare_property_long(dom_domexception_class_entry, "code", sizeof("code")-1, 0, ZEND_ACC_PUBLIC);
 
-	INIT_CLASS_ENTRY(ce, "DOMParentNode", php_dom_parent_node_class_functions);
+	INIT_CLASS_ENTRY(ce, "DOMParentNode", class_DOMParentNode_methods);
 	dom_parentnode_class_entry = zend_register_internal_interface(&ce);
 
-	INIT_CLASS_ENTRY(ce, "DOMChildNode", php_dom_child_node_class_functions);
+	INIT_CLASS_ENTRY(ce, "DOMChildNode", class_DOMChildNode_methods);
 	dom_childnode_class_entry = zend_register_internal_interface(&ce);
 
-	REGISTER_DOM_CLASS(ce, "DOMImplementation", NULL, php_dom_domimplementation_class_functions, dom_domimplementation_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMImplementation", NULL, class_DOMImplementation_methods, dom_domimplementation_class_entry);
 
-	REGISTER_DOM_CLASS(ce, "DOMNode", NULL, php_dom_node_class_functions, dom_node_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMNode", NULL, class_DOMNode_methods, dom_node_class_entry);
 
 	zend_hash_init(&dom_node_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 	dom_register_prop_handler(&dom_node_prop_handlers, "nodeName", sizeof("nodeName")-1, dom_node_node_name_read, NULL);
@@ -625,7 +628,7 @@ PHP_MINIT_FUNCTION(dom)
 	dom_register_prop_handler(&dom_namespace_node_prop_handlers, "parentNode", sizeof("parentNode")-1, dom_node_parent_node_read, NULL);
 	zend_hash_add_ptr(&classes, ce.name, &dom_namespace_node_prop_handlers);
 
-	REGISTER_DOM_CLASS(ce, "DOMDocumentFragment", dom_node_class_entry, php_dom_documentfragment_class_functions, dom_documentfragment_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMDocumentFragment", dom_node_class_entry, class_DOMDocumentFragment_methods, dom_documentfragment_class_entry);
 	zend_hash_init(&dom_documentfragment_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 
 	dom_register_prop_handler(&dom_documentfragment_prop_handlers, "firstElementChild", sizeof("firstElementChild")-1, dom_parent_node_first_element_child_read, NULL);
@@ -636,7 +639,7 @@ PHP_MINIT_FUNCTION(dom)
 	zend_hash_add_ptr(&classes, ce.name, &dom_documentfragment_prop_handlers);
 	zend_class_implements(dom_documentfragment_class_entry, 1, dom_parentnode_class_entry);
 
-	REGISTER_DOM_CLASS(ce, "DOMDocument", dom_node_class_entry, php_dom_document_class_functions, dom_document_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMDocument", dom_node_class_entry, class_DOMDocument_methods, dom_document_class_entry);
 	zend_hash_init(&dom_document_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 	dom_register_prop_handler(&dom_document_prop_handlers, "doctype", sizeof("doctype")-1, dom_document_doctype_read, NULL);
 	dom_register_prop_handler(&dom_document_prop_handlers, "implementation", sizeof("implementation")-1, dom_document_implementation_read, NULL);
@@ -666,7 +669,7 @@ PHP_MINIT_FUNCTION(dom)
 	zend_hash_add_ptr(&classes, ce.name, &dom_document_prop_handlers);
 	zend_class_implements(dom_document_class_entry, 1, dom_parentnode_class_entry);
 
-	INIT_CLASS_ENTRY(ce, "DOMNodeList", php_dom_nodelist_class_functions);
+	INIT_CLASS_ENTRY(ce, "DOMNodeList", class_DOMNodeList_methods);
 	ce.create_object = dom_nnodemap_objects_new;
 	dom_nodelist_class_entry = zend_register_internal_class_ex(&ce, NULL);
 	dom_nodelist_class_entry->get_iterator = php_dom_get_iterator;
@@ -676,7 +679,7 @@ PHP_MINIT_FUNCTION(dom)
 	dom_register_prop_handler(&dom_nodelist_prop_handlers, "length", sizeof("length")-1, dom_nodelist_length_read, NULL);
 	zend_hash_add_ptr(&classes, ce.name, &dom_nodelist_prop_handlers);
 
-	INIT_CLASS_ENTRY(ce, "DOMNamedNodeMap", php_dom_namednodemap_class_functions);
+	INIT_CLASS_ENTRY(ce, "DOMNamedNodeMap", class_DOMNamedNodeMap_methods);
 	ce.create_object = dom_nnodemap_objects_new;
 	dom_namednodemap_class_entry = zend_register_internal_class_ex(&ce, NULL);
 	dom_namednodemap_class_entry->get_iterator = php_dom_get_iterator;
@@ -686,7 +689,7 @@ PHP_MINIT_FUNCTION(dom)
 	dom_register_prop_handler(&dom_namednodemap_prop_handlers, "length", sizeof("length")-1, dom_namednodemap_length_read, NULL);
 	zend_hash_add_ptr(&classes, ce.name, &dom_namednodemap_prop_handlers);
 
-	REGISTER_DOM_CLASS(ce, "DOMCharacterData", dom_node_class_entry, php_dom_characterdata_class_functions, dom_characterdata_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMCharacterData", dom_node_class_entry, class_DOMCharacterData_methods, dom_characterdata_class_entry);
 
 	zend_hash_init(&dom_characterdata_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 	dom_register_prop_handler(&dom_characterdata_prop_handlers, "data", sizeof("data")-1, dom_characterdata_data_read, dom_characterdata_data_write);
@@ -698,7 +701,7 @@ PHP_MINIT_FUNCTION(dom)
 
 	zend_class_implements(dom_characterdata_class_entry, 1, dom_childnode_class_entry);
 
-	REGISTER_DOM_CLASS(ce, "DOMAttr", dom_node_class_entry, php_dom_attr_class_functions, dom_attr_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMAttr", dom_node_class_entry, class_DOMAttr_methods, dom_attr_class_entry);
 
 	zend_hash_init(&dom_attr_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 	dom_register_prop_handler(&dom_attr_prop_handlers, "name", sizeof("name")-1, dom_attr_name_read, NULL);
@@ -709,7 +712,7 @@ PHP_MINIT_FUNCTION(dom)
 	zend_hash_merge(&dom_attr_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0);
 	zend_hash_add_ptr(&classes, ce.name, &dom_attr_prop_handlers);
 
-	REGISTER_DOM_CLASS(ce, "DOMElement", dom_node_class_entry, php_dom_element_class_functions, dom_element_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMElement", dom_node_class_entry, class_DOMElement_methods, dom_element_class_entry);
 
 	zend_hash_init(&dom_element_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 	dom_register_prop_handler(&dom_element_prop_handlers, "tagName", sizeof("tagName")-1, dom_element_tag_name_read, NULL);
@@ -724,17 +727,17 @@ PHP_MINIT_FUNCTION(dom)
 
 	zend_class_implements(dom_element_class_entry, 2, dom_parentnode_class_entry, dom_childnode_class_entry);
 
-	REGISTER_DOM_CLASS(ce, "DOMText", dom_characterdata_class_entry, php_dom_text_class_functions, dom_text_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMText", dom_characterdata_class_entry, class_DOMText_methods, dom_text_class_entry);
 
 	zend_hash_init(&dom_text_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 	dom_register_prop_handler(&dom_text_prop_handlers, "wholeText", sizeof("wholeText")-1, dom_text_whole_text_read, NULL);
 	zend_hash_merge(&dom_text_prop_handlers, &dom_characterdata_prop_handlers, dom_copy_prop_handler, 0);
 	zend_hash_add_ptr(&classes, ce.name, &dom_text_prop_handlers);
 
-	REGISTER_DOM_CLASS(ce, "DOMComment", dom_characterdata_class_entry, php_dom_comment_class_functions, dom_comment_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMComment", dom_characterdata_class_entry, class_DOMComment_methods, dom_comment_class_entry);
 	zend_hash_add_ptr(&classes, ce.name, &dom_characterdata_prop_handlers);
 
-	REGISTER_DOM_CLASS(ce, "DOMCdataSection", dom_text_class_entry, php_dom_cdatasection_class_functions, dom_cdatasection_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMCdataSection", dom_text_class_entry, class_DOMCdataSection_methods, dom_cdatasection_class_entry);
 	zend_hash_add_ptr(&classes, ce.name, &dom_text_prop_handlers);
 
 	REGISTER_DOM_CLASS(ce, "DOMDocumentType", dom_node_class_entry, class_DOMDocumentType_methods, dom_documenttype_class_entry);
@@ -749,7 +752,7 @@ PHP_MINIT_FUNCTION(dom)
 	zend_hash_merge(&dom_documenttype_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0);
 	zend_hash_add_ptr(&classes, ce.name, &dom_documenttype_prop_handlers);
 
-	REGISTER_DOM_CLASS(ce, "DOMNotation", dom_node_class_entry, php_dom_notation_class_functions, dom_notation_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMNotation", dom_node_class_entry, class_DOMNotation_methods, dom_notation_class_entry);
 
 	zend_hash_init(&dom_notation_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 	dom_register_prop_handler(&dom_notation_prop_handlers, "publicId", sizeof("publicId")-1, dom_notation_public_id_read, NULL);
@@ -757,7 +760,7 @@ PHP_MINIT_FUNCTION(dom)
 	zend_hash_merge(&dom_notation_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0);
 	zend_hash_add_ptr(&classes, ce.name, &dom_notation_prop_handlers);
 
-	REGISTER_DOM_CLASS(ce, "DOMEntity", dom_node_class_entry, php_dom_entity_class_functions, dom_entity_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMEntity", dom_node_class_entry, class_DOMEntity_methods, dom_entity_class_entry);
 
 	zend_hash_init(&dom_entity_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 	dom_register_prop_handler(&dom_entity_prop_handlers, "publicId", sizeof("publicId")-1, dom_entity_public_id_read, NULL);
@@ -769,10 +772,10 @@ PHP_MINIT_FUNCTION(dom)
 	zend_hash_merge(&dom_entity_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0);
 	zend_hash_add_ptr(&classes, ce.name, &dom_entity_prop_handlers);
 
-	REGISTER_DOM_CLASS(ce, "DOMEntityReference", dom_node_class_entry, php_dom_entityreference_class_functions, dom_entityreference_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMEntityReference", dom_node_class_entry, class_DOMEntityReference_methods, dom_entityreference_class_entry);
 	zend_hash_add_ptr(&classes, ce.name, &dom_node_prop_handlers);
 
-	REGISTER_DOM_CLASS(ce, "DOMProcessingInstruction", dom_node_class_entry, php_dom_processinginstruction_class_functions, dom_processinginstruction_class_entry);
+	REGISTER_DOM_CLASS(ce, "DOMProcessingInstruction", dom_node_class_entry, class_DOMProcessingInstruction_methods, dom_processinginstruction_class_entry);
 
 	zend_hash_init(&dom_processinginstruction_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 	dom_register_prop_handler(&dom_processinginstruction_prop_handlers, "target", sizeof("target")-1, dom_processinginstruction_target_read, NULL);
@@ -785,7 +788,7 @@ PHP_MINIT_FUNCTION(dom)
 	dom_xpath_object_handlers.offset = XtOffsetOf(dom_xpath_object, dom) + XtOffsetOf(dom_object, std);
 	dom_xpath_object_handlers.free_obj = dom_xpath_objects_free_storage;
 
-	INIT_CLASS_ENTRY(ce, "DOMXPath", php_dom_xpath_class_functions);
+	INIT_CLASS_ENTRY(ce, "DOMXPath", class_DOMXPath_methods);
 	ce.create_object = dom_xpath_objects_new;
 	dom_xpath_class_entry = zend_register_internal_class_ex(&ce, NULL);
 
diff --git a/ext/dom/php_dom.stub.php b/ext/dom/php_dom.stub.php
new file mode 100644
index 0000000000000..952bb65b33fb1
--- /dev/null
+++ b/ext/dom/php_dom.stub.php
@@ -0,0 +1,411 @@
+<?php
+
+/** @generate-function-entries */
+
+class DOMDocumentType
+{
+}
+
+class DOMCdataSection
+{
+    public function __construct(string $value) {}
+}
+
+class DOMComment
+{
+    public function __construct(string $value = "") {}
+}
+
+interface DOMParentNode
+{
+    /** @var ...DOMNode|string $nodes */
+    public function append(...$nodes): void;
+
+    /** @var ...DOMNode|string $nodes */
+    public function prepend(...$nodes): void;
+}
+
+interface DOMChildNode
+{
+    public function remove(): void;
+
+    /** @var ...DOMNode|string $nodes */
+    public function before(... $nodes): void;
+
+    /** @var ...DOMNode|string $nodes */
+    public function after(...$nodes): void;
+
+    /** @var ...DOMNode|string $nodes */
+    public function replaceWith(...$nodes): void;
+}
+
+class DOMNode
+{
+    /** @return DOMNode|false */
+    public function appendChild(DOMNode $newChild) {}
+
+    /** @return string|false */
+    public function C14N(bool $exclusive = false, bool $with_comments = false, ?array $xpath = null, ?array $ns_prefixes = null) {}
+
+    /** @return int|false */
+    public function C14NFile(string $uri, bool $exclusive = false, bool $with_comments = false, ?array $xpath = null, ?array $ns_prefixes = null) {}
+
+    /** @return DOMNode|false */
+    public function cloneNode(bool $recursive = false) {}
+
+    /** @return int */
+    public function getLineNo() {}
+
+    /** @return string|null
+     */
+    public function getNodePath() {}
+
+    /** @return bool */
+    public function hasAttributes() {}
+
+    /** @return bool */
+    public function hasChildNodes() {}
+
+    /** @return DOMNode|false */
+    public function insertBefore(DOMNode $newChild, ?DOMNode $refChild = null) {}
+
+    /** @return bool */
+    public function isDefaultNamespace(string $namespaceURI) {}
+
+    /** @return bool */
+    public function isSameNode(DOMNode $other) {}
+
+    /** @return bool */
+    public function isSupported(string $feature, string $version) {}
+
+    /** @return string|null */
+    public function lookupNamespaceURI(?string $prefix) {}
+
+    /** @return string|null */
+    public function lookupPrefix(string $namespaceURI) {}
+
+    /** @return void */
+    public function normalize() {}
+
+    /** @return DOMNode|false */
+    public function removeChild(DOMNode $oldChild) {}
+
+    /** @return DOMNode|false */
+    public function replaceChild(DOMNode $newChild, DOMNode $oldChild) {}
+}
+
+class DOMImplementation
+{
+    /** @return void */
+    public function getFeature(string $feature, string $version) {}
+
+    /** @return bool */
+    public function hasFeature(string $feature, string $version) {}
+
+    /** @return DOMDocumentType|false */
+    public function createDocumentType(
+        string $qualifiedName, string $publicId = "", string $systemId = "") {}
+
+    /** @return DOMDocument|false */
+    public function createDocument(string $namespaceURI = "", string $qualifiedName = "", DOMDocumentType $doctype = UNKNOWN) {}
+}
+
+class DOMDocumentFragment implements DOMParentNode
+{
+    public function __construct() {}
+
+    /** @return bool */
+    public function appendXML(string $data) {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function append(...$nodes): void {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function prepend(...$nodes): void {}
+}
+
+class DOMNodeList
+{
+    /** @return int|false */
+    public function count() {}
+
+    /** @return DOMNode|null */
+    public function item(int $index) {}
+}
+
+class DOMCharacterData implements DOMChildNode
+{
+    /** @return bool */
+    public function appendData(string $data) {}
+
+    /** @return string|false */
+    public function substringData(int $offset, int $count) {}
+
+    /** @return bool */
+    public function insertData(int $offset, string $data) {}
+
+    /** @return bool */
+    public function deleteData(int $offset, int $count) {}
+
+    /** @return bool */
+    public function replaceData(int $offset, int $count, string $data) {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function replaceWith(...$nodes): void {}
+
+    public function remove(): void {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function before(... $nodes): void {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function after(...$nodes): void {}
+}
+
+class DOMAttr
+{
+    public function __construct(string $name, string $value = "") {}
+
+    /** @return bool */
+    public function isId() {}
+}
+
+class DOMElement implements DOMParentNode, DOMChildNode
+{
+    public function __construct(string $name, ?string $value = null, string $uri = "") {}
+
+    /** @return string */
+    public function getAttribute(string $name) {}
+
+    /** @return string */
+    public function getAttributeNS(?string $namespaceURI, string $localName) {}
+
+    /** @return DOMAttr|DOMNamespaceNode|false */
+    public function getAttributeNode(string $name) {}
+
+    /** @return DOMAttr|DOMNamespaceNode|null */
+    public function getAttributeNodeNS(?string $namespaceURI, string $localName) {}
+
+    /** @return DOMNodeList */
+    public function getElementsByTagName(string $name) {}
+
+    /** @return DOMNodeList */
+    public function getElementsByTagNameNS(string $namespaceURI, string $localName) {}
+
+    /** @return bool */
+    public function hasAttribute(string $name) {}
+
+    /** @return bool */
+    public function hasAttributeNS(?string $namespaceURI, string $localName) {}
+
+    /** @return bool */
+    public function removeAttribute(string $name) {}
+
+    /** @return DOMAttr|false */
+    public function removeAttributeNS(?string $namespaceURI, string $localName) {}
+
+    /** @return DOMAttr|false */
+    public function removeAttributeNode(string $name) {}
+
+    /** @return DOMAttr|bool */
+    public function setAttribute(string $name, string $value) {}
+
+    /** @return null|false */
+    public function setAttributeNS(?string $namespaceURI, string $localName, string $value) {}
+
+    /** @return DOMAttr|null|false */
+    public function setAttributeNode(DOMAttr $attr) {}
+
+    /** @return DOMAttr|null|false */
+    public function setAttributeNodeNS(DOMAttr $attr) {}
+
+    /** @return void */
+    public function setIdAttribute(string $name, bool $isId) {}
+
+    /** @return void */
+    public function setIdAttributeNS(string $namespaceURI, string $localName, bool $isId) {}
+
+    /** @return void */
+    public function setIdAttributeNode(DOMAttr $attr, bool $isId) {}
+
+    public function remove(): void {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function before(... $nodes): void {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function after(...$nodes): void {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function replaceWith(...$nodes): void {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function append(...$nodes): void {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function prepend(...$nodes): void {}
+}
+
+class DOMDocument implements DOMParentNode
+{
+    public function __construct(string $version = "1.0", string $encoding = UNKNOWN) {}
+
+    /** @return DOMAttr|false */
+    public function createAttribute(string $name) {}
+
+    /** @return DOMAttr|false */
+    public function createAttributeNS(?string $namespaceURI, string $qualifiedName) {}
+
+    /** @return DOMCdataSection|false */
+    public function createCDATASection(string $data) {}
+
+    /** @return DOMComment|false */
+    public function createComment(string $data) {}
+
+    /** @return DOMDocumentFragment|false */
+    public function createDocumentFragment() {}
+
+    /** @return DOMElement|false */
+    public function createElement(string $tagName, string $value = "") {}
+
+    /** @return DOMElement|false */
+    public function createElementNS(?string $namespaceURI, string $qualifiedName, string $value = "") {}
+
+    /** @return DOMEntityReference|false */
+    public function createEntityReference(string $name) {}
+
+    /** @return DOMProcessingInstruction|false */
+    public function createProcessingInstruction(string $target, string $data = "") {}
+
+    /** @return DOMText|false */
+    public function createTextNode(string $data) {}
+
+    /** @return DOMElement|null */
+    public function getElementById(string $elementId) {}
+
+    /** @return DOMNodeList */
+    public function getElementsByTagName(string $tagName) {}
+
+    /** @return DOMNodeList */
+    public function getElementsByTagNameNS(string $namespaceURI, string $localName) {}
+
+    /** @return DOMNode|false */
+    public function importNode(DOMNode $importedNode, bool $deep = false) {}
+
+    /** @return DOMDocument|bool */
+    public function load(string $filename, int $options = 0) {}
+
+    /** @return DOMDocument|bool */
+    public function loadXML(string $source, int $options = 0) {}
+
+    /** @return void */
+    public function normalizeDocument() {}
+
+    /** @return bool */
+    public function registerNodeClass(string $baseclass, ?string $extendedclass) {}
+
+    /** @return int|false */
+    public function save(string $filename, int $options = 0) {}
+
+#if defined(LIBXML_HTML_ENABLED)
+    /** @return DOMDocument|bool */
+    public function loadHTML(string $source, int $options = 0) {}
+
+    /** @return DOMDocument|bool */
+    public function loadHTMLFile(string $filename, int $options = 0) {}
+
+    /** @return string|false */
+    public function saveHTML(?DOMNode $node = null) {}
+
+    /** @return int|false */
+    public function saveHTMLFile(string $filename) {}
+#endif
+
+    /** @return string|false */
+    public function saveXML(?DOMNode $node = null, int $options = 0) {}
+
+#if defined(LIBXML_SCHEMAS_ENABLED)
+    /** @return bool */
+    public function schemaValidate(string $filename, int $flags = 0) {}
+
+    /** @return bool */
+    public function schemaValidateSource(string $source, int $flags = 0) {}
+
+    /** @return bool */
+    public function relaxNGValidate(string $filename) {}
+
+    /** @return bool */
+    public function relaxNGValidateSource(string $source) {}
+#endif
+
+    /** @return bool */
+    public function validate() {}
+
+    /** @return int|false */
+    public function xinclude(int $options = 0) {}
+
+    /** @return DOMNode|false */
+    public function adoptNode(DOMNode $source) {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function append(...$nodes): void {}
+
+    /** @var ...DOMNode|string $nodes */
+    public function prepend(...$nodes): void {}
+}
+
+final class DOMException extends Exception
+{
+}
+
+class DOMText
+{
+    public function __construct(string $value = "") {}
+
+    /** @return bool */
+    public function isWhitespaceInElementContent() {}
+
+    /**
+     * @return bool
+     * @alias DOMText::isWhitespaceInElementContent
+     */
+    public function isElementContentWhitespace() {}
+
+    /** @return DOMText|false */
+    public function splitText(int $offset) {}
+}
+
+class DOMNamedNodeMap
+{
+    /** @return DOMNode|null */
+    public function getNamedItem(string $name) {}
+
+    /** @return DOMNode|null */
+    public function getNamedItemNS(?string $namespaceURI, string $localName) {}
+
+    /** @return DOMNode|null */
+    public function item(int $index) {}
+
+    /** @return int|false */
+    public function count() {}
+}
+
+class DOMEntity extends DOMNode
+{
+}
+
+class DOMEntityReference
+{
+    public function __construct(string $name) {}
+}
+
+class DOMNotation extends DOMNode
+{
+}
+
+class DOMProcessingInstruction
+{
+    public function __construct(string $name, string $value = "") {}
+}
+
+function dom_import_simplexml(object $node): ?DOMElement {}
diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h
new file mode 100644
index 0000000000000..3db8d36c6a4ad
--- /dev/null
+++ b/ext/dom/php_dom_arginfo.h
@@ -0,0 +1,772 @@
+/* This is a generated file, edit the .stub.php file instead. */
+
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_dom_import_simplexml, 0, 1, DOMElement, 1)
+	ZEND_ARG_TYPE_INFO(0, node, IS_OBJECT, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMCdataSection___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMComment___construct, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "\"\"")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMParentNode_append, 0, 0, IS_VOID, 0)
+	ZEND_ARG_VARIADIC_INFO(0, nodes)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMParentNode_prepend arginfo_class_DOMParentNode_append
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_DOMChildNode_remove, 0, 0, IS_VOID, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMChildNode_before arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMChildNode_after arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMChildNode_replaceWith arginfo_class_DOMParentNode_append
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_appendChild, 0, 0, 1)
+	ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_C14N, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, exclusive, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, with_comments, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, xpath, IS_ARRAY, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns_prefixes, IS_ARRAY, 1, "null")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_C14NFile, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, exclusive, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, with_comments, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, xpath, IS_ARRAY, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ns_prefixes, IS_ARRAY, 1, "null")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_cloneNode, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, recursive, _IS_BOOL, 0, "false")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_getLineNo, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMNode_getNodePath arginfo_class_DOMNode_getLineNo
+
+#define arginfo_class_DOMNode_hasAttributes arginfo_class_DOMNode_getLineNo
+
+#define arginfo_class_DOMNode_hasChildNodes arginfo_class_DOMNode_getLineNo
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_insertBefore, 0, 0, 1)
+	ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, refChild, DOMNode, 1, "null")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_isDefaultNamespace, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_isSameNode, 0, 0, 1)
+	ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_isSupported, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, feature, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, version, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_lookupNamespaceURI, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 1)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMNode_lookupPrefix arginfo_class_DOMNode_isDefaultNamespace
+
+#define arginfo_class_DOMNode_normalize arginfo_class_DOMNode_getLineNo
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_removeChild, 0, 0, 1)
+	ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNode_replaceChild, 0, 0, 2)
+	ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+	ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMImplementation_getFeature arginfo_class_DOMNode_isSupported
+
+#define arginfo_class_DOMImplementation_hasFeature arginfo_class_DOMNode_isSupported
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMImplementation_createDocumentType, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, publicId, IS_STRING, 0, "\"\"")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, systemId, IS_STRING, 0, "\"\"")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMImplementation_createDocument, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespaceURI, IS_STRING, 0, "\"\"")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifiedName, IS_STRING, 0, "\"\"")
+	ZEND_ARG_OBJ_INFO(0, doctype, DOMDocumentType, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMDocumentFragment___construct arginfo_class_DOMNode_getLineNo
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocumentFragment_appendXML, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMDocumentFragment_append arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMDocumentFragment_prepend arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMNodeList_count arginfo_class_DOMNode_getLineNo
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNodeList_item, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMCharacterData_appendData arginfo_class_DOMDocumentFragment_appendXML
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMCharacterData_substringData, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMCharacterData_insertData, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMCharacterData_deleteData arginfo_class_DOMCharacterData_substringData
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMCharacterData_replaceData, 0, 0, 3)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMCharacterData_replaceWith arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMCharacterData_remove arginfo_class_DOMChildNode_remove
+
+#define arginfo_class_DOMCharacterData_before arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMCharacterData_after arginfo_class_DOMParentNode_append
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMAttr___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "\"\"")
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMAttr_isId arginfo_class_DOMNode_getLineNo
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 0, "\"\"")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_getAttribute, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_getAttributeNS, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMElement_getAttributeNode arginfo_class_DOMElement_getAttribute
+
+#define arginfo_class_DOMElement_getAttributeNodeNS arginfo_class_DOMElement_getAttributeNS
+
+#define arginfo_class_DOMElement_getElementsByTagName arginfo_class_DOMElement_getAttribute
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_getElementsByTagNameNS, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMElement_hasAttribute arginfo_class_DOMElement_getAttribute
+
+#define arginfo_class_DOMElement_hasAttributeNS arginfo_class_DOMElement_getAttributeNS
+
+#define arginfo_class_DOMElement_removeAttribute arginfo_class_DOMElement_getAttribute
+
+#define arginfo_class_DOMElement_removeAttributeNS arginfo_class_DOMElement_getAttributeNS
+
+#define arginfo_class_DOMElement_removeAttributeNode arginfo_class_DOMElement_getAttribute
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setAttribute, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setAttributeNS, 0, 0, 3)
+	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setAttributeNode, 0, 0, 1)
+	ZEND_ARG_OBJ_INFO(0, attr, DOMAttr, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMElement_setAttributeNodeNS arginfo_class_DOMElement_setAttributeNode
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setIdAttribute, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, isId, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setIdAttributeNS, 0, 0, 3)
+	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, isId, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMElement_setIdAttributeNode, 0, 0, 2)
+	ZEND_ARG_OBJ_INFO(0, attr, DOMAttr, 0)
+	ZEND_ARG_TYPE_INFO(0, isId, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMElement_remove arginfo_class_DOMChildNode_remove
+
+#define arginfo_class_DOMElement_before arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMElement_after arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMElement_replaceWith arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMElement_append arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMElement_prepend arginfo_class_DOMParentNode_append
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument___construct, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, version, IS_STRING, 0, "\"1.0\"")
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMDocument_createAttribute arginfo_class_DOMElement_getAttribute
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createAttributeNS, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMDocument_createCDATASection arginfo_class_DOMDocumentFragment_appendXML
+
+#define arginfo_class_DOMDocument_createComment arginfo_class_DOMDocumentFragment_appendXML
+
+#define arginfo_class_DOMDocument_createDocumentFragment arginfo_class_DOMNode_getLineNo
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createElement, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, tagName, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "\"\"")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createElementNS, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, qualifiedName, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "\"\"")
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMDocument_createEntityReference arginfo_class_DOMElement_getAttribute
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_createProcessingInstruction, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, target, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, data, IS_STRING, 0, "\"\"")
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMDocument_createTextNode arginfo_class_DOMDocumentFragment_appendXML
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_getElementById, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, elementId, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_getElementsByTagName, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, tagName, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMDocument_getElementsByTagNameNS arginfo_class_DOMElement_getElementsByTagNameNS
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_importNode, 0, 0, 1)
+	ZEND_ARG_OBJ_INFO(0, importedNode, DOMNode, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, deep, _IS_BOOL, 0, "false")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_load, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_loadXML, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMDocument_normalizeDocument arginfo_class_DOMNode_getLineNo
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_registerNodeClass, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, baseclass, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, extendedclass, IS_STRING, 1)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMDocument_save arginfo_class_DOMDocument_load
+
+#if defined(LIBXML_HTML_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_loadHTML, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
+#endif
+
+#if defined(LIBXML_HTML_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_loadHTMLFile, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
+#endif
+
+#if defined(LIBXML_HTML_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_saveHTML, 0, 0, 0)
+	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, node, DOMNode, 1, "null")
+ZEND_END_ARG_INFO()
+#endif
+
+#if defined(LIBXML_HTML_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_saveHTMLFile, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_saveXML, 0, 0, 0)
+	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, node, DOMNode, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
+
+#if defined(LIBXML_SCHEMAS_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_schemaValidate, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
+#endif
+
+#if defined(LIBXML_SCHEMAS_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_schemaValidateSource, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
+#endif
+
+#if defined(LIBXML_SCHEMAS_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_relaxNGValidate, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+#endif
+
+#if defined(LIBXML_SCHEMAS_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_relaxNGValidateSource, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+#endif
+
+#define arginfo_class_DOMDocument_validate arginfo_class_DOMNode_getLineNo
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_xinclude, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument_adoptNode, 0, 0, 1)
+	ZEND_ARG_OBJ_INFO(0, source, DOMNode, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMDocument_append arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMDocument_prepend arginfo_class_DOMParentNode_append
+
+#define arginfo_class_DOMText___construct arginfo_class_DOMComment___construct
+
+#define arginfo_class_DOMText_isWhitespaceInElementContent arginfo_class_DOMNode_getLineNo
+
+#define arginfo_class_DOMText_isElementContentWhitespace arginfo_class_DOMNode_getLineNo
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMText_splitText, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_DOMNamedNodeMap_getNamedItem arginfo_class_DOMElement_getAttribute
+
+#define arginfo_class_DOMNamedNodeMap_getNamedItemNS arginfo_class_DOMElement_getAttributeNS
+
+#define arginfo_class_DOMNamedNodeMap_item arginfo_class_DOMNodeList_item
+
+#define arginfo_class_DOMNamedNodeMap_count arginfo_class_DOMNode_getLineNo
+
+#define arginfo_class_DOMEntityReference___construct arginfo_class_DOMElement_getAttribute
+
+#define arginfo_class_DOMProcessingInstruction___construct arginfo_class_DOMAttr___construct
+
+
+ZEND_FUNCTION(dom_import_simplexml);
+ZEND_METHOD(DOMCdataSection, __construct);
+ZEND_METHOD(DOMComment, __construct);
+ZEND_METHOD(DOMNode, appendChild);
+ZEND_METHOD(DOMNode, C14N);
+ZEND_METHOD(DOMNode, C14NFile);
+ZEND_METHOD(DOMNode, cloneNode);
+ZEND_METHOD(DOMNode, getLineNo);
+ZEND_METHOD(DOMNode, getNodePath);
+ZEND_METHOD(DOMNode, hasAttributes);
+ZEND_METHOD(DOMNode, hasChildNodes);
+ZEND_METHOD(DOMNode, insertBefore);
+ZEND_METHOD(DOMNode, isDefaultNamespace);
+ZEND_METHOD(DOMNode, isSameNode);
+ZEND_METHOD(DOMNode, isSupported);
+ZEND_METHOD(DOMNode, lookupNamespaceURI);
+ZEND_METHOD(DOMNode, lookupPrefix);
+ZEND_METHOD(DOMNode, normalize);
+ZEND_METHOD(DOMNode, removeChild);
+ZEND_METHOD(DOMNode, replaceChild);
+ZEND_METHOD(DOMImplementation, getFeature);
+ZEND_METHOD(DOMImplementation, hasFeature);
+ZEND_METHOD(DOMImplementation, createDocumentType);
+ZEND_METHOD(DOMImplementation, createDocument);
+ZEND_METHOD(DOMDocumentFragment, __construct);
+ZEND_METHOD(DOMDocumentFragment, appendXML);
+ZEND_METHOD(DOMDocumentFragment, append);
+ZEND_METHOD(DOMDocumentFragment, prepend);
+ZEND_METHOD(DOMNodeList, count);
+ZEND_METHOD(DOMNodeList, item);
+ZEND_METHOD(DOMCharacterData, appendData);
+ZEND_METHOD(DOMCharacterData, substringData);
+ZEND_METHOD(DOMCharacterData, insertData);
+ZEND_METHOD(DOMCharacterData, deleteData);
+ZEND_METHOD(DOMCharacterData, replaceData);
+ZEND_METHOD(DOMCharacterData, replaceWith);
+ZEND_METHOD(DOMCharacterData, remove);
+ZEND_METHOD(DOMCharacterData, before);
+ZEND_METHOD(DOMCharacterData, after);
+ZEND_METHOD(DOMAttr, __construct);
+ZEND_METHOD(DOMAttr, isId);
+ZEND_METHOD(DOMElement, __construct);
+ZEND_METHOD(DOMElement, getAttribute);
+ZEND_METHOD(DOMElement, getAttributeNS);
+ZEND_METHOD(DOMElement, getAttributeNode);
+ZEND_METHOD(DOMElement, getAttributeNodeNS);
+ZEND_METHOD(DOMElement, getElementsByTagName);
+ZEND_METHOD(DOMElement, getElementsByTagNameNS);
+ZEND_METHOD(DOMElement, hasAttribute);
+ZEND_METHOD(DOMElement, hasAttributeNS);
+ZEND_METHOD(DOMElement, removeAttribute);
+ZEND_METHOD(DOMElement, removeAttributeNS);
+ZEND_METHOD(DOMElement, removeAttributeNode);
+ZEND_METHOD(DOMElement, setAttribute);
+ZEND_METHOD(DOMElement, setAttributeNS);
+ZEND_METHOD(DOMElement, setAttributeNode);
+ZEND_METHOD(DOMElement, setAttributeNodeNS);
+ZEND_METHOD(DOMElement, setIdAttribute);
+ZEND_METHOD(DOMElement, setIdAttributeNS);
+ZEND_METHOD(DOMElement, setIdAttributeNode);
+ZEND_METHOD(DOMElement, remove);
+ZEND_METHOD(DOMElement, before);
+ZEND_METHOD(DOMElement, after);
+ZEND_METHOD(DOMElement, replaceWith);
+ZEND_METHOD(DOMElement, append);
+ZEND_METHOD(DOMElement, prepend);
+ZEND_METHOD(DOMDocument, __construct);
+ZEND_METHOD(DOMDocument, createAttribute);
+ZEND_METHOD(DOMDocument, createAttributeNS);
+ZEND_METHOD(DOMDocument, createCDATASection);
+ZEND_METHOD(DOMDocument, createComment);
+ZEND_METHOD(DOMDocument, createDocumentFragment);
+ZEND_METHOD(DOMDocument, createElement);
+ZEND_METHOD(DOMDocument, createElementNS);
+ZEND_METHOD(DOMDocument, createEntityReference);
+ZEND_METHOD(DOMDocument, createProcessingInstruction);
+ZEND_METHOD(DOMDocument, createTextNode);
+ZEND_METHOD(DOMDocument, getElementById);
+ZEND_METHOD(DOMDocument, getElementsByTagName);
+ZEND_METHOD(DOMDocument, getElementsByTagNameNS);
+ZEND_METHOD(DOMDocument, importNode);
+ZEND_METHOD(DOMDocument, load);
+ZEND_METHOD(DOMDocument, loadXML);
+ZEND_METHOD(DOMDocument, normalizeDocument);
+ZEND_METHOD(DOMDocument, registerNodeClass);
+ZEND_METHOD(DOMDocument, save);
+#if defined(LIBXML_HTML_ENABLED)
+ZEND_METHOD(DOMDocument, loadHTML);
+#endif
+#if defined(LIBXML_HTML_ENABLED)
+ZEND_METHOD(DOMDocument, loadHTMLFile);
+#endif
+#if defined(LIBXML_HTML_ENABLED)
+ZEND_METHOD(DOMDocument, saveHTML);
+#endif
+#if defined(LIBXML_HTML_ENABLED)
+ZEND_METHOD(DOMDocument, saveHTMLFile);
+#endif
+ZEND_METHOD(DOMDocument, saveXML);
+#if defined(LIBXML_SCHEMAS_ENABLED)
+ZEND_METHOD(DOMDocument, schemaValidate);
+#endif
+#if defined(LIBXML_SCHEMAS_ENABLED)
+ZEND_METHOD(DOMDocument, schemaValidateSource);
+#endif
+#if defined(LIBXML_SCHEMAS_ENABLED)
+ZEND_METHOD(DOMDocument, relaxNGValidate);
+#endif
+#if defined(LIBXML_SCHEMAS_ENABLED)
+ZEND_METHOD(DOMDocument, relaxNGValidateSource);
+#endif
+ZEND_METHOD(DOMDocument, validate);
+ZEND_METHOD(DOMDocument, xinclude);
+ZEND_METHOD(DOMDocument, adoptNode);
+ZEND_METHOD(DOMDocument, append);
+ZEND_METHOD(DOMDocument, prepend);
+ZEND_METHOD(DOMText, __construct);
+ZEND_METHOD(DOMText, isWhitespaceInElementContent);
+ZEND_METHOD(DOMText, splitText);
+ZEND_METHOD(DOMNamedNodeMap, getNamedItem);
+ZEND_METHOD(DOMNamedNodeMap, getNamedItemNS);
+ZEND_METHOD(DOMNamedNodeMap, item);
+ZEND_METHOD(DOMNamedNodeMap, count);
+ZEND_METHOD(DOMEntityReference, __construct);
+ZEND_METHOD(DOMProcessingInstruction, __construct);
+
+
+static const zend_function_entry ext_functions[] = {
+	ZEND_FE(dom_import_simplexml, arginfo_dom_import_simplexml)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMDocumentType_methods[] = {
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMCdataSection_methods[] = {
+	ZEND_ME(DOMCdataSection, __construct, arginfo_class_DOMCdataSection___construct, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMComment_methods[] = {
+	ZEND_ME(DOMComment, __construct, arginfo_class_DOMComment___construct, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMParentNode_methods[] = {
+	ZEND_ABSTRACT_ME_WITH_FLAGS(DOMParentNode, append, arginfo_class_DOMParentNode_append, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT)
+	ZEND_ABSTRACT_ME_WITH_FLAGS(DOMParentNode, prepend, arginfo_class_DOMParentNode_prepend, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMChildNode_methods[] = {
+	ZEND_ABSTRACT_ME_WITH_FLAGS(DOMChildNode, remove, arginfo_class_DOMChildNode_remove, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT)
+	ZEND_ABSTRACT_ME_WITH_FLAGS(DOMChildNode, before, arginfo_class_DOMChildNode_before, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT)
+	ZEND_ABSTRACT_ME_WITH_FLAGS(DOMChildNode, after, arginfo_class_DOMChildNode_after, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT)
+	ZEND_ABSTRACT_ME_WITH_FLAGS(DOMChildNode, replaceWith, arginfo_class_DOMChildNode_replaceWith, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMNode_methods[] = {
+	ZEND_ME(DOMNode, appendChild, arginfo_class_DOMNode_appendChild, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, C14N, arginfo_class_DOMNode_C14N, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, C14NFile, arginfo_class_DOMNode_C14NFile, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, cloneNode, arginfo_class_DOMNode_cloneNode, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, getLineNo, arginfo_class_DOMNode_getLineNo, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, getNodePath, arginfo_class_DOMNode_getNodePath, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, hasAttributes, arginfo_class_DOMNode_hasAttributes, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, hasChildNodes, arginfo_class_DOMNode_hasChildNodes, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, insertBefore, arginfo_class_DOMNode_insertBefore, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, isDefaultNamespace, arginfo_class_DOMNode_isDefaultNamespace, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, isSameNode, arginfo_class_DOMNode_isSameNode, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, isSupported, arginfo_class_DOMNode_isSupported, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, lookupNamespaceURI, arginfo_class_DOMNode_lookupNamespaceURI, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, lookupPrefix, arginfo_class_DOMNode_lookupPrefix, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, normalize, arginfo_class_DOMNode_normalize, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, removeChild, arginfo_class_DOMNode_removeChild, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNode, replaceChild, arginfo_class_DOMNode_replaceChild, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMImplementation_methods[] = {
+	ZEND_ME(DOMImplementation, getFeature, arginfo_class_DOMImplementation_getFeature, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMImplementation, hasFeature, arginfo_class_DOMImplementation_hasFeature, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMImplementation, createDocumentType, arginfo_class_DOMImplementation_createDocumentType, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMImplementation, createDocument, arginfo_class_DOMImplementation_createDocument, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMDocumentFragment_methods[] = {
+	ZEND_ME(DOMDocumentFragment, __construct, arginfo_class_DOMDocumentFragment___construct, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocumentFragment, appendXML, arginfo_class_DOMDocumentFragment_appendXML, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocumentFragment, append, arginfo_class_DOMDocumentFragment_append, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocumentFragment, prepend, arginfo_class_DOMDocumentFragment_prepend, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMNodeList_methods[] = {
+	ZEND_ME(DOMNodeList, count, arginfo_class_DOMNodeList_count, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNodeList, item, arginfo_class_DOMNodeList_item, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMCharacterData_methods[] = {
+	ZEND_ME(DOMCharacterData, appendData, arginfo_class_DOMCharacterData_appendData, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMCharacterData, substringData, arginfo_class_DOMCharacterData_substringData, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMCharacterData, insertData, arginfo_class_DOMCharacterData_insertData, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMCharacterData, deleteData, arginfo_class_DOMCharacterData_deleteData, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMCharacterData, replaceData, arginfo_class_DOMCharacterData_replaceData, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMCharacterData, replaceWith, arginfo_class_DOMCharacterData_replaceWith, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMCharacterData, remove, arginfo_class_DOMCharacterData_remove, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMCharacterData, before, arginfo_class_DOMCharacterData_before, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMCharacterData, after, arginfo_class_DOMCharacterData_after, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMAttr_methods[] = {
+	ZEND_ME(DOMAttr, __construct, arginfo_class_DOMAttr___construct, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMAttr, isId, arginfo_class_DOMAttr_isId, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMElement_methods[] = {
+	ZEND_ME(DOMElement, __construct, arginfo_class_DOMElement___construct, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, getAttribute, arginfo_class_DOMElement_getAttribute, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, getAttributeNS, arginfo_class_DOMElement_getAttributeNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, getAttributeNode, arginfo_class_DOMElement_getAttributeNode, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, getAttributeNodeNS, arginfo_class_DOMElement_getAttributeNodeNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, getElementsByTagName, arginfo_class_DOMElement_getElementsByTagName, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, getElementsByTagNameNS, arginfo_class_DOMElement_getElementsByTagNameNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, hasAttribute, arginfo_class_DOMElement_hasAttribute, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, hasAttributeNS, arginfo_class_DOMElement_hasAttributeNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, removeAttribute, arginfo_class_DOMElement_removeAttribute, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, removeAttributeNS, arginfo_class_DOMElement_removeAttributeNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, removeAttributeNode, arginfo_class_DOMElement_removeAttributeNode, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, setAttribute, arginfo_class_DOMElement_setAttribute, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, setAttributeNS, arginfo_class_DOMElement_setAttributeNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, setAttributeNode, arginfo_class_DOMElement_setAttributeNode, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, setAttributeNodeNS, arginfo_class_DOMElement_setAttributeNodeNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, setIdAttribute, arginfo_class_DOMElement_setIdAttribute, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, setIdAttributeNS, arginfo_class_DOMElement_setIdAttributeNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, setIdAttributeNode, arginfo_class_DOMElement_setIdAttributeNode, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, remove, arginfo_class_DOMElement_remove, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, before, arginfo_class_DOMElement_before, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, after, arginfo_class_DOMElement_after, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, replaceWith, arginfo_class_DOMElement_replaceWith, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, append, arginfo_class_DOMElement_append, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMElement, prepend, arginfo_class_DOMElement_prepend, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMDocument_methods[] = {
+	ZEND_ME(DOMDocument, __construct, arginfo_class_DOMDocument___construct, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, createAttribute, arginfo_class_DOMDocument_createAttribute, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, createAttributeNS, arginfo_class_DOMDocument_createAttributeNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, createCDATASection, arginfo_class_DOMDocument_createCDATASection, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, createComment, arginfo_class_DOMDocument_createComment, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, createDocumentFragment, arginfo_class_DOMDocument_createDocumentFragment, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, createElement, arginfo_class_DOMDocument_createElement, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, createElementNS, arginfo_class_DOMDocument_createElementNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, createEntityReference, arginfo_class_DOMDocument_createEntityReference, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, createProcessingInstruction, arginfo_class_DOMDocument_createProcessingInstruction, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, createTextNode, arginfo_class_DOMDocument_createTextNode, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, getElementById, arginfo_class_DOMDocument_getElementById, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, getElementsByTagName, arginfo_class_DOMDocument_getElementsByTagName, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, getElementsByTagNameNS, arginfo_class_DOMDocument_getElementsByTagNameNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, importNode, arginfo_class_DOMDocument_importNode, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, load, arginfo_class_DOMDocument_load, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, loadXML, arginfo_class_DOMDocument_loadXML, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, normalizeDocument, arginfo_class_DOMDocument_normalizeDocument, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, registerNodeClass, arginfo_class_DOMDocument_registerNodeClass, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, save, arginfo_class_DOMDocument_save, ZEND_ACC_PUBLIC)
+#if defined(LIBXML_HTML_ENABLED)
+	ZEND_ME(DOMDocument, loadHTML, arginfo_class_DOMDocument_loadHTML, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_HTML_ENABLED)
+	ZEND_ME(DOMDocument, loadHTMLFile, arginfo_class_DOMDocument_loadHTMLFile, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_HTML_ENABLED)
+	ZEND_ME(DOMDocument, saveHTML, arginfo_class_DOMDocument_saveHTML, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_HTML_ENABLED)
+	ZEND_ME(DOMDocument, saveHTMLFile, arginfo_class_DOMDocument_saveHTMLFile, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_ME(DOMDocument, saveXML, arginfo_class_DOMDocument_saveXML, ZEND_ACC_PUBLIC)
+#if defined(LIBXML_SCHEMAS_ENABLED)
+	ZEND_ME(DOMDocument, schemaValidate, arginfo_class_DOMDocument_schemaValidate, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_SCHEMAS_ENABLED)
+	ZEND_ME(DOMDocument, schemaValidateSource, arginfo_class_DOMDocument_schemaValidateSource, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_SCHEMAS_ENABLED)
+	ZEND_ME(DOMDocument, relaxNGValidate, arginfo_class_DOMDocument_relaxNGValidate, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_SCHEMAS_ENABLED)
+	ZEND_ME(DOMDocument, relaxNGValidateSource, arginfo_class_DOMDocument_relaxNGValidateSource, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_ME(DOMDocument, validate, arginfo_class_DOMDocument_validate, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, xinclude, arginfo_class_DOMDocument_xinclude, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, adoptNode, arginfo_class_DOMDocument_adoptNode, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, append, arginfo_class_DOMDocument_append, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMDocument, prepend, arginfo_class_DOMDocument_prepend, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMException_methods[] = {
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMText_methods[] = {
+	ZEND_ME(DOMText, __construct, arginfo_class_DOMText___construct, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMText, isWhitespaceInElementContent, arginfo_class_DOMText_isWhitespaceInElementContent, ZEND_ACC_PUBLIC)
+	ZEND_MALIAS(DOMText, isElementContentWhitespace, isWhitespaceInElementContent, arginfo_class_DOMText_isElementContentWhitespace, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMText, splitText, arginfo_class_DOMText_splitText, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMNamedNodeMap_methods[] = {
+	ZEND_ME(DOMNamedNodeMap, getNamedItem, arginfo_class_DOMNamedNodeMap_getNamedItem, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNamedNodeMap, getNamedItemNS, arginfo_class_DOMNamedNodeMap_getNamedItemNS, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNamedNodeMap, item, arginfo_class_DOMNamedNodeMap_item, ZEND_ACC_PUBLIC)
+	ZEND_ME(DOMNamedNodeMap, count, arginfo_class_DOMNamedNodeMap_count, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMEntity_methods[] = {
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMEntityReference_methods[] = {
+	ZEND_ME(DOMEntityReference, __construct, arginfo_class_DOMEntityReference___construct, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMNotation_methods[] = {
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_DOMProcessingInstruction_methods[] = {
+	ZEND_ME(DOMProcessingInstruction, __construct, arginfo_class_DOMProcessingInstruction___construct, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c
index 8a6e8fe33ec91..c9718e24bbaf9 100644
--- a/ext/dom/processinginstruction.c
+++ b/ext/dom/processinginstruction.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "processinginstruction_arginfo.h"
 
 /*
 * class DOMProcessingInstruction extends DOMNode
@@ -31,13 +30,8 @@
 * Since:
 */
 
-const zend_function_entry php_dom_processinginstruction_class_functions[] = {
-	PHP_ME(domprocessinginstruction, __construct, arginfo_class_DOMProcessingInstruction___construct, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 /* {{{ proto DOMProcessingInstruction::__construct(string name, [string value]); */
-PHP_METHOD(domprocessinginstruction, __construct)
+PHP_METHOD(DOMProcessingInstruction, __construct)
 {
 	xmlNodePtr nodep = NULL, oldnode = NULL;
 	dom_object *intern;
diff --git a/ext/dom/processinginstruction.stub.php b/ext/dom/processinginstruction.stub.php
deleted file mode 100644
index 41108ef7fbcd9..0000000000000
--- a/ext/dom/processinginstruction.stub.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class DOMProcessingInstruction
-{
-    public function __construct(string $name, string $value = "") {}
-}
diff --git a/ext/dom/processinginstruction_arginfo.h b/ext/dom/processinginstruction_arginfo.h
deleted file mode 100644
index 5db080bc34120..0000000000000
--- a/ext/dom/processinginstruction_arginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMProcessingInstruction___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "\"\"")
-ZEND_END_ARG_INFO()
diff --git a/ext/dom/text.c b/ext/dom/text.c
index 103d94dff8931..0258598f061ea 100644
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -23,7 +23,6 @@
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
 #include "dom_ce.h"
-#include "text_arginfo.h"
 
 /*
 * class DOMText extends DOMCharacterData
@@ -32,16 +31,8 @@
 * Since:
 */
 
-const zend_function_entry php_dom_text_class_functions[] = {
-	PHP_ME(domtext, splitText, arginfo_class_DOMText_splitText, ZEND_ACC_PUBLIC)
-	PHP_ME(domtext, isWhitespaceInElementContent, arginfo_class_DOMText_isWhitespaceInElementContent, ZEND_ACC_PUBLIC)
-	PHP_MALIAS(domtext, isElementContentWhitespace, isWhitespaceInElementContent, arginfo_class_DOMText_isElementContentWhitespace, ZEND_ACC_PUBLIC)
-	PHP_ME(domtext, __construct, arginfo_class_DOMText___construct, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 /* {{{ proto DOMText::__construct([string value]); */
-PHP_METHOD(domtext, __construct)
+PHP_METHOD(DOMText, __construct)
 {
 	xmlNodePtr nodep = NULL, oldnode = NULL;
 	dom_object *intern;
@@ -114,7 +105,7 @@ int dom_text_whole_text_read(dom_object *obj, zval *retval)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D
 Since:
 */
-PHP_METHOD(domtext, splitText)
+PHP_METHOD(DOMText, splitText)
 {
 	zval       *id;
 	xmlChar    *cur;
@@ -176,7 +167,7 @@ PHP_METHOD(domtext, splitText)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-isWhitespaceInElementContent
 Since: DOM Level 3
 */
-PHP_METHOD(domtext, isWhitespaceInElementContent)
+PHP_METHOD(DOMText, isWhitespaceInElementContent)
 {
 	zval       *id;
 	xmlNodePtr  node;
diff --git a/ext/dom/text.stub.php b/ext/dom/text.stub.php
deleted file mode 100644
index f45d23f3a5fdc..0000000000000
--- a/ext/dom/text.stub.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class DOMText {
-    public function __construct(string $value = "") {}
-
-    /** @return bool */
-    public function isWhitespaceInElementContent() {}
-
-    /** @return bool */
-    public function isElementContentWhitespace() {}
-
-    /** @return DOMText|false */
-    public function splitText(int $offset) {}
-}
diff --git a/ext/dom/text_arginfo.h b/ext/dom/text_arginfo.h
deleted file mode 100644
index b81ef55a81748..0000000000000
--- a/ext/dom/text_arginfo.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMText___construct, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "\"\"")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMText_isWhitespaceInElementContent, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_DOMText_isElementContentWhitespace arginfo_class_DOMText_isWhitespaceInElementContent
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMText_splitText, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
-ZEND_END_ARG_INFO()
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 85467b815dd32..fbb8f39afb7e2 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -22,7 +22,6 @@
 #include "php.h"
 #if HAVE_LIBXML && HAVE_DOM
 #include "php_dom.h"
-#include "xpath_arginfo.h"
 
 #define PHP_DOM_XPATH_QUERY 0
 #define PHP_DOM_XPATH_EVALUATE 1
@@ -33,16 +32,6 @@
 
 #if defined(LIBXML_XPATH_ENABLED)
 
-const zend_function_entry php_dom_xpath_class_functions[] = {
-	PHP_ME(domxpath, __construct, arginfo_class_DOMXPath___construct, ZEND_ACC_PUBLIC)
-	PHP_ME(domxpath, registerNamespace, arginfo_class_DOMXPath_registerNamespace, ZEND_ACC_PUBLIC)
-	PHP_ME(domxpath, query, arginfo_class_DOMXPath_query, ZEND_ACC_PUBLIC)
-	PHP_ME(domxpath, evaluate, arginfo_class_DOMXPath_evaluate, ZEND_ACC_PUBLIC)
-	PHP_ME(domxpath, registerPhpFunctions, arginfo_class_DOMXPath_registerPhpFunctions, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
-
 static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int type) /* {{{ */
 {
 	zval retval;
@@ -221,7 +210,7 @@ static void dom_xpath_ext_function_object_php(xmlXPathParserContextPtr ctxt, int
 /* }}} */
 
 /* {{{ proto DOMXPath::__construct(DOMDocument doc) U */
-PHP_METHOD(domxpath, __construct)
+PHP_METHOD(DOMXPath, __construct)
 {
 	zval *doc;
 	zend_bool register_node_ns = 1;
@@ -302,7 +291,7 @@ int dom_xpath_register_node_ns_write(dom_object *obj, zval *newval)
 /* }}} */
 
 /* {{{ proto bool dom_xpath_register_ns(string prefix, string uri) */
-PHP_METHOD(domxpath, registerNamespace)
+PHP_METHOD(DOMXPath, registerNamespace)
 {
 	zval *id;
 	xmlXPathContextPtr ctxp;
@@ -487,21 +476,21 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
 /* }}} */
 
 /* {{{ proto DOMNodeList dom_xpath_query(string expr [,DOMNode context [, bool registerNodeNS]]) */
-PHP_METHOD(domxpath, query)
+PHP_METHOD(DOMXPath, query)
 {
 	php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_QUERY);
 }
 /* }}} end dom_xpath_query */
 
 /* {{{ proto mixed dom_xpath_evaluate(string expr [,DOMNode context [, bool registerNodeNS]]) */
-PHP_METHOD(domxpath, evaluate)
+PHP_METHOD(DOMXPath, evaluate)
 {
 	php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_EVALUATE);
 }
 /* }}} end dom_xpath_evaluate */
 
 /* {{{ proto void dom_xpath_register_php_functions() */
-PHP_METHOD(domxpath, registerPhpFunctions)
+PHP_METHOD(DOMXPath, registerPhpFunctions)
 {
 	zval *id = ZEND_THIS;
 	dom_xpath_object *intern;
diff --git a/ext/dom/xpath.stub.php b/ext/dom/xpath.stub.php
index a7ea2bb7b02a5..72883e58a3714 100644
--- a/ext/dom/xpath.stub.php
+++ b/ext/dom/xpath.stub.php
@@ -1,5 +1,7 @@
 <?php
 
+/** @generate-function-entries */
+
 #if defined(LIBXML_XPATH_ENABLED)
 class DOMXPath
 {
diff --git a/ext/dom/xpath_arginfo.h b/ext/dom/xpath_arginfo.h
index a6574c789222a..fa172ed0ca112 100644
--- a/ext/dom/xpath_arginfo.h
+++ b/ext/dom/xpath_arginfo.h
@@ -31,3 +31,40 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMXPath_registerPhpFunctions, 0, 0, 0)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, restrict, "null")
 ZEND_END_ARG_INFO()
 #endif
+
+
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_METHOD(DOMXPath, __construct);
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_METHOD(DOMXPath, evaluate);
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_METHOD(DOMXPath, query);
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_METHOD(DOMXPath, registerNamespace);
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_METHOD(DOMXPath, registerPhpFunctions);
+#endif
+
+
+static const zend_function_entry class_DOMXPath_methods[] = {
+#if defined(LIBXML_XPATH_ENABLED)
+	ZEND_ME(DOMXPath, __construct, arginfo_class_DOMXPath___construct, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+	ZEND_ME(DOMXPath, evaluate, arginfo_class_DOMXPath_evaluate, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+	ZEND_ME(DOMXPath, query, arginfo_class_DOMXPath_query, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+	ZEND_ME(DOMXPath, registerNamespace, arginfo_class_DOMXPath_registerNamespace, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+	ZEND_ME(DOMXPath, registerPhpFunctions, arginfo_class_DOMXPath_registerPhpFunctions, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_FE_END
+};

From 6a034979da12b898ad524ff2d663b086b4ddd6d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Sun, 12 Apr 2020 17:40:32 +0200
Subject: [PATCH 2/2] Address code review comments

---
 ext/dom/{dom_fe.h => domexception.h} |  6 +--
 ext/dom/php_dom.c                    |  3 --
 ext/dom/php_dom.h                    |  2 +-
 ext/dom/php_dom.stub.php             | 22 +++++++++
 ext/dom/php_dom_arginfo.h            | 67 ++++++++++++++++++++++++++
 ext/dom/xpath.stub.php               | 25 ----------
 ext/dom/xpath_arginfo.h              | 70 ----------------------------
 7 files changed, 93 insertions(+), 102 deletions(-)
 rename ext/dom/{dom_fe.h => domexception.h} (96%)
 delete mode 100644 ext/dom/xpath.stub.php
 delete mode 100644 ext/dom/xpath_arginfo.h

diff --git a/ext/dom/dom_fe.h b/ext/dom/domexception.h
similarity index 96%
rename from ext/dom/dom_fe.h
rename to ext/dom/domexception.h
index c350045565db2..d067bfc611dcf 100644
--- a/ext/dom/dom_fe.h
+++ b/ext/dom/domexception.h
@@ -15,8 +15,8 @@
    +----------------------------------------------------------------------+
 */
 
-#ifndef DOM_FE_H
-#define DOM_FE_H
+#ifndef DOM_EXCEPTION_H
+#define DOM_EXCEPTION_H
 
 /* domexception errors */
 typedef enum {
@@ -46,4 +46,4 @@ typedef enum {
 	VALIDATION_ERR                 = 16
 } dom_exception_code;
 
-#endif /* DOM_FE_H */
+#endif /* DOM_EXCEPTION_H */
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 77887badebe1e..c7b2103a0f5cb 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -27,9 +27,6 @@
 #include "php_dom_arginfo.h"
 #include "dom_properties.h"
 #include "zend_interfaces.h"
-#if defined(LIBXML_XPATH_ENABLED)
-#include "xpath_arginfo.h"
-#endif
 
 #include "ext/standard/info.h"
 #define PHP_XPATH 1
diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h
index e1058e849b74c..ec01196af7c8d 100644
--- a/ext/dom/php_dom.h
+++ b/ext/dom/php_dom.h
@@ -93,7 +93,7 @@ typedef struct {
 	HashPosition pos;
 } php_dom_iterator;
 
-#include "dom_fe.h"
+#include "domexception.h"
 
 dom_object *dom_object_get_data(xmlNodePtr obj);
 dom_doc_propsptr dom_get_doc_props(php_libxml_ref_obj *document);
diff --git a/ext/dom/php_dom.stub.php b/ext/dom/php_dom.stub.php
index 952bb65b33fb1..8f1b3754714db 100644
--- a/ext/dom/php_dom.stub.php
+++ b/ext/dom/php_dom.stub.php
@@ -408,4 +408,26 @@ class DOMProcessingInstruction
     public function __construct(string $name, string $value = "") {}
 }
 
+#if defined(LIBXML_XPATH_ENABLED)
+class DOMXPath
+{
+    public function __construct(DOMDocument $doc, bool $registerNodeNS = true) {}
+
+    /** @return mixed */
+    public function evaluate(string $expr, ?DOMNode $context = null, bool $registerNodeNS = true) {}
+
+    /** @return mixed */
+    public function query(string $expr, ?DOMNode $context = null, bool $registerNodeNS = true) {}
+
+    /** @return bool */
+    public function registerNamespace(string $prefix, string $namespaceURI) {}
+
+    /**
+     * @param string|array $restrict
+     * @return bool|null
+     */
+    public function registerPhpFunctions($restrict = null) {}
+}
+#endif
+
 function dom_import_simplexml(object $node): ?DOMElement {}
diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h
index 3db8d36c6a4ad..e989301311531 100644
--- a/ext/dom/php_dom_arginfo.h
+++ b/ext/dom/php_dom_arginfo.h
@@ -407,6 +407,38 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_DOMProcessingInstruction___construct arginfo_class_DOMAttr___construct
 
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMXPath___construct, 0, 0, 1)
+	ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, registerNodeNS, _IS_BOOL, 0, "true")
+ZEND_END_ARG_INFO()
+#endif
+
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMXPath_evaluate, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, expr, IS_STRING, 0)
+	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, context, DOMNode, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, registerNodeNS, _IS_BOOL, 0, "true")
+ZEND_END_ARG_INFO()
+#endif
+
+#if defined(LIBXML_XPATH_ENABLED)
+#define arginfo_class_DOMXPath_query arginfo_class_DOMXPath_evaluate
+#endif
+
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMXPath_registerNamespace, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+#endif
+
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMXPath_registerPhpFunctions, 0, 0, 0)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, restrict, "null")
+ZEND_END_ARG_INFO()
+#endif
+
 
 ZEND_FUNCTION(dom_import_simplexml);
 ZEND_METHOD(DOMCdataSection, __construct);
@@ -533,6 +565,21 @@ ZEND_METHOD(DOMNamedNodeMap, item);
 ZEND_METHOD(DOMNamedNodeMap, count);
 ZEND_METHOD(DOMEntityReference, __construct);
 ZEND_METHOD(DOMProcessingInstruction, __construct);
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_METHOD(DOMXPath, __construct);
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_METHOD(DOMXPath, evaluate);
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_METHOD(DOMXPath, query);
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_METHOD(DOMXPath, registerNamespace);
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+ZEND_METHOD(DOMXPath, registerPhpFunctions);
+#endif
 
 
 static const zend_function_entry ext_functions[] = {
@@ -770,3 +817,23 @@ static const zend_function_entry class_DOMProcessingInstruction_methods[] = {
 	ZEND_ME(DOMProcessingInstruction, __construct, arginfo_class_DOMProcessingInstruction___construct, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+
+static const zend_function_entry class_DOMXPath_methods[] = {
+#if defined(LIBXML_XPATH_ENABLED)
+	ZEND_ME(DOMXPath, __construct, arginfo_class_DOMXPath___construct, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+	ZEND_ME(DOMXPath, evaluate, arginfo_class_DOMXPath_evaluate, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+	ZEND_ME(DOMXPath, query, arginfo_class_DOMXPath_query, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+	ZEND_ME(DOMXPath, registerNamespace, arginfo_class_DOMXPath_registerNamespace, ZEND_ACC_PUBLIC)
+#endif
+#if defined(LIBXML_XPATH_ENABLED)
+	ZEND_ME(DOMXPath, registerPhpFunctions, arginfo_class_DOMXPath_registerPhpFunctions, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_FE_END
+};
diff --git a/ext/dom/xpath.stub.php b/ext/dom/xpath.stub.php
deleted file mode 100644
index 72883e58a3714..0000000000000
--- a/ext/dom/xpath.stub.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/** @generate-function-entries */
-
-#if defined(LIBXML_XPATH_ENABLED)
-class DOMXPath
-{
-    public function __construct(DOMDocument $doc, bool $registerNodeNS = true) {}
-
-    /** @return mixed */
-    public function evaluate(string $expr, ?DOMNode $context = null, bool $registerNodeNS = true) {}
-
-    /** @return mixed */
-    public function query(string $expr, ?DOMNode $context = null, bool $registerNodeNS = true) {}
-
-    /** @return bool */
-    public function registerNamespace(string $prefix, string $namespaceURI) {}
-
-    /**
-     * @param string|array $restrict
-     * @return bool|null
-     */
-    public function registerPhpFunctions($restrict = null) {}
-}
-#endif
diff --git a/ext/dom/xpath_arginfo.h b/ext/dom/xpath_arginfo.h
deleted file mode 100644
index fa172ed0ca112..0000000000000
--- a/ext/dom/xpath_arginfo.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-#if defined(LIBXML_XPATH_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMXPath___construct, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, registerNodeNS, _IS_BOOL, 0, "true")
-ZEND_END_ARG_INFO()
-#endif
-
-#if defined(LIBXML_XPATH_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMXPath_evaluate, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, expr, IS_STRING, 0)
-	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, context, DOMNode, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, registerNodeNS, _IS_BOOL, 0, "true")
-ZEND_END_ARG_INFO()
-#endif
-
-#if defined(LIBXML_XPATH_ENABLED)
-#define arginfo_class_DOMXPath_query arginfo_class_DOMXPath_evaluate
-#endif
-
-#if defined(LIBXML_XPATH_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMXPath_registerNamespace, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, namespaceURI, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-#endif
-
-#if defined(LIBXML_XPATH_ENABLED)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMXPath_registerPhpFunctions, 0, 0, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, restrict, "null")
-ZEND_END_ARG_INFO()
-#endif
-
-
-#if defined(LIBXML_XPATH_ENABLED)
-ZEND_METHOD(DOMXPath, __construct);
-#endif
-#if defined(LIBXML_XPATH_ENABLED)
-ZEND_METHOD(DOMXPath, evaluate);
-#endif
-#if defined(LIBXML_XPATH_ENABLED)
-ZEND_METHOD(DOMXPath, query);
-#endif
-#if defined(LIBXML_XPATH_ENABLED)
-ZEND_METHOD(DOMXPath, registerNamespace);
-#endif
-#if defined(LIBXML_XPATH_ENABLED)
-ZEND_METHOD(DOMXPath, registerPhpFunctions);
-#endif
-
-
-static const zend_function_entry class_DOMXPath_methods[] = {
-#if defined(LIBXML_XPATH_ENABLED)
-	ZEND_ME(DOMXPath, __construct, arginfo_class_DOMXPath___construct, ZEND_ACC_PUBLIC)
-#endif
-#if defined(LIBXML_XPATH_ENABLED)
-	ZEND_ME(DOMXPath, evaluate, arginfo_class_DOMXPath_evaluate, ZEND_ACC_PUBLIC)
-#endif
-#if defined(LIBXML_XPATH_ENABLED)
-	ZEND_ME(DOMXPath, query, arginfo_class_DOMXPath_query, ZEND_ACC_PUBLIC)
-#endif
-#if defined(LIBXML_XPATH_ENABLED)
-	ZEND_ME(DOMXPath, registerNamespace, arginfo_class_DOMXPath_registerNamespace, ZEND_ACC_PUBLIC)
-#endif
-#if defined(LIBXML_XPATH_ENABLED)
-	ZEND_ME(DOMXPath, registerPhpFunctions, arginfo_class_DOMXPath_registerPhpFunctions, ZEND_ACC_PUBLIC)
-#endif
-	ZEND_FE_END
-};