com php-src: Fix arginfo for tidy's global functions: NEWS ext/tidy/tidy.c
| From: | Nikita Popov | Date: | Mon, 18 Feb 2019 16:49:02 +0000 |
| Subject: | com php-src: Fix arginfo for tidy's global functions: NEWS ext/tidy/tidy.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104698@lists.php.net to get a copy of this message | ||
Commit: 8588a45851f32dea8529aa3045455d6cfa8f5a60
Author: Tyson Andre <tysonandre775@hotmail.com> Sun, 17 Feb 2019 22:38:18 -0500
Committer: Nikita Popov <nikita.ppv@gmail.com> Mon, 18 Feb 2019 17:49:02 +0100
Parents: 9249d82019c162c42d2ce8e911e19fd3cc5a726a
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8588a45851f32dea8529aa3045455d6cfa8f5a60
Log:
Fix arginfo for tidy's global functions
See https://secure.php.net/tidy_getopt , etc.
I can't find any other obvious incorrect reflection.
Changed paths:
M NEWS
M ext/tidy/tidy.c
Diff:
diff --git a/NEWS b/NEWS
index fbdc604..18e0f36 100644
--- a/NEWS
+++ b/NEWS
@@ -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 a7935db..ee7defe 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)