php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Throw an exception when using the namespace axis in XPath in modern DOM (#14871)

Browse Source 
This was specified in https://wiki.php.net/rfc/dom_additions_84, under
the "NamespaceInfo" section, but was not implemented yet.
This commit is contained in:
Niels Dossche
2024-07-08 06:15:38 -07:00
committed by GitHub
parent 013bc53f0c
commit ff770d023a
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/dom/tests/modern/xml/XMLDocument_xpath.phpt
View File

@@ -43,7 +43,11 @@ foreach ($result as $item) {
echo "--- Get a namespace node ---\n";
// Namespace nodes don't exist in modern day DOM.
var_dump($xpath->evaluate("//*/namespace::*"));
try {
var_dump($xpath->evaluate("//*/namespace::*"));
} catch (DOMException $e) {
echo $e->getCode(), ": ", $e->getMessage(), "\n";
}
?>
--EXPECT--
@@ -67,7 +71,4 @@ string(4) "data"
string(11) "Dom\Comment"
string(9) " comment "
--- Get a namespace node ---
object(Dom\NodeList)#5 (1) {
["length"]=>
int(0)
}
9: The namespace axis is not well-defined in the living DOM specification. Use Dom\Element::getInScopeNamespaces() or Dom\Element::getDescendantNamespaces() instead.

9
ext/dom/xpath.c
View File

@@ -338,7 +338,14 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type, bool modern)
if (node->type == XML_NAMESPACE_DECL) {
if (modern) {
continue;
if (!EG(exception)) {
php_dom_throw_error_with_message(NOT_SUPPORTED_ERR,
"The namespace axis is not well-defined in the living DOM specification. "
"Use Dom\\Element::getInScopeNamespaces() or Dom\\Element::getDescendantNamespaces() instead.",
/* strict */ true
);
}
break;
}
xmlNodePtr nsparent = node->_private;