Merge branch 'PHP-8.4'

nielsdos · nielsdos · commit b6667c471c54 · 2025-05-04T12:58:07.000+02:00
* PHP-8.4: Backport lexbor/lexbor#274
diff --git a/ext/dom/lexbor/lexbor/selectors-adapted/selectors.c b/ext/dom/lexbor/lexbor/selectors-adapted/selectors.c
@@ -3,7 +3,7 @@
  *
  * Author: Alexander Borisov <borisov@lexbor.com>
  * Adapted for PHP + libxml2 by: Niels Dossche <nielsdos@php.net>
- * Based on Lexbor 2.4.0 (upstream commit e9d35f6384de7bd8c1b79e7111bc3a44f8822967)
+ * Based on Lexbor (upstream commit b347aa4e4da4e82b1cae18989ceea1aa0278daf1)
  */
 
 #include <libxml/xmlstring.h>
@@ -967,7 +967,7 @@ lxb_selectors_state_has_relative(const xmlNode *node,
 			break;
 		}
 
-		while (node !=root && node->next == NULL) {
+		while (node != root && node->next == NULL && node->parent != NULL) {
 			node = node->parent;
 		}
 
diff --git a/ext/dom/tests/modern/css_selectors/lexbor274.phpt b/ext/dom/tests/modern/css_selectors/lexbor274.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Lexbor #274
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$dom = Dom\HTMLDocument::createFromString('<html><body><div></div>\n</body></html>', LIBXML_NOERROR);
+var_dump($dom->querySelector('a:has(+ b)'));
+
+?>
+--EXPECT--
+NULL

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Author: Alexander Borisov <borisov@lexbor.com>`
`5`	`5`	`* Adapted for PHP + libxml2 by: Niels Dossche <nielsdos@php.net>`
`6`		`- * Based on Lexbor 2.4.0 (upstream commit e9d35f6384de7bd8c1b79e7111bc3a44f8822967)`
	`6`	`+ * Based on Lexbor (upstream commit b347aa4e4da4e82b1cae18989ceea1aa0278daf1)`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`#include <libxml/xmlstring.h>`
`@@ -967,7 +967,7 @@ lxb_selectors_state_has_relative(const xmlNode *node,`
`967`	`967`	`break;`
`968`	`968`	`}`
`969`	`969`
`970`		`- while (node !=root && node->next == NULL) {`
	`970`	`+ while (node != root && node->next == NULL && node->parent != NULL) {`
`971`	`971`	`node = node->parent;`
`972`	`972`	`}`
`973`	`973`