archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MFH: fix ws, cs and folding

Browse source
This commit is contained in:
Antony Dovgal 2008-08-14 08:39:05 +00:00
parent fcf11ba65e
commit e18b1c00b6
37 changed files with 476 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ext/dom/attr.c
View file

@ -29,7 +29,6 @@
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_is_id, 0, 0, 0) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_is_id, 0, 0, 0)
@ -99,7 +98,6 @@ PHP_METHOD(domattr, __construct)
/* }}} end DOMAttr::__construct */ /* }}} end DOMAttr::__construct */
/* {{{ name string /* {{{ name string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1112119403 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1112119403
@ -124,8 +122,6 @@ int dom_attr_name_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ specified boolean /* {{{ specified boolean
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-862529273 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-862529273
@ -141,8 +137,6 @@ int dom_attr_specified_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ value string /* {{{ value string
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-221662474 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-221662474
@ -210,8 +204,6 @@ int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ ownerElement DOMElement /* {{{ ownerElement DOMElement
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement
@ -246,8 +238,6 @@ int dom_attr_owner_element_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ schemaTypeInfo DOMTypeInfo /* {{{ schemaTypeInfo DOMTypeInfo
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo
@ -263,8 +253,6 @@ int dom_attr_schema_type_info_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ proto boolean dom_attr_is_id(); /* {{{ proto boolean dom_attr_is_id();
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId
Since: DOM Level 3 Since: DOM Level 3
@ -290,3 +278,12 @@ PHP_FUNCTION(dom_attr_is_id)
/* }}} end dom_attr_is_id */ /* }}} end dom_attr_is_id */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

9
ext/dom/cdatasection.c
View file

@ -83,3 +83,12 @@ PHP_METHOD(domcdatasection, __construct)
/* }}} end DOMCdataSection::__construct */ /* }}} end DOMCdataSection::__construct */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

15
ext/dom/characterdata.c
View file

@ -171,7 +171,6 @@ int dom_characterdata_length_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ proto string dom_characterdata_substring_data(int offset, int count); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
Since: Since:
@ -221,7 +220,6 @@ PHP_FUNCTION(dom_characterdata_substring_data)
} }
/* }}} end dom_characterdata_substring_data */ /* }}} end dom_characterdata_substring_data */
/* {{{ proto void dom_characterdata_append_data(string arg); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F
Since: Since:
@ -256,7 +254,6 @@ PHP_FUNCTION(dom_characterdata_append_data)
} }
/* }}} end dom_characterdata_append_data */ /* }}} end dom_characterdata_append_data */
/* {{{ proto void dom_characterdata_insert_data(int offset, string arg); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F
Since: Since:
@ -305,7 +302,6 @@ PHP_FUNCTION(dom_characterdata_insert_data)
} }
/* }}} end dom_characterdata_insert_data */ /* }}} end dom_characterdata_insert_data */
/* {{{ proto void dom_characterdata_delete_data(int offset, int count); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781
Since: Since:
@ -361,7 +357,6 @@ PHP_FUNCTION(dom_characterdata_delete_data)
} }
/* }}} end dom_characterdata_delete_data */ /* }}} end dom_characterdata_delete_data */
/* {{{ proto void dom_characterdata_replace_data(int offset, int count, string arg); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB
Since: Since:
@ -423,4 +418,14 @@ PHP_FUNCTION(dom_characterdata_replace_data)
RETURN_TRUE; RETURN_TRUE;
} }
/* }}} end dom_characterdata_replace_data */ /* }}} end dom_characterdata_replace_data */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

10
ext/dom/comment.c
View file

@ -81,4 +81,14 @@ PHP_METHOD(domcomment, __construct)
} }
} }
/* }}} end DOMComment::__construct */ /* }}} end DOMComment::__construct */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

77
ext/dom/document.c
View file

