Fix display the form errors correctly

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Form / Type / ConfigType.php

diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 0fcf020add5ef5495f1a341ba52e03ca3fe17992..1714ce74aa549e2cdddcb9f231dc946148e0a75f 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -1,43 +1,86 @@
 <?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;
+use Wallabag\CoreBundle\Entity\Config;
 
 class ConfigType extends AbstractType
 {
-    private $themes = array();
+    private $themes = [];
+    private $languages = [];
 
     /**
-     * @param array $themes Themes come from the LiipThemeBundle (liip_theme.themes)
+     * @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)
+    public function __construct($themes, $languages)
     {
         $this->themes = array_combine(
             $themes,
-            array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $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' => $this->themes))
-            ->add('items_per_page')
-            ->add('language')
-            ->add('save', 'submit')
+            ->add('theme', ChoiceType::class, [
+                'choices' => array_flip($this->themes),
+                'label' => 'config.form_settings.theme_label',
+            ])
+            ->add('items_per_page', null, [
+                'label' => 'config.form_settings.items_per_page_label',
+                'property_path' => 'itemsPerPage',
+            ])
+            ->add('reading_speed', ChoiceType::class, [
+                'label' => 'config.form_settings.reading_speed.label',
+                'property_path' => 'readingSpeed',
+                'choices' => [
+                    'config.form_settings.reading_speed.100_word' => '0.5',
+                    'config.form_settings.reading_speed.200_word' => '1',
+                    'config.form_settings.reading_speed.300_word' => '1.5',
+                    'config.form_settings.reading_speed.400_word' => '2',
+                ],
+            ])
+            ->add('action_mark_as_read', ChoiceType::class, [
+                'label' => 'config.form_settings.action_mark_as_read.label',
+                'property_path' => 'actionMarkAsRead',
+                'choices' => [
+                    'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE,
+                    'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE,
+                ],
+            ])
+            ->add('language', ChoiceType::class, [
+                'choices' => array_flip($this->languages),
+                'label' => 'config.form_settings.language_label',
+            ])
+            ->add('pocket_consumer_key', null, [
+                'property_path' => 'pocketConsumerKey',
+                'label' => 'config.form_settings.pocket_consumer_key_label',
+            ])
+            ->add('save', SubmitType::class, [
+                'label' => 'config.form.save',
+            ])
         ;
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => 'Wallabag\CoreBundle\Entity\Config',
-        ));
+        ]);
     }
 
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'config';
     }