Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from Jun 6, 2020
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab8e9d3
Unpin version for symfony/polyfill-intl-idn
Nyholm Jun 6, 2020
c66657c
minor
Nyholm Jun 6, 2020
8d72984
typo
Nyholm Jun 6, 2020
e4185b0
Added changelgo
Nyholm Jun 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Expand Up @@ -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"
},
Expand Down
9 changes: 6 additions & 3 deletions src/Utils.php
View file
Open in desktop
Expand Up @@ -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');
}
}