diff options
Diffstat (limited to 'ext/dom')
31 files changed, 348 insertions, 348 deletions
diff --git a/ext/dom/attr.c b/ext/dom/attr.c index 34a6749f66..2dd5636e83 100644 --- a/ext/dom/attr.c +++ b/ext/dom/attr.c @@ -40,10 +40,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMAttr extends DOMNode +* class DOMAttr extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-637646024 -* Since: +* Since: */ const zend_function_entry php_dom_attr_class_functions[] = { @@ -94,10 +94,10 @@ PHP_METHOD(domattr, __construct) /* }}} end DOMAttr::__construct */ -/* {{{ name string -readonly=yes +/* {{{ name string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1112119403 -Since: +Since: */ int dom_attr_name_read(dom_object *obj, zval *retval) { @@ -117,10 +117,10 @@ int dom_attr_name_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ specified boolean -readonly=yes +/* {{{ specified boolean +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-862529273 -Since: +Since: */ int dom_attr_specified_read(dom_object *obj, zval *retval) { @@ -131,10 +131,10 @@ int dom_attr_specified_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ value string -readonly=no +/* {{{ value string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-221662474 -Since: +Since: */ int dom_attr_value_read(dom_object *obj, zval *retval) { @@ -181,8 +181,8 @@ int dom_attr_value_write(dom_object *obj, zval *newval) /* }}} */ -/* {{{ ownerElement DOMElement -readonly=yes +/* {{{ ownerElement DOMElement +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement Since: DOM Level 2 */ @@ -210,8 +210,8 @@ int dom_attr_owner_element_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ schemaTypeInfo DOMTypeInfo -readonly=yes +/* {{{ schemaTypeInfo DOMTypeInfo +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo Since: DOM Level 3 */ diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c index 83551766b5..6c81d75fd1 100644 --- a/ext/dom/cdatasection.c +++ b/ext/dom/cdatasection.c @@ -35,10 +35,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMCdataSection extends DOMText +* class DOMCdataSection extends DOMText * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-667469212 -* Since: +* Since: */ const zend_function_entry php_dom_cdatasection_class_functions[] = { diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c index 5946915025..8251215cc4 100644 --- a/ext/dom/characterdata.c +++ b/ext/dom/characterdata.c @@ -56,10 +56,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMCharacterData extends DOMNode +* class DOMCharacterData extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-FF21A306 -* Since: +* Since: */ const zend_function_entry php_dom_characterdata_class_functions[] = { @@ -71,10 +71,10 @@ const zend_function_entry php_dom_characterdata_class_functions[] = { PHP_FE_END }; -/* {{{ data string -readonly=no +/* {{{ data string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-72AB8359 -Since: +Since: */ int dom_characterdata_data_read(dom_object *obj, zval *retval) { @@ -116,10 +116,10 @@ int dom_characterdata_data_write(dom_object *obj, zval *newval) /* }}} */ -/* {{{ length long -readonly=yes +/* {{{ length long +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7D61178C -Since: +Since: */ int dom_characterdata_length_read(dom_object *obj, zval *retval) { @@ -148,7 +148,7 @@ int dom_characterdata_length_read(dom_object *obj, zval *retval) /* {{{ proto string dom_characterdata_substring_data(int offset, int count); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF -Since: +Since: */ PHP_FUNCTION(dom_characterdata_substring_data) { @@ -197,7 +197,7 @@ PHP_FUNCTION(dom_characterdata_substring_data) /* {{{ proto void dom_characterdata_append_data(string arg); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F -Since: +Since: */ PHP_FUNCTION(dom_characterdata_append_data) { @@ -231,7 +231,7 @@ PHP_FUNCTION(dom_characterdata_append_data) /* {{{ proto void dom_characterdata_insert_data(int offset, string arg); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F -Since: +Since: */ PHP_FUNCTION(dom_characterdata_insert_data) { @@ -270,7 +270,7 @@ PHP_FUNCTION(dom_characterdata_insert_data) xmlNodeSetContent(node, first); xmlNodeAddContent(node, (xmlChar *) arg); xmlNodeAddContent(node, second); - + xmlFree(first); xmlFree(second); @@ -280,7 +280,7 @@ PHP_FUNCTION(dom_characterdata_insert_data) /* {{{ proto void dom_characterdata_delete_data(int offset, int count); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781 -Since: +Since: */ PHP_FUNCTION(dom_characterdata_delete_data) { @@ -335,7 +335,7 @@ PHP_FUNCTION(dom_characterdata_delete_data) /* {{{ proto void dom_characterdata_replace_data(int offset, int count, string arg); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB -Since: +Since: */ PHP_FUNCTION(dom_characterdata_replace_data) { diff --git a/ext/dom/comment.c b/ext/dom/comment.c index 0477328966..0fbc5d4d44 100644 --- a/ext/dom/comment.c +++ b/ext/dom/comment.c @@ -35,10 +35,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMComment extends DOMCharacterData +* class DOMComment extends DOMCharacterData * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1728279322 -* Since: +* Since: */ const zend_function_entry php_dom_comment_class_functions[] = { diff --git a/ext/dom/document.c b/ext/dom/document.c index 9f6c093f76..d198e95a9d 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -187,10 +187,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMDocument extends DOMNode +* class DOMDocument extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-i-Document -* Since: +* Since: */ const zend_function_entry php_dom_document_class_functions[] = { /* {{{ */ @@ -235,10 +235,10 @@ const zend_function_entry php_dom_document_class_functions[] = { /* {{{ */ }; /* }}} */ -/* {{{ docType DOMDocumentType -readonly=yes +/* {{{ docType DOMDocumentType +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-B63ED1A31 -Since: +Since: */ int dom_document_doctype_read(dom_object *obj, zval *retval) { @@ -262,10 +262,10 @@ int dom_document_doctype_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ implementation DOMImplementation -readonly=yes +/* {{{ implementation DOMImplementation +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1B793EBA -Since: +Since: */ int dom_document_implementation_read(dom_object *obj, zval *retval) { @@ -275,10 +275,10 @@ int dom_document_implementation_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ documentElement DOMElement -readonly=yes +/* {{{ documentElement DOMElement +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-87CD092 -Since: +Since: */ int dom_document_document_element_read(dom_object *obj, zval *retval) { @@ -358,8 +358,8 @@ int dom_document_encoding_write(dom_object *obj, zval *newval) /* }}} */ -/* {{{ standalone boolean -readonly=no +/* {{{ standalone boolean +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-standalone Since: DOM Level 3 */ @@ -396,7 +396,7 @@ int dom_document_standalone_write(dom_object *obj, zval *newval) /* }}} */ -/* {{{ version string +/* {{{ version string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-version Since: DOM Level 3 @@ -446,8 +446,8 @@ int dom_document_version_write(dom_object *obj, zval *newval) /* }}} */ -/* {{{ strictErrorChecking boolean -readonly=no +/* {{{ strictErrorChecking boolean +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-strictErrorChecking Since: DOM Level 3 */ @@ -475,7 +475,7 @@ int dom_document_strict_error_checking_write(dom_object *obj, zval *newval) /* }}} */ -/* {{{ formatOutput boolean +/* {{{ formatOutput boolean readonly=no */ int dom_document_format_output_read(dom_object *obj, zval *retval) @@ -500,7 +500,7 @@ int dom_document_format_output_write(dom_object *obj, zval *newval) } /* }}} */ -/* {{{ validateOnParse boolean +/* {{{ validateOnParse boolean readonly=no */ int dom_document_validate_on_parse_read(dom_object *obj, zval *retval) @@ -525,7 +525,7 @@ int dom_document_validate_on_parse_write(dom_object *obj, zval *newval) } /* }}} */ -/* {{{ resolveExternals boolean +/* {{{ resolveExternals boolean readonly=no */ int dom_document_resolve_externals_read(dom_object *obj, zval *retval) @@ -550,7 +550,7 @@ int dom_document_resolve_externals_write(dom_object *obj, zval *newval) } /* }}} */ -/* {{{ preserveWhiteSpace boolean +/* {{{ preserveWhiteSpace boolean readonly=no */ int dom_document_preserve_whitespace_read(dom_object *obj, zval *retval) @@ -575,7 +575,7 @@ int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval) } /* }}} */ -/* {{{ recover boolean +/* {{{ recover boolean readonly=no */ int dom_document_recover_read(dom_object *obj, zval *retval) @@ -600,7 +600,7 @@ int dom_document_recover_write(dom_object *obj, zval *newval) } /* }}} */ -/* {{{ substituteEntities boolean +/* {{{ substituteEntities boolean readonly=no */ int dom_document_substitue_entities_read(dom_object *obj, zval *retval) @@ -625,8 +625,8 @@ int dom_document_substitue_entities_write(dom_object *obj, zval *newval) } /* }}} */ -/* {{{ documentURI string -readonly=no +/* {{{ documentURI string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-documentURI Since: DOM Level 3 */ @@ -674,8 +674,8 @@ int dom_document_document_uri_write(dom_object *obj, zval *newval) /* }}} */ -/* {{{ config DOMConfiguration -readonly=yes +/* {{{ config DOMConfiguration +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-config Since: DOM Level 3 */ @@ -689,7 +689,7 @@ int dom_document_config_read(dom_object *obj, zval *retval) /* {{{ proto DOMElement dom_document_create_element(string tagName [, string value]); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547 -Since: +Since: */ PHP_FUNCTION(dom_document_create_element) { @@ -723,7 +723,7 @@ PHP_FUNCTION(dom_document_create_element) /* {{{ proto DOMDocumentFragment dom_document_create_document_fragment(); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5 -Since: +Since: */ PHP_FUNCTION(dom_document_create_document_fragment) { @@ -750,7 +750,7 @@ PHP_FUNCTION(dom_document_create_document_fragment) /* {{{ proto DOMText dom_document_create_text_node(string data); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127 -Since: +Since: */ PHP_FUNCTION(dom_document_create_text_node) { @@ -779,7 +779,7 @@ PHP_FUNCTION(dom_document_create_text_node) /* {{{ proto DOMComment dom_document_create_comment(string data); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328 -Since: +Since: */ PHP_FUNCTION(dom_document_create_comment) { @@ -808,7 +808,7 @@ PHP_FUNCTION(dom_document_create_comment) /* {{{ proto DOMCdataSection dom_document_create_cdatasection(string data); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8 -Since: +Since: */ PHP_FUNCTION(dom_document_create_cdatasection) { @@ -837,7 +837,7 @@ PHP_FUNCTION(dom_document_create_cdatasection) /* {{{ proto DOMProcessingInstruction dom_document_create_processing_instruction(string target, string data); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439 -Since: +Since: */ PHP_FUNCTION(dom_document_create_processing_instruction) { @@ -873,7 +873,7 @@ PHP_FUNCTION(dom_document_create_processing_instruction) /* {{{ proto DOMAttr dom_document_create_attribute(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198 -Since: +Since: */ PHP_FUNCTION(dom_document_create_attribute) { @@ -908,7 +908,7 @@ PHP_FUNCTION(dom_document_create_attribute) /* {{{ proto DOMEntityReference dom_document_create_entity_reference(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE -Since: +Since: */ PHP_FUNCTION(dom_document_create_entity_reference) { @@ -942,7 +942,7 @@ PHP_FUNCTION(dom_document_create_entity_reference) /* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name(string tagname); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094 -Since: +Since: */ PHP_FUNCTION(dom_document_get_elements_by_tag_name) { @@ -976,7 +976,7 @@ PHP_FUNCTION(dom_document_import_node) xmlDocPtr docp; xmlNodePtr nodep, retnodep; dom_object *intern, *nodeobj; - int ret; + int ret; zend_long recursive = 0; if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO|l", &id, dom_document_class_entry, &node, dom_node_class_entry, &recursive) == FAILURE) { @@ -987,7 +987,7 @@ PHP_FUNCTION(dom_document_import_node) DOM_GET_OBJ(nodep, node, xmlNodePtr, nodeobj); - if (nodep->type == XML_HTML_DOCUMENT_NODE || nodep->type == XML_DOCUMENT_NODE + if (nodep->type == XML_HTML_DOCUMENT_NODE || nodep->type == XML_DOCUMENT_NODE || nodep->type == XML_DOCUMENT_TYPE_NODE) { php_error_docref(NULL, E_WARNING, "Cannot import: Node Type Not Supported"); RETURN_FALSE; @@ -1078,7 +1078,7 @@ PHP_FUNCTION(dom_document_create_element_ns) RETURN_FALSE; } - + nodep->ns = nsptr; DOM_RET_OBJ(nodep, &ret, intern); @@ -1387,7 +1387,7 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t so if (file_dest) { ctxt = xmlCreateFileParserCtxt(file_dest); } - + } else { ctxt = xmlCreateMemoryParserCtxt(source, source_len); } @@ -1711,7 +1711,7 @@ PHP_FUNCTION(dom_document_xinclude) zval *id; xmlDoc *docp; xmlNodePtr root; - zend_long flags = 0; + zend_long flags = 0; int err; dom_object *intern; @@ -1724,7 +1724,7 @@ PHP_FUNCTION(dom_document_xinclude) err = xmlXIncludeProcessFlags(docp, flags); /* XML_XINCLUDE_START and XML_XINCLUDE_END nodes need to be removed as these - are added via xmlXIncludeProcess to mark beginning and ending of xincluded document + are added via xmlXIncludeProcess to mark beginning and ending of xincluded document but are not wanted in resulting document - must be done even if err as it could fail after having processed some xincludes */ root = (xmlNodePtr) docp->children; @@ -1740,7 +1740,7 @@ PHP_FUNCTION(dom_document_xinclude) } else { RETVAL_FALSE; } - + } /* }}} */ @@ -1761,19 +1761,19 @@ PHP_FUNCTION(dom_document_validate) DOM_GET_OBJ(docp, id, xmlDocPtr, intern); cvp = xmlNewValidCtxt(); - + cvp->userData = NULL; cvp->error = (xmlValidityErrorFunc) php_libxml_error_handler; cvp->warning = (xmlValidityErrorFunc) php_libxml_error_handler; - + if (xmlValidateDocument(cvp, docp)) { RETVAL_TRUE; } else { RETVAL_FALSE; } - + xmlFreeValidCtxt(cvp); - + } /* }}} */ @@ -1815,7 +1815,7 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type break; case DOM_LOAD_STRING: parser = xmlSchemaNewMemParserCtxt(source, source_len); - /* If loading from memory, we need to set the base directory for the document + /* If loading from memory, we need to set the base directory for the document but it is not apparent how to do that for schema's */ break; default: @@ -1911,7 +1911,7 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ break; case DOM_LOAD_STRING: parser = xmlRelaxNGNewMemParserCtxt(source, source_len); - /* If loading from memory, we need to set the base directory for the document + /* If loading from memory, we need to set the base directory for the document but it is not apparent how to do that for schema's */ break; default: @@ -1980,7 +1980,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ int refcount, ret; zend_long options = 0; htmlParserCtxtPtr ctxt; - + id = getThis(); if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &source, &source_len, &options) == FAILURE) { @@ -2016,7 +2016,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ htmlParseDocument(ctxt); newdoc = ctxt->myDoc; htmlFreeParserCtxt(ctxt); - + if (!newdoc) RETURN_FALSE; @@ -2139,13 +2139,13 @@ PHP_FUNCTION(dom_document_save_html) php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(intern->document)); RETURN_FALSE; } - + buf = xmlBufferCreate(); if (!buf) { php_error_docref(NULL, E_WARNING, "Could not fetch buffer"); RETURN_FALSE; } - + if (node->type == XML_DOCUMENT_FRAG_NODE) { int one_size; diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index a7264ec96f..28c996abc7 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -37,10 +37,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMDocumentFragment extends DOMNode +* class DOMDocumentFragment extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-B63ED1A3 -* Since: +* Since: */ const zend_function_entry php_dom_documentfragment_class_functions[] = { @@ -142,7 +142,7 @@ PHP_METHOD(domdocumentfragment, appendXML) { if (err != 0) { RETURN_FALSE; } - /* Following needed due to bug in libxml2 <= 2.6.14 + /* Following needed due to bug in libxml2 <= 2.6.14 ifdef after next libxml release as bug is fixed in their cvs */ php_dom_xmlSetTreeDoc(lst, nodep->doc); /* End stupid hack */ diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c index 7a1a1ddb59..77fc28e180 100644 --- a/ext/dom/documenttype.c +++ b/ext/dom/documenttype.c @@ -28,20 +28,20 @@ #include "php_dom.h" /* -* class DOMDocumentType extends DOMNode +* class DOMDocumentType extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-412266927 -* Since: +* Since: */ const zend_function_entry php_dom_documenttype_class_functions[] = { PHP_FE_END }; -/* {{{ name string -readonly=yes +/* {{{ name string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1844763134 -Since: +Since: */ int dom_documenttype_name_read(dom_object *obj, zval *retval) { @@ -59,10 +59,10 @@ int dom_documenttype_name_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ entities DOMNamedNodeMap -readonly=yes +/* {{{ entities DOMNamedNodeMap +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1788794630 -Since: +Since: */ int dom_documenttype_entities_read(dom_object *obj, zval *retval) { @@ -87,10 +87,10 @@ int dom_documenttype_entities_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ notations DOMNamedNodeMap -readonly=yes +/* {{{ notations DOMNamedNodeMap +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D46829EF -Since: +Since: */ int dom_documenttype_notations_read(dom_object *obj, zval *retval) { @@ -115,8 +115,8 @@ int dom_documenttype_notations_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ publicId string -readonly=yes +/* {{{ publicId string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-publicId Since: DOM Level 2 */ @@ -140,8 +140,8 @@ int dom_documenttype_public_id_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ systemId string -readonly=yes +/* {{{ systemId string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-systemId Since: DOM Level 2 */ @@ -164,8 +164,8 @@ int dom_documenttype_system_id_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ internalSubset string -readonly=yes +/* {{{ internalSubset string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-internalSubset Since: DOM Level 2 */ diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c index 8a64aeba25..00ed397aeb 100644 --- a/ext/dom/dom_iterators.c +++ b/ext/dom/dom_iterators.c @@ -194,7 +194,7 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter) /* {{{ */ ZVAL_UNDEF(&iterator->curobj); if (intern != NULL && intern->ptr != NULL) { - if (objmap->nodetype != XML_ENTITY_NODE && + if (objmap->nodetype != XML_ENTITY_NODE && objmap->nodetype != XML_NOTATION_NODE) { if (objmap->nodetype == DOM_NODESET) { nodeht = HASH_OF(&objmap->baseobj_zv); @@ -204,13 +204,13 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter) /* {{{ */ } } else { curnode = (xmlNodePtr)((php_libxml_node_ptr *)intern->ptr)->node; - if (objmap->nodetype == XML_ATTRIBUTE_NODE || + if (objmap->nodetype == XML_ATTRIBUTE_NODE || objmap->nodetype == XML_ELEMENT_NODE) { curnode = curnode->next; } else { /* Nav the tree evey time as this is LIVE */ basenode = dom_object_get_node(objmap->baseobj); - if (basenode && (basenode->type == XML_DOCUMENT_NODE || + if (basenode && (basenode->type == XML_DOCUMENT_NODE || basenode->type == XML_HTML_DOCUMENT_NODE)) { basenode = xmlDocGetRootElement((xmlDoc *) basenode); } else if (basenode) { @@ -270,7 +270,7 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, i intern = Z_DOMOBJ_P(object); objmap = (dom_nnodemap_object *)intern->ptr; if (objmap != NULL) { - if (objmap->nodetype != XML_ENTITY_NODE && + if (objmap->nodetype != XML_ENTITY_NODE && objmap->nodetype != XML_NOTATION_NODE) { if (objmap->nodetype == DOM_NODESET) { nodeht = HASH_OF(&objmap->baseobj_zv); diff --git a/ext/dom/domconfiguration.c b/ext/dom/domconfiguration.c index 4c189606dc..4d6755842d 100644 --- a/ext/dom/domconfiguration.c +++ b/ext/dom/domconfiguration.c @@ -44,7 +44,7 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class domdomconfiguration +* class domdomconfiguration * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration * Since: DOM Level 3 @@ -61,7 +61,7 @@ const zend_function_entry php_dom_domconfiguration_class_functions[] = { /* {{{ proto dom_void dom_domconfiguration_set_parameter(string name, domuserdata value); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-property -Since: +Since: */ PHP_FUNCTION(dom_domconfiguration_set_parameter) { @@ -71,7 +71,7 @@ PHP_FUNCTION(dom_domconfiguration_set_parameter) /* {{{ proto domdomuserdata dom_domconfiguration_get_parameter(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-getParameter -Since: +Since: */ PHP_FUNCTION(dom_domconfiguration_get_parameter) { @@ -81,7 +81,7 @@ PHP_FUNCTION(dom_domconfiguration_get_parameter) /* {{{ proto boolean dom_domconfiguration_can_set_parameter(string name, domuserdata value); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-canSetParameter -Since: +Since: */ PHP_FUNCTION(dom_domconfiguration_can_set_parameter) { diff --git a/ext/dom/domerror.c b/ext/dom/domerror.c index be3355b0ec..b971d8e9eb 100644 --- a/ext/dom/domerror.c +++ b/ext/dom/domerror.c @@ -29,7 +29,7 @@ /* -* class domerror +* class domerror * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-Interfaces-DOMError * Since: DOM Level 3 @@ -41,10 +41,10 @@ const zend_function_entry php_dom_domerror_class_functions[] = { /* {{{ attribute protos, not implemented yet */ -/* {{{ severity unsigned short -readonly=yes +/* {{{ severity unsigned short +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-severity -Since: +Since: */ int dom_domerror_severity_read(dom_object *obj, zval *retval) { @@ -54,10 +54,10 @@ int dom_domerror_severity_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ message string -readonly=yes +/* {{{ message string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-message -Since: +Since: */ int dom_domerror_message_read(dom_object *obj, zval *retval) { @@ -67,10 +67,10 @@ int dom_domerror_message_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ type string -readonly=yes +/* {{{ type string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-type -Since: +Since: */ int dom_domerror_type_read(dom_object *obj, zval *retval) { @@ -80,10 +80,10 @@ int dom_domerror_type_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ relatedException object -readonly=yes +/* {{{ relatedException object +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedException -Since: +Since: */ int dom_domerror_related_exception_read(dom_object *obj, zval *retval) { @@ -93,10 +93,10 @@ int dom_domerror_related_exception_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ relatedData domobject -readonly=yes +/* {{{ relatedData domobject +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedData -Since: +Since: */ int dom_domerror_related_data_read(dom_object *obj, zval *retval) { @@ -106,10 +106,10 @@ int dom_domerror_related_data_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ location domlocator -readonly=yes +/* {{{ location domlocator +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-location -Since: +Since: */ int dom_domerror_location_read(dom_object *obj, zval *retval) { diff --git a/ext/dom/domerrorhandler.c b/ext/dom/domerrorhandler.c index af73819ee1..9dfb01deba 100644 --- a/ext/dom/domerrorhandler.c +++ b/ext/dom/domerrorhandler.c @@ -34,7 +34,7 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class domerrorhandler +* class domerrorhandler * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-Interfaces-DOMErrorHandler * Since: DOM Level 3 @@ -49,7 +49,7 @@ const zend_function_entry php_dom_domerrorhandler_class_functions[] = { /* {{{ proto dom_boolean dom_domerrorhandler_handle_error(domerror error); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-ERRORS-DOMErrorHandler-handleError -Since: +Since: */ PHP_FUNCTION(dom_domerrorhandler_handle_error) { diff --git a/ext/dom/domexception.c b/ext/dom/domexception.c index d7de3c4720..e1c4d5ae56 100644 --- a/ext/dom/domexception.c +++ b/ext/dom/domexception.c @@ -28,10 +28,10 @@ #include "php_dom.h" /* -* class DOMException +* class DOMException * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-17189187 -* Since: +* Since: */ extern zend_class_entry *dom_domexception_class_entry; diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c index 49c54b5f86..fab2a41f00 100644 --- a/ext/dom/domimplementation.c +++ b/ext/dom/domimplementation.c @@ -50,10 +50,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMImplementation +* class DOMImplementation * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-102161490 -* Since: +* Since: */ const zend_function_entry php_dom_domimplementation_class_functions[] = { @@ -66,7 +66,7 @@ const zend_function_entry php_dom_domimplementation_class_functions[] = { /* {{{ proto boolean dom_domimplementation_has_feature(string feature, string version); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5CED94D7 -Since: +Since: */ PHP_METHOD(domimplementation, hasFeature) { @@ -127,7 +127,7 @@ PHP_METHOD(domimplementation, createDocumentType) localname = xmlStrdup((xmlChar *) name); } - /* TODO: Test that localname has no invalid chars + /* TODO: Test that localname has no invalid chars php_dom_throw_error(INVALID_CHARACTER_ERR,); */ diff --git a/ext/dom/domimplementationlist.c b/ext/dom/domimplementationlist.c index 5feedebe27..627e59428b 100644 --- a/ext/dom/domimplementationlist.c +++ b/ext/dom/domimplementationlist.c @@ -34,7 +34,7 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class domimplementationlist +* class domimplementationlist * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationList * Since: DOM Level 3 @@ -47,10 +47,10 @@ const zend_function_entry php_dom_domimplementationlist_class_functions[] = { /* {{{ attribute protos, not implemented yet */ -/* {{{ length unsigned long -readonly=yes +/* {{{ length unsigned long +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationList-length -Since: +Since: */ int dom_domimplementationlist_length_read(dom_object *obj, zval *retval) { @@ -62,7 +62,7 @@ int dom_domimplementationlist_length_read(dom_object *obj, zval *retval) /* {{{ proto domdomimplementation dom_domimplementationlist_item(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationList-item -Since: +Since: */ PHP_FUNCTION(dom_domimplementationlist_item) { diff --git a/ext/dom/domimplementationsource.c b/ext/dom/domimplementationsource.c index f3becc6454..30513d5b18 100644 --- a/ext/dom/domimplementationsource.c +++ b/ext/dom/domimplementationsource.c @@ -39,7 +39,7 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class domimplementationsource +* class domimplementationsource * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationSource * Since: DOM Level 3 @@ -55,7 +55,7 @@ const zend_function_entry php_dom_domimplementationsource_class_functions[] = { /* {{{ proto domdomimplementation dom_domimplementationsource_get_domimplementation(string features); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-getDOMImpl -Since: +Since: */ PHP_FUNCTION(dom_domimplementationsource_get_domimplementation) { @@ -65,7 +65,7 @@ PHP_FUNCTION(dom_domimplementationsource_get_domimplementation) /* {{{ proto domimplementationlist dom_domimplementationsource_get_domimplementations(string features); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-getDOMImpls -Since: +Since: */ PHP_FUNCTION(dom_domimplementationsource_get_domimplementations) { diff --git a/ext/dom/domlocator.c b/ext/dom/domlocator.c index e3f3ecf3b0..835d425fa2 100644 --- a/ext/dom/domlocator.c +++ b/ext/dom/domlocator.c @@ -29,7 +29,7 @@ /* -* class domlocator +* class domlocator * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Interfaces-DOMLocator * Since: DOM Level 3 @@ -41,10 +41,10 @@ const zend_function_entry php_dom_domlocator_class_functions[] = { /* {{{ attribute protos, not implemented yet */ -/* {{{ line_number long -readonly=yes +/* {{{ line_number long +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-line-number -Since: +Since: */ int dom_domlocator_line_number_read(dom_object *obj, zval *retval) { @@ -54,10 +54,10 @@ int dom_domlocator_line_number_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ column_number long -readonly=yes +/* {{{ column_number long +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-column-number -Since: +Since: */ int dom_domlocator_column_number_read(dom_object *obj, zval *retval) { @@ -67,10 +67,10 @@ int dom_domlocator_column_number_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ offset long -readonly=yes +/* {{{ offset long +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-offset -Since: +Since: */ int dom_domlocator_offset_read(dom_object *obj, zval *retval) { @@ -80,10 +80,10 @@ int dom_domlocator_offset_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ related_node node -readonly=yes +/* {{{ related_node node +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-node -Since: +Since: */ int dom_domlocator_related_node_read(dom_object *obj, zval *retval) { @@ -93,10 +93,10 @@ int dom_domlocator_related_node_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ uri string -readonly=yes +/* {{{ uri string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-uri -Since: +Since: */ int dom_domlocator_uri_read(dom_object *obj, zval *retval) { diff --git a/ext/dom/domstringlist.c b/ext/dom/domstringlist.c index a13f29c91a..797ed031ec 100644 --- a/ext/dom/domstringlist.c +++ b/ext/dom/domstringlist.c @@ -34,7 +34,7 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class domstringlist +* class domstringlist * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList * Since: DOM Level 3 @@ -47,10 +47,10 @@ const zend_function_entry php_dom_domstringlist_class_functions[] = { /* {{{ attribute protos, not implemented yet */ -/* {{{ length unsigned long -readonly=yes +/* {{{ length unsigned long +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-length -Since: +Since: */ int dom_domstringlist_length_read(dom_object *obj, zval *retval) { @@ -62,7 +62,7 @@ int dom_domstringlist_length_read(dom_object *obj, zval *retval) /* {{{ proto domstring dom_domstringlist_item(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-item -Since: +Since: */ PHP_FUNCTION(dom_domstringlist_item) { diff --git a/ext/dom/element.c b/ext/dom/element.c index d97bfc06b3..e7707cc93f 100644 --- a/ext/dom/element.c +++ b/ext/dom/element.c @@ -120,10 +120,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMElement extends DOMNode +* class DOMElement extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-745549614 -* Since: +* Since: */ const zend_function_entry php_dom_element_class_functions[] = { /* {{{ */ @@ -229,10 +229,10 @@ PHP_METHOD(domelement, __construct) } /* }}} end DOMElement::__construct */ -/* {{{ tagName string -readonly=yes +/* {{{ tagName string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-104682815 -Since: +Since: */ int dom_element_tag_name_read(dom_object *obj, zval *retval) { @@ -263,8 +263,8 @@ int dom_element_tag_name_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ schemaTypeInfo typeinfo -readonly=yes +/* {{{ schemaTypeInfo typeinfo +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Element-schemaTypeInfo Since: DOM Level 3 */ @@ -352,7 +352,7 @@ PHP_FUNCTION(dom_element_get_attribute) value = xmlStrdup(((xmlAttributePtr)attr)->defaultValue); } } - + if (value == NULL) { RETURN_EMPTY_STRING(); } else { @@ -364,7 +364,7 @@ PHP_FUNCTION(dom_element_get_attribute) /* {{{ proto void dom_element_set_attribute(string name, string value); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082 -Since: +Since: */ PHP_FUNCTION(dom_element_set_attribute) { @@ -479,7 +479,7 @@ PHP_FUNCTION(dom_element_remove_attribute) /* {{{ proto DOMAttr dom_element_get_attribute_node(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8 -Since: +Since: */ PHP_FUNCTION(dom_element_get_attribute_node) { @@ -526,7 +526,7 @@ PHP_FUNCTION(dom_element_get_attribute_node) /* {{{ proto DOMAttr dom_element_set_attribute_node(DOMAttr newAttr); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154 -Since: +Since: */ PHP_FUNCTION(dom_element_set_attribute_node) { @@ -561,7 +561,7 @@ PHP_FUNCTION(dom_element_set_attribute_node) existattrp = xmlHasProp(nodep, attrp->name); if (existattrp != NULL && existattrp->type != XML_ATTRIBUTE_DECL) { - if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp)) != NULL && + if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp)) != NULL && ((php_libxml_node_ptr *)oldobj->ptr)->node == (xmlNodePtr) attrp) { RETURN_NULL(); @@ -592,7 +592,7 @@ PHP_FUNCTION(dom_element_set_attribute_node) /* {{{ proto DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198 -Since: +Since: */ PHP_FUNCTION(dom_element_remove_attribute_node) { @@ -629,7 +629,7 @@ PHP_FUNCTION(dom_element_remove_attribute_node) /* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D -Since: +Since: */ PHP_FUNCTION(dom_element_get_elements_by_tag_name) { @@ -720,7 +720,7 @@ static xmlNsPtr _dom_new_reconNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) /* if (ns->prefix == NULL) snprintf((char *) prefix, sizeof(prefix), "default%d", counter++); else - snprintf((char *) prefix, sizeof(prefix), "%.20s%d", + snprintf((char *) prefix, sizeof(prefix), "%.20s%d", (char *)ns->prefix, counter++); def = xmlSearchNs(doc, tree, prefix); } @@ -776,8 +776,8 @@ PHP_FUNCTION(dom_element_set_attribute_ns) node_list_unlink(nodep->children); } - if ((xmlStrEqual((xmlChar *) prefix, (xmlChar *)"xmlns") || - (prefix == NULL && xmlStrEqual((xmlChar *) localname, (xmlChar *)"xmlns"))) && + if ((xmlStrEqual((xmlChar *) prefix, (xmlChar *)"xmlns") || + (prefix == NULL && xmlStrEqual((xmlChar *) localname, (xmlChar *)"xmlns"))) && xmlStrEqual((xmlChar *) uri, (xmlChar *)DOM_XMLNS_NAMESPACE)) { is_xmlns = 1; if (prefix == NULL) { @@ -792,7 +792,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns) tmpnsptr = nsptr->next; while (tmpnsptr) { - if ((tmpnsptr->prefix != NULL) && (tmpnsptr->href != NULL) && + if ((tmpnsptr->prefix != NULL) && (tmpnsptr->href != NULL) && (xmlStrEqual(tmpnsptr->href, (xmlChar *) uri))) { nsptr = tmpnsptr; break; @@ -993,7 +993,7 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns) } if (existattrp != NULL && existattrp->type != XML_ATTRIBUTE_DECL) { - if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp)) != NULL && + if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp)) != NULL && ((php_libxml_node_ptr *)oldobj->ptr)->node == (xmlNodePtr) attrp) { RETURN_NULL(); diff --git a/ext/dom/entity.c b/ext/dom/entity.c index 07c2b0cab3..c7bdbfc951 100644 --- a/ext/dom/entity.c +++ b/ext/dom/entity.c @@ -29,20 +29,20 @@ /* -* class DOMEntity extends DOMNode +* class DOMEntity extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-527DCFF2 -* Since: +* Since: */ const zend_function_entry php_dom_entity_class_functions[] = { PHP_FE_END }; -/* {{{ publicId string -readonly=yes +/* {{{ publicId string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-D7303025 -Since: +Since: */ int dom_entity_public_id_read(dom_object *obj, zval *retval) { @@ -64,10 +64,10 @@ int dom_entity_public_id_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ systemId string -readonly=yes +/* {{{ systemId string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-D7C29F3E -Since: +Since: */ int dom_entity_system_id_read(dom_object *obj, zval *retval) { @@ -89,10 +89,10 @@ int dom_entity_system_id_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ notationName string -readonly=yes +/* {{{ notationName string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-6ABAEB38 -Since: +Since: */ int dom_entity_notation_name_read(dom_object *obj, zval *retval) { @@ -117,8 +117,8 @@ int dom_entity_notation_name_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ actualEncoding string -readonly=no +/* {{{ actualEncoding string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-actualEncoding Since: DOM Level 3 */ @@ -135,8 +135,8 @@ int dom_entity_actual_encoding_write(dom_object *obj, zval *newval) /* }}} */ -/* {{{ encoding string -readonly=no +/* {{{ encoding string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-encoding Since: DOM Level 3 */ @@ -153,8 +153,8 @@ int dom_entity_encoding_write(dom_object *obj, zval *newval) /* }}} */ -/* {{{ version string -readonly=no +/* {{{ version string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-version Since: DOM Level 3 */ diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c index 9505654f9d..76a4c06e3b 100644 --- a/ext/dom/entityreference.c +++ b/ext/dom/entityreference.c @@ -34,10 +34,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMEntityReference extends DOMNode +* class DOMEntityReference extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-11C98490 -* Since: +* Since: */ const zend_function_entry php_dom_entityreference_class_functions[] = { diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c index fb110345ff..efeeaf4ffd 100644 --- a/ext/dom/namednodemap.c +++ b/ext/dom/namednodemap.c @@ -60,10 +60,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMNamedNodeMap +* class DOMNamedNodeMap * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1780488922 -* Since: +* Since: */ const zend_function_entry php_dom_namednodemap_class_functions[] = { /* {{{ */ @@ -78,10 +78,10 @@ const zend_function_entry php_dom_namednodemap_class_functions[] = { /* {{{ */ }; /* }}} */ -/* {{{ length int -readonly=yes +/* {{{ length int +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D0FB19E -Since: +Since: */ int dom_namednodemap_length_read(dom_object *obj, zval *retval) { @@ -93,7 +93,7 @@ int dom_namednodemap_length_read(dom_object *obj, zval *retval) objmap = (dom_nnodemap_object *)obj->ptr; if (objmap != NULL) { - if ((objmap->nodetype == XML_NOTATION_NODE) || + if ((objmap->nodetype == XML_NOTATION_NODE) || objmap->nodetype == XML_ENTITY_NODE) { if (objmap->ht) { count = xmlHashSize(objmap->ht); @@ -121,7 +121,7 @@ int dom_namednodemap_length_read(dom_object *obj, zval *retval) /* {{{ proto DOMNode dom_namednodemap_get_named_item(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549 -Since: +Since: */ PHP_FUNCTION(dom_namednodemap_get_named_item) { @@ -145,7 +145,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item) objmap = (dom_nnodemap_object *)intern->ptr; if (objmap != NULL) { - if ((objmap->nodetype == XML_NOTATION_NODE) || + if ((objmap->nodetype == XML_NOTATION_NODE) || objmap->nodetype == XML_ENTITY_NODE) { if (objmap->ht) { if (objmap->nodetype == XML_ENTITY_NODE) { @@ -176,7 +176,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item) /* {{{ proto DOMNode dom_namednodemap_set_named_item(DOMNode arg); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1025163788 -Since: +Since: */ PHP_FUNCTION(dom_namednodemap_set_named_item) { @@ -186,7 +186,7 @@ PHP_FUNCTION(dom_namednodemap_set_named_item) /* {{{ proto DOMNode dom_namednodemap_remove_named_item(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D58B193 -Since: +Since: */ PHP_FUNCTION(dom_namednodemap_remove_named_item) { @@ -196,7 +196,7 @@ PHP_FUNCTION(dom_namednodemap_remove_named_item) /* {{{ proto DOMNode dom_namednodemap_item(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9 -Since: +Since: */ PHP_FUNCTION(dom_namednodemap_item) { @@ -219,7 +219,7 @@ PHP_FUNCTION(dom_namednodemap_item) objmap = (dom_nnodemap_object *)intern->ptr; if (objmap != NULL) { - if ((objmap->nodetype == XML_NOTATION_NODE) || + if ((objmap->nodetype == XML_NOTATION_NODE) || objmap->nodetype == XML_ENTITY_NODE) { if (objmap->ht) { if (objmap->nodetype == XML_ENTITY_NODE) { @@ -278,7 +278,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item_ns) objmap = (dom_nnodemap_object *)intern->ptr; if (objmap != NULL) { - if ((objmap->nodetype == XML_NOTATION_NODE) || + if ((objmap->nodetype == XML_NOTATION_NODE) || objmap->nodetype == XML_ENTITY_NODE) { if (objmap->ht) { if (objmap->nodetype == XML_ENTITY_NODE) { diff --git a/ext/dom/namelist.c b/ext/dom/namelist.c index 9955cb1b6c..31dc5a9075 100644 --- a/ext/dom/namelist.c +++ b/ext/dom/namelist.c @@ -38,7 +38,7 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMNameList +* class DOMNameList * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList * Since: DOM Level 3 @@ -50,10 +50,10 @@ const zend_function_entry php_dom_namelist_class_functions[] = { PHP_FE_END }; -/* {{{ length int -readonly=yes +/* {{{ length int +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-length -Since: +Since: */ int dom_namelist_length_read(dom_object *obj, zval *retval) { @@ -65,7 +65,7 @@ int dom_namelist_length_read(dom_object *obj, zval *retval) /* {{{ proto string dom_namelist_get_name(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getName -Since: +Since: */ PHP_FUNCTION(dom_namelist_get_name) { @@ -75,7 +75,7 @@ PHP_FUNCTION(dom_namelist_get_name) /* {{{ proto string dom_namelist_get_namespace_uri(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getNamespaceURI -Since: +Since: */ PHP_FUNCTION(dom_namelist_get_namespace_uri) { diff --git a/ext/dom/node.c b/ext/dom/node.c index a51cb52747..26ced06f7d 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -126,10 +126,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMNode +* class DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1950641247 -* Since: +* Since: */ const zend_function_entry php_dom_node_class_functions[] = { /* {{{ */ @@ -170,7 +170,7 @@ static void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep) /* {{{ */ while (curns) { nsdftptr = curns->next; if (curns->href != NULL) { - if((nsptr = xmlSearchNsByHref(doc, nodep->parent, curns->href)) && + if((nsptr = xmlSearchNsByHref(doc, nodep->parent, curns->href)) && (curns->prefix == NULL || xmlStrEqual(nsptr->prefix, curns->prefix))) { curns->next = NULL; if (prevns == NULL) { @@ -191,10 +191,10 @@ static void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep) /* {{{ */ } /* }}} */ -/* {{{ nodeName string -readonly=yes +/* {{{ nodeName string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68D095 -Since: +Since: */ int dom_node_node_name_read(dom_object *obj, zval *retval) { @@ -267,7 +267,7 @@ int dom_node_node_name_read(dom_object *obj, zval *retval) } else { ZVAL_EMPTY_STRING(retval); } - + if (qname != NULL) { xmlFree(qname); } @@ -278,10 +278,10 @@ int dom_node_node_name_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ nodeValue string -readonly=no +/* {{{ nodeValue string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68D080 -Since: +Since: */ int dom_node_node_value_read(dom_object *obj, zval *retval) { @@ -358,7 +358,7 @@ int dom_node_node_value_write(dom_object *obj, zval *newval) /* }}} */ /* {{{ nodeType int -readonly=yes +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-111237558 Since: */ @@ -385,10 +385,10 @@ int dom_node_node_type_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ parentNode DomNode -readonly=yes +/* {{{ parentNode DomNode +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1060184317 -Since: +Since: */ int dom_node_parent_node_read(dom_object *obj, zval *retval) { @@ -413,10 +413,10 @@ int dom_node_parent_node_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ childNodes DomNodeList -readonly=yes +/* {{{ childNodes DomNodeList +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1451460987 -Since: +Since: */ int dom_node_child_nodes_read(dom_object *obj, zval *retval) { @@ -441,10 +441,10 @@ int dom_node_child_nodes_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ firstChild DomNode -readonly=yes +/* {{{ firstChild DomNode +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-169727388 -Since: +Since: */ int dom_node_first_child_read(dom_object *obj, zval *retval) { @@ -472,10 +472,10 @@ int dom_node_first_child_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ lastChild DomNode -readonly=yes +/* {{{ lastChild DomNode +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-61AD09FB -Since: +Since: */ int dom_node_last_child_read(dom_object *obj, zval *retval) { @@ -503,10 +503,10 @@ int dom_node_last_child_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ previousSibling DomNode -readonly=yes +/* {{{ previousSibling DomNode +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-640FB3C8 -Since: +Since: */ int dom_node_previous_sibling_read(dom_object *obj, zval *retval) { @@ -532,7 +532,7 @@ int dom_node_previous_sibling_read(dom_object *obj, zval *retval) /* }}} */ /* {{{ nextSibling DomNode -readonly=yes +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6AC54C2F Since: */ @@ -558,10 +558,10 @@ int dom_node_next_sibling_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ attributes DomNamedNodeMap -readonly=yes +/* {{{ attributes DomNamedNodeMap +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-84CF096 -Since: +Since: */ int dom_node_attributes_read(dom_object *obj, zval *retval) { @@ -586,10 +586,10 @@ int dom_node_attributes_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ ownerDocument DomDocument -readonly=yes +/* {{{ ownerDocument DomDocument +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-node-ownerDoc -Since: +Since: */ int dom_node_owner_document_read(dom_object *obj, zval *retval) { @@ -617,8 +617,8 @@ int dom_node_owner_document_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ namespaceUri string -readonly=yes +/* {{{ namespaceUri string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSname Since: DOM Level 2 */ @@ -656,8 +656,8 @@ int dom_node_namespace_uri_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ prefix string -readonly=no +/* {{{ prefix string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSPrefix Since: DOM Level 2 */ @@ -724,7 +724,7 @@ int dom_node_prefix_write(dom_object *obj, zval *newval) prefix = str->val; if (nsnode && nodep->ns != NULL && !xmlStrEqual(nodep->ns->prefix, (xmlChar *)prefix)) { strURI = (char *) nodep->ns->href; - if (strURI == NULL || + if (strURI == NULL || (!strcmp(prefix, "xml") && strcmp(strURI, (char *) XML_XML_NAMESPACE)) || (nodep->type == XML_ATTRIBUTE_NODE && !strcmp(prefix, "xmlns") && strcmp(strURI, (char *) DOM_XMLNS_NAMESPACE)) || @@ -763,8 +763,8 @@ int dom_node_prefix_write(dom_object *obj, zval *newval) /* }}} */ -/* {{{ localName string -readonly=yes +/* {{{ localName string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSLocalN Since: DOM Level 2 */ @@ -816,8 +816,8 @@ int dom_node_base_uri_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ textContent string -readonly=no +/* {{{ textContent string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-textContent Since: DOM Level 3 */ @@ -974,7 +974,7 @@ PHP_FUNCTION(dom_node_insert_before) xmlUnlinkNode(child); } - if (child->type == XML_TEXT_NODE && (refp->type == XML_TEXT_NODE || + if (child->type == XML_TEXT_NODE && (refp->type == XML_TEXT_NODE || (refp->prev != NULL && refp->prev->type == XML_TEXT_NODE))) { if (child->doc == NULL) { xmlSetTreeDoc(child, parentp->doc); @@ -1073,7 +1073,7 @@ PHP_FUNCTION(dom_node_insert_before) /* {{{ proto DomNode dom_node_replace_child(DomNode newChild, DomNode oldChild); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307 -Since: +Since: */ PHP_FUNCTION(dom_node_replace_child) { @@ -1104,7 +1104,7 @@ PHP_FUNCTION(dom_node_replace_child) stricterror = dom_get_strict_error(intern->document); - if (dom_node_is_read_only(nodep) == SUCCESS || + if (dom_node_is_read_only(nodep) == SUCCESS || (newchild->parent != NULL && dom_node_is_read_only(newchild->parent) == SUCCESS)) { php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror); RETURN_FALSE; @@ -1161,7 +1161,7 @@ PHP_FUNCTION(dom_node_replace_child) /* {{{ proto DomNode dom_node_remove_child(DomNode oldChild); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066 -Since: +Since: */ PHP_FUNCTION(dom_node_remove_child) { @@ -1184,7 +1184,7 @@ PHP_FUNCTION(dom_node_remove_child) stricterror = dom_get_strict_error(intern->document); - if (dom_node_is_read_only(nodep) == SUCCESS || + if (dom_node_is_read_only(nodep) == SUCCESS || (child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) { php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror); RETURN_FALSE; @@ -1212,7 +1212,7 @@ PHP_FUNCTION(dom_node_remove_child) /* {{{ proto DomNode dom_node_append_child(DomNode newChild); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107 -Since: +Since: */ PHP_FUNCTION(dom_node_append_child) { @@ -1313,7 +1313,7 @@ PHP_FUNCTION(dom_node_append_child) /* {{{ proto boolean dom_node_has_child_nodes(); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-810594187 -Since: +Since: */ PHP_FUNCTION(dom_node_has_child_nodes) { @@ -1341,7 +1341,7 @@ PHP_FUNCTION(dom_node_has_child_nodes) /* {{{ proto DomNode dom_node_clone_node(boolean deep); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4 -Since: +Since: */ PHP_FUNCTION(dom_node_clone_node) { @@ -1363,7 +1363,7 @@ PHP_FUNCTION(dom_node_clone_node) RETURN_FALSE; } - /* When deep is false Element nodes still require the attributes + /* When deep is false Element nodes still require the attributes Following taken from libxml as xmlDocCopyNode doesnt do this */ if (n->type == XML_ELEMENT_NODE && recursive == 0) { if (n->nsDef != NULL) { @@ -1402,7 +1402,7 @@ PHP_FUNCTION(dom_node_clone_node) /* {{{ proto void dom_node_normalize(); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize -Since: +Since: */ PHP_FUNCTION(dom_node_normalize) { @@ -1526,24 +1526,24 @@ PHP_FUNCTION(dom_node_lookup_prefix) DOM_GET_OBJ(nodep, id, xmlNodePtr, intern); if (uri_len > 0) { - switch (nodep->type) { + switch (nodep->type) { case XML_ELEMENT_NODE: lookupp = nodep; - break; + break; case XML_DOCUMENT_NODE: case XML_HTML_DOCUMENT_NODE: lookupp = xmlDocGetRootElement((xmlDocPtr) nodep); break; - case XML_ENTITY_NODE : - case XML_NOTATION_NODE: - case XML_DOCUMENT_FRAG_NODE: + case XML_ENTITY_NODE : + case XML_NOTATION_NODE: + case XML_DOCUMENT_FRAG_NODE: case XML_DOCUMENT_TYPE_NODE: case XML_DTD_NODE: RETURN_NULL(); break; default: lookupp = nodep->parent; - } + } if (lookupp != NULL) { nsptr = xmlSearchNsByHref(lookupp->doc, lookupp, (xmlChar *) uri); @@ -1552,7 +1552,7 @@ PHP_FUNCTION(dom_node_lookup_prefix) } } } - + RETURN_NULL(); } /* }}} end dom_node_lookup_prefix */ @@ -1682,14 +1682,14 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ xmlXPathObjectPtr xpathobjp=NULL; if (mode == 0) { - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), - "O|bba!a!", &id, dom_node_class_entry, &exclusive, &with_comments, + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), + "O|bba!a!", &id, dom_node_class_entry, &exclusive, &with_comments, &xpath_array, &ns_prefixes) == FAILURE) { return; } } else { - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), - "Os|bba!a!", &id, dom_node_class_entry, &file, &file_len, &exclusive, + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), + "Os|bba!a!", &id, dom_node_class_entry, &file, &file_len, &exclusive, &with_comments, &xpath_array, &ns_prefixes) == FAILURE) { return; } @@ -1780,7 +1780,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ } ZEND_HASH_FOREACH_END(); inclusive_ns_prefixes[nscount] = NULL; } else { - php_error_docref(NULL, E_NOTICE, + php_error_docref(NULL, E_NOTICE, "Inclusive namespace prefixes only allowed in exclusive mode."); } } @@ -1862,7 +1862,7 @@ PHP_METHOD(domnode, getNodePath) xmlNode *nodep; dom_object *intern; char *value; - + DOM_GET_THIS_OBJ(nodep, id, xmlNodePtr, intern); value = (char *) xmlGetNodePath(nodep); @@ -1882,7 +1882,7 @@ PHP_METHOD(domnode, getLineNo) zval *id; xmlNode *nodep; dom_object *intern; - + if (zend_parse_parameters_none() == FAILURE) { return; } diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c index fa67cc1041..4bf00917e4 100644 --- a/ext/dom/nodelist.c +++ b/ext/dom/nodelist.c @@ -35,10 +35,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMNodeList +* class DOMNodeList * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-536297177 -* Since: +* Since: */ const zend_function_entry php_dom_nodelist_class_functions[] = { @@ -46,10 +46,10 @@ const zend_function_entry php_dom_nodelist_class_functions[] = { PHP_FE_END }; -/* {{{ length int -readonly=yes +/* {{{ length int +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-203510337 -Since: +Since: */ int dom_nodelist_length_read(dom_object *obj, zval *retval) { @@ -100,7 +100,7 @@ int dom_nodelist_length_read(dom_object *obj, zval *retval) /* {{{ proto DOMNode dom_nodelist_item(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136 -Since: +Since: */ PHP_FUNCTION(dom_nodelist_item) { diff --git a/ext/dom/notation.c b/ext/dom/notation.c index cf4039f3ab..20d5d053d2 100644 --- a/ext/dom/notation.c +++ b/ext/dom/notation.c @@ -28,10 +28,10 @@ #include "php_dom.h" /* -* class DOMNotation extends DOMNode +* class DOMNotation extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5431D1B9 -* Since: +* Since: */ const zend_function_entry php_dom_notation_class_functions[] = { @@ -40,10 +40,10 @@ const zend_function_entry php_dom_notation_class_functions[] = { /* {{{ attribute protos, not implemented yet */ -/* {{{ publicId string -readonly=yes +/* {{{ publicId string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-54F2B4D0 -Since: +Since: */ int dom_notation_public_id_read(dom_object *obj, zval *retval) { @@ -65,10 +65,10 @@ int dom_notation_public_id_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ systemId string -readonly=yes +/* {{{ systemId string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-E8AAB1D0 -Since: +Since: */ int dom_notation_system_id_read(dom_object *obj, zval *retval) { diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c index df66fb0bef..804a371635 100644 --- a/ext/dom/processinginstruction.c +++ b/ext/dom/processinginstruction.c @@ -36,10 +36,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMProcessingInstruction extends DOMNode +* class DOMProcessingInstruction extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1004215813 -* Since: +* Since: */ const zend_function_entry php_dom_processinginstruction_class_functions[] = { @@ -88,10 +88,10 @@ PHP_METHOD(domprocessinginstruction, __construct) } /* }}} end DOMProcessingInstruction::__construct */ -/* {{{ target string -readonly=yes +/* {{{ target string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1478689192 -Since: +Since: */ int dom_processinginstruction_target_read(dom_object *obj, zval *retval) { @@ -109,10 +109,10 @@ int dom_processinginstruction_target_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ data string -readonly=no +/* {{{ data string +readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-837822393 -Since: +Since: */ int dom_processinginstruction_data_read(dom_object *obj, zval *retval) { diff --git a/ext/dom/string_extend.c b/ext/dom/string_extend.c index 75680089a4..0c0c0914d3 100644 --- a/ext/dom/string_extend.c +++ b/ext/dom/string_extend.c @@ -38,10 +38,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class domstringextend +* class domstringextend * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend -* Since: +* Since: */ const zend_function_entry php_dom_string_extend_class_functions[] = { @@ -54,7 +54,7 @@ const zend_function_entry php_dom_string_extend_class_functions[] = { /* {{{ proto int dom_string_extend_find_offset16(int offset32); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset16 -Since: +Since: */ PHP_FUNCTION(dom_string_extend_find_offset16) { @@ -64,7 +64,7 @@ PHP_FUNCTION(dom_string_extend_find_offset16) /* {{{ proto int dom_string_extend_find_offset32(int offset16); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset32 -Since: +Since: */ PHP_FUNCTION(dom_string_extend_find_offset32) { diff --git a/ext/dom/text.c b/ext/dom/text.c index fc5f2d50e0..b00cd92c89 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -46,10 +46,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMText extends DOMCharacterData +* class DOMText extends DOMCharacterData * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1312295772 -* Since: +* Since: */ const zend_function_entry php_dom_text_class_functions[] = { @@ -97,8 +97,8 @@ PHP_METHOD(domtext, __construct) } /* }}} end DOMText::__construct */ -/* {{{ wholeText string -readonly=yes +/* {{{ wholeText string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-wholeText Since: DOM Level 3 */ @@ -139,7 +139,7 @@ int dom_text_whole_text_read(dom_object *obj, zval *retval) /* {{{ proto DOMText dom_text_split_text(int offset); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D -Since: +Since: */ PHP_FUNCTION(dom_text_split_text) { @@ -175,12 +175,12 @@ PHP_FUNCTION(dom_text_split_text) first = xmlUTF8Strndup(cur, offset); second = xmlUTF8Strsub(cur, offset, length - offset); - + xmlFree(cur); xmlNodeSetContent(node, first); nnode = xmlNewDocText(node->doc, second); - + xmlFree(first); xmlFree(second); @@ -193,7 +193,7 @@ PHP_FUNCTION(dom_text_split_text) xmlAddNextSibling(node, nnode); nnode->type = XML_TEXT_NODE; } - + php_dom_create_object(nnode, return_value, intern); } /* }}} end dom_text_split_text */ diff --git a/ext/dom/typeinfo.c b/ext/dom/typeinfo.c index 49dddfafcd..3489e5d1f0 100644 --- a/ext/dom/typeinfo.c +++ b/ext/dom/typeinfo.c @@ -29,7 +29,7 @@ /* -* class domtypeinfo +* class domtypeinfo * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#TypeInfo * Since: DOM Level 3 @@ -41,10 +41,10 @@ const zend_function_entry php_dom_typeinfo_class_functions[] = { /* {{{ attribute protos, not implemented yet */ -/* {{{ type_name string -readonly=yes +/* {{{ type_name string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#TypeInfo-typeName -Since: +Since: */ int dom_typeinfo_type_name_read(dom_object *obj, zval *retval) { @@ -54,10 +54,10 @@ int dom_typeinfo_type_name_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ type_namespace string -readonly=yes +/* {{{ type_namespace string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#TypeInfo-typeNamespace -Since: +Since: */ int dom_typeinfo_type_namespace_read(dom_object *obj, zval *retval) { diff --git a/ext/dom/userdatahandler.c b/ext/dom/userdatahandler.c index e0b8756aa8..c51adeebe8 100644 --- a/ext/dom/userdatahandler.c +++ b/ext/dom/userdatahandler.c @@ -29,7 +29,7 @@ /* -* class domuserdatahandler +* class domuserdatahandler * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#UserDataHandler * Since: DOM Level 3 @@ -44,7 +44,7 @@ const zend_function_entry php_dom_userdatahandler_class_functions[] = { /* {{{ proto dom_void dom_userdatahandler_handle(short operation, string key, domobject data, node src, node dst); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-handleUserDataEvent -Since: +Since: */ PHP_FUNCTION(dom_userdatahandler_handle) { diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index c957916156..6ddc30e153 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -31,7 +31,7 @@ #define PHP_DOM_XPATH_EVALUATE 1 /* -* class DOMXPath +* class DOMXPath */ #if defined(LIBXML_XPATH_ENABLED) @@ -82,7 +82,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, char *str; zend_string *callable = NULL; dom_xpath_object *intern; - + if (! zend_is_executing()) { xmlGenericError(xmlGenericErrorContext, @@ -101,7 +101,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, error = 1; } } - + if (error == 1) { for (i = nargs - 1; i >= 0; i--) { obj = valuePop(ctxt); @@ -109,7 +109,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, } return; } - + fci.param_count = nargs - 1; if (fci.param_count > 0) { fci.params = safe_emalloc(fci.param_count, sizeof(zval), 0); @@ -143,7 +143,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, if (node->type == XML_NAMESPACE_DECL) { xmlNsPtr curns; xmlNodePtr nsparent; - + nsparent = node->_private; curns = xmlNewNs(NULL, node->name, NULL); if (node->children) { @@ -169,10 +169,10 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, } xmlXPathFreeObject(obj); } - + fci.size = sizeof(fci); fci.function_table = EG(function_table); - + obj = valuePop(ctxt); if (obj->stringval == NULL) { php_error_docref(NULL, E_WARNING, "Handler name must be a string"); @@ -183,7 +183,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, } efree(fci.params); } - return; + return; } ZVAL_STRING(&fci.function_name, (char *) obj->stringval); xmlXPathFreeObject(obj); @@ -195,7 +195,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, if (!zend_make_callable(&fci.function_name, &callable)) { php_error_docref(NULL, E_WARNING, "Unable to call handler %s()", callable->val); - } else if (intern->registerPhpFunctions == 2 && zend_hash_exists(intern->registered_phpfunctions, callable) == 0) { + } else if (intern->registerPhpFunctions == 2 && zend_hash_exists(intern->registered_phpfunctions, callable) == 0) { php_error_docref(NULL, E_WARNING, "Not allowed to call handler '%s()'.", callable->val); /* Push an empty string, so that we at least have an xslt result... */ valuePush(ctxt, xmlXPathNewString((xmlChar *)"")); @@ -444,7 +444,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ for (i = 0; i < nodesetp->nodeNr; i++) { xmlNodePtr node = nodesetp->nodeTab[i]; zval child; - + if (node->type == XML_NAMESPACE_DECL) { xmlNsPtr curns; xmlNodePtr nsparent; @@ -517,7 +517,7 @@ PHP_FUNCTION(dom_xpath_register_php_functions) zend_string *name; DOM_GET_THIS(id); - + if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "a", &array_value) == SUCCESS) { intern = Z_XPATHOBJ_P(id); zend_hash_internal_pointer_reset(Z_ARRVAL_P(array_value)); @@ -533,7 +533,7 @@ PHP_FUNCTION(dom_xpath_register_php_functions) } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "S", &name) == SUCCESS) { intern = Z_XPATHOBJ_P(id); - + ZVAL_LONG(&new_string, 1); zend_hash_update(intern->registered_phpfunctions, name, &new_string); intern->registerPhpFunctions = 2; @@ -541,7 +541,7 @@ PHP_FUNCTION(dom_xpath_register_php_functions) intern = Z_XPATHOBJ_P(id); intern->registerPhpFunctions = 1; } - + } /* }}} end dom_xpath_register_php_functions */ |