Merge pull request #1 from hshn/form-type-strictness-option

Introduce strict option to Base64EncodedFileType
hshn · Nov 3, 2015 · 52eb2ea · 52eb2ea
2 parents 2704c3f + 8cb9bfc
commit 52eb2ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "symfony/http-foundation": "~2.4"
     },
     "require-dev": {
-        "symfony/form": "~2.4"
+        "symfony/form": "~2.7"
     },
     "suggest": {
         "symfony/form": "to use base64_encoded_file type"

diff --git a/src/Form/Type/Base64EncodedFileType.php b/src/Form/Type/Base64EncodedFileType.php
@@ -6,7 +6,7 @@
 use Hshn\Base64EncodedFile\Form\DataTransformer\FileToBase64EncodedStringTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 
 /**
@@ -19,21 +19,23 @@ class Base64EncodedFileType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addViewTransformer(new FileToBase64EncodedStringTransformer());
+        $builder->addViewTransformer(new FileToBase64EncodedStringTransformer($options['strict_decode']));
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setDefaults([
                 'compound' => false,
                 'data_class' => null,
                 'empty_data' => null,
                 'multiple' => false,
+                'strict_decode' => true,
             ])
+            ->setAllowedTypes('strict_decode', 'boolean')
         ;
     }