Skip to content

ext/dom: Register id attributes set via setAttribute() in XML documents #23801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iliaal wants to merge 1 commit into
base: master
Choose a base branch
from
+59 −2
Open

ext/dom: Register id attributes set via setAttribute() in XML documents #23801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ PHP NEWS
. Fixed Dom\HTMLDocument giving attributes the namespace of their element
when a fragment is parsed with an xlink, xml or xmlns context element.
(Ilia Alshanetsky)
. getElementById() now finds elements whose id attribute was set with
setAttribute()/setAttributeNS() on Dom\XMLDocument. (Ilia Alshanetsky)

- Fileinfo:
. Upgrade to file 5.48. (Weilin Du)
Expand Down
3 changes: 1 addition & 2 deletions ext/dom/element.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,7 @@ static void dom_check_register_attribute_id(xmlAttrPtr attr, php_libxml_ref_obj
{
dom_mark_ids_modified(document);

if (attr->atype != XML_ATTRIBUTE_ID && attr->doc->type == XML_HTML_DOCUMENT_NODE && attr->ns == NULL && xmlStrEqual(attr->name, BAD_CAST "id")) {
/* To respect XML's ID behaviour, we only do this registration for HTML documents. */
if (attr->atype != XML_ATTRIBUTE_ID && attr->ns == NULL && xmlStrEqual(attr->name, BAD_CAST "id")) {
attr->atype = XML_ATTRIBUTE_ID;
}
}
Expand Down
56 changes: 56 additions & 0 deletions ext/dom/tests/modern/xml/Document_getElementById_setAttribute.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
--TEST--
Dom\XMLDocument::getElementById() after setting id with setAttribute()
--EXTENSIONS--
dom
--FILE--
<?php

$dom = Dom\XMLDocument::createEmpty();
$root = $dom->appendChild($dom->createElement("root"));
$a = $dom->createElement("a");
$dom->documentElement->appendChild($a);

echo "--- After parsing ---\n";
var_dump($dom->getElementById("x")?->nodeName);

echo "--- After setAttribute ---\n";
$a->setAttribute("id", "x");
var_dump($dom->getElementById("x")?->nodeName);
var_dump($dom->getElementById("y")?->nodeName);

echo "--- After changing the id value with setAttribute ---\n";
$a->setAttribute("id", "y");
var_dump($dom->getElementById("x")?->nodeName);
var_dump($dom->getElementById("y")?->nodeName);

echo "--- After setAttributeNS ---\n";
$a->setAttributeNS(null, "id", "z");
var_dump($dom->getElementById("y")?->nodeName);
var_dump($dom->getElementById("z")?->nodeName);

echo "--- After removing the attribute ---\n";
$a->removeAttribute("id");
var_dump($dom->getElementById("z")?->nodeName);

echo "--- After setIdAttribute ---\n";
$a->setAttribute("id", "w");
$a->setIdAttribute("id", false);
var_dump($dom->getElementById("w")?->nodeName);

?>
--EXPECT--
--- After parsing ---
NULL
--- After setAttribute ---
string(1) "a"
NULL
--- After changing the id value with setAttribute ---
NULL
string(1) "a"
--- After setAttributeNS ---
NULL
string(1) "a"
--- After removing the attribute ---
NULL
--- After setIdAttribute ---
NULL
Loading