Update to GT\CssXPath 1.6.0 (#9411)

https://github.com/phpgt/CssXPath/releases/tag/v1.6.0

app/Models/Entry.php

@@ -985,11 +985,11 @@ class FreshRSS_Entry extends Minz_Model {
 			$cssSelector = htmlspecialchars_decode($feed->pathEntries(), ENT_QUOTES);
 			$cssSelector = trim($cssSelector, ', ');
 			$path_entries_filter = trim($feed->attributeString('path_entries_filter') ?? '', ', ');
-			$nodes = $xpath->query((new Gt\CssXPath\Translator($cssSelector, '//'))->asXPath());
+			$nodes = $xpath->query((new GT\CssXPath\Translator($cssSelector, '//'))->asXPath());
 			if ($nodes === false || $nodes->length === 0) {
 				Minz_Log::warning('CSS content retrieval matched no elements for feed “' . $feed->name() . '” and article URL ' . $url . ': ' . $cssSelector);
 			} else {
-				$filter_xpath = $path_entries_filter === '' ? '' : (new Gt\CssXPath\Translator($path_entries_filter, 'descendant-or-self::'))->asXPath();
+				$filter_xpath = $path_entries_filter === '' ? '' : (new GT\CssXPath\Translator($path_entries_filter, 'descendant-or-self::'))->asXPath();
 				foreach ($nodes as $node) {
 					try {
 						if (!($node instanceof DOMElement)) {
@@ -1038,7 +1038,7 @@ class FreshRSS_Entry extends Minz_Model {
 				$utf8BOM = "\xEF\xBB\xBF";
 				$doc->loadHTML($utf8BOM . $html, LIBXML_NONET | LIBXML_NOERROR | LIBXML_NOWARNING);
 				$xpath = new DOMXPath($doc);
-				$filterednodes = $xpath->query((new Gt\CssXPath\Translator($path_entries_filter, '//'))->asXPath()) ?: [];
+				$filterednodes = $xpath->query((new GT\CssXPath\Translator($path_entries_filter, '//'))->asXPath()) ?: [];
 				foreach ($filterednodes as $filterednode) {
 					try {
 						if (!($filterednode instanceof DOMElement) || $filterednode->ownerDocument !== $doc || $filterednode->parentNode === null) {
@@ -1116,7 +1116,7 @@ class FreshRSS_Entry extends Minz_Model {
 				return false;
 			}
 			$xpath = new DOMXPath($doc);
-			$filterednodes = $xpath->query((new Gt\CssXPath\Translator($feed->attributeString('path_entries_filter'), '//'))->asXPath()) ?: [];
+			$filterednodes = $xpath->query((new GT\CssXPath\Translator($feed->attributeString('path_entries_filter'), '//'))->asXPath()) ?: [];
 			foreach ($filterednodes as $filterednode) {
 				try {
 					if (!($filterednode instanceof DOMElement) || $filterednode->ownerDocument !== $doc || $filterednode->parentNode === null) {

lib/composer.json

@@ -16,7 +16,7 @@
 	],
 	"require": {
 		"marienfressinaud/lib_opml": "dev-main#f0e850b6394af90b898daf0e65fcc7363457b844",
-		"phpgt/cssxpath": "v1.5.0",
+		"phpgt/cssxpath": "v1.6.0",
 		"phpmailer/phpmailer": "7.1.1",
 		"simplepie/simplepie": "dev-freshrss#caa6737811d75301720d07b30d9b53a4ab0b969d"
 	},

lib/lib_rss.php

@@ -88,8 +88,8 @@ function classAutoloader(string $class): void {
 		$base_dir = LIB_PATH . '/simplepie/simplepie/src/';
 		$relative_class_name = substr($class, strlen($prefix));
 		include $base_dir . str_replace('\\', '/', $relative_class_name) . '.php';
-	} elseif (str_starts_with($class, 'Gt\\CssXPath\\')) {
-		$prefix = 'Gt\\CssXPath\\';
+	} elseif (str_starts_with($class, 'GT\\CssXPath\\')) {
+		$prefix = 'GT\\CssXPath\\';
 		$base_dir = LIB_PATH . '/phpgt/cssxpath/src/';
 		$relative_class_name = substr($class, strlen($prefix));
 		include $base_dir . str_replace('\\', '/', $relative_class_name) . '.php';

lib/phpgt/cssxpath/README.md

@@ -26,7 +26,7 @@ Example usage
 
 
 ```php
-use Gt\CssXPath\Translator;
+use GT\CssXPath\Translator;
 
 $html = <<<HTML
 <form>

lib/phpgt/cssxpath/src/AttributeSelectorConverter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class AttributeSelectorConverter {
 	/** @param array<string, mixed> $token */

lib/phpgt/cssxpath/src/CssAttributeTokenBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class CssAttributeTokenBuilder {
 	/**

lib/phpgt/cssxpath/src/CssSelectorLexer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class CssSelectorLexer {
 	private CssAttributeTokenBuilder $attributeTokenBuilder;

lib/phpgt/cssxpath/src/CssXPathException.php

@@ -1,5 +1,5 @@
 <?php
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 use RuntimeException;
 

lib/phpgt/cssxpath/src/HasSelectorConditionBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class HasSelectorConditionBuilder {
 	private SelectorListSplitter $selectorListSplitter;

lib/phpgt/cssxpath/src/NotSelectorConditionBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class NotSelectorConditionBuilder {
 	private ThreadMatcher $threadMatcher;

lib/phpgt/cssxpath/src/NotYetImplementedException.php

@@ -1,4 +1,4 @@
 <?php
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class NotYetImplementedException extends CssXPathException {}

lib/phpgt/cssxpath/src/PseudoSelectorConverter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class PseudoSelectorConverter {
 	/** @var array<int, string> */

lib/phpgt/cssxpath/src/SelectorListSplitter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class SelectorListSplitter {
 	/** @return array<int, string> */

lib/phpgt/cssxpath/src/SingleSelectorConverter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class SingleSelectorConverter {
 	private ThreadMatcher $threadMatcher;

lib/phpgt/cssxpath/src/ThreadMatcher.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class ThreadMatcher {
 	private CssSelectorLexer $cssSelectorLexer;

lib/phpgt/cssxpath/src/Translator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class Translator {
 	public const CSS_REGEX =

lib/phpgt/cssxpath/src/XPathExpression.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Gt\CssXPath;
+namespace GT\CssXPath;
 
 class XPathExpression {
 	/** @var array<int, string> */

tests/lib/CssXPath/CssXPathTest.php

@@ -4,6 +4,6 @@ declare(strict_types=1);
 final class CssXPathTest extends \PHPUnit\Framework\TestCase
 {
 	public static function testCssXPathTranslatorClassExists(): void {
-		self::assertTrue(class_exists('Gt\\CssXPath\\Translator'));
+		self::assertTrue(class_exists('GT\\CssXPath\\Translator'));
 	}
 }