@ -224,7 +224,7 @@ ZEND_END_ARG_INFO();
* Since: * Since:
*/ */
const zend_function_entry php_dom_document_class_functions[] = { const zend_function_entry php_dom_document_class_functions[] = { /* {{{ */
PHP_FALIAS(createElement, dom_document_create_element, arginfo_dom_document_create_element) PHP_FALIAS(createElement, dom_document_create_element, arginfo_dom_document_create_element)
PHP_FALIAS(createDocumentFragment, dom_document_create_document_fragment, arginfo_dom_document_create_document_fragment) PHP_FALIAS(createDocumentFragment, dom_document_create_document_fragment, arginfo_dom_document_create_document_fragment)
PHP_FALIAS(createTextNode, dom_document_create_text_node, arginfo_dom_document_create_text_node) PHP_FALIAS(createTextNode, dom_document_create_text_node, arginfo_dom_document_create_text_node)
@ -264,6 +264,7 @@ const zend_function_entry php_dom_document_class_functions[] = {
PHP_ME(domdocument, registerNodeClass, arginfo_dom_document_registernodeclass, ZEND_ACC_PUBLIC) PHP_ME(domdocument, registerNodeClass, arginfo_dom_document_registernodeclass, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* }}} */
/* {{{ docType DOMDocumentType /* {{{ docType DOMDocumentType
readonly=yes readonly=yes
@ -299,8 +300,6 @@ int dom_document_doctype_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ implementation DOMImplementation /* {{{ implementation DOMImplementation
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1B793EBA URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1B793EBA
@ -315,8 +314,6 @@ int dom_document_implementation_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ documentElement DOMElement /* {{{ documentElement DOMElement
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-87CD092 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-87CD092
@ -421,8 +418,6 @@ int dom_document_encoding_write(dom_object *obj, zval *newval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ standalone boolean /* {{{ standalone boolean
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-standalone URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-standalone
@ -487,8 +482,6 @@ int dom_document_standalone_write(dom_object *obj, zval *newval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ version string /* {{{ version string
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-version URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-version
@ -683,7 +676,6 @@ int dom_document_validate_on_parse_write(dom_object *obj, zval *newval TSRMLS_DC
} }
/* }}} */ /* }}} */
/* {{{ resolveExternals boolean /* {{{ resolveExternals boolean
readonly=no readonly=no
*/ */
@ -726,7 +718,6 @@ int dom_document_resolve_externals_write(dom_object *obj, zval *newval TSRMLS_DC
} }
/* }}} */ /* }}} */
/* {{{ preserveWhiteSpace boolean /* {{{ preserveWhiteSpace boolean
readonly=no readonly=no
*/ */
@ -811,7 +802,6 @@ int dom_document_recover_write(dom_object *obj, zval *newval TSRMLS_DC)
} }
/* }}} */ /* }}} */
/* {{{ substituteEntities boolean /* {{{ substituteEntities boolean
readonly=no readonly=no
*/ */
@ -854,7 +844,6 @@ int dom_document_substitue_entities_write(dom_object *obj, zval *newval TSRMLS_D
} }
/* }}} */ /* }}} */
/* {{{ documentURI string /* {{{ documentURI string
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-documentURI URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-documentURI
@ -919,8 +908,6 @@ int dom_document_document_uri_write(dom_object *obj, zval *newval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ config DOMConfiguration /* {{{ config DOMConfiguration
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-config URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-config
@ -935,8 +922,6 @@ int dom_document_config_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ proto DOMElement dom_document_create_element(string tagName [, string value]); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547
Since: Since:
@ -970,7 +955,6 @@ PHP_FUNCTION(dom_document_create_element)
} }
/* }}} end dom_document_create_element */ /* }}} end dom_document_create_element */
/* {{{ proto DOMDocumentFragment dom_document_create_document_fragment(); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5
Since: Since:
@ -998,7 +982,6 @@ PHP_FUNCTION(dom_document_create_document_fragment)
} }
/* }}} end dom_document_create_document_fragment */ /* }}} end dom_document_create_document_fragment */
/* {{{ proto DOMText dom_document_create_text_node(string data); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127
Since: Since:
@ -1027,7 +1010,6 @@ PHP_FUNCTION(dom_document_create_text_node)
} }
/* }}} end dom_document_create_text_node */ /* }}} end dom_document_create_text_node */
/* {{{ proto DOMComment dom_document_create_comment(string data); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328
Since: Since:
@ -1056,7 +1038,6 @@ PHP_FUNCTION(dom_document_create_comment)
} }
/* }}} end dom_document_create_comment */ /* }}} end dom_document_create_comment */
/* {{{ proto DOMCdataSection dom_document_create_cdatasection(string data); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8
Since: Since:
@ -1085,7 +1066,6 @@ PHP_FUNCTION(dom_document_create_cdatasection)
} }
/* }}} end dom_document_create_cdatasection */ /* }}} end dom_document_create_cdatasection */
/* {{{ proto DOMProcessingInstruction dom_document_create_processing_instruction(string target, string data); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439
Since: Since:
@ -1121,7 +1101,6 @@ PHP_FUNCTION(dom_document_create_processing_instruction)
} }
/* }}} end dom_document_create_processing_instruction */ /* }}} end dom_document_create_processing_instruction */
/* {{{ proto DOMAttr dom_document_create_attribute(string name); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198
Since: Since:
@ -1156,7 +1135,6 @@ PHP_FUNCTION(dom_document_create_attribute)
} }
/* }}} end dom_document_create_attribute */ /* }}} end dom_document_create_attribute */
/* {{{ proto DOMEntityReference dom_document_create_entity_reference(string name); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE
Since: Since:
@ -1190,7 +1168,6 @@ PHP_FUNCTION(dom_document_create_entity_reference)
} }
/* }}} end dom_document_create_entity_reference */ /* }}} end dom_document_create_entity_reference */
/* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name(string tagname); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094
Since: Since:
@ -1217,7 +1194,6 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name)
} }
/* }}} end dom_document_get_elements_by_tag_name */ /* }}} end dom_document_get_elements_by_tag_name */
/* {{{ proto DOMNode dom_document_import_node(DOMNode importedNode, boolean deep); /* {{{ proto DOMNode dom_document_import_node(DOMNode importedNode, boolean deep);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode
Since: DOM Level 2 Since: DOM Level 2
@ -1260,7 +1236,6 @@ PHP_FUNCTION(dom_document_import_node)
} }
/* }}} end dom_document_import_node */ /* }}} end dom_document_import_node */
/* {{{ proto DOMElement dom_document_create_element_ns(string namespaceURI, string qualifiedName [,string value]); /* {{{ proto DOMElement dom_document_create_element_ns(string namespaceURI, string qualifiedName [,string value]);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS
Since: DOM Level 2 Since: DOM Level 2
@ -1324,7 +1299,6 @@ PHP_FUNCTION(dom_document_create_element_ns)
} }
/* }}} end dom_document_create_element_ns */ /* }}} end dom_document_create_element_ns */
/* {{{ proto DOMAttr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName); /* {{{ proto DOMAttr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS
Since: DOM Level 2 Since: DOM Level 2
@ -1390,7 +1364,6 @@ PHP_FUNCTION(dom_document_create_attribute_ns)
} }
/* }}} end dom_document_create_attribute_ns */ /* }}} end dom_document_create_attribute_ns */
/* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName); /* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS
Since: DOM Level 2 Since: DOM Level 2
@ -1418,7 +1391,6 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns)
} }
/* }}} end dom_document_get_elements_by_tag_name_ns */ /* }}} end dom_document_get_elements_by_tag_name_ns */
/* {{{ proto DOMElement dom_document_get_element_by_id(string elementId); /* {{{ proto DOMElement dom_document_get_element_by_id(string elementId);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId
Since: DOM Level 2 Since: DOM Level 2
@ -1449,7 +1421,6 @@ PHP_FUNCTION(dom_document_get_element_by_id)
} }
/* }}} end dom_document_get_element_by_id */ /* }}} end dom_document_get_element_by_id */
/* {{{ proto DOMNode dom_document_adopt_node(DOMNode source); /* {{{ proto DOMNode dom_document_adopt_node(DOMNode source);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode
Since: DOM Level 3 Since: DOM Level 3
@ -1460,7 +1431,6 @@ PHP_FUNCTION(dom_document_adopt_node)
} }
/* }}} end dom_document_adopt_node */ /* }}} end dom_document_adopt_node */
/* {{{ proto void dom_document_normalize_document(); /* {{{ proto void dom_document_normalize_document();
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument
Since: DOM Level 3 Since: DOM Level 3
@ -1481,7 +1451,6 @@ PHP_FUNCTION(dom_document_normalize_document)
} }
/* }}} end dom_document_normalize_document */ /* }}} end dom_document_normalize_document */
/* {{{ proto DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName); /* {{{ proto DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-renameNode URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-renameNode
Since: DOM Level 3 Since: DOM Level 3
@ -1539,7 +1508,8 @@ PHP_METHOD(domdocument, __construct)
} }
/* }}} end DOMDocument::__construct */ /* }}} end DOMDocument::__construct */
char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len TSRMLS_DC) { char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len TSRMLS_DC) /* {{{ */
{
xmlURI *uri; xmlURI *uri;
xmlChar *escsource; xmlChar *escsource;
char *file_dest; char *file_dest;
@ -1584,10 +1554,10 @@ char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_p
return file_dest; return file_dest;
} }
/* }}} */
static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, int options TSRMLS_DC) /* {{{ */
/* {{{ */ {
static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, int options TSRMLS_DC) {
xmlDocPtr ret; xmlDocPtr ret;
xmlParserCtxtPtr ctxt = NULL; xmlParserCtxtPtr ctxt = NULL;
dom_doc_propsptr doc_props; dom_doc_propsptr doc_props;
@ -1895,7 +1865,8 @@ PHP_FUNCTION(dom_document_savexml)
} }
/* }}} end dom_document_savexml */ /* }}} end dom_document_savexml */
static xmlNodePtr php_dom_free_xinclude_node(xmlNodePtr cur TSRMLS_DC) { static xmlNodePtr php_dom_free_xinclude_node(xmlNodePtr cur TSRMLS_DC) /* {{{ */
{
xmlNodePtr xincnode; xmlNodePtr xincnode;
xincnode = cur; xincnode = cur;
@ -1905,8 +1876,10 @@ static xmlNodePtr php_dom_free_xinclude_node(xmlNodePtr cur TSRMLS_DC) {
return cur; return cur;
} }
/* }}} */
static void php_dom_remove_xinclude_nodes(xmlNodePtr cur TSRMLS_DC) { static void php_dom_remove_xinclude_nodes(xmlNodePtr cur TSRMLS_DC) /* {{{ */
{
while(cur) { while(cur) {
if (cur->type == XML_XINCLUDE_START) { if (cur->type == XML_XINCLUDE_START) {
cur = php_dom_free_xinclude_node(cur TSRMLS_CC); cur = php_dom_free_xinclude_node(cur TSRMLS_CC);
@ -1931,6 +1904,7 @@ static void php_dom_remove_xinclude_nodes(xmlNodePtr cur TSRMLS_DC) {
} }
} }
} }
/* }}} */
/* {{{ proto int dom_document_xinclude([int options]) /* {{{ proto int dom_document_xinclude([int options])
Substitutues xincludes in a DomDocument */ Substitutues xincludes in a DomDocument */
@ -1970,7 +1944,7 @@ PHP_FUNCTION(dom_document_xinclude)
} }
} }
/* }}} */
/* {{{ proto boolean dom_document_validate(); /* {{{ proto boolean dom_document_validate();
Since: DOM extended Since: DOM extended
@ -2007,11 +1981,10 @@ PHP_FUNCTION(dom_document_validate)
xmlFreeValidCtxt(cvp); xmlFreeValidCtxt(cvp);
} }
/* }}} */
#if defined(LIBXML_SCHEMAS_ENABLED) #if defined(LIBXML_SCHEMAS_ENABLED)
static void static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
_dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
{ {
zval *id; zval *id;
xmlDoc *docp; xmlDoc *docp;
@ -2084,6 +2057,7 @@ _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
RETURN_FALSE; RETURN_FALSE;
} }
} }
/* }}} */
/* {{{ proto boolean dom_document_schema_validate_file(string filename); */ /* {{{ proto boolean dom_document_schema_validate_file(string filename); */
PHP_FUNCTION(dom_document_schema_validate_file) PHP_FUNCTION(dom_document_schema_validate_file)
@ -2099,9 +2073,7 @@ PHP_FUNCTION(dom_document_schema_validate_xml)
} }
/* }}} end dom_document_schema_validate */ /* }}} end dom_document_schema_validate */
static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
static void
_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
{ {
zval *id; zval *id;
xmlDoc *docp; xmlDoc *docp;
@ -2174,6 +2146,7 @@ _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
RETURN_FALSE; RETURN_FALSE;
} }
} }
/* }}} */
/* {{{ proto boolean dom_document_relaxNG_validate_file(string filename); */ /* {{{ proto boolean dom_document_relaxNG_validate_file(string filename); */
PHP_FUNCTION(dom_document_relaxNG_validate_file) PHP_FUNCTION(dom_document_relaxNG_validate_file)
@ -2193,7 +2166,7 @@ PHP_FUNCTION(dom_document_relaxNG_validate_xml)
#if defined(LIBXML_HTML_ENABLED) #if defined(LIBXML_HTML_ENABLED)
static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
{ {
zval *id, *rv = NULL; zval *id, *rv = NULL;
xmlDoc *docp = NULL, *newdoc; xmlDoc *docp = NULL, *newdoc;
@ -2266,6 +2239,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode)
DOM_RET_OBJ(rv, (xmlNodePtr) newdoc, &ret, NULL); DOM_RET_OBJ(rv, (xmlNodePtr) newdoc, &ret, NULL);
} }
} }
/* }}} */
/* {{{ proto DOMNode dom_document_load_html_file(string source); /* {{{ proto DOMNode dom_document_load_html_file(string source);
Since: DOM extended Since: DOM extended
@ -2405,3 +2379,12 @@ PHP_METHOD(domdocument, registerNodeClass)
/* }}} */ /* }}} */
#endif /* HAVE_LIBXML && HAVE_DOM */ #endif /* HAVE_LIBXML && HAVE_DOM */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

