cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests bug41861.phpt

rrichards Tue Jul 3 15:02:40 2007 UTC Modified files: /php-src/ext/simplexml simplexml.c /php-src/ext/simplexml/tests bug41861.phpt Log: MFB: fix bug #41861 (getNamespaces() returns namespaces of node's siblings) add test http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.238&r2=1.239&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.238 php-src/ext/simplexml/simplexml.c:1.239 --- php-src/ext/simplexml/simplexml.c:1.238 Mon Jul 2 11:53:08 2007 +++ php-src/ext/simplexml/simplexml.c Tue Jul 3 15:02:40 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.238 2007/07/02 11:53:08 dmitry Exp $ */ +/* $Id: simplexml.c,v 1.239 2007/07/03 15:02:40 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1458,15 +1458,12 @@ 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; } } /* }}} */ @@ -2486,7 +2483,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.238 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.239 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled"); http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug41861.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/simplexml/tests/bug41861.phpt diff -u /dev/null php-src/ext/simplexml/tests/bug41861.phpt:1.2 --- /dev/null Tue Jul 3 15:02:40 2007 +++ php-src/ext/simplexml/tests/bug41861.phpt Tue Jul 3 15:02:40 2007 @@ -0,0 +1,38 @@ +--TEST-- +Bug #41861 (getNamespaces() returns the namespaces of a node's siblings) +--FILE-- +<?php + +$xml = simplexml_load_string('<root> + <first_node_no_ns /> + <ns1:node1 xmlns:ns1="#ns1" /> + <ns2:node2 xmlns:ns2="#ns2" /> + <ns3:node3 xmlns:ns3="#ns3" /> + <last_node_no_ns /> +</root>'); + +$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