diff options
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 519 |
1 files changed, 161 insertions, 358 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index fb60883226..c5d3f71079 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | @@ -28,8 +26,9 @@ #include "ext/standard/php_string.h" #include "ext/standard/info.h" #include "ext/standard/html.h" +#include "zend_interfaces.h" -#if HAVE_XML +#ifdef HAVE_XML #include "php_xml.h" # include "ext/standard/head.h" @@ -37,6 +36,8 @@ #include "ext/libxml/php_libxml.h" #endif +#include "xml_arginfo.h" + /* Short-term TODO list: * - Implement XML_ExternalEntityParserCreate() * - XML_SetCommentHandler @@ -66,7 +67,15 @@ typedef struct { XML_Parser parser; XML_Char *target_encoding; + /* Reference to the object itself, for convenience. + * It is not owned, do not release it. */ zval index; + + /* We return a pointer to these zvals in get_gc(), so it's + * important that a) they are adjacent b) object is the first + * and c) the number of zvals is kept up to date. */ +#define XML_PARSER_NUM_ZVALS 12 + zval object; zval startElementHandler; zval endElementHandler; zval characterDataHandler; @@ -91,8 +100,6 @@ typedef struct { zend_function *startNamespaceDeclPtr; zend_function *endNamespaceDeclPtr; - zval object; - zval data; zval info; int level; @@ -105,6 +112,8 @@ typedef struct { int isparsing; XML_Char *baseURI; + + zend_object std; } xml_parser; @@ -135,37 +144,20 @@ ZEND_GET_MODULE(xml) #define SKIP_TAGSTART(str) ((str) + (parser->toffset > (int)strlen(str) ? strlen(str) : parser->toffset)) +static zend_class_entry *xml_parser_ce; +static zend_object_handlers xml_parser_object_handlers; /* {{{ function prototypes */ PHP_MINIT_FUNCTION(xml); PHP_MINFO_FUNCTION(xml); static PHP_GINIT_FUNCTION(xml); -PHP_FUNCTION(xml_parser_create); -PHP_FUNCTION(xml_parser_create_ns); -PHP_FUNCTION(xml_set_object); -PHP_FUNCTION(xml_set_element_handler); -PHP_FUNCTION(xml_set_character_data_handler); -PHP_FUNCTION(xml_set_processing_instruction_handler); -PHP_FUNCTION(xml_set_default_handler); -PHP_FUNCTION(xml_set_unparsed_entity_decl_handler); -PHP_FUNCTION(xml_set_notation_decl_handler); -PHP_FUNCTION(xml_set_external_entity_ref_handler); -PHP_FUNCTION(xml_set_start_namespace_decl_handler); -PHP_FUNCTION(xml_set_end_namespace_decl_handler); -PHP_FUNCTION(xml_parse); -PHP_FUNCTION(xml_get_error_code); -PHP_FUNCTION(xml_error_string); -PHP_FUNCTION(xml_get_current_line_number); -PHP_FUNCTION(xml_get_current_column_number); -PHP_FUNCTION(xml_get_current_byte_index); -PHP_FUNCTION(xml_parser_free); -PHP_FUNCTION(xml_parser_set_option); -PHP_FUNCTION(xml_parser_get_option); -PHP_FUNCTION(xml_parse_into_struct); +static zend_object *xml_parser_create_object(zend_class_entry *class_type); +static void xml_parser_free_obj(zend_object *object); +static HashTable *xml_parser_get_gc(zend_object *object, zval **table, int *n); +static zend_function *xml_parser_get_constructor(zend_object *object); static zend_string *xml_utf8_decode(const XML_Char *, size_t, const XML_Char *); -static void xml_parser_dtor(zend_resource *rsrc); static void xml_set_handler(zval *, zval *); inline static unsigned short xml_encode_iso_8859_1(unsigned char); inline static char xml_decode_iso_8859_1(unsigned short); @@ -190,141 +182,6 @@ void _xml_startNamespaceDeclHandler(void *, const XML_Char *, const XML_Char *); void _xml_endNamespaceDeclHandler(void *, const XML_Char *); /* }}} */ -/* {{{ extension definition structures */ -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_create, 0, 0, 0) - ZEND_ARG_INFO(0, encoding) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_create_ns, 0, 0, 0) - ZEND_ARG_INFO(0, encoding) - ZEND_ARG_INFO(0, sep) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_object, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, obj) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_element_handler, 0, 0, 3) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, shdl) - ZEND_ARG_INFO(0, ehdl) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_character_data_handler, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, hdl) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_processing_instruction_handler, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, hdl) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_default_handler, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, hdl) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_unparsed_entity_decl_handler, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, hdl) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_notation_decl_handler, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, hdl) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_external_entity_ref_handler, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, hdl) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_start_namespace_decl_handler, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, hdl) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_end_namespace_decl_handler, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, hdl) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parse, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, isfinal) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parse_into_struct, 0, 0, 3) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(1, values) - ZEND_ARG_INFO(1, index) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_error_code, 0, 0, 1) - ZEND_ARG_INFO(0, parser) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_error_string, 0, 0, 1) - ZEND_ARG_INFO(0, code) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_current_line_number, 0, 0, 1) - ZEND_ARG_INFO(0, parser) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_current_column_number, 0, 0, 1) - ZEND_ARG_INFO(0, parser) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_current_byte_index, 0, 0, 1) - ZEND_ARG_INFO(0, parser) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_free, 0, 0, 1) - ZEND_ARG_INFO(0, parser) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_set_option, 0, 0, 3) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, option) - ZEND_ARG_INFO(0, value) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_get_option, 0, 0, 2) - ZEND_ARG_INFO(0, parser) - ZEND_ARG_INFO(0, option) -ZEND_END_ARG_INFO() - -static const zend_function_entry xml_functions[] = { - PHP_FE(xml_parser_create, arginfo_xml_parser_create) - PHP_FE(xml_parser_create_ns, arginfo_xml_parser_create_ns) - PHP_FE(xml_set_object, arginfo_xml_set_object) - PHP_FE(xml_set_element_handler, arginfo_xml_set_element_handler) - PHP_FE(xml_set_character_data_handler, arginfo_xml_set_character_data_handler) - PHP_FE(xml_set_processing_instruction_handler, arginfo_xml_set_processing_instruction_handler) - PHP_FE(xml_set_default_handler, arginfo_xml_set_default_handler) - PHP_FE(xml_set_unparsed_entity_decl_handler,arginfo_xml_set_unparsed_entity_decl_handler) - PHP_FE(xml_set_notation_decl_handler, arginfo_xml_set_notation_decl_handler) - PHP_FE(xml_set_external_entity_ref_handler, arginfo_xml_set_external_entity_ref_handler) - PHP_FE(xml_set_start_namespace_decl_handler,arginfo_xml_set_start_namespace_decl_handler) - PHP_FE(xml_set_end_namespace_decl_handler, arginfo_xml_set_end_namespace_decl_handler) - PHP_FE(xml_parse, arginfo_xml_parse) - PHP_FE(xml_parse_into_struct, arginfo_xml_parse_into_struct) - PHP_FE(xml_get_error_code, arginfo_xml_get_error_code) - PHP_FE(xml_error_string, arginfo_xml_error_string) - PHP_FE(xml_get_current_line_number, arginfo_xml_get_current_line_number) - PHP_FE(xml_get_current_column_number, arginfo_xml_get_current_column_number) - PHP_FE(xml_get_current_byte_index, arginfo_xml_get_current_byte_index) - PHP_FE(xml_parser_free, arginfo_xml_parser_free) - PHP_FE(xml_parser_set_option, arginfo_xml_parser_set_option) - PHP_FE(xml_parser_get_option, arginfo_xml_parser_get_option) - PHP_FE_END -}; - #ifdef LIBXML_EXPAT_COMPAT static const zend_module_dep xml_deps[] = { ZEND_MOD_REQUIRED("libxml") @@ -340,7 +197,7 @@ zend_module_entry xml_module_entry = { STANDARD_MODULE_HEADER, #endif "xml", /* extension name */ - xml_functions, /* extension function list */ + ext_functions, /* extension function list */ PHP_MINIT(xml), /* extension-wide startup function */ NULL, /* extension-wide shutdown function */ NULL, /* per-request startup function */ @@ -366,9 +223,6 @@ const xml_encoding xml_encodings[] = { static XML_Memory_Handling_Suite php_xml_mem_hdlrs; -/* True globals, no need for thread safety */ -static int le_xml_parser; - /* }}} */ /* {{{ startup, shutdown and info functions */ @@ -399,7 +253,20 @@ static void php_xml_free_wrapper(void *ptr) PHP_MINIT_FUNCTION(xml) { - le_xml_parser = zend_register_list_destructors_ex(xml_parser_dtor, NULL, "xml", module_number); + zend_class_entry ce; + INIT_CLASS_ENTRY(ce, "XmlParser", class_XMLParser_methods); + xml_parser_ce = zend_register_internal_class(&ce); + xml_parser_ce->create_object = xml_parser_create_object; + xml_parser_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES; + xml_parser_ce->serialize = zend_class_serialize_deny; + xml_parser_ce->unserialize = zend_class_unserialize_deny; + + memcpy(&xml_parser_object_handlers, &std_object_handlers, sizeof(zend_object_handlers)); + xml_parser_object_handlers.offset = XtOffsetOf(xml_parser, std); + xml_parser_object_handlers.free_obj = xml_parser_free_obj; + xml_parser_object_handlers.get_gc = xml_parser_get_gc; + xml_parser_object_handlers.get_constructor = xml_parser_get_constructor; + xml_parser_object_handlers.clone_obj = NULL; REGISTER_LONG_CONSTANT("XML_ERROR_NONE", XML_ERROR_NONE, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("XML_ERROR_NO_MEMORY", XML_ERROR_NO_MEMORY, CONST_CS|CONST_PERSISTENT); @@ -474,10 +341,26 @@ static void _xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encodi } /* }}} */ -/* {{{ xml_parser_dtor() */ -static void xml_parser_dtor(zend_resource *rsrc) +static inline xml_parser *xml_parser_from_obj(zend_object *obj) { + return (xml_parser *)((char *)(obj) - XtOffsetOf(xml_parser, std)); +} + +#define Z_XMLPARSER_P(zv) xml_parser_from_obj(Z_OBJ_P(zv)) + +static zend_object *xml_parser_create_object(zend_class_entry *class_type) { + xml_parser *intern = zend_object_alloc(sizeof(xml_parser), class_type); + memset(intern, 0, sizeof(xml_parser) - sizeof(zend_object)); + + zend_object_std_init(&intern->std, class_type); + object_properties_init(&intern->std, class_type); + intern->std.handlers = &xml_parser_object_handlers; + + return &intern->std; +} + +static void xml_parser_free_obj(zend_object *object) { - xml_parser *parser = (xml_parser *)rsrc->ptr; + xml_parser *parser = xml_parser_from_obj(object); if (parser->parser) { XML_ParserFree(parser->parser); @@ -528,9 +411,21 @@ static void xml_parser_dtor(zend_resource *rsrc) zval_ptr_dtor(&parser->object); } - efree(parser); + zend_object_std_dtor(&parser->std); +} + +static HashTable *xml_parser_get_gc(zend_object *object, zval **table, int *n) +{ + xml_parser *parser = xml_parser_from_obj(object); + *table = &parser->object; + *n = XML_PARSER_NUM_ZVALS; + return zend_std_get_properties(object); +} + +static zend_function *xml_parser_get_constructor(zend_object *object) { + zend_throw_error(NULL, "Cannot directly construct XmlParser, use xml_parser_create() or xml_parser_create_ns() instead"); + return NULL; } -/* }}} */ /* {{{ xml_set_handler() */ static void xml_set_handler(zval *handler, zval *data) @@ -569,8 +464,7 @@ static void xml_call_handler(xml_parser *parser, zval *handler, zend_function *f fci.retval = retval; fci.param_count = argc; fci.params = argv; - fci.no_separation = 0; - /*fci.function_handler_cache = &function_ptr;*/ + fci.named_params = NULL; result = zend_call_function(&fci, NULL); if (result == FAILURE) { @@ -1117,8 +1011,8 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp XML_Char *encoding; - if (zend_parse_parameters(ZEND_NUM_ARGS(), (ns_support ? "|ss": "|s"), &encoding_param, &encoding_param_len, &ns_param, &ns_param_len) == FAILURE) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), (ns_support ? "|s!s": "|s!"), &encoding_param, &encoding_param_len, &ns_param, &ns_param_len) == FAILURE) { + RETURN_THROWS(); } if (encoding_param != NULL) { @@ -1135,7 +1029,7 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp } else if (strcasecmp(encoding_param, "US-ASCII") == 0) { encoding = (XML_Char*)"US-ASCII"; } else { - php_error_docref(NULL, E_WARNING, "unsupported source encoding \"%s\"", encoding_param); + php_error_docref(NULL, E_WARNING, "Unsupported source encoding \"%s\"", encoding_param); RETURN_FALSE; } } else { @@ -1146,7 +1040,8 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp ns_param = ":"; } - parser = ecalloc(1, sizeof(xml_parser)); + object_init_ex(return_value, xml_parser_ce); + parser = Z_XMLPARSER_P(return_value); parser->parser = XML_ParserCreate_MM((auto_detect ? NULL : encoding), &php_xml_mem_hdlrs, (XML_Char*)ns_param); @@ -1155,73 +1050,54 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp parser->isparsing = 0; XML_SetUserData(parser->parser, parser); - - RETVAL_RES(zend_register_resource(parser, le_xml_parser)); - ZVAL_COPY(&parser->index, return_value); + ZVAL_COPY_VALUE(&parser->index, return_value); } /* }}} */ -/* {{{ proto resource xml_parser_create([string encoding]) - Create an XML parser */ +/* {{{ Create an XML parser */ PHP_FUNCTION(xml_parser_create) { php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto resource xml_parser_create_ns([string encoding [, string sep]]) - Create an XML parser */ +/* {{{ Create an XML parser */ PHP_FUNCTION(xml_parser_create_ns) { php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto int xml_set_object(resource parser, object &obj) - Set up object which should be used for callbacks */ +/* {{{ Set up object which should be used for callbacks */ PHP_FUNCTION(xml_set_object) { xml_parser *parser; zval *pind, *mythis; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "ro", &pind, &mythis) == FAILURE) { - return; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oo", &pind, xml_parser_ce, &mythis) == FAILURE) { + RETURN_THROWS(); } - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; - } + parser = Z_XMLPARSER_P(pind); - /* please leave this commented - or ask thies@thieso.net before doing it (again) */ - if (!Z_ISUNDEF(parser->object)) { - zval_ptr_dtor(&parser->object); - } - - /* please leave this commented - or ask thies@thieso.net before doing it (again) */ - /* zval_add_ref(&parser->object); */ - - Z_ADDREF_P(mythis); - ZVAL_OBJ(&parser->object, Z_OBJ_P(mythis)); + zval_ptr_dtor(&parser->object); + ZVAL_OBJ_COPY(&parser->object, Z_OBJ_P(mythis)); RETVAL_TRUE; } /* }}} */ -/* {{{ proto int xml_set_element_handler(resource parser, string shdl, string ehdl) - Set up start and end element handlers */ +/* {{{ Set up start and end element handlers */ PHP_FUNCTION(xml_set_element_handler) { xml_parser *parser; zval *pind, *shdl, *ehdl; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rzz", &pind, &shdl, &ehdl) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ozz", &pind, xml_parser_ce, &shdl, &ehdl) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); xml_set_handler(&parser->startElementHandler, shdl); xml_set_handler(&parser->endElementHandler, ehdl); XML_SetElementHandler(parser->parser, _xml_startElementHandler, _xml_endElementHandler); @@ -1229,176 +1105,143 @@ PHP_FUNCTION(xml_set_element_handler) } /* }}} */ -/* {{{ proto int xml_set_character_data_handler(resource parser, string hdl) - Set up character data handler */ +/* {{{ Set up character data handler */ PHP_FUNCTION(xml_set_character_data_handler) { xml_parser *parser; zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz", &pind, xml_parser_ce, &hdl) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); xml_set_handler(&parser->characterDataHandler, hdl); XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler); RETVAL_TRUE; } /* }}} */ -/* {{{ proto int xml_set_processing_instruction_handler(resource parser, string hdl) - Set up processing instruction (PI) handler */ +/* {{{ Set up processing instruction (PI) handler */ PHP_FUNCTION(xml_set_processing_instruction_handler) { xml_parser *parser; zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz", &pind, xml_parser_ce, &hdl) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); xml_set_handler(&parser->processingInstructionHandler, hdl); XML_SetProcessingInstructionHandler(parser->parser, _xml_processingInstructionHandler); RETVAL_TRUE; } /* }}} */ -/* {{{ proto int xml_set_default_handler(resource parser, string hdl) - Set up default handler */ +/* {{{ Set up default handler */ PHP_FUNCTION(xml_set_default_handler) { xml_parser *parser; zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz", &pind, xml_parser_ce, &hdl) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); xml_set_handler(&parser->defaultHandler, hdl); XML_SetDefaultHandler(parser->parser, _xml_defaultHandler); RETVAL_TRUE; } /* }}} */ -/* {{{ proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl) - Set up unparsed entity declaration handler */ +/* {{{ Set up unparsed entity declaration handler */ PHP_FUNCTION(xml_set_unparsed_entity_decl_handler) { xml_parser *parser; zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz", &pind, xml_parser_ce, &hdl) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); xml_set_handler(&parser->unparsedEntityDeclHandler, hdl); XML_SetUnparsedEntityDeclHandler(parser->parser, _xml_unparsedEntityDeclHandler); RETVAL_TRUE; } /* }}} */ -/* {{{ proto int xml_set_notation_decl_handler(resource parser, string hdl) - Set up notation declaration handler */ +/* {{{ Set up notation declaration handler */ PHP_FUNCTION(xml_set_notation_decl_handler) { xml_parser *parser; zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz", &pind, xml_parser_ce, &hdl) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); xml_set_handler(&parser->notationDeclHandler, hdl); XML_SetNotationDeclHandler(parser->parser, _xml_notationDeclHandler); RETVAL_TRUE; } /* }}} */ -/* {{{ proto int xml_set_external_entity_ref_handler(resource parser, string hdl) - Set up external entity reference handler */ +/* {{{ Set up external entity reference handler */ PHP_FUNCTION(xml_set_external_entity_ref_handler) { xml_parser *parser; zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz", &pind, xml_parser_ce, &hdl) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); xml_set_handler(&parser->externalEntityRefHandler, hdl); XML_SetExternalEntityRefHandler(parser->parser, (void *) _xml_externalEntityRefHandler); RETVAL_TRUE; } /* }}} */ -/* {{{ proto int xml_set_start_namespace_decl_handler(resource parser, string hdl) - Set up character data handler */ +/* {{{ Set up character data handler */ PHP_FUNCTION(xml_set_start_namespace_decl_handler) { xml_parser *parser; zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz", &pind, xml_parser_ce, &hdl) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); xml_set_handler(&parser->startNamespaceDeclHandler, hdl); XML_SetStartNamespaceDeclHandler(parser->parser, _xml_startNamespaceDeclHandler); RETVAL_TRUE; } /* }}} */ -/* {{{ proto int xml_set_end_namespace_decl_handler(resource parser, string hdl) - Set up character data handler */ +/* {{{ Set up character data handler */ PHP_FUNCTION(xml_set_end_namespace_decl_handler) { xml_parser *parser; zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz", &pind, xml_parser_ce, &hdl) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); xml_set_handler(&parser->endNamespaceDeclHandler, hdl); XML_SetEndNamespaceDeclHandler(parser->parser, _xml_endNamespaceDeclHandler); RETVAL_TRUE; } /* }}} */ -/* {{{ proto int xml_parse(resource parser, string data [, bool isFinal]) - Start parsing an XML document */ +/* {{{ Start parsing an XML document */ PHP_FUNCTION(xml_parse) { xml_parser *parser; @@ -1408,14 +1251,11 @@ PHP_FUNCTION(xml_parse) int ret; zend_bool isFinal = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|b", &pind, &data, &data_len, &isFinal) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|b", &pind, xml_parser_ce, &data, &data_len, &isFinal) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); parser->isparsing = 1; ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, isFinal); parser->isparsing = 0; @@ -1424,9 +1264,7 @@ PHP_FUNCTION(xml_parse) /* }}} */ -/* {{{ proto int xml_parse_into_struct(resource parser, string data, array &values [, array &index ]) - Parsing a XML document */ - +/* {{{ Parsing a XML document */ PHP_FUNCTION(xml_parse_into_struct) { xml_parser *parser; @@ -1435,24 +1273,22 @@ PHP_FUNCTION(xml_parse_into_struct) size_t data_len; int ret; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsz|z", &pind, &data, &data_len, &xdata, &info) == FAILURE) { - return; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Osz|z", &pind, xml_parser_ce, &data, &data_len, &xdata, &info) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); + if (info) { info = zend_try_array_init(info); if (!info) { - return; + RETURN_THROWS(); } } - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; - } - xdata = zend_try_array_init(xdata); if (!xdata) { - return; + RETURN_THROWS(); } ZVAL_COPY_VALUE(&parser->data, xdata); @@ -1475,34 +1311,29 @@ PHP_FUNCTION(xml_parse_into_struct) } /* }}} */ -/* {{{ proto int xml_get_error_code(resource parser) - Get XML parser error code */ +/* {{{ Get XML parser error code */ PHP_FUNCTION(xml_get_error_code) { xml_parser *parser; zval *pind; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &pind, xml_parser_ce) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); RETURN_LONG((zend_long)XML_GetErrorCode(parser->parser)); } /* }}} */ -/* {{{ proto string xml_error_string(int code) - Get XML parser error string */ +/* {{{ Get XML parser error string */ PHP_FUNCTION(xml_error_string) { zend_long code; char *str; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &code) == FAILURE) { - return; + RETURN_THROWS(); } str = (char *)XML_ErrorString((int)code); @@ -1512,107 +1343,83 @@ PHP_FUNCTION(xml_error_string) } /* }}} */ -/* {{{ proto int xml_get_current_line_number(resource parser) - Get current line number for an XML parser */ +/* {{{ Get current line number for an XML parser */ PHP_FUNCTION(xml_get_current_line_number) { xml_parser *parser; zval *pind; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &pind, xml_parser_ce) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); RETVAL_LONG(XML_GetCurrentLineNumber(parser->parser)); } /* }}} */ -/* {{{ proto int xml_get_current_column_number(resource parser) - Get current column number for an XML parser */ +/* {{{ Get current column number for an XML parser */ PHP_FUNCTION(xml_get_current_column_number) { xml_parser *parser; zval *pind; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &pind, xml_parser_ce) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); RETVAL_LONG(XML_GetCurrentColumnNumber(parser->parser)); } /* }}} */ -/* {{{ proto int xml_get_current_byte_index(resource parser) - Get current byte index for an XML parser */ +/* {{{ Get current byte index for an XML parser */ PHP_FUNCTION(xml_get_current_byte_index) { xml_parser *parser; zval *pind; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &pind, xml_parser_ce) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); RETVAL_LONG(XML_GetCurrentByteIndex(parser->parser)); } /* }}} */ -/* {{{ proto int xml_parser_free(resource parser) - Free an XML parser */ +/* {{{ Free an XML parser */ PHP_FUNCTION(xml_parser_free) { zval *pind; xml_parser *parser; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &pind, xml_parser_ce) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); if (parser->isparsing == 1) { php_error_docref(NULL, E_WARNING, "Parser cannot be freed while it is parsing."); RETURN_FALSE; } - if (zend_list_delete(Z_RES(parser->index)) == FAILURE) { - RETURN_FALSE; - } - RETURN_TRUE; } /* }}} */ -/* {{{ proto int xml_parser_set_option(resource parser, int option, mixed value) - Set options in an XML parser */ +/* {{{ Set options in an XML parser */ PHP_FUNCTION(xml_parser_set_option) { xml_parser *parser; zval *pind, *val; zend_long opt; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlz", &pind, &opt, &val) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olz", &pind, xml_parser_ce, &opt, &val) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: parser->case_folding = zval_get_long(val); @@ -1630,7 +1437,7 @@ PHP_FUNCTION(xml_parser_set_option) case PHP_XML_OPTION_TARGET_ENCODING: { const xml_encoding *enc; if (!try_convert_to_string(val)) { - return; + RETURN_THROWS(); } enc = xml_get_encoding((XML_Char*)Z_STRVAL_P(val)); @@ -1650,22 +1457,18 @@ PHP_FUNCTION(xml_parser_set_option) } /* }}} */ -/* {{{ proto int xml_parser_get_option(resource parser, int option) - Get options from an XML parser */ +/* {{{ Get options from an XML parser */ PHP_FUNCTION(xml_parser_get_option) { xml_parser *parser; zval *pind; zend_long opt; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &pind, &opt) == FAILURE) { - return; - } - - if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &pind, xml_parser_ce, &opt) == FAILURE) { + RETURN_THROWS(); } + parser = Z_XMLPARSER_P(pind); switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: RETURN_LONG(parser->case_folding); |