15
ext/dom/documentfragment.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_documentfragement_construct, 0, 0, 0) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_documentfragement_construct, 0, 0, 0)
@ -88,7 +87,8 @@ PHP_METHOD(domdocumentfragment, __construct)
/* php_dom_xmlSetTreeDoc is a custom implementation of xmlSetTreeDoc /* php_dom_xmlSetTreeDoc is a custom implementation of xmlSetTreeDoc
needed for hack in appendXML due to libxml bug - no need to share this function */ needed for hack in appendXML due to libxml bug - no need to share this function */
static void php_dom_xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) { static void php_dom_xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) /* {{{ */
{
xmlAttrPtr prop; xmlAttrPtr prop;
xmlNodePtr cur; xmlNodePtr cur;
@ -117,6 +117,7 @@ static void php_dom_xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) {
tree->doc = doc; tree->doc = doc;
} }
} }
/* }}} */
/* {{{ proto void DOMDocumentFragment::appendXML(string data); */ /* {{{ proto void DOMDocumentFragment::appendXML(string data); */
PHP_METHOD(domdocumentfragment, appendXML) { PHP_METHOD(domdocumentfragment, appendXML) {
@ -154,5 +155,15 @@ PHP_METHOD(domdocumentfragment, appendXML) {
RETURN_TRUE; RETURN_TRUE;
} }
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

19
ext/dom/documenttype.c
View file

@ -62,8 +62,6 @@ int dom_documenttype_name_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ entities DOMNamedNodeMap /* {{{ entities DOMNamedNodeMap
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1788794630 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1788794630
@ -95,8 +93,6 @@ int dom_documenttype_entities_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ notations DOMNamedNodeMap /* {{{ notations DOMNamedNodeMap
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D46829EF URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D46829EF
@ -128,8 +124,6 @@ int dom_documenttype_notations_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ publicId string /* {{{ publicId string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-publicId URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-publicId
@ -158,8 +152,6 @@ int dom_documenttype_public_id_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ systemId string /* {{{ systemId string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-systemId URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-systemId
@ -187,8 +179,6 @@ int dom_documenttype_system_id_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ internalSubset string /* {{{ internalSubset string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-internalSubset URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-internalSubset
@ -232,3 +222,12 @@ int dom_documenttype_internal_subset_read(dom_object *obj, zval **retval TSRMLS_
/* }}} */ /* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

9
ext/dom/dom_ce.h
View file

@ -55,3 +55,12 @@ extern zend_class_entry *dom_xpath_class_entry;
extern zend_class_entry *dom_namespace_node_class_entry; extern zend_class_entry *dom_namespace_node_class_entry;
#endif /* DOM_CE_H */ #endif /* DOM_CE_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

9
ext/dom/dom_fe.h
View file

@ -268,3 +268,12 @@ PHP_FUNCTION(dom_xpath_register_php_functions);
#endif #endif
#endif /* DOM_FE_H */ #endif /* DOM_FE_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

42
ext/dom/dom_iterators.c
View file

@ -42,7 +42,8 @@ struct _notationIterator {
xmlNotation *notation; xmlNotation *notation;
}; };
static void itemHashScanner (void *payload, void *data, xmlChar *name) { static void itemHashScanner (void *payload, void *data, xmlChar *name) /* {{{ */
{
nodeIterator *priv = (nodeIterator *)data; nodeIterator *priv = (nodeIterator *)data;
if(priv->cur < priv->index) { if(priv->cur < priv->index) {
@ -53,9 +54,10 @@ static void itemHashScanner (void *payload, void *data, xmlChar *name) {
} }
} }
} }
/* }}} */
xmlNodePtr create_notation(const xmlChar *name, xmlNodePtr create_notation(const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID) /* {{{ */
const xmlChar *ExternalID, const xmlChar *SystemID) { {
xmlEntityPtr ret; xmlEntityPtr ret;
ret = (xmlEntityPtr) xmlMalloc(sizeof(xmlEntity)); ret = (xmlEntityPtr) xmlMalloc(sizeof(xmlEntity));
@ -76,8 +78,9 @@ xmlNodePtr create_notation(const xmlChar *name,
ret->prev = NULL; ret->prev = NULL;
return((xmlNodePtr) ret); return((xmlNodePtr) ret);
} }
/* }}} */
xmlNode *php_dom_libxml_hash_iter(xmlHashTable *ht, int index) xmlNode *php_dom_libxml_hash_iter(xmlHashTable *ht, int index) /* {{{ */
{ {
xmlNode *nodep = NULL; xmlNode *nodep = NULL;
nodeIterator *iter; nodeIterator *iter;
@ -96,8 +99,9 @@ xmlNode *php_dom_libxml_hash_iter(xmlHashTable *ht, int index)
return NULL; return NULL;
} }
} }
/* }}} */
xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index) xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index) /* {{{ */
{ {
notationIterator *iter; notationIterator *iter;
xmlNotation *notep = NULL; xmlNotation *notep = NULL;
@ -116,8 +120,9 @@ xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index)
return NULL; return NULL;
} }
} }
/* }}} */
static void php_dom_iterator_dtor(zend_object_iterator *iter TSRMLS_DC) static void php_dom_iterator_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{ {
php_dom_iterator *iterator = (php_dom_iterator *)iter; php_dom_iterator *iterator = (php_dom_iterator *)iter;
@ -129,8 +134,9 @@ static void php_dom_iterator_dtor(zend_object_iterator *iter TSRMLS_DC)
efree(iterator); efree(iterator);
} }
/* }}} */
static int php_dom_iterator_valid(zend_object_iterator *iter TSRMLS_DC) static int php_dom_iterator_valid(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{ {
php_dom_iterator *iterator = (php_dom_iterator *)iter; php_dom_iterator *iterator = (php_dom_iterator *)iter;
@ -141,15 +147,17 @@ static int php_dom_iterator_valid(zend_object_iterator *iter TSRMLS_DC)
return FAILURE; return FAILURE;
} }
} }
/* }}} */
static void php_dom_iterator_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) static void php_dom_iterator_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) /* {{{ */
{ {
php_dom_iterator *iterator = (php_dom_iterator *)iter; php_dom_iterator *iterator = (php_dom_iterator *)iter;
*data = &iterator->curobj; *data = &iterator->curobj;
} }
/* }}} */
static int php_dom_iterator_current_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, ulong *int_key TSRMLS_DC) static int php_dom_iterator_current_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, ulong *int_key TSRMLS_DC) /* {{{ */
{ {
zval *curobj; zval *curobj;
xmlNodePtr curnode = NULL; xmlNodePtr curnode = NULL;
@ -180,8 +188,9 @@ static int php_dom_iterator_current_key(zend_object_iterator *iter, char **str_k
return HASH_KEY_IS_STRING; return HASH_KEY_IS_STRING;
} }
} }
/* }}} */
static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{ {
zval *curobj, *curattr = NULL; zval *curobj, *curattr = NULL;
zval *object; zval *object;
@ -247,6 +256,7 @@ err:
iterator->curobj = curattr; iterator->curobj = curattr;
} }
/* }}} */
zend_object_iterator_funcs php_dom_iterator_funcs = { zend_object_iterator_funcs php_dom_iterator_funcs = {
php_dom_iterator_dtor, php_dom_iterator_dtor,
@ -257,7 +267,7 @@ zend_object_iterator_funcs php_dom_iterator_funcs = {
NULL NULL
}; };
zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) /* {{{ */
{ {
dom_object *intern; dom_object *intern;
dom_nnodemap_object *objmap; dom_nnodemap_object *objmap;
@ -327,5 +337,15 @@ err:
return (zend_object_iterator*)iterator; return (zend_object_iterator*)iterator;
} }
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

9
ext/dom/dom_properties.h
View file

@ -160,3 +160,12 @@ int dom_xpath_document_read(dom_object *obj, zval **retval TSRMLS_DC);
#endif #endif
#endif /* DOM_PROPERTIERS_H */ #endif /* DOM_PROPERTIERS_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

16
ext/dom/domconfiguration.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_set_parameter, 0, 0, 2) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_set_parameter, 0, 0, 2)
@ -63,7 +62,6 @@ const zend_function_entry php_dom_domconfiguration_class_functions[] = {
/* {{{ attribute protos, not implemented yet */ /* {{{ attribute protos, not implemented yet */
/* {{{ proto dom_void dom_domconfiguration_set_parameter(string name, domuserdata value); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-property
Since: Since:
@ -74,7 +72,6 @@ PHP_FUNCTION(dom_domconfiguration_set_parameter)
} }
/* }}} end dom_domconfiguration_set_parameter */ /* }}} end dom_domconfiguration_set_parameter */
/* {{{ proto domdomuserdata dom_domconfiguration_get_parameter(string name); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-getParameter
Since: Since:
@ -85,7 +82,6 @@ PHP_FUNCTION(dom_domconfiguration_get_parameter)
} }
/* }}} end dom_domconfiguration_get_parameter */ /* }}} end dom_domconfiguration_get_parameter */
/* {{{ proto boolean dom_domconfiguration_can_set_parameter(string name, domuserdata value); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-canSetParameter
Since: Since:
@ -95,4 +91,16 @@ PHP_FUNCTION(dom_domconfiguration_can_set_parameter)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_domconfiguration_can_set_parameter */ /* }}} end dom_domconfiguration_can_set_parameter */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

21
ext/dom/domerror.c
View file

@ -55,8 +55,6 @@ int dom_domerror_severity_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ message string /* {{{ message string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-message URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-message
@ -71,8 +69,6 @@ int dom_domerror_message_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ type string /* {{{ type string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-type URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-type
@ -87,8 +83,6 @@ int dom_domerror_type_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ relatedException object /* {{{ relatedException object
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedException URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedException
@ -103,8 +97,6 @@ int dom_domerror_related_exception_read(dom_object *obj, zval **retval TSRMLS_DC
/* }}} */ /* }}} */
/* {{{ relatedData domobject /* {{{ relatedData domobject
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedData URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedData
@ -119,8 +111,6 @@ int dom_domerror_related_data_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ location domlocator /* {{{ location domlocator
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-location URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-location
@ -135,4 +125,15 @@ int dom_domerror_location_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

14
ext/dom/domerrorhandler.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_domerrorhandler_handle_error, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_domerrorhandler_handle_error, 0, 0, 1)
@ -49,7 +48,6 @@ const zend_function_entry php_dom_domerrorhandler_class_functions[] = {
/* {{{ attribute protos, not implemented yet */ /* {{{ attribute protos, not implemented yet */
/* {{{ proto dom_boolean dom_domerrorhandler_handle_error(domerror error); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-ERRORS-DOMErrorHandler-handleError
Since: Since:
@ -59,4 +57,16 @@ PHP_FUNCTION(dom_domerrorhandler_handle_error)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_domerrorhandler_handle_error */ /* }}} end dom_domerrorhandler_handle_error */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

14
ext/dom/domexception.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* /*
* class DOMException * class DOMException
* *
@ -41,8 +40,7 @@ const zend_function_entry php_dom_domexception_class_functions[] = {
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* {{{ php_dom_throw_error_with_message */ void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error TSRMLS_DC) /* {{{ */
void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error TSRMLS_DC)
{ {
if (strict_error == 1) { if (strict_error == 1) {
zend_throw_exception(dom_domexception_class_entry, error_message, error_code TSRMLS_CC); zend_throw_exception(dom_domexception_class_entry, error_message, error_code TSRMLS_CC);
@ -50,6 +48,7 @@ void php_dom_throw_error_with_message(int error_code, char *error_message, int s
php_libxml_issue_error(E_WARNING, error_message TSRMLS_CC); php_libxml_issue_error(E_WARNING, error_message TSRMLS_CC);
} }
} }
/* }}} */
/* {{{ php_dom_throw_error */ /* {{{ php_dom_throw_error */
void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC) void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC)
@ -115,3 +114,12 @@ void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC)
/* }}} end php_dom_throw_error */ /* }}} end php_dom_throw_error */
#endif /* HAVE_LIBXML && HAVE_DOM */ #endif /* HAVE_LIBXML && HAVE_DOM */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

13
ext/dom/domimplementation.c
View file

@ -89,7 +89,6 @@ PHP_METHOD(domimplementation, hasFeature)
} }
/* }}} end dom_domimplementation_has_feature */ /* }}} end dom_domimplementation_has_feature */
/* {{{ proto DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId); /* {{{ proto DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType
Since: DOM Level 2 Since: DOM Level 2
@ -150,7 +149,6 @@ PHP_METHOD(domimplementation, createDocumentType)
} }
/* }}} end dom_domimplementation_create_document_type */ /* }}} end dom_domimplementation_create_document_type */
/* {{{ proto DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype); /* {{{ proto DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument
Since: DOM Level 2 Since: DOM Level 2
@ -253,7 +251,6 @@ PHP_METHOD(domimplementation, createDocument)
} }
/* }}} end dom_domimplementation_create_document */ /* }}} end dom_domimplementation_create_document */
/* {{{ proto DOMNode dom_domimplementation_get_feature(string feature, string version); /* {{{ proto DOMNode dom_domimplementation_get_feature(string feature, string version);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature
Since: DOM Level 3 Since: DOM Level 3
@ -263,4 +260,14 @@ PHP_METHOD(domimplementation, getFeature)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_domimplementation_get_feature */ /* }}} end dom_domimplementation_get_feature */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

