Added type attribute wrappers to the remaining node types that did not have

them.  I.e. XML_ATTRIBUTE_NODE and XML_CDATA_SECTION_NODE.  Mentioned in
Bug #15918.

diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index 9246ab702afd53e4ff1d685fffb6fb53ef65963e..b138bec17307d50ab558b09baf24ad6d50d4cf57 100644 (file)
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -1010,6 +1010,7 @@ static zval *php_domobject_new(xmlNodePtr obj, int *found TSRMLS_DC)
                        object_init_ex(wrapper, domxmlattr_class_entry);
                        rsrc_type = le_domxmlattrp;
                        add_property_stringl(wrapper, "name", (char *) attrp->name, strlen(attrp->name), 1);
+                       add_property_long(wrapper, "type", Z_TYPE_P(attrp));
                        content = xmlNodeGetContent((xmlNodePtr) attrp);
                        if (content)
                                add_property_stringl(wrapper, "value", (char *) content, strlen(content), 1);
@@ -1049,6 +1050,7 @@ static zval *php_domobject_new(xmlNodePtr obj, int *found TSRMLS_DC)
                        xmlDtdPtr dtd = (xmlDtdPtr) obj;
                        object_init_ex(wrapper, domxmldtd_class_entry);
                        rsrc_type = le_domxmldtdp;
+                       add_property_long(wrapper, "type", Z_TYPE_P(dtd));
                        if (dtd->ExternalID)
                                add_property_string(wrapper, "publicId", (char *) dtd->ExternalID, 1);
                        if (dtd->SystemID)
@@ -1064,10 +1066,9 @@ static zval *php_domobject_new(xmlNodePtr obj, int *found TSRMLS_DC)
                        object_init_ex(wrapper, domxmlcdata_class_entry);
                        rsrc_type = le_domxmlcdatap;
                        content = xmlNodeGetContent(nodep);
-                       if (content) {
-                               add_property_long(wrapper, "type", Z_TYPE_P(nodep));
+                       add_property_long(wrapper, "type", Z_TYPE_P(nodep));
+                       if (content)
                                add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1);
-                       }
                        break;
                }