Add choice_translation_locale option for Intl choice types

symfony · Apr 20, 2018 · e250dfa · e250dfa
1 parent f77c1d0
commit e250dfa
Show file tree

Hide file tree

Showing 12 changed files with 379 additions and 4 deletions.
diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md
@@ -0,0 +1,34 @@
+UPGRADE FROM 4.1 to 4.2
+=======================
+
+Form
+----
+
+ * Deprecated the `ChoiceLoaderInterface` implementation in `CountryType`, `LanguageType`, `LocaleType` and `CurrencyType`, use the `choice_loader` option instead.
+
+   Before:
+   ```php
+   class MyCountryType extends CountryType
+   {
+       public function loadChoiceList()
+       {
+           // override the method
+       }
+   }
+   ```
+
+   After:
+   ```php
+   class MyCountryType extends AbstractType
+   {
+       public function getParent()
+       {
+           return CountryType::class;
+       }
+
+       public function configureOptions(OptionsResolver $resolver)
+       {
+           $resolver->setDefault('choice_loader', ...); // override the option instead
+       }
+   }
+   ```
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.2.0
+-----
+
+ * added `choice_translation_locale` option to `CountryType`, `LanguageType`, `LocaleType` and `CurrencyType`
+ * deprecated the `ChoiceLoaderInterface` implementation in `CountryType`, `LanguageType`, `LocaleType` and `CurrencyType`
+
 4.1.0
 -----
 

diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/IntlCallbackChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Loader/IntlCallbackChoiceLoader.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList\Loader;
+
+/**
+ * Callback choice loader optimized for Intl choice types.
+ *
+ * @author Jules Pietri <jules@heahprod.com>
+ * @author Yonel Ceruto <yonelceruto@gmail.com>
+ */
+class IntlCallbackChoiceLoader extends CallbackChoiceLoader
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function loadChoicesForValues(array $values, $value = null)
+    {
+        // Optimize
+        $values = array_filter($values);
+        if (empty($values)) {
+            return array();
+        }
+
+        // If no callable is set, values are the same as choices
+        if (null === $value) {
+            return $values;
+        }
+
+        return $this->loadChoiceList($value)->getChoicesForValues($values);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function loadValuesForChoices(array $choices, $value = null)
+    {
+        // Optimize
+        $choices = array_filter($choices);
+        if (empty($choices)) {
+            return array();
+        }
+
+        // If no callable is set, choices are the same as values
+        if (null === $value) {
+            return $choices;
+        }
+
+        return $this->loadChoiceList($value)->getValuesForChoices($choices);
+    }
+}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
@@ -14,7 +14,9 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
 use Symfony\Component\Intl\Intl;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class CountryType extends AbstractType implements ChoiceLoaderInterface
@@ -27,6 +29,8 @@ class CountryType extends AbstractType implements ChoiceLoaderInterface
      * {@link \Symfony\Component\Intl\Intl::getRegionBundle()}.
      *
      * @var ArrayChoiceList
+     *
+     * @deprecated since Symfony 4.2
      */
     private $choiceList;
 
@@ -36,9 +40,18 @@ class CountryType extends AbstractType implements ChoiceLoaderInterface
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'choice_loader' => $this,
+            'choice_loader' => function (Options $options) {
+                $choiceTranslationLocale = $options['choice_translation_locale'];
+
+                return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
+                    return array_flip(Intl::getRegionBundle()->getCountryNames($choiceTranslationLocale));
+                });
+            },
             'choice_translation_domain' => false,
+            'choice_translation_locale' => null,
         ));
