Skip to content

Fix Windows failure #14096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Fix Windows failure #14096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ext/dom/dom_properties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ zend_result dom_entity_encoding_read(dom_object *obj, zval *retval);
zend_result dom_entity_version_read(dom_object *obj, zval *retval);

/* entity reference properties */
int dom_entity_reference_child_read(dom_object *obj, zval *retval);
int dom_entity_reference_text_content_read(dom_object *obj, zval *retval);
int dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval);
zend_result dom_entity_reference_child_read(dom_object *obj, zval *retval);
zend_result dom_entity_reference_text_content_read(dom_object *obj, zval *retval);
zend_result dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval);

/* namednodemap properties */
zend_result dom_namednodemap_length_read(dom_object *obj, zval *retval);
Expand Down
27 changes: 6 additions & 21 deletions ext/dom/entityreference.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,9 @@ xmlEntityPtr dom_entity_reference_fetch_and_sync_declaration(xmlNodePtr referenc
return entity;
}

int dom_entity_reference_child_read(dom_object *obj, zval *retval)
zend_result dom_entity_reference_child_read(dom_object *obj, zval *retval)
{
xmlNodePtr nodep = dom_object_get_node(obj);

if (nodep == NULL) {
php_dom_throw_error(INVALID_STATE_ERR, true);
return FAILURE;
}
DOM_PROP_NODE(xmlNodePtr, nodep, obj);

xmlEntityPtr entity = dom_entity_reference_fetch_and_sync_declaration(nodep);
if (entity == NULL) {
Expand All @@ -99,27 +94,17 @@ int dom_entity_reference_child_read(dom_object *obj, zval *retval)
return SUCCESS;
}

int dom_entity_reference_text_content_read(dom_object *obj, zval *retval)
zend_result dom_entity_reference_text_content_read(dom_object *obj, zval *retval)
{
xmlNodePtr nodep = dom_object_get_node(obj);

if (nodep == NULL) {
php_dom_throw_error(INVALID_STATE_ERR, true);
return FAILURE;
}
DOM_PROP_NODE(xmlNodePtr, nodep, obj);

dom_entity_reference_fetch_and_sync_declaration(nodep);
return dom_node_text_content_read(obj, retval);
}

int dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval)
zend_result dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval)
{
xmlNodePtr nodep = dom_object_get_node(obj);

if (nodep == NULL) {
php_dom_throw_error(INVALID_STATE_ERR, true);
return FAILURE;
}
DOM_PROP_NODE(xmlNodePtr, nodep, obj);

dom_entity_reference_fetch_and_sync_declaration(nodep);
return dom_node_child_nodes_read(obj, retval);
Expand Down
Loading