Shorten air bundle alias

Match parent prototypes
Cleanup

diff --git a/Form/ApplicationType.php b/Form/ApplicationType.php
index cee09db35f1cec1d9c75ef9ce04ec44cffc082d7..f52ad8c46709c1ed2b0addababe2089240ac3146 100644 (file)
--- a/Form/ApplicationType.php
+++ b/Form/ApplicationType.php
@@ -32,39 +32,33 @@ class ApplicationType extends AbstractType {
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

-       public function buildForm(FormBuilderInterface $builder, array $options) {
-               //Create form
-               $form = $builder;
-
+       public function buildForm(FormBuilderInterface $builder, array $options): void {

                //Add dance field
                //Add dance field

-               $form->add('dance', EntityType::class, ['class' => 'Rapsys\AirBundle\Entity\Dance', 'choices' => $options['dance_choices'], 'preferred_choices' => $options['dance_favorites'], 'attr' => ['placeholder' => 'Your dance'], 'choice_translation_domain' => true, 'constraints' => [new NotBlank(['message' => 'Please provide your dance'])], 'data' => $options['dance_default']]);
+               $builder->add('dance', EntityType::class, ['class' => 'Rapsys\AirBundle\Entity\Dance', 'choices' => $options['dance_choices'], 'preferred_choices' => $options['dance_favorites'], 'attr' => ['placeholder' => 'Your dance'], 'choice_translation_domain' => true, 'constraints' => [new NotBlank(['message' => 'Please provide your dance'])], 'data' => $options['dance_default']]);

 
                //Add date field
 
                //Add date field

-               $form->add('date', DateType::class, ['attr' => ['placeholder' => 'Your date', 'class' => 'date'], 'html5' => true, 'input' => 'datetime', 'widget' => 'single_text', 'format' => 'yyyy-MM-dd', 'data' => new \DateTime('+7 day'), 'constraints' => [new NotBlank(['message' => 'Please provide your date']), new Type(['type' => \DateTime::class, 'message' => 'Your date doesn\'t seems to be valid'])]]);
+               $builder->add('date', DateType::class, ['attr' => ['placeholder' => 'Your date', 'class' => 'date'], 'html5' => true, 'input' => 'datetime', 'widget' => 'single_text', 'format' => 'yyyy-MM-dd', 'data' => new \DateTime('+7 day'), 'constraints' => [new NotBlank(['message' => 'Please provide your date']), new Type(['type' => \DateTime::class, 'message' => 'Your date doesn\'t seems to be valid'])]]);

 
                //Add location field
 
                //Add location field

-               $form->add('location', EntityType::class, ['class' => 'Rapsys\AirBundle\Entity\Location', 'choices' => $options['location_choices'], 'preferred_choices' => $options['location_favorites'], 'attr' => ['placeholder' => 'Your location'], 'choice_translation_domain' => true, 'constraints' => [new NotBlank(['message' => 'Please provide your location'])], 'data' => $options['location_default']]);
+               $builder->add('location', EntityType::class, ['class' => 'Rapsys\AirBundle\Entity\Location', 'choices' => $options['location_choices'], 'preferred_choices' => $options['location_favorites'], 'attr' => ['placeholder' => 'Your location'], 'choice_translation_domain' => true, 'constraints' => [new NotBlank(['message' => 'Please provide your location'])], 'data' => $options['location_default']]);

 
                //Add slot field
 
                //Add slot field

-               $form->add('slot', EntityType::class, ['class' => 'Rapsys\AirBundle\Entity\Slot', 'attr' => ['placeholder' => 'Your slot'], 'constraints' => [new NotBlank(['message' => 'Please provide your slot'])], 'choice_translation_domain' => true, 'data' => $options['slot_default']]);
+               $builder->add('slot', EntityType::class, ['class' => 'Rapsys\AirBundle\Entity\Slot', 'attr' => ['placeholder' => 'Your slot'], 'constraints' => [new NotBlank(['message' => 'Please provide your slot'])], 'choice_translation_domain' => true, 'data' => $options['slot_default']]);

 
                //Add extra user field
                if (!empty($options['user'])) {
                        //XXX: choicetype used here to use our own custom translated string
 
                //Add extra user field
                if (!empty($options['user'])) {
                        //XXX: choicetype used here to use our own custom translated string

-                       $form->add('user', ChoiceType::class, ['attr' => ['placeholder' => 'Your user'], 'choice_translation_domain' => false, 'constraints' => [new NotBlank(['message' => 'Please provide your user'])], 'choices' => $options['user_choices'], 'data' => $options['user_default']]);
+                       $builder->add('user', ChoiceType::class, ['attr' => ['placeholder' => 'Your user'], 'choice_translation_domain' => false, 'constraints' => [new NotBlank(['message' => 'Please provide your user'])], 'choices' => $options['user_choices'], 'data' => $options['user_default']]);

                }
 
                //Add submit
                }
 
                //Add submit

-               $form->add('submit', SubmitType::class, ['label' => 'Send', 'attr' => ['class' => 'submit']]);
-
-               //Return form
-               return $form;
+               $builder->add('submit', SubmitType::class, ['label' => 'Send', 'attr' => ['class' => 'submit']]);

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

-       public function configureOptions(OptionsResolver $resolver) {
+       public function configureOptions(OptionsResolver $resolver): void {

                //Set defaults
                $resolver->setDefaults(['error_bubbling' => true, 'dance_choices' => [], 'dance_default' => null, 'dance_favorites' => [], 'location_choices' => [], 'location_default' => null, 'location_favorites' => [], 'slot_default' => null, 'user' => true, 'user_choices' => [], 'user_default' => 1]);
 
                //Set defaults
                $resolver->setDefaults(['error_bubbling' => true, 'dance_choices' => [], 'dance_default' => null, 'dance_favorites' => [], 'location_choices' => [], 'location_default' => null, 'location_favorites' => [], 'slot_default' => null, 'user' => true, 'user_choices' => [], 'user_default' => 1]);
 


@@ -102,7 +96,7 @@ class ApplicationType extends AbstractType {
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

-       public function getName() {
-               return 'rapsys_air_application';
+       public function getName(): string {
+               return 'rapsysair_application';

        }
 }
        }
 }

diff --git a/Form/ContactType.php b/Form/ContactType.php
index bb0ee77053a1c3a36cb495da326d78f6306e4f6f..adee52527b474972db00daf6d5f52d4bbffb6d9e 100644 (file)
--- a/Form/ContactType.php
+++ b/Form/ContactType.php
@@ -33,7 +33,7 @@ class ContactType extends CaptchaType {
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

-       public function configureOptions(OptionsResolver $resolver) {
+       public function configureOptions(OptionsResolver $resolver): void {

                //Set defaults
                $resolver->setDefaults(['error_bubbling' => true]);
        }
                //Set defaults
                $resolver->setDefaults(['error_bubbling' => true]);
        }


@@ -41,7 +41,7 @@ class ContactType extends CaptchaType {
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

-       public function getName() {
+       public function getName(): string {

                return 'contact_form';
        }
 }
                return 'contact_form';
        }
 }

diff --git a/Form/ImageType.php b/Form/ImageType.php
index d1f7de0f7f840fb0502f6c47d23880262f9ac77c..300ffe9e0ca1ad80e2f4d416acc94b91dcf2af22 100644 (file)
--- a/Form/ImageType.php
+++ b/Form/ImageType.php
@@ -81,6 +81,6 @@ class ImageType extends AbstractType {
         * {@inheritdoc}
         */
        public function getName(): string {
         * {@inheritdoc}
         */
        public function getName(): string {

-               return 'rapsys_air_image';
+               return 'rapsysair_image';

        }
 }
        }
 }

diff --git a/Form/LocationType.php b/Form/LocationType.php
index ad4b94579d01861d57a2becdcbe30813a90a88d6..0072d8bc6a254ffb53cebf3a4fd5570e300f748b 100644 (file)
--- a/Form/LocationType.php
+++ b/Form/LocationType.php
@@ -30,8 +30,9 @@ class LocationType extends AbstractType {
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

-       public function buildForm(FormBuilderInterface $builder, array $options) {
-               return $builder
+       public function buildForm(FormBuilderInterface $builder, array $options): void {
+               //Build form
+               $builder

                        ->add('title', TextType::class, ['attr' => ['placeholder' => 'Your title'], 'constraints' => [new NotBlank(['message' => 'Please provide your title'])]])
                        ->add('description', TextareaType::class, ['attr' => ['placeholder' => 'Your description', 'cols' => 50, 'rows' => 15], 'required' => false])
                        ->add('address', TextType::class, ['attr' => ['placeholder' => 'Your address'], 'constraints' => [new NotBlank(['message' => 'Please provide your address'])]])
                        ->add('title', TextType::class, ['attr' => ['placeholder' => 'Your title'], 'constraints' => [new NotBlank(['message' => 'Please provide your title'])]])
                        ->add('description', TextareaType::class, ['attr' => ['placeholder' => 'Your description', 'cols' => 50, 'rows' => 15], 'required' => false])
                        ->add('address', TextType::class, ['attr' => ['placeholder' => 'Your address'], 'constraints' => [new NotBlank(['message' => 'Please provide your address'])]])


@@ -47,7 +48,7 @@ class LocationType extends AbstractType {
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

-       public function configureOptions(OptionsResolver $resolver) {
+       public function configureOptions(OptionsResolver $resolver): void {

                $resolver->setDefaults(['data_class' => Location::class, 'error_bubbling' => true]);
        }
 }
                $resolver->setDefaults(['data_class' => Location::class, 'error_bubbling' => true]);
        }
 }

diff --git a/Form/RegisterType.php b/Form/RegisterType.php
index e6af0830b6192b1cf088fed63d775fd6354be005..e79a7dc8416658e18ea0e0fd65334e45ce021735 100644 (file)
--- a/Form/RegisterType.php
+++ b/Form/RegisterType.php
@@ -187,6 +187,6 @@ class RegisterType extends BaseRegisterType {
         * {@inheritdoc}
         */
        public function getName(): string {
         * {@inheritdoc}
         */
        public function getName(): string {

-               return 'rapsys_air_register';
+               return 'rapsysair_register';

        }
 }
        }
 }

diff --git a/Form/SessionType.php b/Form/SessionType.php
index ef426498f7baffcfbeb2a64529adbd2b41d69174..d6f1ba3095d841abea876e9927a2526c23964936 100644 (file)
--- a/Form/SessionType.php
+++ b/Form/SessionType.php
@@ -39,7 +39,7 @@ class SessionType extends AbstractType {
         *
         * {@inheritdoc}
         */
         *
         * {@inheritdoc}
         */

-       public function buildForm(FormBuilderInterface $builder, array $options) {
+       public function buildForm(FormBuilderInterface $builder, array $options): void {

                //Is admin or user with rainfall >= 2
                if (!empty($options['raincancel'])) {
                        //Add raincancel item
                //Is admin or user with rainfall >= 2
                if (!empty($options['raincancel'])) {
                        //Add raincancel item


@@ -104,15 +104,12 @@ class SessionType extends AbstractType {
                                        ->add('autoattribute', SubmitType::class, ['label' => 'Auto attribute', 'attr' => ['class' => 'submit']]);
                        }
                }
                                        ->add('autoattribute', SubmitType::class, ['label' => 'Auto attribute', 'attr' => ['class' => 'submit']]);
                        }
                }

-
-               //Return form
-               return $builder;

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

-       public function configureOptions(OptionsResolver $resolver) {
+       public function configureOptions(OptionsResolver $resolver): void {

                $resolver->setDefaults(['error_bubbling' => true, 'admin' => false, 'dance_choices' => [], 'dance_default' => null, 'dance_favorites' => [], 'date' => null, 'begin' => null, 'length' => null, 'cancel' => false, 'raincancel' => false, 'modify' => false, 'move' => false, 'attribute' => false, 'user' => null, 'session' => null, 'slot_default' => null]);
 
                //Add admin
                $resolver->setDefaults(['error_bubbling' => true, 'admin' => false, 'dance_choices' => [], 'dance_default' => null, 'dance_favorites' => [], 'date' => null, 'begin' => null, 'length' => null, 'cancel' => false, 'raincancel' => false, 'modify' => false, 'move' => false, 'attribute' => false, 'user' => null, 'session' => null, 'slot_default' => null]);
 
                //Add admin


@@ -161,7 +158,7 @@ class SessionType extends AbstractType {
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

-       public function getName() {
-               return 'rapsys_air_session_edit';
+       public function getName(): string {
+               return 'rapsysair_session_edit';

        }
 }
        }
 }

diff --git a/Form/SnippetType.php b/Form/SnippetType.php
index 0bd83073d28ee313f11b6c7df1a25ef4149e998b..8f81b408dc80f3c3ceebefad820b9dbadcbfff89 100644 (file)
--- a/Form/SnippetType.php
+++ b/Form/SnippetType.php
@@ -120,6 +120,6 @@ class SnippetType extends AbstractType {
         * {@inheritdoc}
         */
        public function getName(): string {
         * {@inheritdoc}
         */
        public function getName(): string {

-               return 'rapsys_air_snippet';
+               return 'rapsysair_snippet';

        }
 }
        }
 }