Commiting r311138 into the 5.3 branch - fix to SimpleXML get properties hash

diff --git a/UPGRADING b/UPGRADING
index c08016d4794c31dfc3660f847df6fa19e2ac96f7..0d849a15e5a0f6e8d6ddbbe75c3c7127bc78cb9a 100755 (executable)
--- a/UPGRADING
+++ b/UPGRADING
@@ -170,6 +170,10 @@ UPGRADE NOTES - PHP X.Y
 - fclose() closes streams with resource refcount > 1; it doesn't merely
   decrement the resource refcount.
 - socket_set_options() and socket_get_options() now support multicast options.
+- Arrays cast from SimpleXMLElement now always contain all nodes instead of
+  just the first matching node.
+- All SimpleXMLElement children are now always printed when using var_dump(),
+  var_export(), and print_r().
 
 ===================================
 5. Changes made to existing methods

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index f9504fe58dc2c51f0cc62360831458c9d548d171..98dbc0c13ebcbd73bfe6db0643aeae456bde2143 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1069,6 +1069,10 @@ static HashTable * sxe_get_prop_hash(zval *object, int is_debug TSRMLS_DC) /* {{
        xmlAttrPtr       attr;
        int              namelen;
        int              test;
+       char             use_iter;
+       zval            *iter_data;
+
+       use_iter = 0;
 
        sxe = php_sxe_fetch_object(object TSRMLS_CC);
 
@@ -1122,6 +1126,7 @@ static HashTable * sxe_get_prop_hash(zval *object, int is_debug TSRMLS_DC) /* {{
 
        GET_NODE(sxe, node);
        node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
+
        if (node && sxe->iter.type != SXE_ITER_ATTRLIST) {
                if (node->type == XML_ATTRIBUTE_NODE) {
                        MAKE_STD_ZVAL(value);
@@ -1129,7 +1134,17 @@ static HashTable * sxe_get_prop_hash(zval *object, int is_debug TSRMLS_DC) /* {{
                        zend_hash_next_index_insert(rv, &value, sizeof(zval *), NULL);
                        node = NULL;
                } else if (sxe->iter.type != SXE_ITER_CHILD) {
-                       node = node->children;
+
+                       if ( !node->children || !node->parent || node->children->next || node->children->children || node->parent->children == node->parent->last ) {
+                               node = node->children;
+                       } else {
+                               iter_data = sxe->iter.data;
+                               sxe->iter.data = NULL;
+
+                               node = php_sxe_reset_iterator(sxe, 0 TSRMLS_CC);
+
+                               use_iter = 1;
+                       }
                }
 
                while (node) {
@@ -1161,10 +1176,25 @@ static HashTable * sxe_get_prop_hash(zval *object, int is_debug TSRMLS_DC) /* {{
 
                        _get_base_node_value(sxe, node, &value, sxe->iter.nsprefix, sxe->iter.isprefix TSRMLS_CC);
 
-                       sxe_properties_add(rv, name, namelen, value TSRMLS_CC);
+                       if ( use_iter ) {
+                               zend_hash_next_index_insert(rv, &value, sizeof(zval *), NULL);
+                       } else {
+                               sxe_properties_add(rv, name, namelen, value TSRMLS_CC);
+                       }
 next_iter:
-                       node = node->next;
+                       if ( use_iter ) {
+                               node = php_sxe_iterator_fetch(sxe, node->next, 0 TSRMLS_CC);
+                       } else {
+                               node = node->next;
+                       }
+               }
+       }
+
+       if ( use_iter ) {
+               if (sxe->iter.data) {
+                       zval_ptr_dtor(&sxe->iter.data);
                }
+               sxe->iter.data = iter_data;
        }
 
        return rv;

diff --git a/ext/simplexml/tests/034.phpt b/ext/simplexml/tests/034.phpt
index 1f3a854fdecde5f8b1cad029409dc224bc9356e2..8610f7036770082ad5c3b81af74c487362e4bb5e 100755 (executable)
--- a/ext/simplexml/tests/034.phpt
+++ b/ext/simplexml/tests/034.phpt
@@ -1,7 +1,7 @@
 --TEST--
-SimpleXML: array casting bug
---XFAIL--
-Does anyone know why?
+SimpleXML: cast to array
+--FAIL--
+Length of cast array does not match expected length
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--

diff --git a/ext/simplexml/tests/bug51615.phpt b/ext/simplexml/tests/bug51615.phpt
index 75f6769ff7c1b6947593383651ae176a60a5af83..e0229943131f3e0380793568cae9cfb187c1ba60 100644 (file)
--- a/ext/simplexml/tests/bug51615.phpt
+++ b/ext/simplexml/tests/bug51615.phpt
@@ -20,7 +20,7 @@ foreach ($html->body->span as $obj) {
 Warning: DOMDocument::loadHTML(): error parsing attribute name in Entity, line: 1 in %s on line %d
 
 Warning: DOMDocument::loadHTML(): error parsing attribute name in Entity, line: 1 in %s on line %d
-object(SimpleXMLElement)#%d (2) {
+object(SimpleXMLElement)#%d (3) {
   ["@attributes"]=>
   array(2) {
     ["title"]=>
@@ -30,6 +30,8 @@ object(SimpleXMLElement)#%d (2) {
   }
   [0]=>
   string(1) "x"
+  [1]=>
+  string(1) "x"
 }
 string(0) ""
 string(0) ""