Allow "symfony/intl:^5"

sonata-project · Jun 17, 2020 · 22b1562 · 22b1562
1 parent 6ef2d34
commit 22b1562
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "symfony/dependency-injection": "^4.4",
         "symfony/http-foundation": "^4.4",
         "symfony/http-kernel": "^4.4",
-        "symfony/intl": "^4.4",
+        "symfony/intl": "^4.4 || ^5.0",
         "symfony/templating": "^4.4",
         "twig/twig": "^2.9"
     },

diff --git a/src/Templating/Helper/LocaleHelper.php b/src/Templating/Helper/LocaleHelper.php
@@ -14,7 +14,6 @@
 namespace Sonata\IntlBundle\Templating\Helper;
 
 use Symfony\Component\Intl\Countries;
-use Symfony\Component\Intl\Intl;
 use Symfony\Component\Intl\Languages;
 use Symfony\Component\Intl\Locales;
 
@@ -33,13 +32,6 @@ class LocaleHelper extends BaseHelper
      */
     public function country($code, $locale = null)
     {
-        // NEXT_MAJOR: Remove this when dropping < 4.3 Symfony support
-        if (!class_exists(Countries::class)) {
-            $name = Intl::getRegionBundle()->getCountryName($code, $locale ?: $this->localeDetector->getLocale());
-
-            return $name ? $this->fixCharset($name) : '';
-        }
-
         return $this->fixCharset(Countries::getName($code, $locale ?: $this->localeDetector->getLocale()));
     }
 
@@ -51,19 +43,6 @@ public function country($code, $locale = null)
      */
     public function language($code, $locale = null)
     {
-        // NEXT_MAJOR: Remove this when dropping < 4.3 Symfony support
-        if (!class_exists(Languages::class)) {
-            $codes = explode('_', $code);
-
-            $name = Intl::getLanguageBundle()->getLanguageName(
-                $codes[0],
-                $codes[1] ?? null,
-                $locale ?: $this->localeDetector->getLocale()
-            );
-
-            return $name ? $this->fixCharset($name) : '';
-        }
-
         return $this->fixCharset(Languages::getName($code, $locale ?: $this->localeDetector->getLocale()));
     }
 
@@ -75,13 +54,6 @@ public function language($code, $locale = null)
      */
     public function locale($code, $locale = null)
     {
-        // NEXT_MAJOR: Remove this when dropping < 4.3 Symfony support
-        if (!class_exists(Locales::class)) {
-            $name = Intl::getLocaleBundle()->getLocaleName($code, $locale ?: $this->localeDetector->getLocale());
-
-            return $name ? $this->fixCharset($name) : '';
-        }
-
         return $this->fixCharset(Locales::getName($code, $locale ?: $this->localeDetector->getLocale()));
     }