CssXPath: Implement ~ Subsequent-sibling

fix FreshRSS#8143
Upstream PR phpgt/CssXPath#231

Author: Alkarex

lib/.gitignore

@@ -12,6 +12,8 @@ marienfressinaud/lib_opml/tests/
 phpgt/cssxpath/.*
 phpgt/cssxpath/composer.json
 phpgt/cssxpath/CONTRIBUTING.md
+phpgt/cssxpath/phpunit.xml
+phpgt/cssxpath/SECURITY*
 phpgt/cssxpath/test/
 phpmailer/phpmailer/*oauth*
 phpmailer/phpmailer/COMMITMENT*

lib/composer.json

@@ -5,14 +5,18 @@
     "homepage": "https://freshrss.org/",
     "license": "AGPL-3.0",
     "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/phpgt/CssXPath.git"
+        },
         {
             "type": "git",
             "url": "https://github.com/FreshRSS/simplepie.git"
         }
     ],
     "require": {
         "marienfressinaud/lib_opml": "0.5.1",
-        "phpgt/cssxpath": "v1.3.0",
+        "phpgt/cssxpath": "dev-master#008aaf7f381e2396590fc53830f4a8ad9f517c7f",
         "phpmailer/phpmailer": "6.11.1",
         "simplepie/simplepie": "dev-freshrss#24cfb0c6d81f81ef110c8257d3464b2649476c77"
     },
@@ -21,6 +25,9 @@
         "vendor-dir": "./"
     },
     "scripts": {
-        "post-update-cmd": "git clean -d -f -X ."
+        "post-update-cmd": [
+            "git clean -d -ff -X .",
+            "find . -name '.git' -type d -exec rm -rf {} + || true"
+        ]
     }
 }

lib/phpgt/cssxpath/README.md

@@ -1,5 +1,5 @@
-Translate CSS selectors to XPath queries
-========================================
+Translate CSS selectors to XPath queries.
+=========================================
 
 A lightweight and dependency free CSS to XPath translator. This repository is used to bring modern DOM functionality like [`querySelectorAll()`][qsa] to PHP in the [PHP.Gt/Dom][gt-dom] project.
 
@@ -61,3 +61,9 @@ It's perhaps worth noting that for XML-style matching to work, you must load the
 
 [qsa]: https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelectorAll
 [gt-dom]: https://www.php.gt/dom
+
+# Proudly sponsored by
+
+[JetBrains Open Source sponsorship program](https://www.jetbrains.com/community/opensource/)
+
+[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://www.jetbrains.com/community/opensource/)

lib/phpgt/cssxpath/src/Translator.php

@@ -12,6 +12,7 @@ class Translator {
 		. '|(#(?P<id>[\w-]*))'
 		. '|(\.(?P<class>[\w-]*))'
 		. '|(?P<sibling>\s*\+\s*)'
+		. '|(?P<subsequentsibling>\s*~\s*)'
 		. "|(\[(?P<attribute>[\w-]*)((?P<attribute_equals>[=~$|^*]+)(?P<attribute_value>(.+\[\]'?)|[^\]]+))*\])+"
 		. '|(?P<descendant>\s+)'
 		. '/';
@@ -24,8 +25,8 @@ class Translator {
 	const EQUALS_STARTS_WITH = "^=";
 
 	public function __construct(
-			protected string $cssSelector, 
-			protected string $prefix = ".//", 
+			protected string $cssSelector,
+			protected string $prefix = ".//",
 			protected bool $htmlMode = true
 		) {
 	}
@@ -198,7 +199,7 @@ protected function convertSingleSelector(string $css):string {
 							"[last()]"
 						);
 					}
-					break;					
+					break;
 
 				}
 				break;
@@ -235,6 +236,14 @@ protected function convertSingleSelector(string $css):string {
 				$hasElement = false;
 				break;
 
+			case "subsequentsibling":
+				array_push(
+					$xpath,
+					"/following-sibling::"
+				);
+				$hasElement = false;
+				break;
+
 			case "attribute":
 				if(!$hasElement) {
 					array_push($xpath, "*");