From 48443183afa087fbcc0e3e328afcc49953f48fe0 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sun, 3 Sep 2023 00:42:49 +0200
Subject: [PATCH] Use zend_result as return for properties in ext/dom (#12113)

---
 UPGRADING.INTERNALS             |   4 +
 ext/dom/attr.c                  |  12 +--
 ext/dom/characterdata.c         |   6 +-
 ext/dom/document.c              |  50 ++++-----
 ext/dom/documenttype.c          |  12 +--
 ext/dom/dom_properties.h        | 186 ++++++++++++++++----------------
 ext/dom/element.c               |  14 +--
 ext/dom/entity.c                |  12 +--
 ext/dom/namednodemap.c          |   2 +-
 ext/dom/node.c                  |  46 ++++----
 ext/dom/nodelist.c              |   2 +-
 ext/dom/notation.c              |   4 +-
 ext/dom/parentnode.c            |   6 +-
 ext/dom/php_dom.c               |   4 +-
 ext/dom/processinginstruction.c |   6 +-
 ext/dom/text.c                  |   2 +-
 ext/dom/xpath.c                 |   6 +-
 17 files changed, 188 insertions(+), 186 deletions(-)

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 18c651ecfa8..e605e15e3c5 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -22,6 +22,10 @@ PHP 8.4 INTERNALS UPGRADE NOTES
 3. Module changes
 ========================
 
+ a. ext/dom
+   - dom_read_t and dom_write_t now expect the function to return zend_result
+     instead of int.
+
 ========================
 4. OpCode changes
 ========================
diff --git a/ext/dom/attr.c b/ext/dom/attr.c
index c5ed97a44f9..cb1129c3940 100644
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@@ -74,7 +74,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1112119403
 Since:
 */
-int dom_attr_name_read(dom_object *obj, zval *retval)
+zend_result dom_attr_name_read(dom_object *obj, zval *retval)
 {
 	xmlAttrPtr attrp;
 
@@ -97,7 +97,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-862529273
 Since:
 */
-int dom_attr_specified_read(dom_object *obj, zval *retval)
+zend_result dom_attr_specified_read(dom_object *obj, zval *retval)
 {
 	/* TODO */
 	ZVAL_TRUE(retval);
@@ -111,7 +111,7 @@ readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-221662474
 Since:
 */
-int dom_attr_value_read(dom_object *obj, zval *retval)
+zend_result dom_attr_value_read(dom_object *obj, zval *retval)
 {
 	xmlAttrPtr attrp = (xmlAttrPtr) dom_object_get_node(obj);
 	xmlChar *content;
@@ -133,7 +133,7 @@ int dom_attr_value_read(dom_object *obj, zval *retval)
 
 }
 
-int dom_attr_value_write(dom_object *obj, zval *newval)
+zend_result dom_attr_value_write(dom_object *obj, zval *newval)
 {
 	xmlAttrPtr attrp = (xmlAttrPtr) dom_object_get_node(obj);
 
@@ -159,7 +159,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement
 Since: DOM Level 2
 */
-int dom_attr_owner_element_read(dom_object *obj, zval *retval)
+zend_result dom_attr_owner_element_read(dom_object *obj, zval *retval)
 {
 	xmlNodePtr nodep, nodeparent;
 
@@ -188,7 +188,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo
 Since: DOM Level 3
 */
-int dom_attr_schema_type_info_read(dom_object *obj, zval *retval)
+zend_result dom_attr_schema_type_info_read(dom_object *obj, zval *retval)
 {
 	/* TODO */
 	ZVAL_NULL(retval);
diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index e03a83ded8e..dda7a42a129 100644
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@@ -35,7 +35,7 @@ readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-72AB8359
 Since:
 */
-int dom_characterdata_data_read(dom_object *obj, zval *retval)
+zend_result dom_characterdata_data_read(dom_object *obj, zval *retval)
 {
 	xmlNodePtr nodep = dom_object_get_node(obj);
 
@@ -49,7 +49,7 @@ int dom_characterdata_data_read(dom_object *obj, zval *retval)
 	return SUCCESS;
 }
 
-int dom_characterdata_data_write(dom_object *obj, zval *newval)
+zend_result dom_characterdata_data_write(dom_object *obj, zval *newval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 
@@ -74,7 +74,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7D61178C
 Since:
 */
-int dom_characterdata_length_read(dom_object *obj, zval *retval)
+zend_result dom_characterdata_length_read(dom_object *obj, zval *retval)
 {
 	xmlNodePtr nodep = dom_object_get_node(obj);
 	long length = 0;
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 234b71be1d8..7d9ec93169a 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -50,7 +50,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-B63ED1A31
 Since:
 */
-int dom_document_doctype_read(dom_object *obj, zval *retval)
+zend_result dom_document_doctype_read(dom_object *obj, zval *retval)
 {
 	xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj);
 	xmlDtdPtr dtdptr;
@@ -77,7 +77,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1B793EBA
 Since:
 */
-int dom_document_implementation_read(dom_object *obj, zval *retval)
+zend_result dom_document_implementation_read(dom_object *obj, zval *retval)
 {
 	php_dom_create_implementation(retval);
 	return SUCCESS;
@@ -90,7 +90,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-87CD092
 Since:
 */
-int dom_document_document_element_read(dom_object *obj, zval *retval)
+zend_result dom_document_document_element_read(dom_object *obj, zval *retval)
 {
 	xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj);
 	xmlNode *root;
@@ -116,7 +116,7 @@ int dom_document_document_element_read(dom_object *obj, zval *retval)
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-encoding
 Since: DOM Level 3
 */
-int dom_document_encoding_read(dom_object *obj, zval *retval)
+zend_result dom_document_encoding_read(dom_object *obj, zval *retval)
 {
 	xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj);
 	char *encoding;
@@ -182,7 +182,7 @@ readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-standalone
 Since: DOM Level 3
 */
-int dom_document_standalone_read(dom_object *obj, zval *retval)
+zend_result dom_document_standalone_read(dom_object *obj, zval *retval)
 {
 	xmlDoc *docp;
 
@@ -197,7 +197,7 @@ int dom_document_standalone_read(dom_object *obj, zval *retval)
 	return SUCCESS;
 }
 
-int dom_document_standalone_write(dom_object *obj, zval *newval)
+zend_result dom_document_standalone_write(dom_object *obj, zval *newval)
 {
 	xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj);
 	zend_long standalone;
@@ -220,7 +220,7 @@ readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-version
 Since: DOM Level 3
 */
-int dom_document_version_read(dom_object *obj, zval *retval)
+zend_result dom_document_version_read(dom_object *obj, zval *retval)
 {
 	xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj);
 	char *version;
@@ -241,7 +241,7 @@ int dom_document_version_read(dom_object *obj, zval *retval)
 	return SUCCESS;
 }
 
-int dom_document_version_write(dom_object *obj, zval *newval)
+zend_result dom_document_version_write(dom_object *obj, zval *newval)
 {
 	xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj);
 	zend_string *str;
@@ -273,14 +273,14 @@ readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-strictErrorChecking
 Since: DOM Level 3
 */
-int dom_document_strict_error_checking_read(dom_object *obj, zval *retval)
+zend_result dom_document_strict_error_checking_read(dom_object *obj, zval *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)
+zend_result 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);
@@ -295,14 +295,14 @@ int dom_document_strict_error_checking_write(dom_object *obj, zval *newval)
 /* {{{ formatOutput	boolean
 readonly=no
 */
-int dom_document_format_output_read(dom_object *obj, zval *retval)
+zend_result dom_document_format_output_read(dom_object *obj, zval *retval)
 {
 	libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
 	ZVAL_BOOL(retval, doc_prop->formatoutput);
 	return SUCCESS;
 }
 
-int dom_document_format_output_write(dom_object *obj, zval *newval)
+zend_result dom_document_format_output_write(dom_object *obj, zval *newval)
 {
 	if (obj->document) {
 		dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);
@@ -316,14 +316,14 @@ int dom_document_format_output_write(dom_object *obj, zval *newval)
 /* {{{ validateOnParse	boolean
 readonly=no
 */
-int	dom_document_validate_on_parse_read(dom_object *obj, zval *retval)
+zend_result	dom_document_validate_on_parse_read(dom_object *obj, zval *retval)
 {
 	libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
 	ZVAL_BOOL(retval, doc_prop->validateonparse);
 	return SUCCESS;
 }
 
-int dom_document_validate_on_parse_write(dom_object *obj, zval *newval)
+zend_result dom_document_validate_on_parse_write(dom_object *obj, zval *newval)
 {
 	if (obj->document) {
 		dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);
@@ -337,14 +337,14 @@ int dom_document_validate_on_parse_write(dom_object *obj, zval *newval)
 /* {{{ resolveExternals	boolean
 readonly=no
 */
-int dom_document_resolve_externals_read(dom_object *obj, zval *retval)
+zend_result dom_document_resolve_externals_read(dom_object *obj, zval *retval)
 {
 	libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
 	ZVAL_BOOL(retval, doc_prop->resolveexternals);
 	return SUCCESS;
 }
 
-int dom_document_resolve_externals_write(dom_object *obj, zval *newval)
+zend_result dom_document_resolve_externals_write(dom_object *obj, zval *newval)
 {
 	if (obj->document) {
 		dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);
@@ -358,14 +358,14 @@ int dom_document_resolve_externals_write(dom_object *obj, zval *newval)
 /* {{{ preserveWhiteSpace	boolean
 readonly=no
 */
-int dom_document_preserve_whitespace_read(dom_object *obj, zval *retval)
+zend_result dom_document_preserve_whitespace_read(dom_object *obj, zval *retval)
 {
 	libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
 	ZVAL_BOOL(retval, doc_prop->preservewhitespace);
 	return SUCCESS;
 }
 
-int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval)
+zend_result dom_document_preserve_whitespace_write(dom_object *obj, zval *newval)
 {
 	if (obj->document) {
 		dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);
@@ -379,14 +379,14 @@ int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval)
 /* {{{ recover	boolean
 readonly=no
 */
-int dom_document_recover_read(dom_object *obj, zval *retval)
+zend_result dom_document_recover_read(dom_object *obj, zval *retval)
 {
 	libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
 	ZVAL_BOOL(retval, doc_prop->recover);
 	return SUCCESS;
 }
 
-int dom_document_recover_write(dom_object *obj, zval *newval)
+zend_result dom_document_recover_write(dom_object *obj, zval *newval)
 {
 	if (obj->document) {
 		dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);
@@ -400,14 +400,14 @@ int dom_document_recover_write(dom_object *obj, zval *newval)
 /* {{{ substituteEntities	boolean
 readonly=no
 */
-int dom_document_substitue_entities_read(dom_object *obj, zval *retval)
+zend_result dom_document_substitue_entities_read(dom_object *obj, zval *retval)
 {
 	libxml_doc_props const* doc_prop = dom_get_doc_props_read_only(obj->document);
 	ZVAL_BOOL(retval, doc_prop->substituteentities);
 	return SUCCESS;
 }
 
-int dom_document_substitue_entities_write(dom_object *obj, zval *newval)
+zend_result dom_document_substitue_entities_write(dom_object *obj, zval *newval)
 {
 	if (obj->document) {
 		dom_doc_propsptr doc_prop = dom_get_doc_props(obj->document);
@@ -423,7 +423,7 @@ readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-documentURI
 Since: DOM Level 3
 */
-int dom_document_document_uri_read(dom_object *obj, zval *retval)
+zend_result dom_document_document_uri_read(dom_object *obj, zval *retval)
 {
 	xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj);
 	char *url;
@@ -443,7 +443,7 @@ int dom_document_document_uri_read(dom_object *obj, zval *retval)
 	return SUCCESS;
 }
 
-int dom_document_document_uri_write(dom_object *obj, zval *newval)
+zend_result dom_document_document_uri_write(dom_object *obj, zval *newval)
 {
 	xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj);
 	zend_string *str;
@@ -475,7 +475,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-config
 Since: DOM Level 3
 */
-int dom_document_config_read(dom_object *obj, zval *retval)
+zend_result dom_document_config_read(dom_object *obj, zval *retval)
 {
 	ZVAL_NULL(retval);
 	return SUCCESS;
diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c
index cfc4b043edb..c85f0c3ad37 100644
--- a/ext/dom/documenttype.c
+++ b/ext/dom/documenttype.c
@@ -28,7 +28,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1844763134
 Since:
 */
-int dom_documenttype_name_read(dom_object *obj, zval *retval)
+zend_result dom_documenttype_name_read(dom_object *obj, zval *retval)
 {
 	xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
 
@@ -49,7 +49,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1788794630
 Since:
 */
-int dom_documenttype_entities_read(dom_object *obj, zval *retval)
+zend_result dom_documenttype_entities_read(dom_object *obj, zval *retval)
 {
 	xmlDtdPtr doctypep = (xmlDtdPtr) dom_object_get_node(obj);
 	xmlHashTable *entityht;
@@ -77,7 +77,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D46829EF
 Since:
 */
-int dom_documenttype_notations_read(dom_object *obj, zval *retval)
+zend_result dom_documenttype_notations_read(dom_object *obj, zval *retval)
 {
 	xmlDtdPtr doctypep = (xmlDtdPtr) dom_object_get_node(obj);
 	xmlHashTable *notationht;
@@ -105,7 +105,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-publicId
 Since: DOM Level 2
 */
-int dom_documenttype_public_id_read(dom_object *obj, zval *retval)
+zend_result dom_documenttype_public_id_read(dom_object *obj, zval *retval)
 {
 	xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
 
@@ -130,7 +130,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-systemId
 Since: DOM Level 2
 */
-int dom_documenttype_system_id_read(dom_object *obj, zval *retval)
+zend_result dom_documenttype_system_id_read(dom_object *obj, zval *retval)
 {
 	xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
 
@@ -154,7 +154,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-internalSubset
 Since: DOM Level 2
 */
-int dom_documenttype_internal_subset_read(dom_object *obj, zval *retval)
+zend_result dom_documenttype_internal_subset_read(dom_object *obj, zval *retval)
 {
 	xmlDtdPtr dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
 	xmlDtdPtr intsubset;
diff --git a/ext/dom/dom_properties.h b/ext/dom/dom_properties.h
index 5a371304a1f..5116c310570 100644
--- a/ext/dom/dom_properties.h
+++ b/ext/dom/dom_properties.h
@@ -19,127 +19,125 @@
 #define DOM_PROPERTIES_H
 
 /* attr properties */
-int dom_attr_name_read(dom_object *obj, zval *retval);
-int dom_attr_specified_read(dom_object *obj, zval *retval);
-int dom_attr_value_read(dom_object *obj, zval *retval);
-int dom_attr_value_write(dom_object *obj, zval *newval);
-int dom_attr_owner_element_read(dom_object *obj, zval *retval);
-int dom_attr_schema_type_info_read(dom_object *obj, zval *retval);
+zend_result dom_attr_name_read(dom_object *obj, zval *retval);
+zend_result dom_attr_specified_read(dom_object *obj, zval *retval);
+zend_result dom_attr_value_read(dom_object *obj, zval *retval);
+zend_result dom_attr_value_write(dom_object *obj, zval *newval);
+zend_result dom_attr_owner_element_read(dom_object *obj, zval *retval);
+zend_result dom_attr_schema_type_info_read(dom_object *obj, zval *retval);
 
 /* characterdata properties */
-int dom_characterdata_data_read(dom_object *obj, zval *retval);
-int dom_characterdata_data_write(dom_object *obj, zval *newval);
-int dom_characterdata_length_read(dom_object *obj, zval *retval);
+zend_result dom_characterdata_data_read(dom_object *obj, zval *retval);
+zend_result dom_characterdata_data_write(dom_object *obj, zval *newval);
+zend_result dom_characterdata_length_read(dom_object *obj, zval *retval);
 
 /* document properties */
-int dom_document_doctype_read(dom_object *obj, zval *retval);
-int dom_document_implementation_read(dom_object *obj, zval *retval);
-int dom_document_document_element_read(dom_object *obj, zval *retval);
-int dom_document_actual_encoding_read(dom_object *obj, zval *retval);
-int dom_document_actual_encoding_write(dom_object *obj, zval *newval);
-int dom_document_encoding_read(dom_object *obj, zval *retval);
-int dom_document_encoding_write(dom_object *obj, zval *newval);
-int dom_document_standalone_read(dom_object *obj, zval *retval);
-int dom_document_standalone_write(dom_object *obj, zval *newval);
-int dom_document_version_read(dom_object *obj, zval *retval);
-int dom_document_version_write(dom_object *obj, zval *newval);
-int dom_document_strict_error_checking_read(dom_object *obj, zval *retval);
-int dom_document_strict_error_checking_write(dom_object *obj, zval *newval);
-int dom_document_document_uri_read(dom_object *obj, zval *retval);
-int dom_document_document_uri_write(dom_object *obj, zval *newval);
-int dom_document_config_read(dom_object *obj, zval *retval);
-int dom_document_format_output_read(dom_object *obj, zval *retval);
-int dom_document_format_output_write(dom_object *obj, zval *newval);
-int	dom_document_validate_on_parse_read(dom_object *obj, zval *retval);
-int dom_document_validate_on_parse_write(dom_object *obj, zval *newval);
-int dom_document_resolve_externals_read(dom_object *obj, zval *retval);
-int dom_document_resolve_externals_write(dom_object *obj, zval *newval);
-int dom_document_preserve_whitespace_read(dom_object *obj, zval *retval);
-int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval);
-int dom_document_recover_read(dom_object *obj, zval *retval);
-int dom_document_recover_write(dom_object *obj, zval *newval);
-int dom_document_substitue_entities_read(dom_object *obj, zval *retval);
-int dom_document_substitue_entities_write(dom_object *obj, zval *newval);
+zend_result dom_document_doctype_read(dom_object *obj, zval *retval);
+zend_result dom_document_implementation_read(dom_object *obj, zval *retval);
+zend_result dom_document_document_element_read(dom_object *obj, zval *retval);
+zend_result dom_document_actual_encoding_read(dom_object *obj, zval *retval);
+zend_result dom_document_actual_encoding_write(dom_object *obj, zval *newval);
+zend_result dom_document_encoding_read(dom_object *obj, zval *retval);
+zend_result dom_document_encoding_write(dom_object *obj, zval *newval);
+zend_result dom_document_standalone_read(dom_object *obj, zval *retval);
+zend_result dom_document_standalone_write(dom_object *obj, zval *newval);
+zend_result dom_document_version_read(dom_object *obj, zval *retval);
+zend_result dom_document_version_write(dom_object *obj, zval *newval);
+zend_result dom_document_strict_error_checking_read(dom_object *obj, zval *retval);
+zend_result dom_document_strict_error_checking_write(dom_object *obj, zval *newval);
+zend_result dom_document_document_uri_read(dom_object *obj, zval *retval);
+zend_result dom_document_document_uri_write(dom_object *obj, zval *newval);
+zend_result dom_document_config_read(dom_object *obj, zval *retval);
+zend_result dom_document_format_output_read(dom_object *obj, zval *retval);
+zend_result dom_document_format_output_write(dom_object *obj, zval *newval);
+zend_result dom_document_validate_on_parse_read(dom_object *obj, zval *retval);
+zend_result dom_document_validate_on_parse_write(dom_object *obj, zval *newval);
+zend_result dom_document_resolve_externals_read(dom_object *obj, zval *retval);
+zend_result dom_document_resolve_externals_write(dom_object *obj, zval *newval);
+zend_result dom_document_preserve_whitespace_read(dom_object *obj, zval *retval);
+zend_result dom_document_preserve_whitespace_write(dom_object *obj, zval *newval);
+zend_result dom_document_recover_read(dom_object *obj, zval *retval);
+zend_result dom_document_recover_write(dom_object *obj, zval *newval);
+zend_result dom_document_substitue_entities_read(dom_object *obj, zval *retval);
+zend_result dom_document_substitue_entities_write(dom_object *obj, zval *newval);
 
 /* documenttype properties */
-int dom_documenttype_name_read(dom_object *obj, zval *retval);
-int dom_documenttype_entities_read(dom_object *obj, zval *retval);
-int dom_documenttype_notations_read(dom_object *obj, zval *retval);
-int dom_documenttype_public_id_read(dom_object *obj, zval *retval);
-int dom_documenttype_system_id_read(dom_object *obj, zval *retval);
-int dom_documenttype_internal_subset_read(dom_object *obj, zval *retval);
+zend_result dom_documenttype_name_read(dom_object *obj, zval *retval);
+zend_result dom_documenttype_entities_read(dom_object *obj, zval *retval);
+zend_result dom_documenttype_notations_read(dom_object *obj, zval *retval);
+zend_result dom_documenttype_public_id_read(dom_object *obj, zval *retval);
+zend_result dom_documenttype_system_id_read(dom_object *obj, zval *retval);
+zend_result dom_documenttype_internal_subset_read(dom_object *obj, zval *retval);
 
 /* element properties */
-int dom_element_tag_name_read(dom_object *obj, zval *retval);
-int dom_element_class_name_read(dom_object *obj, zval *retval);
-int dom_element_class_name_write(dom_object *obj, zval *newval);
-int dom_element_id_read(dom_object *obj, zval *retval);
-int dom_element_id_write(dom_object *obj, zval *newval);
-int dom_element_schema_type_info_read(dom_object *obj, zval *retval);
+zend_result dom_element_tag_name_read(dom_object *obj, zval *retval);
+zend_result dom_element_class_name_read(dom_object *obj, zval *retval);
+zend_result dom_element_class_name_write(dom_object *obj, zval *newval);
+zend_result dom_element_id_read(dom_object *obj, zval *retval);
+zend_result dom_element_id_write(dom_object *obj, zval *newval);
+zend_result dom_element_schema_type_info_read(dom_object *obj, zval *retval);
 
 /* entity properties */
-int dom_entity_public_id_read(dom_object *obj, zval *retval);
-int dom_entity_system_id_read(dom_object *obj, zval *retval);
-int dom_entity_notation_name_read(dom_object *obj, zval *retval);
-int dom_entity_actual_encoding_read(dom_object *obj, zval *retval);
-int dom_entity_encoding_read(dom_object *obj, zval *retval);
-int dom_entity_version_read(dom_object *obj, zval *retval);
+zend_result dom_entity_public_id_read(dom_object *obj, zval *retval);
+zend_result dom_entity_system_id_read(dom_object *obj, zval *retval);
+zend_result dom_entity_notation_name_read(dom_object *obj, zval *retval);
+zend_result dom_entity_actual_encoding_read(dom_object *obj, zval *retval);
+zend_result dom_entity_encoding_read(dom_object *obj, zval *retval);
+zend_result dom_entity_version_read(dom_object *obj, zval *retval);
 
 /* namednodemap properties */
-int dom_namednodemap_length_read(dom_object *obj, zval *retval);
+zend_result dom_namednodemap_length_read(dom_object *obj, zval *retval);
 
 /* parent node properties */
-int dom_parent_node_first_element_child_read(dom_object *obj, zval *retval);
-int dom_parent_node_last_element_child_read(dom_object *obj, zval *retval);
-int dom_parent_node_child_element_count(dom_object *obj, zval *retval);
+zend_result dom_parent_node_first_element_child_read(dom_object *obj, zval *retval);
+zend_result dom_parent_node_last_element_child_read(dom_object *obj, zval *retval);
+zend_result dom_parent_node_child_element_count(dom_object *obj, zval *retval);
 
 /* node properties */
-int dom_node_node_name_read(dom_object *obj, zval *retval);
-int dom_node_node_value_read(dom_object *obj, zval *retval);
-int dom_node_node_value_write(dom_object *obj, zval *newval);
-int dom_node_node_type_read(dom_object *obj, zval *retval);
-int dom_node_parent_node_read(dom_object *obj, zval *retval);
-int dom_node_parent_element_read(dom_object *obj, zval *retval);
-int dom_node_child_nodes_read(dom_object *obj, zval *retval);
-int dom_node_first_child_read(dom_object *obj, zval *retval);
-int dom_node_last_child_read(dom_object *obj, zval *retval);
-int dom_node_previous_sibling_read(dom_object *obj, zval *retval);
-int dom_node_next_sibling_read(dom_object *obj, zval *retval);
-int dom_node_previous_element_sibling_read(dom_object *obj, zval *retval);
-int dom_node_next_element_sibling_read(dom_object *obj, zval *retval);
-int dom_node_attributes_read(dom_object *obj, zval *retval);
-int dom_node_is_connected_read(dom_object *obj, zval *retval);
-int dom_node_owner_document_read(dom_object *obj, zval *retval);
-int dom_node_namespace_uri_read(dom_object *obj, zval *retval);
-int dom_node_prefix_read(dom_object *obj, zval *retval);
-int dom_node_prefix_write(dom_object *obj, zval *newval);
-int dom_node_local_name_read(dom_object *obj, zval *retval);
-int dom_node_base_uri_read(dom_object *obj, zval *retval);
-int dom_node_text_content_read(dom_object *obj, zval *retval);
-int dom_node_text_content_write(dom_object *obj, zval *newval);
+zend_result dom_node_node_name_read(dom_object *obj, zval *retval);
+zend_result dom_node_node_value_read(dom_object *obj, zval *retval);
+zend_result dom_node_node_value_write(dom_object *obj, zval *newval);
+zend_result dom_node_node_type_read(dom_object *obj, zval *retval);
+zend_result dom_node_parent_node_read(dom_object *obj, zval *retval);
+zend_result dom_node_parent_element_read(dom_object *obj, zval *retval);
+zend_result dom_node_child_nodes_read(dom_object *obj, zval *retval);
+zend_result dom_node_first_child_read(dom_object *obj, zval *retval);
+zend_result dom_node_last_child_read(dom_object *obj, zval *retval);
+zend_result dom_node_previous_sibling_read(dom_object *obj, zval *retval);
+zend_result dom_node_next_sibling_read(dom_object *obj, zval *retval);
+zend_result dom_node_previous_element_sibling_read(dom_object *obj, zval *retval);
+zend_result dom_node_next_element_sibling_read(dom_object *obj, zval *retval);
+zend_result dom_node_attributes_read(dom_object *obj, zval *retval);
+zend_result dom_node_is_connected_read(dom_object *obj, zval *retval);
+zend_result dom_node_owner_document_read(dom_object *obj, zval *retval);
+zend_result dom_node_namespace_uri_read(dom_object *obj, zval *retval);
+zend_result dom_node_prefix_read(dom_object *obj, zval *retval);
+zend_result dom_node_prefix_write(dom_object *obj, zval *newval);
+zend_result dom_node_local_name_read(dom_object *obj, zval *retval);
+zend_result dom_node_base_uri_read(dom_object *obj, zval *retval);
+zend_result dom_node_text_content_read(dom_object *obj, zval *retval);
+zend_result dom_node_text_content_write(dom_object *obj, zval *newval);
 
 /* nodelist properties */
-int dom_nodelist_length_read(dom_object *obj, zval *retval);
-xmlNodePtr dom_nodelist_xml_item(dom_nnodemap_object *objmap, long index);
-xmlNodePtr dom_nodelist_baseobj_item(dom_nnodemap_object *objmap, long index);
+zend_result dom_nodelist_length_read(dom_object *obj, zval *retval);
 
 /* notation properties */
-int dom_notation_public_id_read(dom_object *obj, zval *retval);
-int dom_notation_system_id_read(dom_object *obj, zval *retval);
+zend_result dom_notation_public_id_read(dom_object *obj, zval *retval);
+zend_result dom_notation_system_id_read(dom_object *obj, zval *retval);
 
 /* processinginstruction properties */
-int dom_processinginstruction_target_read(dom_object *obj, zval *retval);
-int dom_processinginstruction_data_read(dom_object *obj, zval *retval);
-int dom_processinginstruction_data_write(dom_object *obj, zval *newval);
+zend_result dom_processinginstruction_target_read(dom_object *obj, zval *retval);
+zend_result dom_processinginstruction_data_read(dom_object *obj, zval *retval);
+zend_result dom_processinginstruction_data_write(dom_object *obj, zval *newval);
 
 /* text properties */
-int dom_text_whole_text_read(dom_object *obj, zval *retval);
+zend_result dom_text_whole_text_read(dom_object *obj, zval *retval);
 
 #ifdef LIBXML_XPATH_ENABLED
 /* xpath properties */
-int dom_xpath_document_read(dom_object *obj, zval *retval);
-int dom_xpath_register_node_ns_read(dom_object *obj, zval *retval);
-int dom_xpath_register_node_ns_write(dom_object *obj, zval *newval);
+zend_result dom_xpath_document_read(dom_object *obj, zval *retval);
+zend_result dom_xpath_register_node_ns_read(dom_object *obj, zval *retval);
+zend_result dom_xpath_register_node_ns_write(dom_object *obj, zval *newval);
 #endif
 
 #endif /* DOM_PROPERTIES_H */
diff --git a/ext/dom/element.c b/ext/dom/element.c
index fabc3c514bf..8a19a49c1a6 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -108,7 +108,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-104682815
 Since:
 */
-int dom_element_tag_name_read(dom_object *obj, zval *retval)
+zend_result dom_element_tag_name_read(dom_object *obj, zval *retval)
 {
 	xmlNodePtr nodep;
 	xmlNsPtr ns;
@@ -137,7 +137,7 @@ int dom_element_tag_name_read(dom_object *obj, zval *retval)
 
 /* }}} */
 
-static int dom_element_reflected_attribute_read(dom_object *obj, zval *retval, const char *name)
+static zend_result dom_element_reflected_attribute_read(dom_object *obj, zval *retval, const char *name)
 {
 	xmlNodePtr nodep = dom_object_get_node(obj);
 
@@ -176,12 +176,12 @@ static xmlAttrPtr dom_element_reflected_attribute_write(dom_object *obj, zval *n
 URL: https://dom.spec.whatwg.org/#dom-element-classname
 Since:
 */
-int dom_element_class_name_read(dom_object *obj, zval *retval)
+zend_result dom_element_class_name_read(dom_object *obj, zval *retval)
 {
 	return dom_element_reflected_attribute_read(obj, retval, "class");
 }
 
-int dom_element_class_name_write(dom_object *obj, zval *newval)
+zend_result dom_element_class_name_write(dom_object *obj, zval *newval)
 {
 	if (dom_element_reflected_attribute_write(obj, newval, "class")) {
 		return SUCCESS;
@@ -194,14 +194,14 @@ int dom_element_class_name_write(dom_object *obj, zval *newval)
 URL: https://dom.spec.whatwg.org/#dom-element-id
 Since:
 */
-int dom_element_id_read(dom_object *obj, zval *retval)
+zend_result dom_element_id_read(dom_object *obj, zval *retval)
 {
 	return dom_element_reflected_attribute_read(obj, retval, "id");
 }
 
 static void php_set_attribute_id(xmlAttrPtr attrp, bool is_id);
 
-int dom_element_id_write(dom_object *obj, zval *newval)
+zend_result dom_element_id_write(dom_object *obj, zval *newval)
 {
 	xmlAttrPtr attr = dom_element_reflected_attribute_write(obj, newval, "id");
 	if (!attr) {
@@ -217,7 +217,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Element-schemaTypeInfo
 Since: DOM Level 3
 */
-int dom_element_schema_type_info_read(dom_object *obj, zval *retval)
+zend_result dom_element_schema_type_info_read(dom_object *obj, zval *retval)
 {
 	ZVAL_NULL(retval);
 	return SUCCESS;
diff --git a/ext/dom/entity.c b/ext/dom/entity.c
index cdd8f2ac029..828027c9673 100644
--- a/ext/dom/entity.c
+++ b/ext/dom/entity.c
@@ -36,7 +36,7 @@ readonly=yes
 URL: https://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D7303025
 Since:
 */
-int dom_entity_public_id_read(dom_object *obj, zval *retval)
+zend_result dom_entity_public_id_read(dom_object *obj, zval *retval)
 {
 	xmlEntity *nodep = (xmlEntity *) dom_object_get_node(obj);
 
@@ -61,7 +61,7 @@ readonly=yes
 URL: https://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D7C29F3E
 Since:
 */
-int dom_entity_system_id_read(dom_object *obj, zval *retval)
+zend_result dom_entity_system_id_read(dom_object *obj, zval *retval)
 {
 	xmlEntity *nodep = (xmlEntity *) dom_object_get_node(obj);
 
@@ -86,7 +86,7 @@ readonly=yes
 URL: https://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6ABAEB38
 Since:
 */
-int dom_entity_notation_name_read(dom_object *obj, zval *retval)
+zend_result dom_entity_notation_name_read(dom_object *obj, zval *retval)
 {
 	xmlEntity *nodep = (xmlEntity *) dom_object_get_node(obj);
 
@@ -116,7 +116,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-actualEncoding
 Since: DOM Level 3
 */
-int dom_entity_actual_encoding_read(dom_object *obj, zval *retval)
+zend_result dom_entity_actual_encoding_read(dom_object *obj, zval *retval)
 {
 	ZVAL_NULL(retval);
 	return SUCCESS;
@@ -129,7 +129,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-encoding
 Since: DOM Level 3
 */
-int dom_entity_encoding_read(dom_object *obj, zval *retval)
+zend_result dom_entity_encoding_read(dom_object *obj, zval *retval)
 {
 	ZVAL_NULL(retval);
 	return SUCCESS;
@@ -142,7 +142,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-version
 Since: DOM Level 3
 */
-int dom_entity_version_read(dom_object *obj, zval *retval)
+zend_result dom_entity_version_read(dom_object *obj, zval *retval)
 {
 	ZVAL_NULL(retval);
 	return SUCCESS;
diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c
index 213238215b3..32d10a1bc0d 100644
--- a/ext/dom/namednodemap.c
+++ b/ext/dom/namednodemap.c
@@ -63,7 +63,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D0FB19E
 Since:
 */
-int dom_namednodemap_length_read(dom_object *obj, zval *retval)
+zend_result dom_namednodemap_length_read(dom_object *obj, zval *retval)
 {
 	ZVAL_LONG(retval, php_dom_get_namednodemap_length(obj));
 	return SUCCESS;
diff --git a/ext/dom/node.c b/ext/dom/node.c
index 627f24cb339..7064fa10f0e 100644
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -69,7 +69,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68D095
 Since:
 */
-int dom_node_node_name_read(dom_object *obj, zval *retval)
+zend_result dom_node_node_name_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 
@@ -133,7 +133,7 @@ readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68D080
 Since:
 */
-int dom_node_node_value_read(dom_object *obj, zval *retval)
+zend_result dom_node_node_value_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 
@@ -170,7 +170,7 @@ int dom_node_node_value_read(dom_object *obj, zval *retval)
 	return SUCCESS;
 }
 
-int dom_node_node_value_write(dom_object *obj, zval *newval)
+zend_result dom_node_node_value_write(dom_object *obj, zval *newval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 	zend_string *str;
@@ -214,7 +214,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-111237558
 Since:
 */
-int dom_node_node_type_read(dom_object *obj, zval *retval)
+zend_result dom_node_node_type_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep;
 
@@ -261,7 +261,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1060184317
 Since:
 */
-int dom_node_parent_node_read(dom_object *obj, zval *retval)
+zend_result dom_node_parent_node_read(dom_object *obj, zval *retval)
 {
 	return dom_node_parent_get(obj, retval, false);
 }
@@ -273,7 +273,7 @@ readonly=yes
 URL: https://dom.spec.whatwg.org/#parent-element
 Since:
 */
-int dom_node_parent_element_read(dom_object *obj, zval *retval)
+zend_result dom_node_parent_element_read(dom_object *obj, zval *retval)
 {
 	return dom_node_parent_get(obj, retval, true);
 }
@@ -285,7 +285,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1451460987
 Since:
 */
-int dom_node_child_nodes_read(dom_object *obj, zval *retval)
+zend_result dom_node_child_nodes_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 	dom_object *intern;
@@ -308,7 +308,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-169727388
 Since:
 */
-int dom_node_first_child_read(dom_object *obj, zval *retval)
+zend_result dom_node_first_child_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep, *first = NULL;
 
@@ -339,7 +339,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-61AD09FB
 Since:
 */
-int dom_node_last_child_read(dom_object *obj, zval *retval)
+zend_result dom_node_last_child_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep, *last = NULL;
 
@@ -370,7 +370,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-640FB3C8
 Since:
 */
-int dom_node_previous_sibling_read(dom_object *obj, zval *retval)
+zend_result dom_node_previous_sibling_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep, *prevsib;
 
@@ -398,7 +398,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6AC54C2F
 Since:
 */
-int dom_node_next_sibling_read(dom_object *obj, zval *retval)
+zend_result dom_node_next_sibling_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep, *nextsib;
 
@@ -426,7 +426,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-640FB3C8
 Since:
 */
-int dom_node_previous_element_sibling_read(dom_object *obj, zval *retval)
+zend_result dom_node_previous_element_sibling_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep, *prevsib;
 
@@ -459,7 +459,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6AC54C2F
 Since:
 */
-int dom_node_next_element_sibling_read(dom_object *obj, zval *retval)
+zend_result dom_node_next_element_sibling_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep, *nextsib;
 
@@ -492,7 +492,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-84CF096
 Since:
 */
-int dom_node_attributes_read(dom_object *obj, zval *retval)
+zend_result dom_node_attributes_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 	dom_object *intern;
@@ -520,7 +520,7 @@ readonly=yes
 URL: https://dom.spec.whatwg.org/#dom-node-isconnected
 Since:
 */
-int dom_node_is_connected_read(dom_object *obj, zval *retval)
+zend_result dom_node_is_connected_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 
@@ -539,7 +539,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-node-ownerDoc
 Since:
 */
-int dom_node_owner_document_read(dom_object *obj, zval *retval)
+zend_result dom_node_owner_document_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 	xmlDocPtr docp;
@@ -570,7 +570,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSname
 Since: DOM Level 2
 */
-int dom_node_namespace_uri_read(dom_object *obj, zval *retval)
+zend_result dom_node_namespace_uri_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 	char *str = NULL;
@@ -609,7 +609,7 @@ readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSPrefix
 Since: DOM Level 2
 */
-int dom_node_prefix_read(dom_object *obj, zval *retval)
+zend_result dom_node_prefix_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 	xmlNsPtr ns;
@@ -643,7 +643,7 @@ int dom_node_prefix_read(dom_object *obj, zval *retval)
 
 }
 
-int dom_node_prefix_write(dom_object *obj, zval *newval)
+zend_result dom_node_prefix_write(dom_object *obj, zval *newval)
 {
 	zend_string *prefix_str;
 	xmlNode *nodep, *nsnode = NULL;
@@ -718,7 +718,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSLocalN
 Since: DOM Level 2
 */
-int dom_node_local_name_read(dom_object *obj, zval *retval)
+zend_result dom_node_local_name_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 
@@ -743,7 +743,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-baseURI
 Since: DOM Level 3
 */
-int dom_node_base_uri_read(dom_object *obj, zval *retval)
+zend_result dom_node_base_uri_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 	xmlChar *baseuri;
@@ -771,7 +771,7 @@ readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-textContent
 Since: DOM Level 3
 */
-int dom_node_text_content_read(dom_object *obj, zval *retval)
+zend_result dom_node_text_content_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 
@@ -785,7 +785,7 @@ int dom_node_text_content_read(dom_object *obj, zval *retval)
 	return SUCCESS;
 }
 
-int dom_node_text_content_write(dom_object *obj, zval *newval)
+zend_result dom_node_text_content_write(dom_object *obj, zval *newval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 
diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c
index c94a6fd5105..b74a23ee722 100644
--- a/ext/dom/nodelist.c
+++ b/ext/dom/nodelist.c
@@ -112,7 +112,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-203510337
 Since:
 */
-int dom_nodelist_length_read(dom_object *obj, zval *retval)
+zend_result dom_nodelist_length_read(dom_object *obj, zval *retval)
 {
 	ZVAL_LONG(retval, php_dom_get_nodelist_length(obj));
 	return SUCCESS;
diff --git a/ext/dom/notation.c b/ext/dom/notation.c
index 853635868b0..31631f7b961 100644
--- a/ext/dom/notation.c
+++ b/ext/dom/notation.c
@@ -37,7 +37,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-54F2B4D0
 Since:
 */
-int dom_notation_public_id_read(dom_object *obj, zval *retval)
+zend_result dom_notation_public_id_read(dom_object *obj, zval *retval)
 {
 	xmlEntityPtr nodep = (xmlEntityPtr) dom_object_get_node(obj);
 
@@ -62,7 +62,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-E8AAB1D0
 Since:
 */
-int dom_notation_system_id_read(dom_object *obj, zval *retval)
+zend_result dom_notation_system_id_read(dom_object *obj, zval *retval)
 {
 	xmlEntityPtr nodep = (xmlEntityPtr) dom_object_get_node(obj);
 
diff --git a/ext/dom/parentnode.c b/ext/dom/parentnode.c
index 8b225d75c92..5b058a217b8 100644
--- a/ext/dom/parentnode.c
+++ b/ext/dom/parentnode.c
@@ -28,7 +28,7 @@
 readonly=yes
 URL: https://www.w3.org/TR/dom/#dom-parentnode-firstelementchild
 */
-int dom_parent_node_first_element_child_read(dom_object *obj, zval *retval)
+zend_result dom_parent_node_first_element_child_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep, *first = NULL;
 
@@ -61,7 +61,7 @@ int dom_parent_node_first_element_child_read(dom_object *obj, zval *retval)
 readonly=yes
 URL: https://www.w3.org/TR/dom/#dom-parentnode-lastelementchild
 */
-int dom_parent_node_last_element_child_read(dom_object *obj, zval *retval)
+zend_result dom_parent_node_last_element_child_read(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep, *last = NULL;
 
@@ -94,7 +94,7 @@ int dom_parent_node_last_element_child_read(dom_object *obj, zval *retval)
 readonly=yes
 https://www.w3.org/TR/dom/#dom-parentnode-childelementcount
 */
-int dom_parent_node_child_element_count(dom_object *obj, zval *retval)
+zend_result dom_parent_node_child_element_count(dom_object *obj, zval *retval)
 {
 	xmlNode *nodep, *first = NULL;
 	zend_long count = 0;
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index bada817e301..aeec672a325 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -92,8 +92,8 @@ static zend_object *dom_objects_namespace_node_new(zend_class_entry *class_type)
 static void dom_object_namespace_node_free_storage(zend_object *object);
 static xmlNodePtr php_dom_create_fake_namespace_decl_node_ptr(xmlNodePtr nodep, xmlNsPtr original);
 
-typedef int (*dom_read_t)(dom_object *obj, zval *retval);
-typedef int (*dom_write_t)(dom_object *obj, zval *newval);
+typedef zend_result (*dom_read_t)(dom_object *obj, zval *retval);
+typedef zend_result (*dom_write_t)(dom_object *obj, zval *newval);
 
 typedef struct _dom_prop_handler {
 	dom_read_t read_func;
diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c
index 2e8695e276c..d35beba564d 100644
--- a/ext/dom/processinginstruction.c
+++ b/ext/dom/processinginstruction.c
@@ -70,7 +70,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1478689192
 Since:
 */
-int dom_processinginstruction_target_read(dom_object *obj, zval *retval)
+zend_result dom_processinginstruction_target_read(dom_object *obj, zval *retval)
 {
 	xmlNodePtr nodep = dom_object_get_node(obj);
 
@@ -91,7 +91,7 @@ readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-837822393
 Since:
 */
-int dom_processinginstruction_data_read(dom_object *obj, zval *retval)
+zend_result dom_processinginstruction_data_read(dom_object *obj, zval *retval)
 {
 	xmlNodePtr nodep = dom_object_get_node(obj);
 
@@ -105,7 +105,7 @@ int dom_processinginstruction_data_read(dom_object *obj, zval *retval)
 	return SUCCESS;
 }
 
-int dom_processinginstruction_data_write(dom_object *obj, zval *newval)
+zend_result dom_processinginstruction_data_write(dom_object *obj, zval *newval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
 
diff --git a/ext/dom/text.c b/ext/dom/text.c
index ef5568b586e..c51240273d8 100644
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -64,7 +64,7 @@ readonly=yes
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-wholeText
 Since: DOM Level 3
 */
-int dom_text_whole_text_read(dom_object *obj, zval *retval)
+zend_result dom_text_whole_text_read(dom_object *obj, zval *retval)
 {
 	xmlNodePtr node;
 	xmlChar *wholetext = NULL;
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 5c6e5d3307e..3c44a5b7f4f 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -246,7 +246,7 @@ PHP_METHOD(DOMXPath, __construct)
 /* }}} end DOMXPath::__construct */
 
 /* {{{ document DOMDocument*/
-int dom_xpath_document_read(dom_object *obj, zval *retval)
+zend_result dom_xpath_document_read(dom_object *obj, zval *retval)
 {
 	xmlDoc *docp = NULL;
 	xmlXPathContextPtr ctx = (xmlXPathContextPtr) obj->ptr;
@@ -265,14 +265,14 @@ static inline dom_xpath_object *php_xpath_obj_from_dom_obj(dom_object *obj) {
 	return (dom_xpath_object*)((char*)(obj) - XtOffsetOf(dom_xpath_object, dom));
 }
 
-int dom_xpath_register_node_ns_read(dom_object *obj, zval *retval)
+zend_result dom_xpath_register_node_ns_read(dom_object *obj, zval *retval)
 {
 	ZVAL_BOOL(retval, php_xpath_obj_from_dom_obj(obj)->register_node_ns);
 
 	return SUCCESS;
 }
 
-int dom_xpath_register_node_ns_write(dom_object *obj, zval *newval)
+zend_result dom_xpath_register_node_ns_write(dom_object *obj, zval *newval)
 {
 	php_xpath_obj_from_dom_obj(obj)->register_node_ns = zend_is_true(newval);