raulfraile
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/FileType.php
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/FileType.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/FormType.php
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/FormType.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Form.php
Lines changed: 9 additions & 0 deletions b/‎src/Symfony/Component/Form/Form.php
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/CompoundFormTest.php
Lines changed: 16 additions & 1 deletion b/‎src/Symfony/Component/Form/Tests/CompoundFormTest.php
Lines changed: 16 additions & 1 deletion
@@ -105,6 +105,7 @@ public function configureOptions(OptionsResolver $resolver)
             'data_class' => $dataClass,
             'empty_data' => $emptyData,
             'multiple' => false,
+            'allow_file_upload' => true,
         ));
     }
 
 
@@ -213,6 +213,7 @@ public function configureOptions(OptionsResolver $resolver)
             'attr' => $defaultAttr,
             'post_max_size_message' => 'The uploaded file was too large. Please try to upload a smaller file.',
             'upload_max_size_message' => $uploadMaxSizeMessage, // internal
+            'allow_file_upload' => false,
         ));
 
         $resolver->setAllowedTypes('label_attr', 'array');
 
@@ -541,6 +541,11 @@ public function submit($submittedData, $clearMissing = true)
             $submittedData = null;
         } elseif (is_scalar($submittedData)) {
             $submittedData = (string) $submittedData;
+        } elseif ($this->config->getOption('allow_file_upload')) {
+            // no-op
+        } elseif ($this->config->getRequestHandler()->isFileUpload($submittedData)) {
+            $submittedData = null;
+            $this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, file upload given.');
         }
 
         $dispatcher = $this->config->getEventDispatcher();
@@ -550,6 +555,10 @@ public function submit($submittedData, $clearMissing = true)
         $viewData = null;
 
         try {
+            if (null !== $this->transformationFailure) {
+                throw $this->transformationFailure;
+            }
+
             // Hook to change content of the data submitted by the browser
             if ($dispatcher->hasListeners(FormEvents::PRE_SUBMIT)) {
                 $event = new FormEvent($this, $submittedData);
 
@@ -712,7 +712,7 @@ public function testSubmitPostOrPutRequestWithSingleChildForm($method)
             'REQUEST_METHOD' => $method,
         ));
 
-        $form = $this->getBuilder('image')
+        $form = $this->getBuilder('image', null, null, array('allow_file_upload' => true))
             ->setMethod($method)
             ->setRequestHandler(new HttpFoundationRequestHandler())
             ->getForm();
@@ -1088,6 +1088,21 @@ public function testDisabledButtonIsNotSubmitted()
         $this->assertFalse($submit->isSubmitted());
     }
 
+    public function testFileUpload()
+    {
+        $reqHandler = new HttpFoundationRequestHandler();
+        $this->form->add($this->getBuilder('foo')->setRequestHandler($reqHandler)->getForm());
+        $this->form->add($this->getBuilder('bar')->setRequestHandler($reqHandler)->getForm());
+
+        $this->form->submit(array(
+            'foo' => 'Foo',
+            'bar' => new UploadedFile(__FILE__, 'upload.png', 'image/png', 123, UPLOAD_ERR_OK),
+        ));
+
+        $this->assertSame('Submitted data was expected to be text or number, file upload given.', $this->form->get('bar')->getTransformationFailure()->getMessage());
+        $this->assertNull($this->form->get('bar')->getData());
+    }
+
     protected function createForm()
     {
         return $this->getBuilder()
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ public function configureOptions(OptionsResolver $resolver)`
`105`	`105`	`'data_class' => $dataClass,`
`106`	`106`	`'empty_data' => $emptyData,`
`107`	`107`	`'multiple' => false,`
	`108`	`+ 'allow_file_upload' => true,`
`108`	`109`	`));`
`109`	`110`	`}`
`110`	`111`