diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index d9c577efd49..3ba14255abd 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1458,15 +1458,12 @@ SXE_METHOD(getNamespaces) GET_NODE(sxe, node); node = php_sxe_get_first_node(sxe, node TSRMLS_CC); - while (node) { - SKIP_TEXT(node) + if (node) { if (node->type == XML_ELEMENT_NODE) { sxe_add_namespaces(sxe, node, recursive, return_value TSRMLS_CC); } else if (node->type == XML_ATTRIBUTE_NODE && node->ns) { sxe_add_namespace_name(return_value, node->ns TSRMLS_CC); } -next_iter: - node = node->next; } } /* }}} */ diff --git a/ext/simplexml/tests/bug41861.phpt b/ext/simplexml/tests/bug41861.phpt new file mode 100644 index 00000000000..07622ebbd38 --- /dev/null +++ b/ext/simplexml/tests/bug41861.phpt @@ -0,0 +1,38 @@ +--TEST-- +Bug #41861 (getNamespaces() returns the namespaces of a node's siblings) +--FILE-- + + + + + + +'); + +$name = $xml->getName(); +$namespaces = $xml->getNamespaces(True); +echo "root(recursive): '$name' -- namespaces: ", implode(', ', $namespaces), "\n"; +$namespaces = $xml->getNamespaces(False); +echo "root(non-recursive): '$name' -- namespaces: ", implode(', ', $namespaces), "\n"; + +foreach (array(null, '#ns1', '#ns2', '#ns3') as $ns) +{ + foreach ($xml->children($ns) as $child) + { + $name = $child->getName(); + $namespaces = $child->getNamespaces(false); + + echo "children($ns): '$name' -- namespaces: ", implode(', ', $namespaces), "\n"; + } +} +?> +--EXPECT-- +root(recursive): 'root' -- namespaces: #ns1, #ns2, #ns3 +root(non-recursive): 'root' -- namespaces: +children(): 'first_node_no_ns' -- namespaces: +children(): 'last_node_no_ns' -- namespaces: +children(#ns1): 'node1' -- namespaces: #ns1 +children(#ns2): 'node2' -- namespaces: #ns2 +children(#ns3): 'node3' -- namespaces: #ns3