Merge pull request #30 from LinioIT/fix/DIS-735-improve-features-of-born-date-type

[DIS-735] fix: improve features of born date type

Author: tamara-dietz

src/Form/Extension/BirthdayTypeExtension.php

@@ -6,8 +6,6 @@
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class BirthdayTypeExtension extends AbstractTypeExtension
@@ -17,13 +15,6 @@ public function configureOptions(OptionsResolver $resolver): void
         $resolver->setDefined(['order', 'minAgeAllowed', 'maxAgeAllowed']);
     }
 
-    public function buildView(FormView $view, FormInterface $form, array $options): void
-    {
-        $view->vars['order'] = $options['order'] ?? '';
-        $view->vars['minAgeAllowed'] = $options['minAgeAllowed'] ?? '';
-        $view->vars['maxAgeAllowed'] = $options['maxAgeAllowed'] ?? '';
-    }
-
     public static function getExtendedTypes(): iterable
     {
         return [BirthdayType::class];

src/Form/FormFactory.php

@@ -7,8 +7,10 @@
 use Linio\DynamicFormBundle\DataProvider;
 use Linio\DynamicFormBundle\Exception\NonExistentFormException;
 use Linio\DynamicFormBundle\Exception\NotExistentDataProviderException;
+use Linio\DynamicFormBundle\FormlyMapper\FormlyField\BirthdayField;
 use Linio\DynamicFormBundle\HelpMessageProvider;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormFactory as SymfonyFormFactory;
@@ -144,6 +146,10 @@ public function createBuilder($key, $data = [], $options = [], $name = null)
                 $fieldOptions['constraints'] = $constraints;
             }
 
+            if (isset($fieldConfiguration['type'])) {
+                $fieldOptions = $this->updateBirthdayFieldOptions($fieldConfiguration['type'], $key, $fieldOptions);
+            }
+
             $field = $formBuilder->create($key, $fieldConfiguration['type'], $fieldOptions);
 
             if (isset($fieldConfiguration['transformer'])) {
@@ -165,6 +171,26 @@ public function createBuilder($key, $data = [], $options = [], $name = null)
         return $formBuilder;
     }
 
+    public function updateBirthdayFieldOptions(string $type, string $key, array $fieldOptions): array
+    {
+        if ($type != BirthdayType::class) {
+            return $fieldOptions;
+        }
+
+        $birthdayField = new BirthdayField();
+        $birthdayField->setFieldConfiguration([
+            'name' => $key,
+            'type' => $birthdayField->getFieldType(),
+            'options' => $fieldOptions,
+        ]);
+
+        $fieldOptions = $birthdayField->getFormlyFieldConfiguration()['templateOptions'];
+        $fieldOptions['label'] = lcfirst($fieldOptions['label']);
+        unset($fieldOptions['type']);
+
+        return $fieldOptions;
+    }
+
     /**
      * This method generates a validator based on the configuration file.
      *

src/FormlyMapper/FormlyField/BirthdayField.php

@@ -16,7 +16,7 @@ class BirthdayField extends FormlyField
     /**
      * {@inheritdoc}
      */
-    protected function getFieldType()
+    public function getFieldType()
     {
         return 'birthday';
     }

tests/Form/FormFactoryTest.php

@@ -10,6 +10,7 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormFactory as SymfonyFormFactory;
@@ -76,6 +77,50 @@ public function testIsCreatingASimpleForm(): void
         $this->assertEquals('foo_form', $actual);
     }
 
+    public function testIsCreatingFormWithBirthdayFieldWithYearsAllowed(): void
+    {
+        $minAgeAllowed = 0;
+        $maxAgeAllowed = 18;
+
+        $formConfiguration = [
+            'foo' => [
+                'borndate' => [
+                    'enabled' => true,
+                    'type' => 'Symfony\Component\Form\Extension\Core\Type\BirthdayType',
+                    'options' => [
+                        'minAgeAllowed' => $minAgeAllowed,
+                        'maxAgeAllowed' => $maxAgeAllowed,
+                        'order' => 'desc',
+                    ],
+                ],
+            ],
+        ];
+
+        $expectedFieldOptions = [
+            'label' => 'borndate',
+            'years' => range(date('Y') - $minAgeAllowed, date('Y') - $maxAgeAllowed),
+        ];
+
+        $this->formFactoryMock->createNamedBuilder('foo', FormType::class, ['foo_form_data'], ['foo_form_options'])
+            ->willReturn($this->formBuilderMock->reveal());
+
+        $this->formBuilderMock->create('borndate', BirthdayType::class, $expectedFieldOptions)
+            ->willReturn('borndate_instance');
+
+        $this->formBuilderMock->add('borndate_instance')
+            ->shouldBeCalled();
+
+        $this->formBuilderMock->getForm()
+            ->willReturn('foo_form');
+
+        $this->formFactory->setFormFactory($this->formFactoryMock->reveal());
+        $this->formFactory->setConfiguration($formConfiguration);
+
+        $actual = $this->formFactory->createForm('foo', ['foo_form_data'], ['foo_form_options']);
+
+        $this->assertEquals('foo_form', $actual);
+    }
+
     public function testIsCreatingFormWithValidators(): void
     {
         $formConfiguration = [