diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Form')
5 files changed, 14 insertions, 11 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index d5890971..49b05b80 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |||
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type; | |||
4 | 4 | ||
5 | use Symfony\Component\Form\AbstractType; | 5 | use Symfony\Component\Form\AbstractType; |
6 | use Symfony\Component\Form\FormBuilderInterface; | 6 | use Symfony\Component\Form\FormBuilderInterface; |
7 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; | 7 | use Symfony\Component\OptionsResolver\OptionsResolver; |
8 | 8 | ||
9 | class ConfigType extends AbstractType | 9 | class ConfigType extends AbstractType |
10 | { | 10 | { |
@@ -24,14 +24,17 @@ class ConfigType extends AbstractType | |||
24 | public function buildForm(FormBuilderInterface $builder, array $options) | 24 | public function buildForm(FormBuilderInterface $builder, array $options) |
25 | { | 25 | { |
26 | $builder | 26 | $builder |
27 | ->add('theme', 'choice', array('choices' => $this->themes)) | 27 | ->add('theme', 'choice', array( |
28 | 'choices' => array_flip($this->themes), | ||
29 | 'choices_as_values' => true, | ||
30 | )) | ||
28 | ->add('items_per_page') | 31 | ->add('items_per_page') |
29 | ->add('language') | 32 | ->add('language') |
30 | ->add('save', 'submit') | 33 | ->add('save', 'submit') |
31 | ; | 34 | ; |
32 | } | 35 | } |
33 | 36 | ||
34 | public function setDefaultOptions(OptionsResolverInterface $resolver) | 37 | public function configureOptions(OptionsResolver $resolver) |
35 | { | 38 | { |
36 | $resolver->setDefaults(array( | 39 | $resolver->setDefaults(array( |
37 | 'data_class' => 'Wallabag\CoreBundle\Entity\Config', | 40 | 'data_class' => 'Wallabag\CoreBundle\Entity\Config', |
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryType.php b/src/Wallabag/CoreBundle/Form/Type/EntryType.php index 0532bf10..4abdc10b 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EntryType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryType.php | |||
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type; | |||
4 | 4 | ||
5 | use Symfony\Component\Form\AbstractType; | 5 | use Symfony\Component\Form\AbstractType; |
6 | use Symfony\Component\Form\FormBuilderInterface; | 6 | use Symfony\Component\Form\FormBuilderInterface; |
7 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; | 7 | use Symfony\Component\OptionsResolver\OptionsResolver; |
8 | 8 | ||
9 | class EntryType extends AbstractType | 9 | class EntryType extends AbstractType |
10 | { | 10 | { |
@@ -16,7 +16,7 @@ class EntryType extends AbstractType | |||
16 | ; | 16 | ; |
17 | } | 17 | } |
18 | 18 | ||
19 | public function setDefaultOptions(OptionsResolverInterface $resolver) | 19 | public function configureOptions(OptionsResolver $resolver) |
20 | { | 20 | { |
21 | $resolver->setDefaults(array( | 21 | $resolver->setDefaults(array( |
22 | 'data_class' => 'Wallabag\CoreBundle\Entity\Entry', | 22 | 'data_class' => 'Wallabag\CoreBundle\Entity\Entry', |
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php index a12fff2b..985cb55b 100644 --- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php +++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php | |||
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type; | |||
4 | 4 | ||
5 | use Symfony\Component\Form\AbstractType; | 5 | use Symfony\Component\Form\AbstractType; |
6 | use Symfony\Component\Form\FormBuilderInterface; | 6 | use Symfony\Component\Form\FormBuilderInterface; |
7 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; | 7 | use Symfony\Component\OptionsResolver\OptionsResolver; |
8 | use Symfony\Component\Validator\Constraints; | 8 | use Symfony\Component\Validator\Constraints; |
9 | 9 | ||
10 | class NewUserType extends AbstractType | 10 | class NewUserType extends AbstractType |
@@ -27,7 +27,7 @@ class NewUserType extends AbstractType | |||
27 | ; | 27 | ; |
28 | } | 28 | } |
29 | 29 | ||
30 | public function setDefaultOptions(OptionsResolverInterface $resolver) | 30 | public function configureOptions(OptionsResolver $resolver) |
31 | { | 31 | { |
32 | $resolver->setDefaults(array( | 32 | $resolver->setDefaults(array( |
33 | 'data_class' => 'Wallabag\CoreBundle\Entity\User', | 33 | 'data_class' => 'Wallabag\CoreBundle\Entity\User', |
diff --git a/src/Wallabag/CoreBundle/Form/Type/RssType.php b/src/Wallabag/CoreBundle/Form/Type/RssType.php index e14e84e1..1f7f4c68 100644 --- a/src/Wallabag/CoreBundle/Form/Type/RssType.php +++ b/src/Wallabag/CoreBundle/Form/Type/RssType.php | |||
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type; | |||
4 | 4 | ||
5 | use Symfony\Component\Form\AbstractType; | 5 | use Symfony\Component\Form\AbstractType; |
6 | use Symfony\Component\Form\FormBuilderInterface; | 6 | use Symfony\Component\Form\FormBuilderInterface; |
7 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; | 7 | use Symfony\Component\OptionsResolver\OptionsResolver; |
8 | 8 | ||
9 | class RssType extends AbstractType | 9 | class RssType extends AbstractType |
10 | { | 10 | { |
@@ -16,7 +16,7 @@ class RssType extends AbstractType | |||
16 | ; | 16 | ; |
17 | } | 17 | } |
18 | 18 | ||
19 | public function setDefaultOptions(OptionsResolverInterface $resolver) | 19 | public function configureOptions(OptionsResolver $resolver) |
20 | { | 20 | { |
21 | $resolver->setDefaults(array( | 21 | $resolver->setDefaults(array( |
22 | 'data_class' => 'Wallabag\CoreBundle\Entity\Config', | 22 | 'data_class' => 'Wallabag\CoreBundle\Entity\Config', |
diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php index f0367d14..1b628051 100644 --- a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php +++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php | |||
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type; | |||
4 | 4 | ||
5 | use Symfony\Component\Form\AbstractType; | 5 | use Symfony\Component\Form\AbstractType; |
6 | use Symfony\Component\Form\FormBuilderInterface; | 6 | use Symfony\Component\Form\FormBuilderInterface; |
7 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; | 7 | use Symfony\Component\OptionsResolver\OptionsResolver; |
8 | 8 | ||
9 | class UserInformationType extends AbstractType | 9 | class UserInformationType extends AbstractType |
10 | { | 10 | { |
@@ -17,7 +17,7 @@ class UserInformationType extends AbstractType | |||
17 | ; | 17 | ; |
18 | } | 18 | } |
19 | 19 | ||
20 | public function setDefaultOptions(OptionsResolverInterface $resolver) | 20 | public function configureOptions(OptionsResolver $resolver) |
21 | { | 21 | { |
22 | $resolver->setDefaults(array( | 22 | $resolver->setDefaults(array( |
23 | 'data_class' => 'Wallabag\CoreBundle\Entity\User', | 23 | 'data_class' => 'Wallabag\CoreBundle\Entity\User', |