[php-src] master: Merge branch 'PHP-8.4' into PHP-8.5

From: Date: Mon, 12 Oct 2026 21:06:18 +0000
Subject: [php-src] master: Merge branch 'PHP-8.4' into PHP-8.5
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-142221@lists.php.net to get a copy of this message
Author: David Carlier (devnexen) Date: 2026-10-12T22:05:40+01:00 Commit: https://github.com/php/php-src/commit/bbfdd69f60191d77bc6382e99a242b88ee991e72 Raw diff: https://github.com/php/php-src/commit/bbfdd69f60191d77bc6382e99a242b88ee991e72.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: Fix GH-24260: querySelectorAll() returns duplicate elements for selector lists Changed paths: A ext/dom/tests/modern/css_selectors/gh24260.phpt M ext/dom/parentnode/css_selectors.c Diff: diff --git a/ext/dom/parentnode/css_selectors.c b/ext/dom/parentnode/css_selectors.c index fd7f7b50c6a4..d454bcae1707 100644 --- a/ext/dom/parentnode/css_selectors.c +++ b/ext/dom/parentnode/css_selectors.c @@ -241,7 +241,7 @@ void dom_parent_node_query_selector_all(xmlNodePtr thisp, dom_object *intern, zv selectors_str, dom_query_selector_find_array_callback, &ctx, - LXB_SELECTORS_OPT_DEFAULT + LXB_SELECTORS_OPT_MATCH_FIRST ) != LXB_STATUS_OK) { zend_array_destroy(list); RETURN_THROWS(); diff --git a/ext/dom/tests/modern/css_selectors/gh24260.phpt b/ext/dom/tests/modern/css_selectors/gh24260.phpt new file mode 100644 index 000000000000..d1c408067299 --- /dev/null +++ b/ext/dom/tests/modern/css_selectors/gh24260.phpt @@ -0,0 +1,29 @@ +--TEST-- +GH-24260 (querySelectorAll() returns duplicate elements for selector lists) +--EXTENSIONS-- +dom +--FILE-- +<?php + +$dom = Dom\HTMLDocument::createFromString( + '<!DOCTYPE html><div><p class="a b">one</p><p class="b">two</p></div>' +); + +foreach ([$dom, $dom->querySelector('div')] as $context) { + foreach (['.a, .b', '.a, .b, .a.b', 'p, :is(.a, .b)'] as $selector) { + $texts = []; + foreach ($context->querySelectorAll($selector) as $node) { + $texts[] = $node->textContent; + } + echo $selector, ': ', implode(' ', $texts), "\n"; + } +} + +?> +--EXPECT-- +.a, .b: one two +.a, .b, .a.b: one two +p, :is(.a, .b): one two +.a, .b: one two +.a, .b, .a.b: one two +p, :is(.a, .b): one two

« previous php.cvs (#142221) next »