diff --git a/NEWS b/NEWS index a6555ac871c9..24ad85f93eb7 100644 --- a/NEWS +++ b/NEWS @@ -129,6 +129,10 @@ PHP NEWS . Fix error paths in dom_xml_serializing_a_document_node(). (ndossche) . Fixed use-after-free on namespace axis results with a foreign-document XPath callback node. (David Carlier) + . Fixed CSS selectors checking only the nearest element for a descendant or + subsequent-sibling combinator after a compound selector that starts with + :is(), :where(), :not(), :has() or :nth-child(An+B of S), by merging + lexbor/lexbor@f6c1d06. (phcorp) - FFI: . Fixed bug GH-24582 (Memory leaks in ext/ffi parser when finalize_type() diff --git a/ext/dom/lexbor/lexbor/selectors-adapted/selectors.c b/ext/dom/lexbor/lexbor/selectors-adapted/selectors.c index 3f16ccfa5f5a..19e1c1523c0b 100644 --- a/ext/dom/lexbor/lexbor/selectors-adapted/selectors.c +++ b/ext/dom/lexbor/lexbor/selectors-adapted/selectors.c @@ -189,6 +189,10 @@ static lxb_selectors_entry_t * lxb_selectors_state_find(lxb_selectors_t *selectors, lxb_selectors_entry_t *entry); +static lxb_selectors_entry_t * +lxb_selectors_state_find_forward(lxb_selectors_t *selectors, + lxb_selectors_entry_t *entry); + static lxb_selectors_entry_t * lxb_selectors_state_found_check(lxb_selectors_t *selectors, lxb_selectors_entry_t *entry); @@ -673,6 +677,29 @@ lxb_inline void lxb_selectors_switch_to_not_found(lxb_selectors_t *selectors, lxb_selectors_nested_t *current) { + lxb_css_selector_combinator_t combinator; + + combinator = current->entry->combinator; + + /* + * A nested selector rejected this candidate. Continue the combinator + * before backtracking to another entry. + */ + if (combinator == LXB_CSS_SELECTOR_COMBINATOR_DESCENDANT + || combinator == LXB_CSS_SELECTOR_COMBINATOR_FOLLOWING + || (current->forward + && combinator == LXB_CSS_SELECTOR_COMBINATOR_CHILD)) + { + if (current->forward) { + selectors->state = lxb_selectors_state_find_forward; + } + else { + selectors->state = lxb_selectors_state_find; + } + + return; + } + if (current->forward) { selectors->state = lxb_selectors_state_not_found_forward; } diff --git a/ext/dom/tests/modern/css_selectors/lexbor436.phpt b/ext/dom/tests/modern/css_selectors/lexbor436.phpt new file mode 100644 index 000000000000..95ab6e765f1d --- /dev/null +++ b/ext/dom/tests/modern/css_selectors/lexbor436.phpt @@ -0,0 +1,43 @@ +--TEST-- +Lexbor #436 (combinator after a compound-leading selector-taking pseudo-class checks only one element) +--EXTENSIONS-- +dom +--FILE-- +