diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 86092b554e8..d720cd7ce1f 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -40,6 +40,8 @@
 #include "buffio.h"
 #endif
 
+#include "tidy_arginfo.h"
+
 /* compatibility with older versions of libtidy */
 #ifndef TIDY_CALL
 #define TIDY_CALL
@@ -280,135 +282,6 @@ STD_PHP_INI_ENTRY("tidy.default_config",	"",		PHP_INI_SYSTEM,		OnUpdateString,
 STD_PHP_INI_ENTRY("tidy.clean_output",		"0",	PHP_INI_USER,		php_tidy_set_clean_output,	clean_output,		zend_tidy_globals,	tidy_globals)
 PHP_INI_END()
 
-/* {{{ arginfo */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_string, 0, 0, 1)
-	ZEND_ARG_INFO(0, input)
-	ZEND_ARG_INFO(0, config_options)
-	ZEND_ARG_INFO(0, encoding)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_error_buffer, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_output, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_file, 0, 0, 1)
-	ZEND_ARG_INFO(0, file)
-	ZEND_ARG_INFO(0, config_options)
-	ZEND_ARG_INFO(0, encoding)
-	ZEND_ARG_INFO(0, use_include_path)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_clean_repair, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_repair_string, 0, 0, 1)
-	ZEND_ARG_INFO(0, data)
-	ZEND_ARG_INFO(0, config_file)
-	ZEND_ARG_INFO(0, encoding)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_repair_file, 0, 0, 1)
-	ZEND_ARG_INFO(0, filename)
-	ZEND_ARG_INFO(0, config_file)
-	ZEND_ARG_INFO(0, encoding)
-	ZEND_ARG_INFO(0, use_include_path)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_diagnose, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_tidy_no_args, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_release, 0)
-ZEND_END_ARG_INFO()
-
-#if HAVE_TIDYOPTGETDOC
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_opt_doc, 0, 0, 2)
-	ZEND_ARG_INFO(0, resource)
-	ZEND_ARG_INFO(0, optname)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_opt_doc_method, 0, 0, 1)
-	ZEND_ARG_INFO(0, optname)
-ZEND_END_ARG_INFO()
-#endif
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_config, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_status, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_html_ver, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_is_xhtml, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_is_xml, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_error_count, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_warning_count, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_access_count, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_config_count, 0, 0, 1)
-    ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_getopt_method, 0, 0, 1)
-	ZEND_ARG_INFO(0, option)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_getopt, 0, 0, 2)
-	ZEND_ARG_INFO(0, object)
-	ZEND_ARG_INFO(0, option)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_root, 0, 0, 1)
-	ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_html, 0, 0, 1)
-	ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_head, 0, 0, 1)
-	ZEND_ARG_INFO(0, object)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_body, 0, 0, 1)
-	ZEND_ARG_INFO(0, tidy)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_construct, 0, 0, 0)
-    ZEND_ARG_INFO(0, filename)
-    ZEND_ARG_INFO(0, config_file)
-    ZEND_ARG_INFO(0, encoding)
-    ZEND_ARG_INFO(0, use_include_path)
-ZEND_END_ARG_INFO()
-/* }}} */
-
 static const zend_function_entry tidy_functions[] = {
 	PHP_FE(tidy_getopt,             arginfo_tidy_getopt)
 	PHP_FE(tidy_parse_string,       arginfo_tidy_parse_string)
@@ -440,41 +313,41 @@ static const zend_function_entry tidy_functions[] = {
 };
 
 static const zend_function_entry tidy_funcs_doc[] = {
-	TIDY_METHOD_MAP(getOpt, tidy_getopt, arginfo_tidy_getopt_method)
-	TIDY_METHOD_MAP(cleanRepair, tidy_clean_repair, arginfo_tidy_no_args)
-	TIDY_DOC_ME(parseFile, arginfo_tidy_parse_file)
-	TIDY_DOC_ME(parseString, arginfo_tidy_parse_string)
-	TIDY_METHOD_MAP(repairString, tidy_repair_string, arginfo_tidy_repair_string)
-	TIDY_METHOD_MAP(repairFile, tidy_repair_file, arginfo_tidy_repair_file)
-	TIDY_METHOD_MAP(diagnose, tidy_diagnose, arginfo_tidy_no_args)
-	TIDY_METHOD_MAP(getRelease, tidy_get_release, arginfo_tidy_no_args)
-	TIDY_METHOD_MAP(getConfig, tidy_get_config, arginfo_tidy_no_args)
-	TIDY_METHOD_MAP(getStatus, tidy_get_status, arginfo_tidy_no_args)
-	TIDY_METHOD_MAP(getHtmlVer, tidy_get_html_ver, arginfo_tidy_no_args)
+	TIDY_METHOD_MAP(getOpt, tidy_getopt, arginfo_class_tidy_getOpt)
+	TIDY_METHOD_MAP(cleanRepair, tidy_clean_repair, arginfo_class_tidy_cleanRepair)
+	TIDY_DOC_ME(parseFile, arginfo_class_tidy_parseFile)
+	TIDY_DOC_ME(parseString, arginfo_class_tidy_parseString)
+	TIDY_METHOD_MAP(repairString, tidy_repair_string, arginfo_class_tidy_repairString)
+	TIDY_METHOD_MAP(repairFile, tidy_repair_file, arginfo_class_tidy_repairFile)
+	TIDY_METHOD_MAP(diagnose, tidy_diagnose, arginfo_class_tidy_diagnose)
+	TIDY_METHOD_MAP(getRelease, tidy_get_release, arginfo_class_tidy_getRelease)
+	TIDY_METHOD_MAP(getConfig, tidy_get_config, arginfo_class_tidy_getConfig)
+	TIDY_METHOD_MAP(getStatus, tidy_get_status, arginfo_class_tidy_getStatus)
+	TIDY_METHOD_MAP(getHtmlVer, tidy_get_html_ver, arginfo_class_tidy_getHtmlVer)
 #if HAVE_TIDYOPTGETDOC
-	TIDY_METHOD_MAP(getOptDoc, tidy_get_opt_doc, arginfo_tidy_get_opt_doc_method)
+	TIDY_METHOD_MAP(getOptDoc, tidy_get_opt_doc, arginfo_class_tidy_getOptDoc)
 #endif
-	TIDY_METHOD_MAP(isXhtml, tidy_is_xhtml, arginfo_tidy_no_args)
-	TIDY_METHOD_MAP(isXml, tidy_is_xml, arginfo_tidy_no_args)
-	TIDY_METHOD_MAP(root, tidy_get_root, arginfo_tidy_no_args)
-	TIDY_METHOD_MAP(head, tidy_get_head, arginfo_tidy_no_args)
-	TIDY_METHOD_MAP(html, tidy_get_html, arginfo_tidy_no_args)
-	TIDY_METHOD_MAP(body, tidy_get_body, arginfo_tidy_no_args)
-	TIDY_DOC_ME(__construct, arginfo_tidy_construct)
+	TIDY_METHOD_MAP(isXhtml, tidy_is_xhtml, arginfo_class_tidy_isXhtml)
+	TIDY_METHOD_MAP(isXml, tidy_is_xml, arginfo_class_tidy_isXml)
+	TIDY_METHOD_MAP(root, tidy_get_root, arginfo_class_tidy_root)
+	TIDY_METHOD_MAP(head, tidy_get_head, arginfo_class_tidy_head)
+	TIDY_METHOD_MAP(html, tidy_get_html, arginfo_class_tidy_html)
+	TIDY_METHOD_MAP(body, tidy_get_body, arginfo_class_tidy_body)
+	TIDY_DOC_ME(__construct, arginfo_class_tidy___construct)
 	PHP_FE_END
 };
 
 static const zend_function_entry tidy_funcs_node[] = {
-	TIDY_NODE_ME(hasChildren, arginfo_tidy_no_args)
-	TIDY_NODE_ME(hasSiblings, arginfo_tidy_no_args)
-	TIDY_NODE_ME(isComment, arginfo_tidy_no_args)
-	TIDY_NODE_ME(isHtml, arginfo_tidy_no_args)
-	TIDY_NODE_ME(isText, arginfo_tidy_no_args)
-	TIDY_NODE_ME(isJste, arginfo_tidy_no_args)
-	TIDY_NODE_ME(isAsp, arginfo_tidy_no_args)
-	TIDY_NODE_ME(isPhp, arginfo_tidy_no_args)
-	TIDY_NODE_ME(getParent, arginfo_tidy_no_args)
-	TIDY_NODE_PRIVATE_ME(__construct, arginfo_tidy_no_args)
+	TIDY_NODE_ME(hasChildren, arginfo_class_tidyNode_hasChildren)
+	TIDY_NODE_ME(hasSiblings, arginfo_class_tidyNode_hasSiblings)
+	TIDY_NODE_ME(isComment, arginfo_class_tidyNode_isComment)
+	TIDY_NODE_ME(isHtml, arginfo_class_tidyNode_isHtml)
+	TIDY_NODE_ME(isText, arginfo_class_tidyNode_isText)
+	TIDY_NODE_ME(isJste, arginfo_class_tidyNode_isJste)
+	TIDY_NODE_ME(isAsp, arginfo_class_tidyNode_isAsp)
+	TIDY_NODE_ME(isPhp, arginfo_class_tidyNode_isPhp)
+	TIDY_NODE_ME(getParent, arginfo_class_tidyNode_getParent)
+	TIDY_NODE_PRIVATE_ME(__construct, arginfo_class_tidyNode___construct)
 	PHP_FE_END
 };
 
diff --git a/ext/tidy/tidy.stub.php b/ext/tidy/tidy.stub.php
new file mode 100644
index 00000000000..3add15a2823
--- /dev/null
+++ b/ext/tidy/tidy.stub.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * @param array|string $config_options
+ * @return tidy|false
+ */
+function tidy_parse_string(string $input, $config_options = UNKNOWN, string $encoding = UNKNOWN) {}
+
+/** @return string|false */
+function tidy_get_error_buffer(tidy $object) {}
+
+function tidy_get_output(tidy $object): string {}
+
+/**
+ * @param array|string $config_options
+ * @return tidy|false
+ */
+function tidy_parse_file(string $file, $config_options = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false) {}
+
+function tidy_clean_repair(tidy $object): bool {}
+
+/**
+ * @param array|string $config_options
+ * @return string|false
+ */
+function tidy_repair_string(string $data, $config_file = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false) {}
+
+/**
+ * @param array|string $config_options
+ * @return string|false
+ */
+function tidy_repair_file(string $filename, $config_file = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false) {}
+
+function tidy_diagnose(tidy $object): bool {}
+
+function tidy_get_release(): string {}
+
+#if HAVE_TIDYOPTGETDOC
+/** @return string|false */
+function tidy_get_opt_doc(tidy $object, string $optname) {}
+#endif
+
+function tidy_get_config(tidy $object): array {}
+
+function tidy_get_status(tidy $object): int {}
+
+function tidy_get_html_ver(tidy $object): int {}
+
+function tidy_is_xhtml(tidy $object): bool {}
+
+function tidy_is_xml(tidy $object): bool {}
+
+function tidy_error_count(tidy $object): int {}
+
+function tidy_warning_count(tidy $object): int {}
+
+function tidy_access_count(tidy $object): int {}
+
+function tidy_config_count(tidy $object): int {}
+
+/** @return string|int|bool */
+function tidy_getopt(tidy $object, string $option) {}
+
+function tidy_get_root(tidy $object): ?tidyNode {}
+
+function tidy_get_html(tidy $object): ?tidyNode {}
+
+function tidy_get_head(tidy $object): ?tidyNode {}
+
+function tidy_get_body(tidy $tidy): ?tidyNode {}
+
+class tidy
+{
+    /** @param array|string $config_options */
+    public function __construct(string $filename = UNKNOWN, $config_file = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false) {}
+
+    /** @return string|int|bool */
+    public function getOpt(string $option) {}
+
+    public function cleanRepair(): bool {}
+
+    /** @param array|string $config_options */
+    public function parseFile(string $file, $config_options = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false): bool {}
+
+    /** @param array|string $config_options */
+    public function parseString(string $input, $config_optinons = UNKNOWN, string $encoding = UNKNOWN): bool {}
+
+    /** @param array|string $config_options */
+    public function repairString(string $data, $config_file = UNKNOWN, string $encoding = UNKNOWN): bool {}
+
+    /** @param array|string $config_options */
+    public function repairFile(string $filename, $config_file = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false): bool {}
+
+    public function diagnose(): bool {}
+
+    public function getRelease(): string {}
+
+    public function getConfig(): array {}
+
+    public function getStatus(): int {}
+
+    public function getHtmlVer(): int {}
+
+#if HAVE_TIDYOPTGETDOC
+    /** @return string|false */
+    public function getOptDoc(string $optname) {}
+#endif
+
+    public function isXhtml(): bool {}
+
+    public function isXml(): bool {}
+
+    public function root(): ?tidyNode {}
+
+    public function head(): ?tidyNode {}
+
+    public function html(): ?tidyNode {}
+
+    public function body(): ?tidyNode {}
+}
+
+class tidyNode
+{
+    private function __construct() {}
+
+    public function hasChildren(): bool {}
+
+    public function hasSiblings(): bool {}
+
+    public function isComment(): bool {}
+
+    public function isHtml(): bool {}
+
+    public function isText(): bool {}
+
+    public function isJste(): bool {}
+
+    public function isAsp(): bool {}
+
+    public function isPhp(): bool {}
+
+    public function getParent(): ?tidyNode {}
+}
diff --git a/ext/tidy/tidy_arginfo.h b/ext/tidy/tidy_arginfo.h
new file mode 100644
index 00000000000..d1643c1e701
--- /dev/null
+++ b/ext/tidy/tidy_arginfo.h
@@ -0,0 +1,183 @@
+/* This is a generated file, edit the .stub.php file instead. */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_string, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_INFO(0, config_options)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_error_buffer, 0, 0, 1)
+	ZEND_ARG_OBJ_INFO(0, object, tidy, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_tidy_get_output, 0, 1, IS_STRING, 0)
+	ZEND_ARG_OBJ_INFO(0, object, tidy, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_file, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0)
+	ZEND_ARG_INFO(0, config_options)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, use_include_path, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_tidy_clean_repair, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_OBJ_INFO(0, object, tidy, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_repair_string, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
+	ZEND_ARG_INFO(0, config_file)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, use_include_path, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_repair_file, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
+	ZEND_ARG_INFO(0, config_file)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, use_include_path, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_tidy_diagnose arginfo_tidy_clean_repair
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_tidy_get_release, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#if HAVE_TIDYOPTGETDOC
+ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_opt_doc, 0, 0, 2)
+	ZEND_ARG_OBJ_INFO(0, object, tidy, 0)
+	ZEND_ARG_TYPE_INFO(0, optname, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_tidy_get_config, 0, 1, IS_ARRAY, 0)
+	ZEND_ARG_OBJ_INFO(0, object, tidy, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_tidy_get_status, 0, 1, IS_LONG, 0)
+	ZEND_ARG_OBJ_INFO(0, object, tidy, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_tidy_get_html_ver arginfo_tidy_get_status
+
+#define arginfo_tidy_is_xhtml arginfo_tidy_clean_repair
+
+#define arginfo_tidy_is_xml arginfo_tidy_clean_repair
+
+#define arginfo_tidy_error_count arginfo_tidy_get_status
+
+#define arginfo_tidy_warning_count arginfo_tidy_get_status
+
+#define arginfo_tidy_access_count arginfo_tidy_get_status
+
+#define arginfo_tidy_config_count arginfo_tidy_get_status
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_getopt, 0, 0, 2)
+	ZEND_ARG_OBJ_INFO(0, object, tidy, 0)
+	ZEND_ARG_TYPE_INFO(0, option, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_tidy_get_root, 0, 1, tidyNode, 1)
+	ZEND_ARG_OBJ_INFO(0, object, tidy, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_tidy_get_html arginfo_tidy_get_root
+
+#define arginfo_tidy_get_head arginfo_tidy_get_root
+
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_tidy_get_body, 0, 1, tidyNode, 1)
+	ZEND_ARG_OBJ_INFO(0, tidy, tidy, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_tidy___construct, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
+	ZEND_ARG_INFO(0, config_file)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, use_include_path, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_tidy_getOpt, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, option, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_tidy_cleanRepair, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_tidy_parseFile, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0)
+	ZEND_ARG_INFO(0, config_options)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, use_include_path, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_tidy_parseString, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_INFO(0, config_optinons)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_tidy_repairString, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
+	ZEND_ARG_INFO(0, config_file)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_tidy_repairFile, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
+	ZEND_ARG_INFO(0, config_file)
+	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, use_include_path, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_tidy_diagnose arginfo_class_tidy_cleanRepair
+
+#define arginfo_class_tidy_getRelease arginfo_tidy_get_release
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_tidy_getConfig, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_tidy_getStatus, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_tidy_getHtmlVer arginfo_class_tidy_getStatus
+
+#if HAVE_TIDYOPTGETDOC
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_tidy_getOptDoc, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, optname, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+#endif
+
+#define arginfo_class_tidy_isXhtml arginfo_class_tidy_cleanRepair
+
+#define arginfo_class_tidy_isXml arginfo_class_tidy_cleanRepair
+
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_tidy_root, 0, 0, tidyNode, 1)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_tidy_head arginfo_class_tidy_root
+
+#define arginfo_class_tidy_html arginfo_class_tidy_root
+
+#define arginfo_class_tidy_body arginfo_class_tidy_root
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_tidyNode___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_class_tidyNode_hasChildren arginfo_class_tidy_cleanRepair
+
+#define arginfo_class_tidyNode_hasSiblings arginfo_class_tidy_cleanRepair
+
+#define arginfo_class_tidyNode_isComment arginfo_class_tidy_cleanRepair
+
+#define arginfo_class_tidyNode_isHtml arginfo_class_tidy_cleanRepair
+
+#define arginfo_class_tidyNode_isText arginfo_class_tidy_cleanRepair
+
+#define arginfo_class_tidyNode_isJste arginfo_class_tidy_cleanRepair
+
+#define arginfo_class_tidyNode_isAsp arginfo_class_tidy_cleanRepair
+
+#define arginfo_class_tidyNode_isPhp arginfo_class_tidy_cleanRepair
+
+#define arginfo_class_tidyNode_getParent arginfo_class_tidy_root