Replace dropped calls with checker, factory and security replacements

[airbundle] / Form / RegisterType.php

diff --git a/Form/RegisterType.php b/Form/RegisterType.php
index b6689a70a2eb356c194ae75f2a6852b663e3a39c..199e3d95c6764e05e5903931840ecd934f1a70eb 100644 (file)
--- a/Form/RegisterType.php
+++ b/Form/RegisterType.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
 <?php declare(strict_types=1);
 
 /*

- * This file is part of the Rapsys PackBundle package.
+ * This file is part of the Rapsys AirBundle package.

  *
  * (c) Raphaël Gertz <symfony@rapsys.eu>
  *
  *
  * (c) Raphaël Gertz <symfony@rapsys.eu>
  *


@@ -11,13 +11,17 @@
 
 namespace Rapsys\AirBundle\Form;
 
 
 namespace Rapsys\AirBundle\Form;
 

-use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;

 use Symfony\Component\Form\Extension\Core\Type\TelType;
 use Symfony\Component\Form\Extension\Core\Type\TelType;

+use Symfony\Component\Form\Extension\Core\Type\TextType;

 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;

-use Symfony\Component\Validator\Constraints\NotBlank;

 
 

-class RegisterType extends \Rapsys\UserBundle\Form\RegisterType {
+use Rapsys\AirBundle\Entity\Country;
+
+use Rapsys\UserBundle\Form\RegisterType as BaseRegisterType;
+
+class RegisterType extends BaseRegisterType {

        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */


@@ -25,6 +29,17 @@ class RegisterType extends \Rapsys\UserBundle\Form\RegisterType {
                //Call parent build form
                $form = parent::buildForm($builder, $options);
 
                //Call parent build form
                $form = parent::buildForm($builder, $options);
 

+               //Add extra city field
+               if (!empty($options['city'])) {
+                       $form->add('city', TextType::class, ['attr' => ['placeholder' => 'Your city'], 'required' => false]);
+               }
+
+               //Add extra country field
+               if (!empty($options['country'])) {
+                       //Add country field
+                       $form->add('country', EntityType::class, ['class' => $options['country_class'], 'choice_label' => 'title'/*, 'choices' => $options['location_choices']*/, 'preferred_choices' => $options['country_favorites'], 'attr' => ['placeholder' => 'Your country'], 'choice_translation_domain' => false, 'required' => true, 'data' => $options['country_default']]);
+               }
+

                //Add extra phone field
                if (!empty($options['phone'])) {
                        $form->add('phone', TelType::class, ['attr' => ['placeholder' => 'Your phone'], 'required' => false]);
                //Add extra phone field
                if (!empty($options['phone'])) {
                        $form->add('phone', TelType::class, ['attr' => ['placeholder' => 'Your phone'], 'required' => false]);


@@ -32,12 +47,12 @@ class RegisterType extends \Rapsys\UserBundle\Form\RegisterType {
 
                //Add extra pseudonym field
                if (!empty($options['pseudonym'])) {
 
                //Add extra pseudonym field
                if (!empty($options['pseudonym'])) {

-                       $form->add('pseudonym', TextType::class, ['attr' => ['placeholder' => 'Your pseudonym'], 'constraints' => [new NotBlank(['message' => 'Please provide your pseudonym'])]]);
+                       $form->add('pseudonym', TextType::class, ['attr' => ['placeholder' => 'Your pseudonym'], 'required' => false]);

                }
 
                }
 

-               //Add extra slug field
-               if (!empty($options['slug'])) {
-                       $form->add('slug', TextType::class, ['attr' => ['placeholder' => 'Your slug'], 'required' => false]);
+               //Add extra zipcode field
+               if (!empty($options['zipcode'])) {
+                       $form->add('zipcode', TextType::class, ['attr' => ['placeholder' => 'Your zipcode'], 'required' => false]);

                }
 
                //Return form
                }
 
                //Return form


@@ -52,7 +67,22 @@ class RegisterType extends \Rapsys\UserBundle\Form\RegisterType {
                parent::configureOptions($resolver);
 
                //Set defaults
                parent::configureOptions($resolver);
 
                //Set defaults

-               $resolver->setDefaults(['phone' => true, 'pseudonym' => true, 'slug' => true]);
+               $resolver->setDefaults(['city' => true, 'country' => true, 'country_class' => 'Rapsys\AirBundle\Entity\Country', 'country_default' => null, 'country_favorites' => [], 'phone' => true, 'pseudonym' => true, 'zipcode' => true]);
+
+               //Add extra city option
+               $resolver->setAllowedTypes('city', 'boolean');
+
+               //Add extra country option
+               $resolver->setAllowedTypes('country', 'boolean');
+
+               //Add country class
+               $resolver->setAllowedTypes('country_class', 'string');
+
+               //Add country default
+               $resolver->setAllowedTypes('country_default', [Country::class, 'null']);
+
+               //Add country favorites
+               $resolver->setAllowedTypes('country_favorites', 'array');

 
                //Add extra phone option
                $resolver->setAllowedTypes('phone', 'boolean');
 
                //Add extra phone option
                $resolver->setAllowedTypes('phone', 'boolean');


@@ -60,8 +90,8 @@ class RegisterType extends \Rapsys\UserBundle\Form\RegisterType {
                //Add extra pseudonym option
                $resolver->setAllowedTypes('pseudonym', 'boolean');
 
                //Add extra pseudonym option
                $resolver->setAllowedTypes('pseudonym', 'boolean');
 

-               //Add extra slug option
-               $resolver->setAllowedTypes('slug', 'boolean');
+               //Add extra zipcode option
+               $resolver->setAllowedTypes('zipcode', 'boolean');

        }
 
 
        }