[Form] optimize ChoiceType children by caching choices

HeahDude · HeahDude · commit 8298b1d68945 · 2016-03-28T06:31:06.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
@@ -17,13 +17,20 @@
 
 class CountryType extends AbstractType
 {
+    /**
+     * Stores the available country choices.
+     *
+     * @var array
+     */
+    private static $countries;
+
     /**
      * {@inheritdoc}
      */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'choices' => array_flip(Intl::getRegionBundle()->getCountryNames()),
+            'choices' => self::getCountries(),
             'choice_translation_domain' => false,
         ));
     }
@@ -43,4 +50,25 @@ public function getBlockPrefix()
     {
         return 'country';
     }
+
+    /**
+     * Returns the country choices.
+     *
+     * The choices are generated from the Intl component
+     * {@link \Symfony\Component\Intl\Intl::getRegionBundle()}.
+     *
+     * They are cached during a single request, so multiple
+     * country fields on the same page don't lead to
+     * unnecessary overhead.
+     *
+     * @return array The country choices
+     */
+    private static function getCountries()
+    {
+        if (null === self::$countries) {
+            self::$countries = array_flip(Intl::getRegionBundle()->getCountryNames());
+        }
+
+        return self::$countries;
+    }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
@@ -17,13 +17,20 @@
 
 class CurrencyType extends AbstractType
 {
+    /**
+     * Stores the available currency choices.
+     *
+     * @var array
+     */
+    private static $currencies;
+
     /**
      * {@inheritdoc}
      */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'choices' => array_flip(Intl::getCurrencyBundle()->getCurrencyNames()),
+            'choices' => self::getCurrencies(),
             'choice_translation_domain' => false,
         ));
     }
@@ -43,4 +50,25 @@ public function getBlockPrefix()
     {
         return 'currency';
     }
+
+    /**
+     * Returns the currency choices.
+     *
+     * The choices are generated from the Intl component
+     * {@link \Symfony\Component\Intl\Intl::getCurrencyBundle()}.
+     *
+     * They are cached during a single request, so multiple
+     * currency fields on the same page don't lead to
+     * unnecessary overhead.
+     *
+     * @return array The currency choices
+     */
+    private static function getCurrencies()
+    {
+        if (null === self::$currencies) {
+            self::$currencies = array_flip(Intl::getCurrencyBundle()->getCurrencyNames());
+        }
+
+        return self::$currencies;
+    }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
@@ -17,13 +17,20 @@
 
 class LanguageType extends AbstractType
 {
+    /**
+     * Stores the available language choices.
+     *
+     * @var array
+     */
+    private static $languages;
+
     /**
      * {@inheritdoc}
      */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'choices' => array_flip(Intl::getLanguageBundle()->getLanguageNames()),
+            'choices' => self::getLanguages(),
             'choice_translation_domain' => false,
         ));
     }
@@ -43,4 +50,25 @@ public function getBlockPrefix()
     {
         return 'language';
     }
+
+    /**
+     * Returns the language choices.
+     *
+     * The choices are generated from the Intl component
+     * {@link \Symfony\Component\Intl\Intl::getLanguageBundle()}.
+     *
+     * They are cached during a single request, so multiple
+     * language fields on the same page don't lead to
+     * unnecessary overhead.
+     *
+     * @return array The language choices
+     */
+    private static function getLanguages()
+    {
+        if (null === self::$languages) {
+            self::$languages = array_flip(Intl::getLanguageBundle()->getLanguageNames());
+        }
+
+        return self::$languages;
+    }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
@@ -17,13 +17,20 @@
 
 class LocaleType extends AbstractType
 {
+    /**
+     * Stores the available locale choices.
+     *
+     * @var array
+     */
+    private static $locales;
+
     /**
      * {@inheritdoc}
      */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'choices' => array_flip(Intl::getLocaleBundle()->getLocaleNames()),
+            'choices' => self::getLocales(),
             'choice_translation_domain' => false,
         ));
     }
@@ -43,4 +50,25 @@ public function getBlockPrefix()
     {
         return 'locale';
     }
+
+    /**
+     * Returns the locale choices.
+     *
+     * The choices are generated from the Intl component
+     * {@link \Symfony\Component\Intl\Intl::getLocaleBundle()}.
+     *
+     * They are cached during a single request, so multiple
+     * locale fields on the same page don't lead to
+     * unnecessary overhead.
+     *
+     * @return array The locale choices
+     */
+    private static function getLocales()
+    {
+        if (null === self::$locales) {
+            self::$locales = array_flip(Intl::getLocaleBundle()->getLocaleNames());
+        }
+
+        return self::$locales;
+    }
 }
