diff options
| author | Tyson Andre <tysonandre775@hotmail.com> | 2019-02-17 22:38:18 -0500 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-18 17:49:02 +0100 |
| commit | 8588a45851f32dea8529aa3045455d6cfa8f5a60 (patch) | |
| tree | 91584b2e2d9699fb1ac739bd6cf798cf2fd27b8b | |
| parent | 9249d82019c162c42d2ce8e911e19fd3cc5a726a (diff) | |
| download | php-git-8588a45851f32dea8529aa3045455d6cfa8f5a60.tar.gz | |
Fix arginfo for tidy's global functions
See https://secure.php.net/tidy_getopt , etc.
I can't find any other obvious incorrect reflection.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/tidy/tidy.c | 18 |
2 files changed, 15 insertions, 5 deletions
@@ -98,6 +98,8 @@ PHP NEWS - Tidy: . Added TIDY_TAG_* constants for HTML5 elements. (cmb) + . Fixed bug #76736 (wrong reflection for tidy_get_head, tidy_get_html, + tidy_get_root, and tidy_getopt) (tandre) - WDDX: . Deprecated the WDDX extension. (cmb) diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index a7935dbcf1..ee7defeac4 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) |