Merge f9b455a into 1be8f83

Kunstmaan · May 8, 2019 · 2793cb8 · 2793cb8
2 parents 1be8f83 + f9b455a
commit 2793cb8
Show file tree

Hide file tree

Showing 18 changed files with 165 additions and 99 deletions.
diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/CheckboxPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/CheckboxPagePart.php
@@ -100,27 +100,28 @@ public function getDefaultView()
     public function adaptForm(FormBuilderInterface $formBuilder, ArrayObject $fields, $sequence)
     {
         $bfsf = new BooleanFormSubmissionField();
-        $bfsf->setFieldName('field_' . $this->getUniqueId());
+        $bfsf->setFieldName('field_'.$this->getUniqueId());
         $bfsf->setLabel($this->getLabel());
         $bfsf->setSequence($sequence);
 
         $data = $formBuilder->getData();
-        $data['formwidget_' . $this->getUniqueId()] = $bfsf;
-        $constraints = array();
+        $data['formwidget_'.$this->getUniqueId()] = $bfsf;
+        $constraints = [];
         if ($this->getRequired()) {
-            $options = array();
+            $options = [];
             if (!empty($this->errorMessageRequired)) {
                 $options['message'] = $this->errorMessageRequired;
             }
             $constraints[] = new NotBlank($options);
         }
-        $formBuilder->add('formwidget_' . $this->getUniqueId(),
+        $formBuilder->add(
+            'formwidget_'.$this->getUniqueId(),
             BooleanFormSubmissionType::class,
-            array(
+            [
                 'label' => $this->getLabel(),
-                'constraints' => $constraints,
+                'value_constraints' => $constraints,
                 'required' => $this->getRequired(),
-            )
+            ]
         );
         $formBuilder->setData($data);
 

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/ChoicePagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/ChoicePagePart.php
@@ -89,35 +89,35 @@ public function adaptForm(FormBuilderInterface $formBuilder, ArrayObject $fields
         $choices = array_map('trim', $choices);
 
         $cfsf = new ChoiceFormSubmissionField();
-        $cfsf->setFieldName('field_' . $this->getUniqueId());
+        $cfsf->setFieldName('field_'.$this->getUniqueId());
         $cfsf->setLabel($this->getLabel());
         $cfsf->setChoices($choices);
         $cfsf->setRequired($this->required);
         $cfsf->setSequence($sequence);
 
         $data = $formBuilder->getData();
-        $data['formwidget_' . $this->getUniqueId()] = $cfsf;
-        $constraints = array();
+        $data['formwidget_'.$this->getUniqueId()] = $cfsf;
+        $constraints = [];
         if ($this->getRequired()) {
-            $options = array();
+            $options = [];
             if (!empty($this->errorMessageRequired)) {
                 $options['message'] = $this->errorMessageRequired;
             }
             $constraints[] = new NotBlank($options);
         }
 
         $formBuilder->add(
-            'formwidget_' . $this->getUniqueId(),
+            'formwidget_'.$this->getUniqueId(),
             ChoiceFormSubmissionType::class,
-            array(
+            [
                 'label' => $this->getLabel(),
                 'required' => $this->getRequired(),
                 'expanded' => $this->getExpanded(),
                 'multiple' => $this->getMultiple(),
                 'choices' => $choices,
                 'placeholder' => $this->getEmptyValue(),
-                'constraints' => $constraints,
-            )
+                'value_constraints' => $constraints,
+            ]
         );
         $formBuilder->setData($data);
 

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/EmailPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/EmailPagePart.php
@@ -132,34 +132,35 @@ public function getDefaultView()
     public function adaptForm(FormBuilderInterface $formBuilder, ArrayObject $fields, $sequence)
     {
         $efsf = new EmailFormSubmissionField();
-        $efsf->setFieldName('field_' . $this->getUniqueId());
+        $efsf->setFieldName('field_'.$this->getUniqueId());
         $efsf->setLabel($this->getLabel());
         $efsf->setSequence($sequence);
 
         $data = $formBuilder->getData();
-        $data['formwidget_' . $this->getUniqueId()] = $efsf;
+        $data['formwidget_'.$this->getUniqueId()] = $efsf;
 
-        $constraints = array();
+        $constraints = [];
         if ($this->getRequired()) {
-            $options = array();
+            $options = [];
             if (!empty($this->errorMessageRequired)) {
                 $options['message'] = $this->errorMessageRequired;
             }
             $constraints[] = new NotBlank($options);
         }
-        $options = array();
+        $options = [];
         if (!empty($this->errorMessageInvalid)) {
             $options['message'] = $this->getErrorMessageInvalid();
         }
         $constraints[] = new Email($options);
 
-        $formBuilder->add('formwidget_' . $this->getUniqueId(),
+        $formBuilder->add(
+            'formwidget_'.$this->getUniqueId(),
             EmailFormSubmissionType::class,
-            array(
+            [
                 'label' => $this->getLabel(),
-                'constraints' => $constraints,
+                'value_constraints' => $constraints,
                 'required' => $this->getRequired(),
-            )
+            ]
         );
         $formBuilder->setData($data);
 

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/FileUploadPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/FileUploadPagePart.php
@@ -43,30 +43,30 @@ class FileUploadPagePart extends AbstractFormPagePart
     public function adaptForm(FormBuilderInterface $formBuilder, ArrayObject $fields, $sequence)
     {
         $ffsf = new FileFormSubmissionField();
-        $ffsf->setFieldName('field_' . $this->getUniqueId());
+        $ffsf->setFieldName('field_'.$this->getUniqueId());
         $ffsf->setLabel($this->getLabel());
         $ffsf->setSequence($sequence);
 
         $data = $formBuilder->getData();
-        $data['formwidget_' . $this->getUniqueId()] = $ffsf;
+        $data['formwidget_'.$this->getUniqueId()] = $ffsf;
 
-        $constraints = array();
+        $constraints = [];
         if ($this->getRequired()) {
-            $options = array();
+            $options = [];
             if (!empty($this->errorMessageRequired)) {
                 $options['message'] = $this->errorMessageRequired;
             }
             $constraints[] = new NotBlank($options);
         }
 
         $formBuilder->add(
-            'formwidget_' . $this->getUniqueId(),
+            'formwidget_'.$this->getUniqueId(),
             FileFormSubmissionType::class,
-            array(
+            [
                 'label' => $this->getLabel(),
-                'constraints' => $constraints,
+                'value_constraints' => $constraints,
                 'required' => $this->getRequired(),
-            )
+            ]
         );
         $formBuilder->setData($data);
 

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/MultiLineTextPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/MultiLineTextPagePart.php
@@ -163,37 +163,37 @@ public function getErrorMessageRequired()
     public function adaptForm(FormBuilderInterface $formBuilder, ArrayObject $fields, $sequence)
     {
         $mfsf = new TextFormSubmissionField();
-        $mfsf->setFieldName('field_' . $this->getUniqueId());
+        $mfsf->setFieldName('field_'.$this->getUniqueId());
         $mfsf->setLabel($this->getLabel());
         $mfsf->setSequence($sequence);
 
         $data = $formBuilder->getData();
-        $data['formwidget_' . $this->getUniqueId()] = $mfsf;
+        $data['formwidget_'.$this->getUniqueId()] = $mfsf;
 
-        $constraints = array();
+        $constraints = [];
         if ($this->getRequired()) {
-            $options = array();
+            $options = [];
             if (!empty($this->errorMessageRequired)) {
                 $options['message'] = $this->errorMessageRequired;
             }
             $constraints[] = new NotBlank($options);
         }
         if ($this->getRegex()) {
-            $options = array('pattern' => $this->getRegex());
+            $options = ['pattern' => $this->getRegex()];
             if (!empty($this->errorMessageRegex)) {
                 $options['message'] = $this->errorMessageRegex;
             }
             $constraints[] = new Regex($options);
         }
 
         $formBuilder->add(
-            'formwidget_' . $this->getUniqueId(),
+            'formwidget_'.$this->getUniqueId(),
             TextFormSubmissionType::class,
-            array(
+            [
                 'label' => $this->getLabel(),
-                'constraints' => $constraints,
+                'value_constraints' => $constraints,
                 'required' => $this->getRequired(),
-            )
+            ]
         );
         $formBuilder->setData($data);
 

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/SingleLineTextPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/SingleLineTextPagePart.php
@@ -163,36 +163,37 @@ public function getDefaultView()
     public function adaptForm(FormBuilderInterface $formBuilder, ArrayObject $fields, $sequence)
     {
         $sfsf = new StringFormSubmissionField();
-        $sfsf->setFieldName('field_' . $this->getUniqueId());
+        $sfsf->setFieldName('field_'.$this->getUniqueId());
         $sfsf->setLabel($this->getLabel());
         $sfsf->setSequence($sequence);
 
         $data = $formBuilder->getData();
-        $data['formwidget_' . $this->getUniqueId()] = $sfsf;
+        $data['formwidget_'.$this->getUniqueId()] = $sfsf;
 
-        $constraints = array();
+        $constraints = [];
         if ($this->getRequired()) {
-            $options = array();
+            $options = [];
             if (!empty($this->errorMessageRequired)) {
                 $options['message'] = $this->errorMessageRequired;
             }
             $constraints[] = new NotBlank($options);
         }
         if ($this->getRegex()) {
-            $options = array('pattern' => $this->getRegex());
+            $options = ['pattern' => $this->getRegex()];
             if (!empty($this->errorMessageRegex)) {
                 $options['message'] = $this->errorMessageRegex;
             }
             $constraints[] = new Regex($options);
         }
 
-        $formBuilder->add('formwidget_' . $this->getUniqueId(),
+        $formBuilder->add(
+            'formwidget_'.$this->getUniqueId(),
             StringFormSubmissionType::class,
-            array(
+            [
                 'label' => $this->getLabel(),
-                'constraints' => $constraints,
+                'value_constraints' => $constraints,
                 'required' => $this->getRequired(),
-            )
+            ]
         );
         $formBuilder->setData($data);
 

diff --git a/src/Kunstmaan/FormBundle/Form/BooleanFormSubmissionType.php b/src/Kunstmaan/FormBundle/Form/BooleanFormSubmissionType.php
@@ -18,19 +18,29 @@ class BooleanFormSubmissionType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $keys = array_fill_keys(array('label', 'required', 'constraints'), null);
-        $fieldOptions = array_filter(array_replace($keys, array_intersect_key($options, $keys)), function ($v) {
-            return isset($v);
-        });
+        if (isset($options['value_constraints']) && !empty($options['value_constraints'])) {
+            $options['constraints'] = $options['value_constraints'];
+        }
+
+        $keys = array_fill_keys(['label', 'required', 'constraints'], null);
+        $fieldOptions = array_filter(
+            array_replace($keys, array_intersect_key($options, $keys)),
+            function ($v) {
+                return isset($v);
+            }
+        );
 
         $builder->add('value', CheckboxType::class, $fieldOptions);
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
-            'data_class' => 'Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\BooleanFormSubmissionField',
-        ]);
+        $resolver->setDefaults(
+            [
+                'data_class' => 'Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\BooleanFormSubmissionField',
+                'value_constraints' => [],
+            ]
+        );
     }
 
     /**

diff --git a/src/Kunstmaan/FormBundle/Form/ChoiceFormSubmissionType.php b/src/Kunstmaan/FormBundle/Form/ChoiceFormSubmissionType.php
@@ -18,10 +18,20 @@ class ChoiceFormSubmissionType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $keys = array_fill_keys(['label', 'required', 'expanded', 'multiple', 'choices', 'placeholder', 'constraints'], null);
-        $fieldOptions = array_filter(array_replace($keys, array_intersect_key($options, $keys)), function ($v) {
-            return isset($v);
-        });
+        if (isset($options['value_constraints']) && !empty($options['value_constraints'])) {
+            $options['constraints'] = $options['value_constraints'];
+        }
+
+        $keys = array_fill_keys(
+            ['label', 'required', 'expanded', 'multiple', 'choices', 'placeholder', 'constraints'],
+            null
+        );
+        $fieldOptions = array_filter(
+            array_replace($keys, array_intersect_key($options, $keys)),
+            function ($v) {
+                return isset($v);
+            }
+        );
         $fieldOptions['choices'] = array_flip($fieldOptions['choices']);
         $fieldOptions['empty_data'] = null;
 
@@ -38,12 +48,15 @@ public function getBlockPrefix()
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
+        $resolver->setDefaults(
+            [
                 'data_class' => 'Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\ChoiceFormSubmissionField',
                 'choices' => [],
                 'placeholder' => null,
                 'expanded' => null,
                 'multiple' => null,
-        ]);
+                'value_constraints' => [],
+            ]
+        );
     }
 }
diff --git a/src/Kunstmaan/FormBundle/Form/EmailFormSubmissionType.php b/src/Kunstmaan/FormBundle/Form/EmailFormSubmissionType.php
@@ -18,18 +18,28 @@ class EmailFormSubmissionType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $keys = array_fill_keys(array('label', 'required', 'constraints'), null);
-        $fieldOptions = array_filter(array_replace($keys, array_intersect_key($options, $keys)), function ($v) {
-            return isset($v);
-        });
+        if (isset($options['value_constraints']) && !empty($options['value_constraints'])) {
+            $options['constraints'] = $options['value_constraints'];
+        }
+
+        $keys = array_fill_keys(['label', 'required', 'constraints'], null);
+        $fieldOptions = array_filter(
+            array_replace($keys, array_intersect_key($options, $keys)),
+            function ($v) {
+                return isset($v);
+            }
+        );
         $builder->add('value', EmailType::class, $fieldOptions);
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\EmailFormSubmissionField',
-        ));
+        $resolver->setDefaults(
+            [
+                'data_class' => 'Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\EmailFormSubmissionField',
+                'value_constraints' => [],
+            ]
+        );
     }
 
     /**