Merge branch 'hotfix/2619' into develop

Forward port #2619
zendframework · Oct 2, 2012 · 90dda04 · 90dda04
2 parents 760feb2 + 1fb9ca3
commit 90dda04
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 13 deletions.
diff --git a/library/Zend/Form/Element/File.php b/library/Zend/Form/Element/File.php
@@ -22,6 +22,8 @@
 namespace Zend\Form\Element;
 
 use Zend\Form\Element;
+use Zend\Form\ElementPrepareAwareInterface;
+use Zend\Form\Form;
 
 /**
  * @category   Zend
@@ -30,7 +32,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class File extends Element
+class File extends Element implements ElementPrepareAwareInterface
 {
     /**
      * Seed attributes
@@ -40,4 +42,16 @@ class File extends Element
     protected $attributes = array(
         'type' => 'file',
     );
+
+    /**
+     * Prepare the form element (mostly used for rendering purposes)
+     *
+     * @param  Form $form
+     * @return mixed
+     */
+    public function prepareElement(Form $form)
+    {
+        // Ensure the form is using correct enctype
+        $form->setAttribute('enctype', 'multipart/form-data');
+    }
 }
diff --git a/library/Zend/Form/Form.php b/library/Zend/Form/Form.php
@@ -137,12 +137,6 @@ public function add($elementOrFieldset, array $flags = array())
             $elementOrFieldset = $factory->create($elementOrFieldset);
         }
 
-        // check if the element is a file and add enctype attribute if so
-        $type = $elementOrFieldset->getAttribute('type');
-        if (isset($type) && $type === 'file') {
-            $this->attributes['enctype'] = 'multipart/form-data';
-        }
-
         parent::add($elementOrFieldset, $flags);
 
         if ($elementOrFieldset instanceof Fieldset && $elementOrFieldset->useAsBaseFieldset()) {

diff --git a/tests/ZendTest/Form/FormTest.php b/tests/ZendTest/Form/FormTest.php
@@ -310,13 +310,38 @@ public function testCanRetrieveDataWithoutErrorsFollowingValidation()
      */
     public function testCanAddFileEnctypeAttribute()
     {
-        $this->form->add(array(
-            'name' => 'file_resource',
-            'attributes' => array(
-                'label' => 'This is a file',
-                'type' => 'file',
-            )));
+        $file = new Element\File('file_resource');
+        $file
+            ->setOptions(array())
+            ->setLabel('File');
+        $this->form->add($file);
+
+        $this->form->prepare();
+        $enctype = $this->form->getAttribute('enctype');
+        $this->assertNotEmpty($enctype);
+        $this->assertEquals($enctype, 'multipart/form-data');
+    }
 
+    /**
+     * @group ZF2-336
+     */
+    public function testCanAddFileEnctypeFromCollectionAttribute()
+    {
+        $file = new Element\File('file_resource');
+        $file
+            ->setOptions(array())
+            ->setLabel('File');
+
+        $fileCollection = new Element\Collection('collection');
+        $fileCollection->setOptions(array(
+             'count' => 2,
+             'allow_add' => false,
+             'allow_remove' => false,
+             'target_element' => $file,
+        ));
+        $this->form->add($fileCollection);
+
+        $this->form->prepare();
         $enctype = $this->form->getAttribute('enctype');
         $this->assertNotEmpty($enctype);
         $this->assertEquals($enctype, 'multipart/form-data');