16
ext/dom/domimplementationlist.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementationlist_item, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementationlist_item, 0, 0, 1)
@ -63,9 +62,6 @@ int dom_domimplementationlist_length_read(dom_object *obj, zval **retval TSRMLS_
/* }}} */ /* }}} */
/* {{{ proto domdomimplementation dom_domimplementationlist_item(int index); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationList-item
Since: Since:
@ -75,4 +71,16 @@ PHP_FUNCTION(dom_domimplementationlist_item)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_domimplementationlist_item */ /* }}} end dom_domimplementationlist_item */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

14
ext/dom/domimplementationsource.c
View file

@ -55,7 +55,6 @@ const zend_function_entry php_dom_domimplementationsource_class_functions[] = {
/* {{{ attribute protos, not implemented yet */ /* {{{ attribute protos, not implemented yet */
/* {{{ proto domdomimplementation dom_domimplementationsource_get_domimplementation(string features); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-getDOMImpl
Since: Since:
@ -66,7 +65,6 @@ PHP_FUNCTION(dom_domimplementationsource_get_domimplementation)
} }
/* }}} end dom_domimplementationsource_get_domimplementation */ /* }}} end dom_domimplementationsource_get_domimplementation */
/* {{{ proto domimplementationlist dom_domimplementationsource_get_domimplementations(string features); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-getDOMImpls
Since: Since:
@ -76,4 +74,16 @@ PHP_FUNCTION(dom_domimplementationsource_get_domimplementations)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_domimplementationsource_get_domimplementations */ /* }}} end dom_domimplementationsource_get_domimplementations */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

18
ext/dom/domlocator.c
View file

@ -55,8 +55,6 @@ int dom_domlocator_line_number_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ column_number long /* {{{ column_number long
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-column-number URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-column-number
@ -71,8 +69,6 @@ int dom_domlocator_column_number_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ offset long /* {{{ offset long
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-offset URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-offset
@ -87,8 +83,6 @@ int dom_domlocator_offset_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ related_node node /* {{{ related_node node
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-node URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-node
@ -103,8 +97,6 @@ int dom_domlocator_related_node_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ uri string /* {{{ uri string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-uri URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-uri
@ -119,5 +111,15 @@ int dom_domlocator_uri_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

16
ext/dom/domstringlist.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_stringlist_item, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_stringlist_item, 0, 0, 1)
@ -63,9 +62,6 @@ int dom_domstringlist_length_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ proto domstring dom_domstringlist_item(int index); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-item
Since: Since:
@ -75,4 +71,16 @@ PHP_FUNCTION(dom_domstringlist_item)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_domstringlist_item */ /* }}} end dom_domstringlist_item */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

43
ext/dom/element.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute, 0, 0, 1)
@ -146,7 +145,7 @@ ZEND_END_ARG_INFO();
* Since: * Since:
*/ */
const zend_function_entry php_dom_element_class_functions[] = { const zend_function_entry php_dom_element_class_functions[] = { /* {{{ */
PHP_FALIAS(getAttribute, dom_element_get_attribute, arginfo_dom_element_get_attribute) PHP_FALIAS(getAttribute, dom_element_get_attribute, arginfo_dom_element_get_attribute)
PHP_FALIAS(setAttribute, dom_element_set_attribute, arginfo_dom_element_set_attribute) PHP_FALIAS(setAttribute, dom_element_set_attribute, arginfo_dom_element_set_attribute)
PHP_FALIAS(removeAttribute, dom_element_remove_attribute, arginfo_dom_element_remove_attribute) PHP_FALIAS(removeAttribute, dom_element_remove_attribute, arginfo_dom_element_remove_attribute)
@ -168,6 +167,7 @@ const zend_function_entry php_dom_element_class_functions[] = {
PHP_ME(domelement, __construct, arginfo_dom_element_construct, ZEND_ACC_PUBLIC) PHP_ME(domelement, __construct, arginfo_dom_element_construct, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* }}} */
/* {{{ proto void DOMElement::__construct(string name, [string value], [string uri]); */ /* {{{ proto void DOMElement::__construct(string name, [string value], [string uri]); */
PHP_METHOD(domelement, __construct) PHP_METHOD(domelement, __construct)
@ -283,8 +283,6 @@ int dom_element_tag_name_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ schemaTypeInfo typeinfo /* {{{ schemaTypeInfo typeinfo
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Element-schemaTypeInfo URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Element-schemaTypeInfo
@ -299,7 +297,8 @@ int dom_element_schema_type_info_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
static xmlNodePtr dom_get_dom1_attribute(xmlNodePtr elem, xmlChar *name) { static xmlNodePtr dom_get_dom1_attribute(xmlNodePtr elem, xmlChar *name) /* {{{ */
{
int len; int len;
const xmlChar *nqname; const xmlChar *nqname;
@ -339,6 +338,7 @@ static xmlNodePtr dom_get_dom1_attribute(xmlNodePtr elem, xmlChar *name) {
} }
return (xmlNodePtr)xmlHasNsProp(elem, name, NULL); return (xmlNodePtr)xmlHasNsProp(elem, name, NULL);
} }
/* }}} */
/* {{{ proto string dom_element_get_attribute(string name); /* {{{ proto string dom_element_get_attribute(string name);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9
@ -383,7 +383,6 @@ PHP_FUNCTION(dom_element_get_attribute)
} }
/* }}} end dom_element_get_attribute */ /* }}} end dom_element_get_attribute */
/* {{{ proto void dom_element_set_attribute(string name, string value); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082
Since: Since:
@ -450,7 +449,6 @@ PHP_FUNCTION(dom_element_set_attribute)
} }
/* }}} end dom_element_set_attribute */ /* }}} end dom_element_set_attribute */
/* {{{ proto void dom_element_remove_attribute(string name); /* {{{ proto void dom_element_remove_attribute(string name);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9
Since: Since:
@ -499,7 +497,6 @@ PHP_FUNCTION(dom_element_remove_attribute)
} }
/* }}} end dom_element_remove_attribute */ /* }}} end dom_element_remove_attribute */
/* {{{ proto DOMAttr dom_element_get_attribute_node(string name); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8
Since: Since:
@ -546,7 +543,6 @@ PHP_FUNCTION(dom_element_get_attribute_node)
} }
/* }}} end dom_element_get_attribute_node */ /* }}} end dom_element_get_attribute_node */
/* {{{ proto DOMAttr dom_element_set_attribute_node(DOMAttr newAttr); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154
Since: Since:
@ -613,7 +609,6 @@ PHP_FUNCTION(dom_element_set_attribute_node)
} }
/* }}} end dom_element_set_attribute_node */ /* }}} end dom_element_set_attribute_node */
/* {{{ proto DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198
Since: Since:
@ -651,7 +646,6 @@ PHP_FUNCTION(dom_element_remove_attribute_node)
} }
/* }}} end dom_element_remove_attribute_node */ /* }}} end dom_element_remove_attribute_node */
/* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name(string name); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D
Since: Since:
@ -678,7 +672,6 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name)
} }
/* }}} end dom_element_get_elements_by_tag_name */ /* }}} end dom_element_get_elements_by_tag_name */
/* {{{ proto string dom_element_get_attribute_ns(string namespaceURI, string localName); /* {{{ proto string dom_element_get_attribute_ns(string namespaceURI, string localName);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS
Since: DOM Level 2 Since: DOM Level 2
@ -720,7 +713,8 @@ PHP_FUNCTION(dom_element_get_attribute_ns)
} }
/* }}} end dom_element_get_attribute_ns */ /* }}} end dom_element_get_attribute_ns */
static xmlNsPtr _dom_new_reconNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) { static xmlNsPtr _dom_new_reconNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) /* {{{ */
{
xmlNsPtr def; xmlNsPtr def;
xmlChar prefix[50]; xmlChar prefix[50];
int counter = 1; int counter = 1;
@ -756,6 +750,7 @@ static xmlNsPtr _dom_new_reconNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) {
def = xmlNewNs(tree, ns->href, prefix); def = xmlNewNs(tree, ns->href, prefix);
return(def); return(def);
} }
/* }}} */
/* {{{ proto void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value); /* {{{ proto void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS
@ -874,7 +869,6 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
} }
/* }}} end dom_element_set_attribute_ns */ /* }}} end dom_element_set_attribute_ns */
/* {{{ proto void dom_element_remove_attribute_ns(string namespaceURI, string localName); /* {{{ proto void dom_element_remove_attribute_ns(string namespaceURI, string localName);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS
Since: DOM Level 2 Since: DOM Level 2
@ -932,7 +926,6 @@ PHP_FUNCTION(dom_element_remove_attribute_ns)
} }
/* }}} end dom_element_remove_attribute_ns */ /* }}} end dom_element_remove_attribute_ns */
/* {{{ proto DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName); /* {{{ proto DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS
Since: DOM Level 2 Since: DOM Level 2
@ -963,7 +956,6 @@ PHP_FUNCTION(dom_element_get_attribute_node_ns)
} }
/* }}} end dom_element_get_attribute_node_ns */ /* }}} end dom_element_get_attribute_node_ns */
/* {{{ proto DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr); /* {{{ proto DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS
Since: DOM Level 2 Since: DOM Level 2
@ -1037,8 +1029,6 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns)
} }
/* }}} end dom_element_set_attribute_node_ns */ /* }}} end dom_element_set_attribute_node_ns */
/* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName); /* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942
Since: DOM Level 2 Since: DOM Level 2
@ -1067,7 +1057,6 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name_ns)
} }
/* }}} end dom_element_get_elements_by_tag_name_ns */ /* }}} end dom_element_get_elements_by_tag_name_ns */
/* {{{ proto boolean dom_element_has_attribute(string name); /* {{{ proto boolean dom_element_has_attribute(string name);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttr URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttr
Since: DOM Level 2 Since: DOM Level 2
@ -1096,7 +1085,6 @@ PHP_FUNCTION(dom_element_has_attribute)
} }
/* }}} end dom_element_has_attribute */ /* }}} end dom_element_has_attribute */
/* {{{ proto boolean dom_element_has_attribute_ns(string namespaceURI, string localName); /* {{{ proto boolean dom_element_has_attribute_ns(string namespaceURI, string localName);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttrNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttrNS
Since: DOM Level 2 Since: DOM Level 2
@ -1135,8 +1123,7 @@ PHP_FUNCTION(dom_element_has_attribute_ns)
} }
/* }}} end dom_element_has_attribute_ns */ /* }}} end dom_element_has_attribute_ns */
static void php_set_attribute_id(xmlAttrPtr attrp, zend_bool is_id) /* {{{ */
static void php_set_attribute_id(xmlAttrPtr attrp, zend_bool is_id)
{ {
if (is_id == 1 && attrp->atype != XML_ATTRIBUTE_ID) { if (is_id == 1 && attrp->atype != XML_ATTRIBUTE_ID) {
xmlChar *id_val; xmlChar *id_val;
@ -1153,6 +1140,7 @@ static void php_set_attribute_id(xmlAttrPtr attrp, zend_bool is_id)
} }
} }
} }
/* }}} */
/* {{{ proto void dom_element_set_id_attribute(string name, boolean isId); /* {{{ proto void dom_element_set_id_attribute(string name, boolean isId);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr
@ -1190,7 +1178,6 @@ PHP_FUNCTION(dom_element_set_id_attribute)
} }
/* }}} end dom_element_set_id_attribute */ /* }}} end dom_element_set_id_attribute */
/* {{{ proto void dom_element_set_id_attribute_ns(string namespaceURI, string localName, boolean isId); /* {{{ proto void dom_element_set_id_attribute_ns(string namespaceURI, string localName, boolean isId);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS
Since: DOM Level 3 Since: DOM Level 3
@ -1227,7 +1214,6 @@ PHP_FUNCTION(dom_element_set_id_attribute_ns)
} }
/* }}} end dom_element_set_id_attribute_ns */ /* }}} end dom_element_set_id_attribute_ns */
/* {{{ proto void dom_element_set_id_attribute_node(attr idAttr, boolean isId); /* {{{ proto void dom_element_set_id_attribute_node(attr idAttr, boolean isId);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode
Since: DOM Level 3 Since: DOM Level 3
@ -1264,3 +1250,12 @@ PHP_FUNCTION(dom_element_set_id_attribute_node)
/* }}} end dom_element_set_id_attribute_node */ /* }}} end dom_element_set_id_attribute_node */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

