[Form] simplified file type class

File uploads documentation is here:

symfony/symfony-docs#400

Author: fabpot

UPDATE.md

@@ -19,7 +19,14 @@ beta4 to beta5
   methods in the Serializer class itself breaking BC and adding component
   specific Exception classes.
 
-* The temporary storage for file uploads has been removed
+* The FileType Form class has been heavily changed:
+
+    * The temporary storage has been removed.
+
+    * The file type `type` option has also been removed (the new behavior is
+      the same as when the `type` was set to `file` before).
+
+    * The file input is now rendered as any other input field.
 
 * The `Symfony\Component\HttpFoundation\File\File::getExtension()` and
   `guessExtension()` methods do not return the extension with a `.` anymore.

src/Symfony/Bridge/Twig/Resources/views/Form/div_layout.html.twig

@@ -16,12 +16,6 @@
 {% endspaceless %}
 {% endblock form_label %}
 
-{% block file_label %}
-{% spaceless %}
-    {{ form_label(form.file) }}
-{% endspaceless %}
-{% endblock file_label %}
-
 {% block field_errors %}
 {% spaceless %}
     {% if errors|length > 0 %}
@@ -243,14 +237,6 @@
 {% endspaceless %}
 {% endblock percent_widget %}
 
-{% block file_widget %}
-{% spaceless %}
-    <div {{ block('container_attributes') }}>
-        {{ form_widget(form.file) }}
-    </div>
-{% endspaceless %}
-{% endblock file_widget %}
-
 {% block repeated_row %}
 {% spaceless %}
     {{ block('field_rows') }}

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_label.html.php

@@ -1,8 +1,7 @@
-<div<?php echo $view['form']->attributes() ?>>
-    <input type="file"
-        id="<?php echo $view->escape($form['file']->get('id')) ?>"
-        name="<?php echo $view->escape($form['file']->get('name')) ?>"
-        <?php if ($form['file']->get('disabled')): ?>disabled="disabled"<?php endif ?>
-        <?php if ($form['file']->get('required')): ?>required="required"<?php endif ?>
-    />
-</div>
+<input type="file"
+    <?php echo $view['form']->attributes() ?>
+    name="<?php echo $view->escape($full_name) ?>"
+    value="<?php echo $view->escape($value) ?>"
+    <?php if ($read_only): ?>disabled="disabled"<?php endif ?>
+    <?php if ($required): ?>required="required"<?php endif ?>
+/>

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_widget.html.php

@@ -13,65 +13,25 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\Form\ReversedTransformer;
-use Symfony\Component\Form\Extension\Core\DataTransformer\FileToStringTransformer;
-use Symfony\Component\Form\Extension\Core\DataTransformer\FileToArrayTransformer;
 use Symfony\Component\Form\FormView;
 
 class FileType extends AbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function buildForm(FormBuilder $builder, array $options)
-    {
-        if ($options['type'] === 'string') {
-            $builder->appendNormTransformer(
-                new ReversedTransformer(new FileToStringTransformer())
-            );
-        }
-
-        $builder
-            ->appendNormTransformer(new FileToArrayTransformer())
-            ->add('file', 'field')
-        ;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function buildViewBottomUp(FormView $view, FormInterface $form)
+    public function buildView(FormView $view, FormInterface $form)
     {
         $view
             ->set('multipart', true)
-            ->getChild('file')
-                ->set('type', 'file')
-                ->set('value', '')
+            ->set('type', 'file')
+            ->set('value', '')
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOptions(array $options)
-    {
-        return array(
-            'type' => 'string',
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAllowedOptionValues(array $options)
+    public function getParent(array $options)
     {
-        return array(
-            'type' => array(
-                'string',
-                'file',
-            ),
-        );
+        return 'field';
     }
 
     /**

src/Symfony/Component/Form/Extension/Core/DataTransformer/FileToArrayTransformer.php

@@ -413,11 +413,8 @@ public function testFileLabelAccessibility()
         $this->assertMatchesXpath($html,
 '/div
     [
-        ./label[@for="name_file"]
-        /following-sibling::div[@id="name"]
-            [
-                ./input[@id="name_file"][@type="file"]
-            ]
+        ./label[@for="name"]
+        /following-sibling::input[@id="name"][@type="file"]
     ]
 '
         );

src/Symfony/Component/Form/Extension/Core/DataTransformer/FileToStringTransformer.php

@@ -753,11 +753,8 @@ public function testFile()
         ));
 
         $this->assertWidgetMatchesXpath($form->createView(), array(),
-'/div
-    [
-        ./input[@type="file"][@id="na&me_file"]
-    ]
-    [count(./input)=1]
+'/input
+    [@type="file"]
 '
         );
     }

src/Symfony/Component/Form/Extension/Core/Type/FileType.php

@@ -25,7 +25,7 @@ public function testDontPassValueToView()
         ));
         $view = $form->createView();
 
-        $this->assertEquals('', $view['file']->get('value'));
+        $this->assertEquals('', $view->get('value'));
     }
 
     private function createUploadedFileMock($name, $originalName, $valid)