Skip to content

Simplify configuration getters #11778

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.

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
Jul 24, 2023
Merged
Changes from all commits
Commits
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
57 changes: 14 additions & 43 deletions ext/dom/document.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,18 +269,13 @@ Since: DOM Level 3
*/
int dom_document_strict_error_checking_read(dom_object *obj, zval *retval)
{
if (obj->document) {
dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);
ZVAL_BOOL(retval, doc_prop->stricterror);
} else {
ZVAL_FALSE(retval);
}
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->stricterror);
return SUCCESS;
}

int dom_document_strict_error_checking_write(dom_object *obj, zval *newval)
{

if (obj->document) {
dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);
doc_prop->stricterror = zend_is_true(newval);
Expand All @@ -296,12 +291,8 @@ readonly=no
*/
int dom_document_format_output_read(dom_object *obj, zval *retval)
{
if (obj->document) {
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->formatoutput);
} else {
ZVAL_FALSE(retval);
}
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->formatoutput);
return SUCCESS;
}

Expand All @@ -321,12 +312,8 @@ readonly=no
*/
int dom_document_validate_on_parse_read(dom_object *obj, zval *retval)
{
if (obj->document) {
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->validateonparse);
} else {
ZVAL_FALSE(retval);
}
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->validateonparse);
return SUCCESS;
}

Expand All @@ -346,12 +333,8 @@ readonly=no
*/
int dom_document_resolve_externals_read(dom_object *obj, zval *retval)
{
if (obj->document) {
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->resolveexternals);
} else {
ZVAL_FALSE(retval);
}
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->resolveexternals);
return SUCCESS;
}

Expand All @@ -371,12 +354,8 @@ readonly=no
*/
int dom_document_preserve_whitespace_read(dom_object *obj, zval *retval)
{
if (obj->document) {
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->preservewhitespace);
} else {
ZVAL_FALSE(retval);
}
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->preservewhitespace);
return SUCCESS;
}

Expand All @@ -396,12 +375,8 @@ readonly=no
*/
int dom_document_recover_read(dom_object *obj, zval *retval)
{
if (obj->document) {
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->recover);
} else {
ZVAL_FALSE(retval);
}
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->recover);
return SUCCESS;
}

Expand All @@ -421,12 +396,8 @@ readonly=no
*/
int dom_document_substitue_entities_read(dom_object *obj, zval *retval)
{
if (obj->document) {
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->substituteentities);
} else {
ZVAL_FALSE(retval);
}
libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
ZVAL_BOOL(retval, doc_prop->substituteentities);
return SUCCESS;
}

Expand Down