19
ext/dom/entity.c
View file

@ -67,8 +67,6 @@ int dom_entity_public_id_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ systemId string /* {{{ systemId string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-D7C29F3E URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-D7C29F3E
@ -97,8 +95,6 @@ int dom_entity_system_id_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ notationName string /* {{{ notationName string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-6ABAEB38 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-6ABAEB38
@ -130,8 +126,6 @@ int dom_entity_notation_name_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ actualEncoding string /* {{{ actualEncoding string
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-actualEncoding URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-actualEncoding
@ -151,8 +145,6 @@ int dom_entity_actual_encoding_write(dom_object *obj, zval *newval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ encoding string /* {{{ encoding string
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-encoding URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-encoding
@ -172,8 +164,6 @@ int dom_entity_encoding_write(dom_object *obj, zval *newval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ version string /* {{{ version string
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-version URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-version
@ -194,3 +184,12 @@ int dom_entity_version_write(dom_object *obj, zval *newval TSRMLS_DC)
/* }}} */ /* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

12
ext/dom/entityreference.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_entityreference_construct, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_entityreference_construct, 0, 0, 1)
@ -87,6 +86,15 @@ PHP_METHOD(domentityreference, __construct)
php_libxml_increment_node_ptr((php_libxml_node_object *)intern, node, (void *)intern TSRMLS_CC); php_libxml_increment_node_ptr((php_libxml_node_object *)intern, node, (void *)intern TSRMLS_CC);
} }
} }
/* }}} end DOMEntityReference::__construct */ /* }}} end DOMEntityReference::__construct */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

23
ext/dom/namednodemap.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item, 0, 0, 1)
@ -74,7 +73,7 @@ ZEND_END_ARG_INFO();
* Since: * Since:
*/ */
const zend_function_entry php_dom_namednodemap_class_functions[] = { const zend_function_entry php_dom_namednodemap_class_functions[] = { /* {{{ */
PHP_FALIAS(getNamedItem, dom_namednodemap_get_named_item, arginfo_dom_namednodemap_get_named_item) PHP_FALIAS(getNamedItem, dom_namednodemap_get_named_item, arginfo_dom_namednodemap_get_named_item)
PHP_FALIAS(setNamedItem, dom_namednodemap_set_named_item, arginfo_dom_namednodemap_set_named_item) PHP_FALIAS(setNamedItem, dom_namednodemap_set_named_item, arginfo_dom_namednodemap_set_named_item)
PHP_FALIAS(removeNamedItem, dom_namednodemap_remove_named_item, arginfo_dom_namednodemap_remove_named_item) PHP_FALIAS(removeNamedItem, dom_namednodemap_remove_named_item, arginfo_dom_namednodemap_remove_named_item)
@ -84,6 +83,7 @@ const zend_function_entry php_dom_namednodemap_class_functions[] = {
PHP_FALIAS(removeNamedItemNS, dom_namednodemap_remove_named_item_ns, arginfo_dom_namednodemap_remove_named_item_ns) PHP_FALIAS(removeNamedItemNS, dom_namednodemap_remove_named_item_ns, arginfo_dom_namednodemap_remove_named_item_ns)
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* }}} */
/* {{{ length int /* {{{ length int
readonly=yes readonly=yes
@ -127,9 +127,6 @@ int dom_namednodemap_length_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ proto DOMNode dom_namednodemap_get_named_item(string name); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549
Since: Since:
@ -184,7 +181,6 @@ PHP_FUNCTION(dom_namednodemap_get_named_item)
} }
/* }}} end dom_namednodemap_get_named_item */ /* }}} end dom_namednodemap_get_named_item */
/* {{{ proto DOMNode dom_namednodemap_set_named_item(DOMNode arg); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1025163788
Since: Since:
@ -195,7 +191,6 @@ PHP_FUNCTION(dom_namednodemap_set_named_item)
} }
/* }}} end dom_namednodemap_set_named_item */ /* }}} end dom_namednodemap_set_named_item */
/* {{{ proto DOMNode dom_namednodemap_remove_named_item(string name); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D58B193
Since: Since:
@ -206,7 +201,6 @@ PHP_FUNCTION(dom_namednodemap_remove_named_item)
} }
/* }}} end dom_namednodemap_remove_named_item */ /* }}} end dom_namednodemap_remove_named_item */
/* {{{ proto DOMNode dom_namednodemap_item(int index); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9
Since: Since:
@ -265,7 +259,6 @@ PHP_FUNCTION(dom_namednodemap_item)
} }
/* }}} end dom_namednodemap_item */ /* }}} end dom_namednodemap_item */
/* {{{ proto DOMNode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName); /* {{{ proto DOMNode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS
Since: DOM Level 2 Since: DOM Level 2
@ -320,7 +313,6 @@ PHP_FUNCTION(dom_namednodemap_get_named_item_ns)
} }
/* }}} end dom_namednodemap_get_named_item_ns */ /* }}} end dom_namednodemap_get_named_item_ns */
/* {{{ proto DOMNode dom_namednodemap_set_named_item_ns(DOMNode arg); /* {{{ proto DOMNode dom_namednodemap_set_named_item_ns(DOMNode arg);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-setNamedItemNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-setNamedItemNS
Since: DOM Level 2 Since: DOM Level 2
@ -331,7 +323,6 @@ PHP_FUNCTION(dom_namednodemap_set_named_item_ns)
} }
/* }}} end dom_namednodemap_set_named_item_ns */ /* }}} end dom_namednodemap_set_named_item_ns */
/* {{{ proto DOMNode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName); /* {{{ proto DOMNode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-removeNamedItemNS URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-removeNamedItemNS
Since: DOM Level 2 Since: DOM Level 2
@ -341,4 +332,14 @@ PHP_FUNCTION(dom_namednodemap_remove_named_item_ns)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_namednodemap_remove_named_item_ns */ /* }}} end dom_namednodemap_remove_named_item_ns */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

15
ext/dom/namelist.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namelist_get_name, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namelist_get_name, 0, 0, 1)
@ -67,9 +66,6 @@ int dom_namelist_length_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ proto string dom_namelist_get_name(int index); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getName
Since: Since:
@ -80,7 +76,6 @@ PHP_FUNCTION(dom_namelist_get_name)
} }
/* }}} end dom_namelist_get_name */ /* }}} end dom_namelist_get_name */
/* {{{ proto string dom_namelist_get_namespace_uri(int index); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getNamespaceURI
Since: Since:
@ -90,4 +85,14 @@ PHP_FUNCTION(dom_namelist_get_namespace_uri)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_namelist_get_namespace_uri */ /* }}} end dom_namelist_get_namespace_uri */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

84
ext/dom/node.c
View file

