aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Form
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2015-12-22 13:00:37 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-01-15 09:35:38 +0100
commit5c895a7fd15822856fb407910264c5d95e1e223c (patch)
treea850ff9ccfd8067d4f8cdd341a2dda4324008afa /src/Wallabag/CoreBundle/Form
parent619cc45359ead519b64129181a07e14160fbbfcb (diff)
downloadwallabag-5c895a7fd15822856fb407910264c5d95e1e223c.tar.gz
wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.tar.zst
wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.zip
Update bundle & stock file
- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler
Diffstat (limited to 'src/Wallabag/CoreBundle/Form')
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php2
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ConfigType.php3
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/NewUserType.php3
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php b/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php
index 615b8169..7d05a5d8 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php
@@ -19,7 +19,7 @@ class ChangePasswordType extends AbstractType
19 'constraints' => new UserPassword(array('message' => 'Wrong value for your current password')), 19 'constraints' => new UserPassword(array('message' => 'Wrong value for your current password')),
20 )) 20 ))
21 ->add('new_password', RepeatedType::class, array( 21 ->add('new_password', RepeatedType::class, array(
22 'type' => 'password', 22 'type' => PasswordType::class,
23 'invalid_message' => 'The password fields must match.', 23 'invalid_message' => 'The password fields must match.',
24 'required' => true, 24 'required' => true,
25 'first_options' => array('label' => 'New password'), 25 'first_options' => array('label' => 'New password'),
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 88082a04..a139f2df 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -36,7 +36,8 @@ class ConfigType extends AbstractType
36 )) 36 ))
37 ->add('items_per_page') 37 ->add('items_per_page')
38 ->add('language', ChoiceType::class, array( 38 ->add('language', ChoiceType::class, array(
39 'choices' => $this->languages, 39 'choices' => array_flip($this->languages),
40 'choices_as_values' => true,
40 )) 41 ))
41 ->add('save', SubmitType::class) 42 ->add('save', SubmitType::class)
42 ; 43 ;
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
index e6fff976..ffbe9ba2 100644
--- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
@@ -4,6 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\EmailType; 6use Symfony\Component\Form\Extension\Core\Type\EmailType;
7use Symfony\Component\Form\Extension\Core\Type\PasswordType;
7use Symfony\Component\Form\Extension\Core\Type\RepeatedType; 8use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
8use Symfony\Component\Form\Extension\Core\Type\SubmitType; 9use Symfony\Component\Form\Extension\Core\Type\SubmitType;
9use Symfony\Component\Form\Extension\Core\Type\TextType; 10use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -18,7 +19,7 @@ class NewUserType extends AbstractType
18 $builder 19 $builder
19 ->add('username', TextType::class, array('required' => true)) 20 ->add('username', TextType::class, array('required' => true))
20 ->add('plainPassword', RepeatedType::class, array( 21 ->add('plainPassword', RepeatedType::class, array(
21 'type' => 'password', 22 'type' => PasswordType::class,
22 'constraints' => array( 23 'constraints' => array(
23 new Constraints\Length(array( 24 new Constraints\Length(array(
24 'min' => 8, 25 'min' => 8,
diff --git a/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php b/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php
index 296cec9e..5815b8c6 100644
--- a/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php
@@ -19,7 +19,7 @@ class TaggingRuleType extends AbstractType
19 ; 19 ;
20 20
21 $tagsField = $builder 21 $tagsField = $builder
22 ->create('tags', 'text') 22 ->create('tags', TextType::class)
23 ->addModelTransformer(new StringToListTransformer(',')); 23 ->addModelTransformer(new StringToListTransformer(','));
24 24
25 $builder->add($tagsField); 25 $builder->add($tagsField);