From 65682ca0ae89588ebc4ffbf95f4809740c406b00 Mon Sep 17 00:00:00 2001 From: Serhii Maistrenko Date: Wed, 20 Dec 2023 11:03:50 +0200 Subject: [PATCH 1/4] add explicit type annotation for proper object conversion --- src/Helper/ConvertUrlElementFinderModifier.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Helper/ConvertUrlElementFinderModifier.php b/src/Helper/ConvertUrlElementFinderModifier.php index ea855f6..20255c2 100644 --- a/src/Helper/ConvertUrlElementFinderModifier.php +++ b/src/Helper/ConvertUrlElementFinderModifier.php @@ -51,7 +51,7 @@ final public function execute(DOMNodeList $nodeList): void if ($this->baseUrl !== '' && !preg_match('!^(/|http)!i', $relative)) { $relative = UriResolver::resolve(new Uri($this->baseUrl), new Uri($relative)); } - $url = UriResolver::resolve($affected, new Uri($relative)); + $url = UriResolver::resolve($affected, new Uri((string)$relative)); $element->setAttribute($attribute, (string)$url); } } From 44d83bf5f864da84ccf41559db0c495c22cf3e12 Mon Sep 17 00:00:00 2001 From: Serhii Maistrenko Date: Wed, 20 Dec 2023 11:05:26 +0200 Subject: [PATCH 2/4] update guzzlehttp/psr7 requirement to ^2.4.5 and update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ composer.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc4fd16..ef91963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All Notable changes to `Parser` will be documented in this file ## Planned changes +## 1.0.3 [2023-12-20] +- 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 + ## 1.0.1 [2021-06-01] - Return support of guzzlehttp/guzzle ^6.3 diff --git a/composer.json b/composer.json index b5b41df..871df7f 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-dom": "*", "ext-mbstring": "*", "guzzlehttp/guzzle": "^6.3 || ^7.3", - "guzzlehttp/psr7": "^1.5", + "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" From 1c8ad8bf27147175e7b944d0a7f60f8186501116 Mon Sep 17 00:00:00 2001 From: Serhii Maistrenko Date: Wed, 20 Dec 2023 15:25:10 +0200 Subject: [PATCH 3/4] update CHANGELOG.md --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef91963..81f95a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ All Notable changes to `Parser` will be documented in this file ## Planned changes - -## 1.0.3 [2023-12-20] - Updated minimum required version for guzzlehttp/psr7 to 2.4.5 ## 1.0.2 [2023-12-5] From 8c6f1eb8da1901def1bee6c79f4f58c0e8d49192 Mon Sep 17 00:00:00 2001 From: Serhii Maistrenko Date: Wed, 20 Dec 2023 17:58:30 +0200 Subject: [PATCH 4/4] update object conversion --- src/Helper/ConvertUrlElementFinderModifier.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Helper/ConvertUrlElementFinderModifier.php b/src/Helper/ConvertUrlElementFinderModifier.php index 20255c2..fe70213 100644 --- a/src/Helper/ConvertUrlElementFinderModifier.php +++ b/src/Helper/ConvertUrlElementFinderModifier.php @@ -49,10 +49,10 @@ final public function execute(DOMNodeList $nodeList): void !preg_match('!^\s*javascript\s*:\s*!', $relative) ) { if ($this->baseUrl !== '' && !preg_match('!^(/|http)!i', $relative)) { - $relative = UriResolver::resolve(new Uri($this->baseUrl), new Uri($relative)); + $relative = UriResolver::resolve(new Uri($this->baseUrl), new Uri($relative))->__toString(); } - $url = UriResolver::resolve($affected, new Uri((string)$relative)); - $element->setAttribute($attribute, (string)$url); + $url = UriResolver::resolve($affected, new Uri($relative))->__toString(); + $element->setAttribute($attribute, $url); } } }