@ -150,7 +150,7 @@ ZEND_END_ARG_INFO();
* Since: * Since:
*/ */
const zend_function_entry php_dom_node_class_functions[] = { const zend_function_entry php_dom_node_class_functions[] = { /* {{{ */
PHP_FALIAS(insertBefore, dom_node_insert_before, arginfo_dom_node_insert_before) PHP_FALIAS(insertBefore, dom_node_insert_before, arginfo_dom_node_insert_before)
PHP_FALIAS(replaceChild, dom_node_replace_child, arginfo_dom_node_replace_child) PHP_FALIAS(replaceChild, dom_node_replace_child, arginfo_dom_node_replace_child)
PHP_FALIAS(removeChild, dom_node_remove_child, arginfo_dom_node_remove_child) PHP_FALIAS(removeChild, dom_node_remove_child, arginfo_dom_node_remove_child)
@ -174,8 +174,10 @@ const zend_function_entry php_dom_node_class_functions[] = {
PHP_ME(domnode, C14NFile, arginfo_dom_node_C14NFile, ZEND_ACC_PUBLIC) PHP_ME(domnode, C14NFile, arginfo_dom_node_C14NFile, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* }}} */
static void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep) { static void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep) /* {{{ */
{
xmlNsPtr nsptr; xmlNsPtr nsptr;
if (nodep->type == XML_ELEMENT_NODE) { if (nodep->type == XML_ELEMENT_NODE) {
@ -190,6 +192,7 @@ static void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep) {
xmlReconciliateNs(doc, nodep); xmlReconciliateNs(doc, nodep);
} }
} }
/* }}} */
/* {{{ nodeName string /* {{{ nodeName string
readonly=yes readonly=yes
@ -281,8 +284,6 @@ int dom_node_node_name_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ nodeValue string /* {{{ nodeValue string
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68D080 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68D080
@ -377,8 +378,6 @@ int dom_node_node_value_write(dom_object *obj, zval *newval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ nodeType int /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-111237558
@ -409,8 +408,6 @@ int dom_node_node_type_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ parentNode DomNode /* {{{ parentNode DomNode
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1060184317 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1060184317
@ -444,8 +441,6 @@ int dom_node_parent_node_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ childNodes DomNodeList /* {{{ childNodes DomNodeList
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1451460987 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1451460987
@ -478,8 +473,6 @@ int dom_node_child_nodes_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ firstChild DomNode /* {{{ firstChild DomNode
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-169727388 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-169727388
@ -516,8 +509,6 @@ int dom_node_first_child_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ lastChild DomNode /* {{{ lastChild DomNode
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-61AD09FB URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-61AD09FB
@ -554,8 +545,6 @@ int dom_node_last_child_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ previousSibling DomNode /* {{{ previousSibling DomNode
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-640FB3C8 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-640FB3C8
@ -589,8 +578,6 @@ int dom_node_previous_sibling_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ nextSibling DomNode /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6AC54C2F
@ -624,8 +611,6 @@ int dom_node_next_sibling_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ attributes DomNamedNodeMap /* {{{ attributes DomNamedNodeMap
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-84CF096 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-84CF096
@ -658,8 +643,6 @@ int dom_node_attributes_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ ownerDocument DomDocument /* {{{ ownerDocument DomDocument
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-node-ownerDoc URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-node-ownerDoc
@ -700,8 +683,6 @@ int dom_node_owner_document_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ namespaceUri string /* {{{ namespaceUri string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSname URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSname
@ -745,8 +726,6 @@ int dom_node_namespace_uri_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ prefix string /* {{{ prefix string
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSPrefix URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSPrefix
@ -869,8 +848,6 @@ int dom_node_prefix_write(dom_object *obj, zval *newval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ localName string /* {{{ localName string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSLocalN URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSLocalN
@ -900,8 +877,6 @@ int dom_node_local_name_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ baseURI string /* {{{ baseURI string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-baseURI URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-baseURI
@ -934,8 +909,6 @@ int dom_node_base_uri_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ textContent string /* {{{ textContent string
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-textContent URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-textContent
@ -974,10 +947,7 @@ int dom_node_text_content_write(dom_object *obj, zval *newval TSRMLS_DC)
/* }}} */ /* }}} */
static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib, xmlNodePtr nextsib, xmlNodePtr fragment, dom_object *intern, dom_object *childobj TSRMLS_DC) /* {{{ */
static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib,
xmlNodePtr nextsib, xmlNodePtr fragment,
dom_object *intern, dom_object *childobj TSRMLS_DC)
{ {
xmlNodePtr newchild, node; xmlNodePtr newchild, node;
@ -1020,6 +990,7 @@ static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib,
return newchild; return newchild;
} }
/* }}} */
/* {{{ proto domnode dom_node_insert_before(DomNode newChild, DomNode refChild); /* {{{ proto domnode dom_node_insert_before(DomNode newChild, DomNode refChild);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727
@ -1182,7 +1153,6 @@ PHP_FUNCTION(dom_node_insert_before)
} }
/* }}} end dom_node_insert_before */ /* }}} end dom_node_insert_before */
/* {{{ proto DomNode dom_node_replace_child(DomNode newChild, DomNode oldChild); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307
Since: Since:
@ -1274,7 +1244,6 @@ PHP_FUNCTION(dom_node_replace_child)
} }
/* }}} end dom_node_replace_child */ /* }}} end dom_node_replace_child */
/* {{{ proto DomNode dom_node_remove_child(DomNode oldChild); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066
Since: Since:
@ -1327,7 +1296,6 @@ PHP_FUNCTION(dom_node_remove_child)
} }
/* }}} end dom_node_remove_child */ /* }}} end dom_node_remove_child */
/* {{{ proto DomNode dom_node_append_child(DomNode newChild); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107
Since: Since:
@ -1429,7 +1397,6 @@ PHP_FUNCTION(dom_node_append_child)
} }
/* }}} end dom_node_append_child */ /* }}} end dom_node_append_child */
/* {{{ proto boolean dom_node_has_child_nodes(); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-810594187
Since: Since:
@ -1458,7 +1425,6 @@ PHP_FUNCTION(dom_node_has_child_nodes)
} }
/* }}} end dom_node_has_child_nodes */ /* }}} end dom_node_has_child_nodes */
/* {{{ proto DomNode dom_node_clone_node(boolean deep); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4
Since: Since:
@ -1521,8 +1487,6 @@ PHP_FUNCTION(dom_node_clone_node)
} }
/* }}} end dom_node_clone_node */ /* }}} end dom_node_clone_node */
/* {{{ proto void dom_node_normalize(); /* {{{ proto void dom_node_normalize();
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize
Since: Since:
@ -1544,7 +1508,6 @@ PHP_FUNCTION(dom_node_normalize)
} }
/* }}} end dom_node_normalize */ /* }}} end dom_node_normalize */
/* {{{ proto boolean dom_node_is_supported(string feature, string version); /* {{{ proto boolean dom_node_is_supported(string feature, string version);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Level-2-Core-Node-supports URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Level-2-Core-Node-supports
Since: DOM Level 2 Since: DOM Level 2
@ -1567,7 +1530,6 @@ PHP_FUNCTION(dom_node_is_supported)
} }
/* }}} end dom_node_is_supported */ /* }}} end dom_node_is_supported */
/* {{{ proto boolean dom_node_has_attributes(); /* {{{ proto boolean dom_node_has_attributes();
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeHasAttrs URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeHasAttrs
Since: DOM Level 2 Since: DOM Level 2
@ -1605,7 +1567,6 @@ PHP_FUNCTION(dom_node_compare_document_position)
} }
/* }}} end dom_node_compare_document_position */ /* }}} end dom_node_compare_document_position */
/* {{{ proto boolean dom_node_is_same_node(DomNode other); /* {{{ proto boolean dom_node_is_same_node(DomNode other);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode
Since: DOM Level 3 Since: DOM Level 3
@ -1632,7 +1593,6 @@ PHP_FUNCTION(dom_node_is_same_node)
} }
/* }}} end dom_node_is_same_node */ /* }}} end dom_node_is_same_node */
/* {{{ proto string dom_node_lookup_prefix(string namespaceURI); /* {{{ proto string dom_node_lookup_prefix(string namespaceURI);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix
Since: DOM Level 3 Since: DOM Level 3
@ -1683,7 +1643,6 @@ PHP_FUNCTION(dom_node_lookup_prefix)
} }
/* }}} end dom_node_lookup_prefix */ /* }}} end dom_node_lookup_prefix */
/* {{{ proto boolean dom_node_is_default_namespace(string namespaceURI); /* {{{ proto boolean dom_node_is_default_namespace(string namespaceURI);
URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-isDefaultNamespace URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-isDefaultNamespace
Since: DOM Level 3 Since: DOM Level 3
@ -1717,7 +1676,6 @@ PHP_FUNCTION(dom_node_is_default_namespace)
} }
/* }}} end dom_node_is_default_namespace */ /* }}} end dom_node_is_default_namespace */
/* {{{ proto string dom_node_lookup_namespace_uri(string prefix); /* {{{ proto string dom_node_lookup_namespace_uri(string prefix);
URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI
Since: DOM Level 3 Since: DOM Level 3
@ -1752,7 +1710,6 @@ PHP_FUNCTION(dom_node_lookup_namespace_uri)
} }
/* }}} end dom_node_lookup_namespace_uri */ /* }}} end dom_node_lookup_namespace_uri */
/* {{{ proto boolean dom_node_is_equal_node(DomNode arg); /* {{{ proto boolean dom_node_is_equal_node(DomNode arg);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isEqualNode URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isEqualNode
Since: DOM Level 3 Since: DOM Level 3
@ -1763,7 +1720,6 @@ PHP_FUNCTION(dom_node_is_equal_node)
} }
/* }}} end dom_node_is_equal_node */ /* }}} end dom_node_is_equal_node */
/* {{{ proto DomNode dom_node_get_feature(string feature, string version); /* {{{ proto DomNode dom_node_get_feature(string feature, string version);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getFeature URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getFeature
Since: DOM Level 3 Since: DOM Level 3
@ -1774,7 +1730,6 @@ PHP_FUNCTION(dom_node_get_feature)
} }
/* }}} end dom_node_get_feature */ /* }}} end dom_node_get_feature */
/* {{{ proto DomUserData dom_node_set_user_data(string key, DomUserData data, userdatahandler handler); /* {{{ proto DomUserData dom_node_set_user_data(string key, DomUserData data, userdatahandler handler);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData
Since: DOM Level 3 Since: DOM Level 3
@ -1785,7 +1740,6 @@ PHP_FUNCTION(dom_node_set_user_data)
} }
/* }}} end dom_node_set_user_data */ /* }}} end dom_node_set_user_data */
/* {{{ proto DomUserData dom_node_get_user_data(string key); /* {{{ proto DomUserData dom_node_get_user_data(string key);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData
Since: DOM Level 3 Since: DOM Level 3
@ -1796,8 +1750,7 @@ PHP_FUNCTION(dom_node_get_user_data)
} }
/* }}} end dom_node_get_user_data */ /* }}} end dom_node_get_user_data */
static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode)
{ {
zval *id; zval *id;
zval *xpath_array=NULL, *ns_prefixes=NULL; zval *xpath_array=NULL, *ns_prefixes=NULL;
@ -1965,6 +1918,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode)
} }
} }
} }
/* }}} */
/* {{{ proto string DOMNode::C14N([bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]]) /* {{{ proto string DOMNode::C14N([bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]])
Canonicalize nodes to a string */ Canonicalize nodes to a string */
@ -1972,6 +1926,7 @@ PHP_METHOD(domnode, C14N)
{ {
dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */
/* {{{ proto int DOMNode::C14NFile(string uri [, bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]]) /* {{{ proto int DOMNode::C14NFile(string uri [, bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]])
Canonicalize nodes to a file */ Canonicalize nodes to a file */
@ -1979,12 +1934,10 @@ PHP_METHOD(domnode, C14NFile)
{ {
dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */
#endif
/* {{{ proto int DOMNode::getNodePath() /* {{{ proto int DOMNode::getNodePath()
Gets an xpath for a node */ Gets an xpath for a node */
PHP_METHOD(domnode, getNodePath) PHP_METHOD(domnode, getNodePath)
{ {
zval *id; zval *id;
@ -1992,8 +1945,6 @@ PHP_METHOD(domnode, getNodePath)
dom_object *intern; dom_object *intern;
char *value; char *value;
DOM_GET_THIS_OBJ(nodep, id, xmlNodePtr, intern); DOM_GET_THIS_OBJ(nodep, id, xmlNodePtr, intern);
value = xmlGetNodePath(nodep); value = xmlGetNodePath(nodep);
@ -2003,7 +1954,16 @@ PHP_METHOD(domnode, getNodePath)
RETVAL_STRING(value, 1); RETVAL_STRING(value, 1);
xmlFree(value); xmlFree(value);
} }
} }
/* }}} */
#endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

11
ext/dom/nodelist.c
View file

@ -99,7 +99,6 @@ int dom_nodelist_length_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ proto DOMNode dom_nodelist_item(int index); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136
Since: Since:
@ -173,4 +172,14 @@ PHP_FUNCTION(dom_nodelist_item)
RETVAL_NULL(); RETVAL_NULL();
} }
/* }}} end dom_nodelist_item */ /* }}} end dom_nodelist_item */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

