Rework some ns stuff

Author: ndossche

ext/dom/dom_ce.h

@@ -66,5 +66,6 @@ extern PHP_DOM_EXPORT zend_class_entry *dom_xpath_class_entry;
 extern PHP_DOM_EXPORT zend_class_entry *dom_modern_xpath_class_entry;
 #endif
 extern PHP_DOM_EXPORT zend_class_entry *dom_namespace_node_class_entry;
+extern PHP_DOM_EXPORT zend_class_entry *dom_namespace_info_class_entry;
 
 #endif /* DOM_CE_H */

ext/dom/element.c

@@ -1755,22 +1755,58 @@ PHP_METHOD(DOM_Element, getInScopeNamespaces)
 	DOM_GET_THIS_OBJ(nodep, id, xmlNodePtr, intern);
 
 	php_dom_libxml_ns_mapper *ns_mapper = php_dom_get_ns_mapper(intern);
-	php_dom_in_scope_ns namespaces = php_dom_get_in_scope_ns(ns_mapper, nodep, true);
 
-	array_init_size(return_value, namespaces.count);
+	HashTable prefix_to_ns_table;
+	zend_hash_init(&prefix_to_ns_table, 0, NULL, NULL, false);
+	zend_hash_real_init_mixed(&prefix_to_ns_table);
+
+	/* https://www.w3.org/TR/1999/REC-xpath-19991116/#namespace-nodes */
+	for (const xmlNode *cur = nodep; cur != NULL; cur = cur->parent) {
+		if (cur->type == XML_ELEMENT_NODE) {
+			for (const xmlAttr *attr = cur->properties; attr != NULL; attr = attr->next) {
+				if (attr->ns != NULL && php_dom_ns_is_fast_ex(attr->ns, php_dom_ns_is_xmlns_magic_token)
+					&& attr->children != NULL && attr->children->content != NULL) {
+					const char *prefix = attr->ns->prefix == NULL ? NULL : (const char *) attr->name;
+					const char *key = prefix == NULL ? "" : prefix;
+					xmlNsPtr ns = php_dom_libxml_ns_mapper_get_ns_raw_strings_nullsafe(ns_mapper, prefix, (const char *) attr->children->content);
+					zend_hash_str_add_ptr(&prefix_to_ns_table, key, strlen(key), ns);
+				}
+			}
+		}
+	}
+
+	array_init_size(return_value, zend_hash_num_elements(&prefix_to_ns_table));
+
+	xmlNsPtr ns;
+	zend_string *prefix;
+	ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&prefix_to_ns_table, prefix, ns) {
+		if (ZSTR_LEN(prefix) == 0 && (ns == NULL || ns->href == NULL || *ns->href == '\0')) {
+			/* Exception: "the value of the xmlns attribute for the nearest such element is non-empty" */
+			continue;
+		}
 
-	for (size_t i = 0; i < namespaces.count; i++) {
-		xmlNsPtr ns = namespaces.list[i];
-		if (ns == NULL) {
-			/* This case corresponds to xmlns="" */
-			add_assoc_null(return_value, "");
+		zval zv;
+		object_init_ex(&zv, dom_namespace_info_class_entry);
+		zend_object *obj = Z_OBJ(zv);
+
+		if (ZSTR_LEN(prefix) != 0) {
+			ZVAL_STRING(OBJ_PROP_NUM(obj, 0), (const char *) ZSTR_VAL(prefix));
 		} else {
-			const char *prefix = (const char *) ns->prefix;
-			add_assoc_stringl(return_value, prefix == NULL ? "" : prefix, (const char *) ns->href, xmlStrlen(ns->href));
+			ZVAL_NULL(OBJ_PROP_NUM(obj, 0));
 		}
-	}
 
-	php_dom_in_scope_ns_destroy(&namespaces);
+		if (ns != NULL && ns->href != NULL && *ns->href != '\0') {
+			ZVAL_STRING(OBJ_PROP_NUM(obj, 1), (const char *) ns->href);
+		} else {
+			ZVAL_NULL(OBJ_PROP_NUM(obj, 1));
+		}
+
+		ZVAL_OBJ_COPY(OBJ_PROP_NUM(obj, 2), &intern->std);
+
+		zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &zv);
+	} ZEND_HASH_FOREACH_END();
+
+	zend_hash_destroy(&prefix_to_ns_table);
 }
 
 PHP_METHOD(DOM_Element, rename)

ext/dom/namespace_compat.c

@@ -455,17 +455,18 @@ PHP_DOM_EXPORT void php_dom_libxml_reconcile_modern(php_dom_libxml_ns_mapper *ns
 	zend_hash_destroy(&ctx.old_ns_to_new_ns_ptr);
 }
 
