X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FForm%2FType%2FConfigType.php;h=a139f2df0f076bd4ec5af45aa90f5d610f1260b6;hb=e008c037f53324b931f027483f9f1053171109c5;hp=74e2a6f1463aca4ba7025028f5128ab898333631;hpb=4d85d7e9ba676bd5ac3428976ce9227f460eb542;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 74e2a6f1..a139f2df 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -1,40 +1,56 @@
 <?php
+
 namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ConfigType extends AbstractType
 {
+    private $themes = array();
+    private $languages = array();
+
+    /**
+     * @param array $themes    Themes come from the LiipThemeBundle (liip_theme.themes)
+     * @param array $languages Languages come from configuration, array just code language as key and label as value
+     */
+    public function __construct($themes, $languages)
+    {
+        $this->themes = array_combine(
+            $themes,
+            array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes)
+        );
+
+        $this->languages = $languages;
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('theme', 'choice', array(
-                'choices' => array(
-                    'baggy' => 'Baggy',
-                    'courgette' => 'Courgette',
-                    'dark' => 'Dark',
-                    'default' => 'Default',
-                    'dmagenta' => 'Dmagenta',
-                    'solarized' => 'Solarized',
-                    'solarized_dark' => 'Solarized Dark',
-                ),
+            ->add('theme', ChoiceType::class, array(
+                'choices' => array_flip($this->themes),
+                'choices_as_values' => true,
             ))
             ->add('items_per_page')
-            ->add('language')
-            ->add('save', 'submit')
+            ->add('language', ChoiceType::class, array(
+                'choices' => array_flip($this->languages),
+                'choices_as_values' => true,
+            ))
+            ->add('save', SubmitType::class)
         ;
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'data_class' => 'Wallabag\CoreBundle\Entity\Config',
         ));
     }
 
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'config';
     }