14
ext/dom/notation.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* /*
* class DOMNotation extends DOMNode * class DOMNotation extends DOMNode
* *
@ -69,8 +68,6 @@ int dom_notation_public_id_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ systemId string /* {{{ systemId string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-E8AAB1D0 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-E8AAB1D0
@ -99,4 +96,15 @@ int dom_notation_system_id_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

45
ext/dom/php_dom.c
View file

@ -34,6 +34,7 @@
#define PHP_XPATH 1 #define PHP_XPATH 1
#define PHP_XPTR 2 #define PHP_XPTR 2
/* {{{ class entries */
zend_class_entry *dom_node_class_entry; zend_class_entry *dom_node_class_entry;
zend_class_entry *dom_domexception_class_entry; zend_class_entry *dom_domexception_class_entry;
zend_class_entry *dom_domstringlist_class_entry; zend_class_entry *dom_domstringlist_class_entry;
@ -67,11 +68,12 @@ zend_class_entry *dom_string_extend_class_entry;
zend_class_entry *dom_xpath_class_entry; zend_class_entry *dom_xpath_class_entry;
#endif #endif
zend_class_entry *dom_namespace_node_class_entry; zend_class_entry *dom_namespace_node_class_entry;
/* }}} */
zend_object_handlers dom_object_handlers; zend_object_handlers dom_object_handlers;
static HashTable classes; static HashTable classes;
/* {{{ prop handler tables */
static HashTable dom_domstringlist_prop_handlers; static HashTable dom_domstringlist_prop_handlers;
static HashTable dom_namelist_prop_handlers; static HashTable dom_namelist_prop_handlers;
static HashTable dom_domimplementationlist_prop_handlers; static HashTable dom_domimplementationlist_prop_handlers;
@ -94,6 +96,7 @@ static HashTable dom_namespace_node_prop_handlers;
#if defined(LIBXML_XPATH_ENABLED) #if defined(LIBXML_XPATH_ENABLED)
static HashTable dom_xpath_prop_handlers; static HashTable dom_xpath_prop_handlers;
#endif #endif
/* }}} */
typedef int (*dom_read_t)(dom_object *obj, zval **retval TSRMLS_DC); typedef int (*dom_read_t)(dom_object *obj, zval **retval TSRMLS_DC);
typedef int (*dom_write_t)(dom_object *obj, zval *newval TSRMLS_DC); typedef int (*dom_write_t)(dom_object *obj, zval *newval TSRMLS_DC);
@ -274,7 +277,7 @@ static void dom_register_prop_handler(HashTable *prop_handler, char *name, dom_r
} }
/* }}} */ /* }}} */
static zval **dom_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC) static zval **dom_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC) /* {{{ */
{ {
dom_object *obj; dom_object *obj;
zval tmp_member; zval tmp_member;
@ -305,6 +308,7 @@ static zval **dom_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC)
} }
return retval; return retval;
} }
/* }}} */
/* {{{ dom_read_property */ /* {{{ dom_read_property */
zval *dom_read_property(zval *object, zval *member, int type TSRMLS_DC) zval *dom_read_property(zval *object, zval *member, int type TSRMLS_DC)
@ -436,7 +440,7 @@ static int dom_property_exists(zval *object, zval *member, int check_empty TSRML
} }
/* }}} */ /* }}} */
void *php_dom_export_node(zval *object TSRMLS_DC) void *php_dom_export_node(zval *object TSRMLS_DC) /* {{{ */
{ {
php_libxml_node_object *intern; php_libxml_node_object *intern;
xmlNodePtr nodep = NULL; xmlNodePtr nodep = NULL;
@ -448,6 +452,7 @@ void *php_dom_export_node(zval *object TSRMLS_DC)
return nodep; return nodep;
} }
/* }}} */
/* {{{ proto somNode dom_import_simplexml(sxeobject node) /* {{{ proto somNode dom_import_simplexml(sxeobject node)
Get a simplexml_element object from dom to allow for processing */ Get a simplexml_element object from dom to allow for processing */
@ -475,7 +480,7 @@ PHP_FUNCTION(dom_import_simplexml)
} }
/* }}} */ /* }}} */
zend_object_value dom_objects_store_clone_obj(zval *zobject TSRMLS_DC) zend_object_value dom_objects_store_clone_obj(zval *zobject TSRMLS_DC) /* {{{ */
{ {
zend_object_value retval; zend_object_value retval;
void *new_object; void *new_object;
@ -502,6 +507,7 @@ zend_object_value dom_objects_store_clone_obj(zval *zobject TSRMLS_DC)
return retval; return retval;
} }
/* }}} */
/* {{{ arginfo */ /* {{{ arginfo */
static static
@ -525,7 +531,7 @@ static const zend_module_dep dom_deps[] = {
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
zend_module_entry dom_module_entry = { zend_module_entry dom_module_entry = { /* {{{ */
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
dom_deps, dom_deps,
"dom", "dom",
@ -538,6 +544,7 @@ zend_module_entry dom_module_entry = {
DOM_API_VERSION, /* Extension versionnumber */ DOM_API_VERSION, /* Extension versionnumber */
STANDARD_MODULE_PROPERTIES STANDARD_MODULE_PROPERTIES
}; };
/* }}} */
#ifdef COMPILE_DL_DOM #ifdef COMPILE_DL_DOM
ZEND_GET_MODULE(dom) ZEND_GET_MODULE(dom)
@ -874,7 +881,7 @@ PHP_MINFO_FUNCTION(dom)
} }
/* }}} */ /* }}} */
PHP_MSHUTDOWN_FUNCTION(dom) PHP_MSHUTDOWN_FUNCTION(dom) /* {{{ */
{ {
zend_hash_destroy(&dom_domstringlist_prop_handlers); zend_hash_destroy(&dom_domstringlist_prop_handlers);
zend_hash_destroy(&dom_namelist_prop_handlers); zend_hash_destroy(&dom_namelist_prop_handlers);
@ -907,6 +914,7 @@ PHP_MSHUTDOWN_FUNCTION(dom)
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ node_list_unlink */ /* {{{ node_list_unlink */
void node_list_unlink(xmlNodePtr node TSRMLS_DC) void node_list_unlink(xmlNodePtr node TSRMLS_DC)
@ -992,7 +1000,7 @@ void dom_objects_free_storage(void *object TSRMLS_DC)
} }
/* }}} */ /* }}} */
void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, xmlChar *local, xmlChar *ns TSRMLS_DC) void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, xmlChar *local, xmlChar *ns TSRMLS_DC) /* {{{ */
{ {
dom_nnodemap_object *mapptr; dom_nnodemap_object *mapptr;
zval *baseobj = NULL; zval *baseobj = NULL;
@ -1014,8 +1022,9 @@ void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xml
mapptr->ns = ns; mapptr->ns = ns;
} }
/* }}} */
static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool hash_copy TSRMLS_DC) static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool hash_copy TSRMLS_DC) /* {{{ */
{ {
zend_class_entry *base_class; zend_class_entry *base_class;
zval *tmp; zval *tmp;
@ -1045,6 +1054,7 @@ static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool
return intern; return intern;
} }
/* }}} */
/* {{{ dom_objects_clone */ /* {{{ dom_objects_clone */
void dom_objects_clone(void *object, void **object_clone TSRMLS_DC) void dom_objects_clone(void *object, void **object_clone TSRMLS_DC)
@ -1116,7 +1126,7 @@ zend_object_value dom_xpath_objects_new(zend_class_entry *class_type TSRMLS_DC)
/* }}} */ /* }}} */
#endif #endif
static void dom_nnodemap_object_dtor(void *object, zend_object_handle handle TSRMLS_DC) static void dom_nnodemap_object_dtor(void *object, zend_object_handle handle TSRMLS_DC) /* {{{ */
{ {
zval *baseobj; zval *baseobj;
dom_object *intern; dom_object *intern;
@ -1142,8 +1152,9 @@ static void dom_nnodemap_object_dtor(void *object, zend_object_handle handle TSR
} }
/* }}} */
void dom_nnodemap_objects_free_storage(void *object TSRMLS_DC) void dom_nnodemap_objects_free_storage(void *object TSRMLS_DC) /* {{{ */
{ {
dom_object *intern = (dom_object *)object; dom_object *intern = (dom_object *)object;
@ -1153,8 +1164,9 @@ void dom_nnodemap_objects_free_storage(void *object TSRMLS_DC)
efree(object); efree(object);
} }
/* }}} */
zend_object_value dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_DC) zend_object_value dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{ {
zend_object_value retval; zend_object_value retval;
dom_object *intern; dom_object *intern;
@ -1176,8 +1188,9 @@ zend_object_value dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_D
return retval; return retval;
} }
/* }}} */
void php_dom_create_interator(zval *return_value, int ce_type TSRMLS_DC) void php_dom_create_interator(zval *return_value, int ce_type TSRMLS_DC) /* {{{ */
{ {
zend_class_entry *ce; zend_class_entry *ce;
@ -1189,6 +1202,7 @@ void php_dom_create_interator(zval *return_value, int ce_type TSRMLS_DC)
object_init_ex(return_value, ce); object_init_ex(return_value, ce);
} }
/* }}} */
/* {{{ php_dom_create_object */ /* {{{ php_dom_create_object */
PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval *wrapper_in, zval *return_value, dom_object *domobj TSRMLS_DC) PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval *wrapper_in, zval *return_value, dom_object *domobj TSRMLS_DC)
@ -1310,7 +1324,6 @@ PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval *wra
} }
/* }}} end php_domobject_new */ /* }}} end php_domobject_new */
void php_dom_create_implementation(zval **retval TSRMLS_DC) { void php_dom_create_implementation(zval **retval TSRMLS_DC) {
object_init_ex(*retval, dom_domimplementation_class_entry); object_init_ex(*retval, dom_domimplementation_class_entry);
} }
@ -1351,7 +1364,7 @@ int dom_has_feature(char *feature, char *version)
} }
/* }}} end dom_has_feature */ /* }}} end dom_has_feature */
xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *local, int *cur, int index) xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *local, int *cur, int index) /* {{{ */
{ {
xmlNodePtr ret = NULL; xmlNodePtr ret = NULL;
@ -1375,9 +1388,9 @@ xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *l
} }
return ret; return ret;
} }
/* }}} */
/* }}} end dom_element_get_elements_by_tag_name_ns_raw */ /* }}} end dom_element_get_elements_by_tag_name_ns_raw */
/* {{{ void dom_normalize (xmlNodePtr nodep TSRMLS_DC) */ /* {{{ void dom_normalize (xmlNodePtr nodep TSRMLS_DC) */
void dom_normalize (xmlNodePtr nodep TSRMLS_DC) void dom_normalize (xmlNodePtr nodep TSRMLS_DC)
{ {
@ -1485,7 +1498,7 @@ int dom_check_qname(char *qname, char **localname, char **prefix, int uri_len, i
return 0; return 0;
} }
/* }}} */
/* /*
http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#ID-DocCrElNS http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#ID-DocCrElNS

9
ext/dom/php_dom.h
View file

@ -154,3 +154,12 @@ PHP_MSHUTDOWN_FUNCTION(dom);
PHP_MINFO_FUNCTION(dom); PHP_MINFO_FUNCTION(dom);
#endif /* PHP_DOM_H */ #endif /* PHP_DOM_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

11
ext/dom/processinginstruction.c
View file

@ -114,8 +114,6 @@ int dom_processinginstruction_target_read(dom_object *obj, zval **retval TSRMLS_
/* }}} */ /* }}} */
/* {{{ data string /* {{{ data string
readonly=no readonly=no
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-837822393 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-837822393
@ -179,3 +177,12 @@ int dom_processinginstruction_data_write(dom_object *obj, zval *newval TSRMLS_DC
/* }}} */ /* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

15
ext/dom/string_extend.c
View file

@ -27,7 +27,6 @@
#if HAVE_LIBXML && HAVE_DOM #if HAVE_LIBXML && HAVE_DOM
#include "php_dom.h" #include "php_dom.h"
/* {{{ arginfo */ /* {{{ arginfo */
static static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_string_extend_find_offset16, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_string_extend_find_offset16, 0, 0, 1)
@ -55,7 +54,6 @@ const zend_function_entry php_dom_string_extend_class_functions[] = {
/* {{{ attribute protos, not implemented yet */ /* {{{ attribute protos, not implemented yet */
/* {{{ proto int dom_string_extend_find_offset16(int offset32); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset16
Since: Since:
@ -66,7 +64,6 @@ PHP_FUNCTION(dom_string_extend_find_offset16)
} }
/* }}} end dom_string_extend_find_offset16 */ /* }}} end dom_string_extend_find_offset16 */
/* {{{ proto int dom_string_extend_find_offset32(int 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset32
Since: Since:
@ -76,4 +73,16 @@ PHP_FUNCTION(dom_string_extend_find_offset32)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_string_extend_find_offset32 */ /* }}} end dom_string_extend_find_offset32 */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

13
ext/dom/text.c
View file

@ -141,7 +141,6 @@ int dom_text_whole_text_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ proto DOMText dom_text_split_text(int offset); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D
Since: Since:
@ -204,7 +203,6 @@ PHP_FUNCTION(dom_text_split_text)
} }
/* }}} end dom_text_split_text */ /* }}} end dom_text_split_text */
/* {{{ proto boolean dom_text_is_whitespace_in_element_content(); /* {{{ proto boolean dom_text_is_whitespace_in_element_content();
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-isWhitespaceInElementContent URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-isWhitespaceInElementContent
Since: DOM Level 3 Since: DOM Level 3
@ -228,7 +226,6 @@ PHP_FUNCTION(dom_text_is_whitespace_in_element_content)
} }
/* }}} end dom_text_is_whitespace_in_element_content */ /* }}} end dom_text_is_whitespace_in_element_content */
/* {{{ proto DOMText dom_text_replace_whole_text(string content); /* {{{ proto DOMText dom_text_replace_whole_text(string content);
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-replaceWholeText URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-replaceWholeText
Since: DOM Level 3 Since: DOM Level 3
@ -238,4 +235,14 @@ PHP_FUNCTION(dom_text_replace_whole_text)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_text_replace_whole_text */ /* }}} end dom_text_replace_whole_text */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