-PHP_DOM_EXPORT php_dom_in_scope_ns php_dom_get_in_scope_ns(php_dom_libxml_ns_mapper *ns_mapper, const xmlNode *node, bool register_element_default_ns)
+PHP_DOM_EXPORT php_dom_in_scope_ns php_dom_get_in_scope_ns(php_dom_libxml_ns_mapper *ns_mapper, const xmlNode *node)
 {
 	ZEND_ASSERT(node != NULL);
 
-	php_dom_in_scope_ns in_scope_ns;
-	in_scope_ns.origin_is_ns_compat = true;
-
 	/* libxml fetches all nsDef items from bottom to top - left to right, ignoring prefixes already in the list.
 	 * We don't have nsDef, but we can use the ns pointer (as that is necessarily in scope),
 	 * and check the xmlns attributes. */
 	HashTable tmp_prefix_to_ns_table;
+
+	/* libxml fetches all nsDef items from bottom to top - left to right, ignoring prefixes already in the list.
+	 * We don't have nsDef, but we can use the ns pointer (as that is necessarily in scope),
+	 * and check the xmlns attributes. */
 	zend_hash_init(&tmp_prefix_to_ns_table, 0, NULL, NULL, false);
 	zend_hash_real_init_mixed(&tmp_prefix_to_ns_table);
 
@@ -474,15 +475,9 @@ PHP_DOM_EXPORT php_dom_in_scope_ns php_dom_get_in_scope_ns(php_dom_libxml_ns_map
 			/* Register namespace of element */
 			if (cur->ns != NULL) {
 				const char *prefix = (const char *) cur->ns->prefix;
-				if (register_element_default_ns || prefix != NULL) {
-					if (prefix == NULL) {
-						zend_hash_str_add_ptr(&tmp_prefix_to_ns_table, "", 0, cur->ns);
-					} else {
-						zend_hash_str_add_ptr(&tmp_prefix_to_ns_table, prefix, strlen(prefix), cur->ns);
-					}
+				if (prefix != NULL) {
+					zend_hash_str_add_ptr(&tmp_prefix_to_ns_table, prefix, strlen(prefix), cur->ns);
 				}
-			} else if (register_element_default_ns) {
-				zend_hash_str_add_ptr(&tmp_prefix_to_ns_table, "", 0, NULL);
 			}
 
 			/* Register xmlns attributes */
@@ -499,6 +494,8 @@ PHP_DOM_EXPORT php_dom_in_scope_ns php_dom_get_in_scope_ns(php_dom_libxml_ns_map
 		}
 	}
 
+	php_dom_in_scope_ns in_scope_ns;
+	in_scope_ns.origin_is_ns_compat = true;
 	in_scope_ns.count = zend_hash_num_elements(&tmp_prefix_to_ns_table);
 	in_scope_ns.list = safe_emalloc(in_scope_ns.count, sizeof(xmlNsPtr), 0);
 

ext/dom/namespace_compat.h

@@ -70,7 +70,7 @@ typedef struct _php_dom_in_scope_ns {
    bool origin_is_ns_compat;
 } php_dom_in_scope_ns;
 
-PHP_DOM_EXPORT php_dom_in_scope_ns php_dom_get_in_scope_ns(php_dom_libxml_ns_mapper *ns_mapper, const xmlNode *node, bool register_element_default_ns);
+PHP_DOM_EXPORT php_dom_in_scope_ns php_dom_get_in_scope_ns(php_dom_libxml_ns_mapper *ns_mapper, const xmlNode *node);
 PHP_DOM_EXPORT php_dom_in_scope_ns php_dom_get_in_scope_ns_legacy(const xmlNode *node);
 PHP_DOM_EXPORT void php_dom_in_scope_ns_destroy(php_dom_in_scope_ns *in_scope_ns);
 

ext/dom/php_dom.c

@@ -82,6 +82,7 @@ PHP_DOM_EXPORT zend_class_entry *dom_xpath_class_entry;
 PHP_DOM_EXPORT zend_class_entry *dom_modern_xpath_class_entry;
 #endif
 PHP_DOM_EXPORT zend_class_entry *dom_namespace_node_class_entry;
+PHP_DOM_EXPORT zend_class_entry *dom_namespace_info_class_entry;
 /* }}} */
 
 static zend_object_handlers dom_object_handlers;
@@ -802,6 +803,8 @@ PHP_MINIT_FUNCTION(dom)
 	DOM_REGISTER_PROP_HANDLER(&dom_namespace_node_prop_handlers, "parentElement", dom_node_parent_element_read, NULL);
 	zend_hash_add_new_ptr(&classes, dom_namespace_node_class_entry->name, &dom_namespace_node_prop_handlers);
 
+	dom_namespace_info_class_entry = register_class_DOM_NamespaceInfo();
+
 	dom_documentfragment_class_entry = register_class_DOMDocumentFragment(dom_node_class_entry, dom_parentnode_class_entry);
 	dom_documentfragment_class_entry->create_object = dom_objects_new;
 	dom_documentfragment_class_entry->default_object_handlers = &dom_object_handlers;

ext/dom/php_dom.stub.php

@@ -1376,6 +1376,7 @@ public function replaceChildren(Node|string ...$nodes): void {}
 
         public string $substitutedNodeValue;
 
+        /** @return list<NamespaceInfo> */
         public function getInScopeNamespaces(): array {}
 
         public function rename(?string $namespaceURI, string $qualifiedName): void {}
@@ -1645,6 +1646,20 @@ public function saveXML(?Node $node = null, int $options = 0): string|false {}
         public function saveXMLFile(string $filename, int $options = 0): int|false {}
     }
 
+    /**
+     * @not-serializable
+     * @strict-properties
+     */
+    final class NamespaceInfo
+    {
+        public readonly ?string $prefix;
+        public readonly ?string $namespaceURI;
+        public readonly Element $element;
+
+        /** @implementation-alias DOM\Node::__construct */
+        private function __construct() {}
+    }
+
 #ifdef LIBXML_XPATH_ENABLED
     /** @not-serializable */
     final class XPath

ext/dom/php_dom_arginfo.h

@@ -5,6 +5,20 @@ dom
 --FILE--
 <?php
 
+function dump($dom, $name) {
+    echo "\n=== $name ===\n";
+    $list = $dom->getElementsByTagName($name)[0]->getInScopeNamespaces();
+    foreach ($list as $entry) {
+        echo "prefix: ";
+        var_dump($entry->prefix);
+        echo "namespaceURI: ";
+        var_dump($entry->namespaceURI);
+        echo "element->nodeName: ";
+        var_dump($entry->element->nodeName);
+        echo "---\n";
+    }
+}
+
 $dom = DOM\XMLDocument::createFromString(<<<XML
 <root xmlns="urn:a">
     <child xmlns="">
@@ -16,41 +30,52 @@ $dom = DOM\XMLDocument::createFromString(<<<XML
 </root>
 XML);
 
-var_dump($dom->getElementsByTagName('c:child')[0]->getInScopeNamespaces());
-var_dump($dom->getElementsByTagName('child')[0]->getInScopeNamespaces());
-var_dump($dom->getElementsByTagName('b:sibling')[0]->getInScopeNamespaces());
-var_dump($dom->getElementsByTagName('d:child')[0]->getInScopeNamespaces());
-var_dump($dom->documentElement->getInScopeNamespaces());
+dump($dom, 'c:child');
+dump($dom, 'child');
+dump($dom, 'b:sibling');
+dump($dom, 'd:child');
+dump($dom, 'root');
 
 ?>
 --EXPECT--
-array(2) {
-  ["c"]=>
-  string(5) "urn:c"
-  [""]=>
-  NULL
-}
-array(1) {
-  [""]=>
-  NULL
-}
-array(3) {
-  ["b"]=>
-  string(5) "urn:b"
-  ["d"]=>
-  string(5) "urn:d"
-  [""]=>
-  string(5) "urn:a"
-}
-array(3) {
-  ["d"]=>
-  string(6) "urn:d2"
-  ["b"]=>
-  string(5) "urn:b"
-  [""]=>
-  string(5) "urn:a"
-}
-array(1) {
-  [""]=>
-  string(5) "urn:a"
-}
+=== c:child ===
+prefix: string(1) "c"
+namespaceURI: string(5) "urn:c"
+element->nodeName: string(7) "c:child"
+---
+
+=== child ===
+
+=== b:sibling ===
+prefix: string(1) "b"
+namespaceURI: string(5) "urn:b"
+element->nodeName: string(9) "b:sibling"
+---
+prefix: string(1) "d"
+namespaceURI: string(5) "urn:d"
+element->nodeName: string(9) "b:sibling"
+---
+prefix: NULL
+namespaceURI: string(5) "urn:a"
+element->nodeName: string(9) "b:sibling"
+---
+
+=== d:child ===
+prefix: string(1) "d"
+namespaceURI: string(6) "urn:d2"
+element->nodeName: string(7) "d:child"
+---
+prefix: string(1) "b"
+namespaceURI: string(5) "urn:b"
+element->nodeName: string(7) "d:child"
+---
+prefix: NULL
+namespaceURI: string(5) "urn:a"
+element->nodeName: string(7) "d:child"
+---
+
+=== root ===
+prefix: NULL
+namespaceURI: string(5) "urn:a"
+element->nodeName: string(4) "root"
+---

ext/dom/tests/modern/extensions/Element_getInScopeNamespaces.phpt

@@ -287,7 +287,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type, bool modern)
 	if (register_node_ns && nodep != NULL) {
 		if (modern) {
 			php_dom_libxml_ns_mapper *ns_mapper = php_dom_get_ns_mapper(&intern->dom);
-			in_scope_ns = php_dom_get_in_scope_ns(ns_mapper, nodep, false);
+			in_scope_ns = php_dom_get_in_scope_ns(ns_mapper, nodep);
 		} else {
 			in_scope_ns = php_dom_get_in_scope_ns_legacy(nodep);
 		}