diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2020-06-20 14:09:36 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2020-06-20 14:15:38 +0100 |
| commit | e6149aa297b1e71a733ad947adf78db9d3f7c266 (patch) | |
| tree | 070e1cfa0c2d12d6bacb5fa14976f98bb1c8a584 /vendor/guzzlehttp | |
| parent | 3bb1d9f95e94da8ba89421c43714eb4337fb6a48 (diff) | |
| download | webtrees-e6149aa297b1e71a733ad947adf78db9d3f7c266.tar.gz webtrees-e6149aa297b1e71a733ad947adf78db9d3f7c266.tar.bz2 webtrees-e6149aa297b1e71a733ad947adf78db9d3f7c266.zip | |
Update vendor dependencies
Diffstat (limited to 'vendor/guzzlehttp')
| -rw-r--r-- | vendor/guzzlehttp/guzzle/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | vendor/guzzlehttp/guzzle/composer.json | 2 | ||||
| -rw-r--r-- | vendor/guzzlehttp/guzzle/src/ClientInterface.php | 2 | ||||
| -rw-r--r-- | vendor/guzzlehttp/guzzle/src/Utils.php | 9 |
4 files changed, 12 insertions, 5 deletions
diff --git a/vendor/guzzlehttp/guzzle/CHANGELOG.md b/vendor/guzzlehttp/guzzle/CHANGELOG.md index f5b183a0c1..464cf1c500 100644 --- a/vendor/guzzlehttp/guzzle/CHANGELOG.md +++ b/vendor/guzzlehttp/guzzle/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 6.5.5 - 2020-06-16 + +* Unpin version constraint for `symfony/polyfill-intl-idn` [#2678](https://github.com/guzzle/guzzle/pull/2678) + ## 6.5.4 - 2020-05-25 * Fix various intl icu issues [#2626](https://github.com/guzzle/guzzle/pull/2626) diff --git a/vendor/guzzlehttp/guzzle/composer.json b/vendor/guzzlehttp/guzzle/composer.json index b7bff79a84..c01864f013 100644 --- a/vendor/guzzlehttp/guzzle/composer.json +++ b/vendor/guzzlehttp/guzzle/composer.json @@ -23,7 +23,7 @@ "require": { "php": ">=5.5", "ext-json": "*", - "symfony/polyfill-intl-idn": "1.17.0", + "symfony/polyfill-intl-idn": "^1.17.0", "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1" }, diff --git a/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/vendor/guzzlehttp/guzzle/src/ClientInterface.php index 54c759b96b..638b75dca4 100644 --- a/vendor/guzzlehttp/guzzle/src/ClientInterface.php +++ b/vendor/guzzlehttp/guzzle/src/ClientInterface.php @@ -15,7 +15,7 @@ interface ClientInterface /** * @deprecated Will be removed in Guzzle 7.0.0 */ - const VERSION = '6.5.4'; + const VERSION = '6.5.5'; /** * Send an HTTP request. diff --git a/vendor/guzzlehttp/guzzle/src/Utils.php b/vendor/guzzlehttp/guzzle/src/Utils.php index dd90c2265e..c698acbf02 100644 --- a/vendor/guzzlehttp/guzzle/src/Utils.php +++ b/vendor/guzzlehttp/guzzle/src/Utils.php @@ -81,9 +81,12 @@ final class Utils } /* - * The Idn class is marked as @internal. We've locked the version to - * symfony/polyfill-intl-idn to avoid issues in the future. + * The Idn class is marked as @internal. Verify that class and method exists. */ - return Idn::idn_to_ascii($domain, $options, Idn::INTL_IDNA_VARIANT_UTS46, $info); + if (method_exists(Idn::class, 'idn_to_ascii')) { + return Idn::idn_to_ascii($domain, $options, Idn::INTL_IDNA_VARIANT_UTS46, $info); + } + + throw new \RuntimeException('ext-intl or symfony/polyfill-intl-idn not loaded or too old'); } } |