Use xparse/element-finder:2.0 (#98)

funivan · web-flow · commit 8e26a7f3d7d0 · 2024-01-11T12:19:34.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,10 @@
 All Notable changes to `Parser` will be documented in this file
 
 ## Planned changes
-- Updated minimum required version for guzzlehttp/psr7 to 2.4.5
+- ElementFinderFactory now accept use `Xparse\ElementFinder\ExpressionTranslator\ExpressionTranslatorInterface`
 - Updated minimum required php version to 8.1
 - Add `RecursiveParser` (merged from the [xparse/recursive-pagination](https://github.com/xparse/RecursivePagination) repository)
+- Updated minimum required version for guzzlehttp/psr7 to 2.4.5
 
 ## 1.0.2 [2023-12-5]
 - Minimum supported php version is now php 8.0
diff --git a/composer.json b/composer.json
@@ -23,8 +23,7 @@
     "guzzlehttp/guzzle": "^6.3 || ^7.3",
     "guzzlehttp/psr7": "^2.4.5",
     "psr/http-message": "^1.0",
-    "xparse/element-finder": "0.* || ^1.0.0",
-    "xparse/expression-translator": "0.0.* || ^1.0.0"
+    "xparse/element-finder": "^2.0"
   },
   "require-dev": {
     "ext-iconv": "*",
diff --git a/src/ElementFinderFactory.php b/src/ElementFinderFactory.php
@@ -8,9 +8,9 @@
 use Psr\Http\Message\ResponseInterface;
 use Xparse\ElementFinder\ElementFinder;
 use Xparse\ElementFinder\ElementFinderInterface;
+use Xparse\ElementFinder\ExpressionTranslator\ExpressionTranslatorInterface;
+use Xparse\ElementFinder\ExpressionTranslator\XpathExpression;
 use Xparse\ElementFinder\Helper\StringHelper;
-use Xparse\ExpressionTranslator\ExpressionTranslatorInterface;
-use Xparse\ExpressionTranslator\XpathExpression;
 use Xparse\Parser\Helper\EncodingConverterInterface;
 use Xparse\Parser\Helper\LinkConverterInterface;
 use Xparse\Parser\Helper\RelativeToAbsoluteLinkConverter;
diff --git a/tests/Helper/LinkConverterTest.php b/tests/Helper/LinkConverterTest.php
@@ -32,13 +32,13 @@ public function getConvertRelativeUrlToAbsolute(): array
                 'url' => 'http://funivan.com/userName',
             ],
             [
-                'html' => '<img src="/hello.jpg"/>',
-                'expect' => '<img src="http://funivan.com/hello.jpg"/>',
+                'html' => '<img src="/hello.jpg">',
+                'expect' => '<img src="http://funivan.com/hello.jpg">',
                 'url' => 'http://funivan.com/userName',
             ],
             [
-                'html' => '<img src="hello.jpg"/>',
-                'expect' => '<img src="http://funivan.com/userName/hello.jpg"/>',
+                'html' => '<img src="hello.jpg">',
+                'expect' => '<img src="http://funivan.com/userName/hello.jpg">',
                 'url' => 'http://funivan.com/userName/',
             ],
             [
@@ -68,14 +68,14 @@ public function getConvertRelativeUrlToAbsolute(): array
             ],
             [
                 'html' => '<head><base href="http://www.example.com/images/" target="_blank"></head>
-                     <body><img src="stickman.gif" width="24" height="39" alt="Stickman"/></body>',
-                'expect' => '<img src="http://www.example.com/images/stickman.gif" width="24" height="39" alt="Stickman"/>',
+                     <body><img src="stickman.gif" width="24" height="39" alt="Stickman"></body>',
+                'expect' => '<img src="http://www.example.com/images/stickman.gif" width="24" height="39" alt="Stickman">',
                 'url' => 'http://www.example.com/',
             ],
             [
                 'html' => '<head><base href="http://www.example.com/data/images/" target="_blank"></head>
-                     <body><img src="../stickman.gif" width="24" height="39" alt="Stickman"/></body>',
-                'expect' => '<img src="http://www.example.com/data/stickman.gif" width="24" height="39" alt="Stickman"/>',
+                     <body><img src="../stickman.gif" width="24" height="39" alt="Stickman"></body>',
+                'expect' => '<img src="http://www.example.com/data/stickman.gif" width="24" height="39" alt="Stickman">',
                 'url' => 'http://www.example.com/',
             ],
             [
