Some improvements

javiereguiluz · javiereguiluz · commit 9810d57185d6 · 2019-07-08T08:33:59.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
 use Symfony\Component\Form\Exception\LogicException;
+use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\Languages;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -45,12 +46,12 @@ public function configureOptions(OptionsResolver $resolver)
                 $choiceTranslationLocale = $options['choice_translation_locale'];
                 $choiceSelfTranslation = $options['choice_self_translation'];
 
-                return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale, $choiceSelfTranslation) {
-                    if (true === $choiceSelfTranslation) {
-                        foreach (Languages::getLanguageCodes() as $languageCode) {
+                return new IntlCallbackChoiceLoader(static function () use ($choiceTranslationLocale, $choiceSelfTranslation) {
+                    if ($choiceSelfTranslation) {
+                        foreach (Languages::getNames() as $languageCode => $languageName) {
                             try {
                                 $languagesList[$languageCode] = Languages::getName($languageCode, $languageCode);
-                            } catch (\Exception $e) {
+                            } catch (MissingResourceException $e) {
                             }
                         }
                     } else {
@@ -65,7 +66,7 @@ public function configureOptions(OptionsResolver $resolver)
             'choice_translation_locale' => null,
         ]);
 
-        $resolver->setAllowedTypes('choice_self_translation', ['boolean']);
+        $resolver->setAllowedTypes('choice_self_translation', ['bool']);
         $resolver->setAllowedTypes('choice_translation_locale', ['null', 'string']);
 
         $resolver->setNormalizer('choice_self_translation', function (Options $options, $value) {
