Fixed deprecated Intl component usage

stloyd · stloyd · commit 3b808b8794c9 · 2020-09-07T14:56:55.000+02:00
diff --git a/src/Sylius/Bundle/CoreBundle/Form/Extension/LocaleTypeExtension.php b/src/Sylius/Bundle/CoreBundle/Form/Extension/LocaleTypeExtension.php
@@ -20,7 +20,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Locales;
 
 final class LocaleTypeExtension extends AbstractTypeExtension
 {
@@ -61,15 +61,15 @@ public function getExtendedType(): string
 
     private function getLocaleName(string $code): ?string
     {
-        return Intl::getLocaleBundle()->getLocaleName($code);
+        return Locales::getName($code);
     }
 
     /**
      * @return array|LocaleInterface[]
      */
     private function getAvailableLocales(): array
     {
-        $availableLocales = Intl::getLocaleBundle()->getLocaleNames();
+        $availableLocales = Locales::getNames();
 
         /** @var LocaleInterface[] $definedLocales */
         $definedLocales = $this->localeRepository->findAll();
diff --git a/src/Sylius/Component/Locale/Converter/LocaleConverter.php b/src/Sylius/Component/Locale/Converter/LocaleConverter.php
@@ -13,14 +13,14 @@
 
 namespace Sylius\Component\Locale\Converter;
 
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Locales;
 use Webmozart\Assert\Assert;
 
 final class LocaleConverter implements LocaleConverterInterface
 {
     public function convertNameToCode(string $name, ?string $locale = null): string
     {
-        $names = Intl::getLocaleBundle()->getLocaleNames($locale ?? 'en');
+        $names = Locales::getNames($locale ?? 'en');
         $code = array_search($name, $names, true);
 
         Assert::string($code, sprintf('Cannot find code for "%s" locale name', $name));
@@ -30,7 +30,7 @@ public function convertNameToCode(string $name, ?string $locale = null): string
 
     public function convertCodeToName(string $code, ?string $locale = null): string
     {
-        $name = Intl::getLocaleBundle()->getLocaleName($code, $locale ?? 'en');
+        $name = Locales::getName($code, $locale ?? 'en');
 
         Assert::string($name, sprintf('Cannot find name for "%s" locale code', $code));
 
diff --git a/src/Sylius/Component/Locale/Model/Locale.php b/src/Sylius/Component/Locale/Model/Locale.php
@@ -14,7 +14,7 @@
 namespace Sylius\Component\Locale\Model;
 
 use Sylius\Component\Resource\Model\TimestampableTrait;
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Locales;
 
 class Locale implements LocaleInterface
 {
@@ -53,6 +53,6 @@ public function setCode(?string $code): void
 
     public function getName(?string $locale = null): ?string
     {
-        return Intl::getLocaleBundle()->getLocaleName($this->getCode(), $locale);
+        return Locales::getName($this->getCode(), $locale);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`use Symfony\Component\Form\FormBuilderInterface;`
`21`	`21`	`use Symfony\Component\Form\FormEvent;`
`22`	`22`	`use Symfony\Component\Form\FormEvents;`
`23`		`-use Symfony\Component\Intl\Intl;`
	`23`	`+use Symfony\Component\Intl\Locales;`
`24`	`24`
`25`	`25`	`final class LocaleTypeExtension extends AbstractTypeExtension`
`26`	`26`	`{`
`@@ -61,15 +61,15 @@ public function getExtendedType(): string`
`61`	`61`
`62`	`62`	`private function getLocaleName(string $code): ?string`
`63`	`63`	`{`
`64`		`- return Intl::getLocaleBundle()->getLocaleName($code);`
	`64`	`+ return Locales::getName($code);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
`68`	`68`	`* @return array\|LocaleInterface[]`
`69`	`69`	`*/`
`70`	`70`	`private function getAvailableLocales(): array`
`71`	`71`	`{`
`72`		`- $availableLocales = Intl::getLocaleBundle()->getLocaleNames();`
	`72`	`+ $availableLocales = Locales::getNames();`
`73`	`73`
`74`	`74`	`/** @var LocaleInterface[] $definedLocales */`
`75`	`75`	`$definedLocales = $this->localeRepository->findAll();`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,14 @@`
`13`	`13`
`14`	`14`	`namespace Sylius\Component\Locale\Converter;`
`15`	`15`
`16`		`-use Symfony\Component\Intl\Intl;`
	`16`	`+use Symfony\Component\Intl\Locales;`
`17`	`17`	`use Webmozart\Assert\Assert;`
`18`	`18`
`19`	`19`	`final class LocaleConverter implements LocaleConverterInterface`
`20`	`20`	`{`
`21`	`21`	`public function convertNameToCode(string $name, ?string $locale = null): string`
`22`	`22`	`{`
`23`		`- $names = Intl::getLocaleBundle()->getLocaleNames($locale ?? 'en');`
	`23`	`+ $names = Locales::getNames($locale ?? 'en');`
`24`	`24`	`$code = array_search($name, $names, true);`
`25`	`25`
`26`	`26`	`Assert::string($code, sprintf('Cannot find code for "%s" locale name', $name));`
`@@ -30,7 +30,7 @@ public function convertNameToCode(string $name, ?string $locale = null): string`
`30`	`30`
`31`	`31`	`public function convertCodeToName(string $code, ?string $locale = null): string`
`32`	`32`	`{`
`33`		`- $name = Intl::getLocaleBundle()->getLocaleName($code, $locale ?? 'en');`
	`33`	`+ $name = Locales::getName($code, $locale ?? 'en');`
`34`	`34`
`35`	`35`	`Assert::string($name, sprintf('Cannot find name for "%s" locale code', $code));`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`namespace Sylius\Component\Locale\Model;`
`15`	`15`
`16`	`16`	`use Sylius\Component\Resource\Model\TimestampableTrait;`
`17`		`-use Symfony\Component\Intl\Intl;`
	`17`	`+use Symfony\Component\Intl\Locales;`
`18`	`18`
`19`	`19`	`class Locale implements LocaleInterface`
`20`	`20`	`{`
`@@ -53,6 +53,6 @@ public function setCode(?string $code): void`
`53`	`53`
`54`	`54`	`public function getName(?string $locale = null): ?string`
`55`	`55`	`{`
`56`		`- return Intl::getLocaleBundle()->getLocaleName($this->getCode(), $locale);`
	`56`	`+ return Locales::getName($this->getCode(), $locale);`
`57`	`57`	`}`
`58`	`58`	`}`