diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-18 17:51:41 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-18 17:51:41 +0100 |
| commit | 879cd0491399ccfacac0d6ed701d998a65a6cc97 (patch) | |
| tree | bc4d8d27a4425fd94d60cd2e4f9b08e4c5fdd38a /ext/tidy/tidy.c | |
| parent | 9baa3a95b9ccdf125d277664e5709d189e7d4ae2 (diff) | |
| parent | 8588a45851f32dea8529aa3045455d6cfa8f5a60 (diff) | |
| download | php-git-879cd0491399ccfacac0d6ed701d998a65a6cc97.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/tidy/tidy.c')
| -rw-r--r-- | ext/tidy/tidy.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index c2d5a30cfc..7eff4787cc 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -379,17 +379,25 @@ 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, 0, 0, 1) +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(arginfo_tidy_get_root, 0) +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(arginfo_tidy_get_html, 0) +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(arginfo_tidy_get_head, 0) +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) @@ -435,7 +443,7 @@ static const zend_function_entry tidy_functions[] = { }; static const zend_function_entry tidy_funcs_doc[] = { - TIDY_METHOD_MAP(getOpt, tidy_getopt, arginfo_tidy_getopt) + TIDY_METHOD_MAP(getOpt, tidy_getopt, arginfo_tidy_getopt_method) TIDY_METHOD_MAP(cleanRepair, tidy_clean_repair, NULL) TIDY_DOC_ME(parseFile, arginfo_tidy_parse_file) TIDY_DOC_ME(parseString, arginfo_tidy_parse_string) |