Unpin version for symfony/polyfill-intl-idn (#2678)

* Unpin version for symfony/polyfill-intl-idn * minor * typo * Added changelgo
guzzle · Jun 6, 2020 · 23730ab · 23730ab
1 parent a4a1b69
commit 23730ab
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 6.5.5 - UNRELEASED
+
+* 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/composer.json b/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/src/Utils.php b/src/Utils.php
@@ -81,9 +81,12 @@ private static function idnToAsci($domain, $options, &$info = [])
         }
 
         /*
-         * 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');
     }
 }