+
+        $resolver->setAllowedTypes('choice_translation_locale', array('null', 'string'));
     }
 
     /**
@@ -59,9 +72,13 @@ public function getBlockPrefix()
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since Symfony 4.2
      */
     public function loadChoiceList($value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 4.2, use "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
+
         if (null !== $this->choiceList) {
             return $this->choiceList;
         }
@@ -71,9 +88,13 @@ public function loadChoiceList($value = null)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since Symfony 4.2
      */
     public function loadChoicesForValues(array $values, $value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 4.2, use "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
+
         // Optimize
         $values = array_filter($values);
         if (empty($values)) {
@@ -90,9 +111,13 @@ public function loadChoicesForValues(array $values, $value = null)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since Symfony 4.2
      */
     public function loadValuesForChoices(array $choices, $value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 4.2, use "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
+
         // Optimize
         $choices = array_filter($choices);
         if (empty($choices)) {

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
@@ -14,7 +14,9 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
 use Symfony\Component\Intl\Intl;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class CurrencyType extends AbstractType implements ChoiceLoaderInterface
@@ -27,6 +29,8 @@ class CurrencyType extends AbstractType implements ChoiceLoaderInterface
      * {@link \Symfony\Component\Intl\Intl::getCurrencyBundle()}.
      *
      * @var ArrayChoiceList
+     *
+     * @deprecated since Symfony 4.2
      */
     private $choiceList;
 
@@ -36,9 +40,18 @@ class CurrencyType extends AbstractType implements ChoiceLoaderInterface
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'choice_loader' => $this,
+            'choice_loader' => function (Options $options) {
+                $choiceTranslationLocale = $options['choice_translation_locale'];
+
+                return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
+                    return array_flip(Intl::getCurrencyBundle()->getCurrencyNames($choiceTranslationLocale));
+                });
+            },
             'choice_translation_domain' => false,
+            'choice_translation_locale' => null,
         ));
+
+        $resolver->setAllowedTypes('choice_translation_locale', array('null', 'string'));
     }
 
     /**
@@ -59,9 +72,13 @@ public function getBlockPrefix()
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since Symfony 4.2
      */
     public function loadChoiceList($value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 4.2, use "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
+
         if (null !== $this->choiceList) {
             return $this->choiceList;
         }
@@ -71,9 +88,13 @@ public function loadChoiceList($value = null)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since Symfony 4.2
      */
     public function loadChoicesForValues(array $values, $value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 4.2, use "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
+
         // Optimize
         $values = array_filter($values);
         if (empty($values)) {
@@ -90,9 +111,13 @@ public function loadChoicesForValues(array $values, $value = null)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since Symfony 4.2
      */
     public function loadValuesForChoices(array $choices, $value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 4.2, use "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
+
         // Optimize
         $choices = array_filter($choices);
         if (empty($choices)) {

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
@@ -14,7 +14,9 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
 use Symfony\Component\Intl\Intl;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class LanguageType extends AbstractType implements ChoiceLoaderInterface
@@ -27,6 +29,8 @@ class LanguageType extends AbstractType implements ChoiceLoaderInterface
      * {@link \Symfony\Component\Intl\Intl::getLanguageBundle()}.
      *
      * @var ArrayChoiceList
+     *
+     * @deprecated since Symfony 4.2
      */
     private $choiceList;
 
@@ -36,9 +40,18 @@ class LanguageType extends AbstractType implements ChoiceLoaderInterface
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'choice_loader' => $this,
+            'choice_loader' => function (Options $options) {
+                $choiceTranslationLocale = $options['choice_translation_locale'];
+
+                return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
+                    return array_flip(Intl::getLanguageBundle()->getLanguageNames($choiceTranslationLocale));
+                });
+            },
             'choice_translation_domain' => false,
+            'choice_translation_locale' => null,
         ));
+
+        $resolver->setAllowedTypes('choice_translation_locale', array('null', 'string'));
     }
 
     /**
@@ -59,9 +72,13 @@ public function getBlockPrefix()
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since Symfony 4.2
      */
     public function loadChoiceList($value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 4.2, use "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
+
         if (null !== $this->choiceList) {
             return $this->choiceList;
         }
@@ -71,9 +88,13 @@ public function loadChoiceList($value = null)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since Symfony 4.2
      */
     public function loadChoicesForValues(array $values, $value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 4.2, use "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
+
         // Optimize
         $values = array_filter($values);
         if (empty($values)) {
@@ -90,9 +111,13 @@ public function loadChoicesForValues(array $values, $value = null)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated since Symfony 4.2
      */
     public function loadValuesForChoices(array $choices, $value = null)
     {
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 4.2, use "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
+
         // Optimize
         $choices = array_filter($choices);
         if (empty($choices)) {