MFH: php_error() -> php_error_docref()

diff --git a/ext/simplexml/php_simplexml_exports.h b/ext/simplexml/php_simplexml_exports.h
index 6d6e7b8baf542a3b4f6780af20c2675f99598847..445605fdf5e671a6b04e88ddb907c4cf17f3757d 100755 (executable)
--- a/ext/simplexml/php_simplexml_exports.h
+++ b/ext/simplexml/php_simplexml_exports.h
@@ -35,7 +35,7 @@
                __n = (__s)->node->node; \
        } else { \
                __n = NULL; \
-               php_error(E_WARNING, "Node no longer exists"); \
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Node no longer exists"); \
        } \
 }
 

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 6c343718176b969553573e65d58c0825156f52fb..d47187dbe0ded3c99c60724ecfbdf8fe244bb6be 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -92,7 +92,7 @@ static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, int
                __n = (__s)->node->node; \
        } else { \
                __n = NULL; \
-               php_error(E_WARNING, "Node no longer exists"); \
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Node no longer exists"); \
        } \
 }
 
@@ -295,7 +295,7 @@ change_node_zval(xmlNodePtr node, zval *value)
                        }
                        break;
                default:
-                       php_error(E_WARNING, "It is not possible to assign complex types to nodes");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "It is not possible to assign complex types to nodes");
                        break;
        }
 }
@@ -420,7 +420,7 @@ next_iter:
                        }
                        change_node_zval(newnode, value);
                } else if (counter > 1) {
-                       php_error(E_WARNING, "Cannot assign to an array of nodes (duplicate subnodes or attr detected)\n");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot assign to an array of nodes (duplicate subnodes or attr detected)\n");
                } else {
                        if (attribs) {
                                switch (Z_TYPE_P(value)) {
@@ -433,7 +433,7 @@ next_iter:
                                                newnode = (xmlNodePtr)xmlNewProp(node, name, Z_STRVAL_P(value));
                                                break;
                                        default:
-                                               php_error(E_WARNING, "It is not yet possible to assign complex types to attributes");
+                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "It is not yet possible to assign complex types to attributes");
                                }
                        }
                }
@@ -1545,7 +1545,7 @@ PHP_FUNCTION(simplexml_import_dom)
 
        if (nodep) {
                if (nodep->doc == NULL) {
-                       php_error(E_WARNING, "Imported Node must have associated Document");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Imported Node must have associated Document");
                        RETURN_NULL();
                }
                if (nodep->type == XML_DOCUMENT_NODE || nodep->type == XML_HTML_DOCUMENT_NODE) {
@@ -1570,7 +1570,7 @@ PHP_FUNCTION(simplexml_import_dom)
                return_value->type = IS_OBJECT;
                return_value->value.obj = php_sxe_register_object(sxe TSRMLS_CC);
        } else {
-               php_error(E_WARNING, "Invalid Nodetype to import");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Nodetype to import");
                RETVAL_NULL();
        }
 }