[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
| From: | David Carlier | Date: | Mon, 12 Oct 2026 21:06:20 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142222@lists.php.net to get a copy of this message | ||
Author: David Carlier (devnexen)
Date: 2026-10-12T22:05:42+01:00
Commit: https://github.com/php/php-src/commit/f9b0defcbb9578569c05400fb0073549e9cbc970
Raw diff: https://github.com/php/php-src/commit/f9b0defcbb9578569c05400fb0073549e9cbc970.diff
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
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 0fc0cc1ef0f6..6b2c374dcec4 100644
--- a/ext/dom/parentnode/css_selectors.c
+++ b/ext/dom/parentnode/css_selectors.c
@@ -239,7 +239,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