From 73c6c52b2a70f1b2952cf27eda689b17a2c0da91 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Sun, 28 Jun 2020 10:06:49 +0200
Subject: [PATCH 1/2] Updated to guzzle 7

---
 composer.json                              | 11 +++++------
 module/Core/src/Util/UrlValidator.php      |  1 +
 module/Core/test/Util/UrlValidatorTest.php |  5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index d733ba89..f1a072fe 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "doctrine/orm": "^2.7",
         "endroid/qr-code": "^3.6",
         "geoip2/geoip2": "^2.9",
-        "guzzlehttp/guzzle": "^6.5.1",
+        "guzzlehttp/guzzle": "^7.0",
         "laminas/laminas-config": "^3.3",
         "laminas/laminas-config-aggregator": "^1.1",
         "laminas/laminas-dependency-plugin": "^1.0",
@@ -50,18 +50,17 @@
         "predis/predis": "^1.1",
         "pugx/shortid-php": "^0.5",
         "ramsey/uuid": "^3.9",
-        "shlinkio/shlink-common": "^3.1.0",
+        "shlinkio/shlink-common": "^3.2.0",
         "shlinkio/shlink-config": "^1.0",
         "shlinkio/shlink-event-dispatcher": "^1.4",
         "shlinkio/shlink-installer": "^5.1.0",
-        "shlinkio/shlink-ip-geolocation": "^1.4",
+        "shlinkio/shlink-ip-geolocation": "^1.5",
         "symfony/console": "^5.1",
         "symfony/filesystem": "^5.1",
         "symfony/lock": "^5.1",
         "symfony/mercure": "^0.3.0",
         "symfony/process": "^5.1",
-        "symfony/string": "^5.1",
-        "symfony/translation-contracts": "^2.1"
+        "symfony/string": "^5.1"
     },
     "require-dev": {
         "devster/ubench": "^2.0",
@@ -72,7 +71,7 @@
         "phpunit/phpunit": "~9.0.1",
         "roave/security-advisories": "dev-master",
         "shlinkio/php-coding-standard": "~2.1.0",
-        "shlinkio/shlink-test-utils": "^1.4",
+        "shlinkio/shlink-test-utils": "^1.5",
         "symfony/var-dumper": "^5.0"
     },
     "autoload": {
diff --git a/module/Core/src/Util/UrlValidator.php b/module/Core/src/Util/UrlValidator.php
index 8d8cd072..01885446 100644
--- a/module/Core/src/Util/UrlValidator.php
+++ b/module/Core/src/Util/UrlValidator.php
@@ -37,6 +37,7 @@ class UrlValidator implements UrlValidatorInterface, RequestMethodInterface
         try {
             $this->httpClient->request(self::METHOD_GET, $url, [
                 RequestOptions::ALLOW_REDIRECTS => ['max' => self::MAX_REDIRECTS],
+                RequestOptions::IDN_CONVERSION => true,
             ]);
         } catch (GuzzleException $e) {
             throw InvalidUrlException::fromUrl($url, $e);
diff --git a/module/Core/test/Util/UrlValidatorTest.php b/module/Core/test/Util/UrlValidatorTest.php
index 50b70961..a20ed693 100644
--- a/module/Core/test/Util/UrlValidatorTest.php
+++ b/module/Core/test/Util/UrlValidatorTest.php
@@ -48,7 +48,10 @@ class UrlValidatorTest extends TestCase
         $request = $this->httpClient->request(
             RequestMethodInterface::METHOD_GET,
             $expectedUrl,
-            [RequestOptions::ALLOW_REDIRECTS => ['max' => 15]],
+            [
+                RequestOptions::ALLOW_REDIRECTS => ['max' => 15],
+                RequestOptions::IDN_CONVERSION => true,
+            ],
         )->willReturn(new Response());
 
         $this->urlValidator->validateUrl($expectedUrl);

From 554a66503f154b0b47cd33764d8d300858f18ea7 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Sun, 28 Jun 2020 10:07:43 +0200
Subject: [PATCH 2/2] Updated changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64a22146..b83747d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 * [#508](https://github.com/shlinkio/shlink/issues/508) Added mutation checks to database tests.
 * [#790](https://github.com/shlinkio/shlink/issues/790) Updated to doctrine/migrations v3.
+* [#798](https://github.com/shlinkio/shlink/issues/798) Updated to guzzlehttp/guzzle v7.
 
 #### Deprecated