Merge remote-tracking branch 'wallabag/master'

3 files changed, 3 insertions, 102 deletions

diff --git a/src/Wallabag/CoreBundle/Form/Type/ClientType.php b/src/Wallabag/CoreBundle/Form/Type/ClientType.php
deleted file mode 100644
index 8b351e60..00000000
--- a/src/Wallabag/CoreBundle/Form/Type/ClientType.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Form\Type;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\CallbackTransformer;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\Extension\Core\Type\UrlType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class ClientType extends AbstractType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add('redirect_uris', UrlType::class, ['required' => true, 'label' => 'developer.client.form.redirect_uris_label'])
-            ->add('save', SubmitType::class, ['label' => 'developer.client.form.save_label'])
-        ;
-
-        $builder->get('redirect_uris')
-            ->addModelTransformer(new CallbackTransformer(
-                function ($originalUri) {
-                    return $originalUri;
-                },
-                function ($submittedUri) {
-                    return [$submittedUri];
-                }
-            ))
-        ;
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults([
-            'data_class' => 'Wallabag\ApiBundle\Entity\Client',
-        ]);
-    }
-
-    public function getBlockPrefix()
-    {
-        return 'client';
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 7d25cc80..0bac2874 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -52,6 +52,9 @@ class ConfigType extends AbstractType
                 'choices' => array_flip($this->languages),
                 'label' => 'config.form_settings.language_label',
             ])
+            ->add('pocket_consumer_key', null, [
+                'label' => 'config.form_settings.pocket_consumer_key_label',
+            ])
             ->add('save', SubmitType::class, [
                 'label' => 'config.form.save',
             ])
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
deleted file mode 100644
index 6a6f63d1..00000000
--- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Form\Type;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\PasswordType;
-use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints;
-
-class NewUserType extends AbstractType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add('username', TextType::class, [
-                'required' => true,
-                'label' => 'config.form_new_user.username_label',
-            ])
-            ->add('plainPassword', RepeatedType::class, [
-                'type' => PasswordType::class,
-                'invalid_message' => 'validator.password_must_match',
-                'first_options' => ['label' => 'config.form_new_user.password_label'],
-                'second_options' => ['label' => 'config.form_new_user.repeat_new_password_label'],
-                'constraints' => [
-                    new Constraints\Length([
-                        'min' => 8,
-                        'minMessage' => 'validator.password_too_short',
-                    ]),
-                    new Constraints\NotBlank(),
-                ],
-                'label' => 'config.form_new_user.plain_password_label',
-            ])
-            ->add('email', EmailType::class, [
-                'label' => 'config.form_new_user.email_label',
-            ])
-            ->add('save', SubmitType::class, [
-                'label' => 'config.form.save',
-            ])
-        ;
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults([
-            'data_class' => 'Wallabag\UserBundle\Entity\User',
-        ]);
-    }
-
-    public function getBlockPrefix()
-    {
-        return 'new_user';
-    }
-}