Merge pull request #2 from egeloen/base64-option

Only allow bool values for base64 option
egeloen · May 21, 2016 · 79d36b8 · 79d36b8
2 parents 289969c + a42ef79
commit 79d36b8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,9 @@ php:
     - 7.0
     - hhvm
 
+branches:
+    only: master
+
 env:
     global:
         - COMPOSER_PREFER_LOWEST=false

diff --git a/Form/Extension/Base64FileExtension.php b/Form/Extension/Base64FileExtension.php
@@ -52,6 +52,12 @@ public function configureOptions(OptionsResolver $resolver)
                 return !$options['base64'] ? $value : null;
             },
         ]);
+
+        if (method_exists($resolver, 'setDefault')) {
+            $resolver->setAllowedTypes('base64', 'bool');
+        } else {
+            $resolver->setAllowedTypes(array('base64' => 'bool'));
+        }
     }
 
     /**

diff --git a/Tests/Form/Extension/Base64FileExtensionTest.php b/Tests/Form/Extension/Base64FileExtensionTest.php
@@ -106,6 +106,15 @@ public function testInvalidInitialData()
         $this->factory->create($this->formType, new \stdClass(), array('base64' => true));
     }
 
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "base64" with value "foo" is expected to be of type "bool"
+     */
+    public function testInvalidBase64Option()
+    {
+        $this->factory->create($this->formType, null, array('base64' => 'foo'));
+    }
+
     /**
      * @return string
      */