diff options
Diffstat (limited to 'ext/tidy')
| -rw-r--r-- | ext/tidy/tests/019.phpt | 7 | ||||
| -rw-r--r-- | ext/tidy/tidy.c | 59 |
2 files changed, 31 insertions, 35 deletions
diff --git a/ext/tidy/tests/019.phpt b/ext/tidy/tests/019.phpt index 188b8cd4e9..dae23127b5 100644 --- a/ext/tidy/tests/019.phpt +++ b/ext/tidy/tests/019.phpt @@ -7,17 +7,14 @@ tidy_repair_*() and invalid parameters $l = 1; $s = ""; -$a = array(); tidy_repair_string($s, $l, $l, $l); tidy_repair_string($s, $s, $s, $s); tidy_repair_string($l, $l, $l ,$l); -tidy_repair_string($a, $a, $a, $a); tidy_repair_file($s, $l, $l, $l); tidy_repair_file($s, $s, $s, $s); tidy_repair_file($l, $l, $l ,$l); -tidy_repair_file($a, $a, $a, $a); echo "Done\n"; ?> @@ -32,11 +29,7 @@ Warning: tidy_repair_string(): Could not load configuration file '1' in %s on li Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d -Warning: tidy_repair_string() expects parameter 1 to be string, array given in %s on line %d - Warning: tidy_repair_file(): Filename cannot be empty in %s on line %d Warning: tidy_repair_file(): Filename cannot be empty in %s on line %d - -Warning: tidy_repair_file() expects parameter 1 to be a valid path, array given in %s on line %d Done diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index ee7defeac4..656af8b4f0 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -215,8 +215,8 @@ static void tidy_object_free_storage(zend_object *); static zend_object *tidy_object_new_node(zend_class_entry *); static zend_object *tidy_object_new_doc(zend_class_entry *); static zval * tidy_instanciate(zend_class_entry *, zval *); -static int tidy_doc_cast_handler(zval *, zval *, int); -static int tidy_node_cast_handler(zval *, zval *, int); +static int tidy_doc_cast_handler(zend_object *, zval *, int); +static int tidy_node_cast_handler(zend_object *, zval *, int); static void tidy_doc_update_properties(PHPTidyObj *); static void tidy_add_default_properties(PHPTidyObj *, tidy_obj_type); static void *php_tidy_get_opt_val(PHPTidyDoc *, TidyOption, TidyOptionType *); @@ -329,6 +329,9 @@ 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() @@ -444,40 +447,40 @@ 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, NULL) + 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, NULL) - TIDY_METHOD_MAP(getRelease, tidy_get_release, NULL) - TIDY_METHOD_MAP(getConfig, tidy_get_config, NULL) - TIDY_METHOD_MAP(getStatus, tidy_get_status, NULL) - TIDY_METHOD_MAP(getHtmlVer, tidy_get_html_ver, NULL) + 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) #if HAVE_TIDYOPTGETDOC TIDY_METHOD_MAP(getOptDoc, tidy_get_opt_doc, arginfo_tidy_get_opt_doc_method) #endif - TIDY_METHOD_MAP(isXhtml, tidy_is_xhtml, NULL) - TIDY_METHOD_MAP(isXml, tidy_is_xml, NULL) - TIDY_METHOD_MAP(root, tidy_get_root, NULL) - TIDY_METHOD_MAP(head, tidy_get_head, NULL) - TIDY_METHOD_MAP(html, tidy_get_html, NULL) - TIDY_METHOD_MAP(body, tidy_get_body, NULL) + 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) PHP_FE_END }; static const zend_function_entry tidy_funcs_node[] = { - TIDY_NODE_ME(hasChildren, NULL) - TIDY_NODE_ME(hasSiblings, NULL) - TIDY_NODE_ME(isComment, NULL) - TIDY_NODE_ME(isHtml, NULL) - TIDY_NODE_ME(isText, NULL) - TIDY_NODE_ME(isJste, NULL) - TIDY_NODE_ME(isAsp, NULL) - TIDY_NODE_ME(isPhp, NULL) - TIDY_NODE_ME(getParent, NULL) - TIDY_NODE_PRIVATE_ME(__construct, NULL) + 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) PHP_FE_END }; @@ -760,7 +763,7 @@ static zval * tidy_instanciate(zend_class_entry *pce, zval *object) return object; } -static int tidy_doc_cast_handler(zval *in, zval *out, int type) +static int tidy_doc_cast_handler(zend_object *in, zval *out, int type) { TidyBuffer output; PHPTidyObj *obj; @@ -780,7 +783,7 @@ static int tidy_doc_cast_handler(zval *in, zval *out, int type) break; case IS_STRING: - obj = Z_TIDY_P(in); + obj = php_tidy_fetch_object(in); tidyBufInit(&output); tidySaveBuffer (obj->ptdoc->doc, &output); ZVAL_STRINGL(out, (char *) output.bp, output.size ? output.size-1 : 0); @@ -794,7 +797,7 @@ static int tidy_doc_cast_handler(zval *in, zval *out, int type) return SUCCESS; } -static int tidy_node_cast_handler(zval *in, zval *out, int type) +static int tidy_node_cast_handler(zend_object *in, zval *out, int type) { TidyBuffer buf; PHPTidyObj *obj; @@ -814,7 +817,7 @@ static int tidy_node_cast_handler(zval *in, zval *out, int type) break; case IS_STRING: - obj = Z_TIDY_P(in); + obj = php_tidy_fetch_object(in); tidyBufInit(&buf); if (obj->ptdoc) { tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf); |