Skip to content

Commit 8588a45

Browse files
TysonAndrenikic
authored andcommitted
Fix arginfo for tidy's global functions
See https://secure.php.net/tidy_getopt , etc. I can't find any other obvious incorrect reflection.
1 parent 9249d82 commit 8588a45

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ PHP NEWS
9898

9999
- Tidy:
100100
. Added TIDY_TAG_* constants for HTML5 elements. (cmb)
101+
. Fixed bug #76736 (wrong reflection for tidy_get_head, tidy_get_html,
102+
tidy_get_root, and tidy_getopt) (tandre)
101103

102104
- WDDX:
103105
. Deprecated the WDDX extension. (cmb)

ext/tidy/tidy.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,17 +379,25 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_config_count, 0, 0, 1)
379379
ZEND_ARG_INFO(0, object)
380380
ZEND_END_ARG_INFO()
381381

382-
ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_getopt, 0, 0, 1)
382+
ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_getopt_method, 0, 0, 1)
383383
ZEND_ARG_INFO(0, option)
384384
ZEND_END_ARG_INFO()
385385

386-
ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_root, 0)
386+
ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_getopt, 0, 0, 2)
387+
ZEND_ARG_INFO(0, object)
388+
ZEND_ARG_INFO(0, option)
389+
ZEND_END_ARG_INFO()
390+
391+
ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_root, 0, 0, 1)
392+
ZEND_ARG_INFO(0, object)
387393
ZEND_END_ARG_INFO()
388394

389-
ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_html, 0)
395+
ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_html, 0, 0, 1)
396+
ZEND_ARG_INFO(0, object)
390397
ZEND_END_ARG_INFO()
391398

392-
ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_head, 0)
399+
ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_head, 0, 0, 1)
400+
ZEND_ARG_INFO(0, object)
393401
ZEND_END_ARG_INFO()
394402

395403
ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_body, 0, 0, 1)
@@ -435,7 +443,7 @@ static const zend_function_entry tidy_functions[] = {
435443
};
436444

437445
static const zend_function_entry tidy_funcs_doc[] = {
438-
TIDY_METHOD_MAP(getOpt, tidy_getopt, arginfo_tidy_getopt)
446+
TIDY_METHOD_MAP(getOpt, tidy_getopt, arginfo_tidy_getopt_method)
439447
TIDY_METHOD_MAP(cleanRepair, tidy_clean_repair, NULL)
440448
TIDY_DOC_ME(parseFile, arginfo_tidy_parse_file)
441449
TIDY_DOC_ME(parseString, arginfo_tidy_parse_string)

0 commit comments

Comments
 (0)