13
ext/dom/typeinfo.c
View file

@ -55,8 +55,6 @@ int dom_typeinfo_type_name_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ type_namespace string /* {{{ type_namespace string
readonly=yes readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#TypeInfo-typeNamespace URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#TypeInfo-typeNamespace
@ -71,4 +69,15 @@ int dom_typeinfo_type_namespace_read(dom_object *obj, zval **retval TSRMLS_DC)
/* }}} */ /* }}} */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

13
ext/dom/userdatahandler.c
View file

@ -42,7 +42,6 @@ const zend_function_entry php_dom_userdatahandler_class_functions[] = {
/* {{{ attribute protos, not implemented yet */ /* {{{ attribute protos, not implemented yet */
/* {{{ proto dom_void dom_userdatahandler_handle(short operation, string key, domobject data, node src, node dst); /* {{{ 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 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-handleUserDataEvent
Since: Since:
@ -52,4 +51,16 @@ PHP_FUNCTION(dom_userdatahandler_handle)
DOM_NOT_IMPLEMENTED(); DOM_NOT_IMPLEMENTED();
} }
/* }}} end dom_userdatahandler_handle */ /* }}} end dom_userdatahandler_handle */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

9
ext/dom/xml_common.h
View file

@ -95,3 +95,12 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj);
DOM_GET_OBJ(__ptr, __id, __prtype, __intern); DOM_GET_OBJ(__ptr, __id, __prtype, __intern);
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/

28
ext/dom/xpath.c
View file

@ -75,7 +75,7 @@ const zend_function_entry php_dom_xpath_class_functions[] = {
}; };
static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int type) static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int type) /* {{{ */
{ {
zval **args; zval **args;
zval *retval; zval *retval;
@ -256,16 +256,19 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
efree(fci.params); efree(fci.params);
} }
} }
/* }}} */
static void dom_xpath_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs) static void dom_xpath_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs) /* {{{ */
{ {
dom_xpath_ext_function_php(ctxt, nargs, 1); dom_xpath_ext_function_php(ctxt, nargs, 1);
} }
/* }}} */
static void dom_xpath_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs) static void dom_xpath_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs) /* {{{ */
{ {
dom_xpath_ext_function_php(ctxt, nargs, 2); dom_xpath_ext_function_php(ctxt, nargs, 2);
} }
/* }}} */
/* {{{ proto void DOMXPath::__construct(DOMDocument doc) U */ /* {{{ proto void DOMXPath::__construct(DOMDocument doc) U */
PHP_METHOD(domxpath, __construct) PHP_METHOD(domxpath, __construct)
@ -334,6 +337,7 @@ int dom_xpath_document_read(dom_object *obj, zval **retval TSRMLS_DC)
} }
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ proto boolean dom_xpath_register_ns(string prefix, string uri); */ /* {{{ proto boolean dom_xpath_register_ns(string prefix, string uri); */
PHP_FUNCTION(dom_xpath_register_ns) PHP_FUNCTION(dom_xpath_register_ns)
@ -361,8 +365,9 @@ PHP_FUNCTION(dom_xpath_register_ns)
} }
RETURN_TRUE; RETURN_TRUE;
} }
/* }}} */
static void dom_xpath_iter(zval *baseobj, dom_object *intern) static void dom_xpath_iter(zval *baseobj, dom_object *intern) /* {{{ */
{ {
dom_nnodemap_object *mapptr; dom_nnodemap_object *mapptr;
@ -371,8 +376,10 @@ static void dom_xpath_iter(zval *baseobj, dom_object *intern)
mapptr->nodetype = DOM_NODESET; mapptr->nodetype = DOM_NODESET;
} }
/* }}} */
static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) { static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
{
zval *id, *retval, *context = NULL; zval *id, *retval, *context = NULL;
xmlXPathContextPtr ctxp; xmlXPathContextPtr ctxp;
xmlNodePtr nodep = NULL; xmlNodePtr nodep = NULL;
@ -513,6 +520,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) {
xmlXPathFreeObject(xpathobjp); xmlXPathFreeObject(xpathobjp);
} }
/* }}} */
/* {{{ proto DOMNodeList dom_xpath_query(string expr [,DOMNode context]); */ /* {{{ proto DOMNodeList dom_xpath_query(string expr [,DOMNode context]); */
PHP_FUNCTION(dom_xpath_query) PHP_FUNCTION(dom_xpath_query)
@ -574,5 +582,13 @@ PHP_FUNCTION(dom_xpath_register_php_functions)
#endif /* LIBXML_XPATH_ENABLED */ #endif /* LIBXML_XPATH_ENABLED */
/* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/