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

More on the way to W3C coformance:

Browse source 
@- Changed DomNode->next_sibling and DomNode->previous_sibling to return NULL
@  instead of false (W3C specs). (chregu)
@- Changed DomNode->insert_before() and DomNode->append_child() to conform to
@  W3C specs (moving not copying nodes, accepting NULL as 2nd param). (chregu)
This commit is contained in:
Christian Stocker 2002-08-16 08:42:41 +00:00
parent 38eea2e817
commit 9c20c7c9ba
1 changed files with 28 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

62
ext/domxml/php_domxml.c
View file

@ -2115,7 +2115,8 @@ PHP_FUNCTION(domxml_node_next_sibling)
first = nodep->next; first = nodep->next;
if (!first) { if (!first) {
RETURN_FALSE; rv = NULL;
return;
} }
DOMXML_RET_OBJ(rv, first, &ret); DOMXML_RET_OBJ(rv, first, &ret);
@ -2136,7 +2137,8 @@ PHP_FUNCTION(domxml_node_previous_sibling)
first = nodep->prev; first = nodep->prev;
if (!first) { if (!first) {
RETURN_FALSE; rv = NULL;
return;
} }
DOMXML_RET_OBJ(rv, first, &ret); DOMXML_RET_OBJ(rv, first, &ret);
@ -2357,15 +2359,11 @@ PHP_FUNCTION(domxml_node_replace_node)
PHP_FUNCTION(domxml_node_append_child) PHP_FUNCTION(domxml_node_append_child)
{ {
zval *id, *rv = NULL, *node; zval *id, *rv = NULL, *node;
xmlNodePtr child, nodep, new_child; xmlNodePtr child, parent, new_child;
int ret; int ret;
DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep); DOMXML_PARAM_ONE(parent, id, le_domxmlnodep, "o", &node);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &node) == FAILURE) {
return;
}
DOMXML_GET_OBJ(child, node, le_domxmlnodep); DOMXML_GET_OBJ(child, node, le_domxmlnodep);
if (child->type == XML_ATTRIBUTE_NODE) { if (child->type == XML_ATTRIBUTE_NODE) {
@ -2373,29 +2371,18 @@ PHP_FUNCTION(domxml_node_append_child)
RETURN_FALSE; RETURN_FALSE;
} }
if (NULL == (new_child = xmlCopyNode(child, 1))) { /* first unlink node, if child is already a child of parent */
php_error(E_WARNING, "%s(): unable to clone node", get_active_function_name(TSRMLS_C)); if (child->parent == parent){
RETURN_FALSE; xmlUnlinkNode(child);
} }
new_child = xmlAddChild(parent, child);
/* copy namespace if one is there */ if (NULL == new_child) {
if (child->ns) {
new_child->ns = child->ns;
}
/* FIXME reverted xmlAddChildList; crashes
* Uwe: must have been a temporary problem. It works for me with both
* xmlAddChildList and xmlAddChild
*/
child = xmlAddChild(nodep, new_child);
if (NULL == child) {
php_error(E_WARNING, "%s(): couldn't append node", get_active_function_name(TSRMLS_C)); php_error(E_WARNING, "%s(): couldn't append node", get_active_function_name(TSRMLS_C));
RETURN_FALSE; RETURN_FALSE;
} }
DOMXML_RET_OBJ(rv, child, &ret); DOMXML_RET_OBJ(rv, new_child, &ret);
} }
/* }}} */ /* }}} */
@ -2442,19 +2429,26 @@ PHP_FUNCTION(domxml_node_append_sibling)
PHP_FUNCTION(domxml_node_insert_before) PHP_FUNCTION(domxml_node_insert_before)
{ {
zval *id, *rv = NULL, *node, *ref; zval *id, *rv = NULL, *node, *ref;
xmlNodePtr child, new_child, nodep, refp; xmlNodePtr child, new_child, parent, refp;
int ret; int ret;
DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep); DOMXML_PARAM_TWO(parent, id, le_domxmlnodep, "oo!", &node, &ref);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "oo", &node, &ref) == FAILURE) {
return;
}
DOMXML_GET_OBJ(child, node, le_domxmlnodep); DOMXML_GET_OBJ(child, node, le_domxmlnodep);
DOMXML_GET_OBJ(refp, ref, le_domxmlnodep);
new_child = xmlAddPrevSibling(refp, child); if (ref != NULL) {
DOMXML_GET_OBJ(refp, ref, le_domxmlnodep);
new_child = xmlAddPrevSibling(refp, child);
} else {
/* first unlink node, if child is already a child of parent
for some strange reason, this is needed
*/
if (child->parent == parent){
xmlUnlinkNode(child);
}
new_child = xmlAddChild(parent, child);
}
if (NULL == new_child) { if (NULL == new_child) {
php_error(E_WARNING, "%s(): couldn't add newnode as the previous sibling of refnode", get_active_function_name(TSRMLS_C)); php_error(E_WARNING, "%s(): couldn't add newnode as the previous sibling of refnode", get_active_function_name(TSRMLS_C));