Merge pull request #86 from vchabot/multiple-file

Add Multiple file input

Author: GromNaN

lib/autoload/sfCoreAutoload.class.php

@@ -480,6 +480,7 @@ static public function make()
     'sfvalidatorerror' => 'validator/sfValidatorError.class.php',
     'sfvalidatorerrorschema' => 'validator/sfValidatorErrorSchema.class.php',
     'sfvalidatorfile' => 'validator/sfValidatorFile.class.php',
+    'sfvalidatorfilemulti' => 'validator/sfValidatorFileMulti.class.php',
     'sfvalidatorfromdescription' => 'validator/sfValidatorFromDescription.class.php',
     'sfvalidatorinteger' => 'validator/sfValidatorInteger.class.php',
     'sfvalidatorip' => 'validator/sfValidatorIp.class.php',
@@ -517,6 +518,7 @@ static public function make()
     'sfwidgetforminput' => 'widget/sfWidgetFormInput.class.php',
     'sfwidgetforminputcheckbox' => 'widget/sfWidgetFormInputCheckbox.class.php',
     'sfwidgetforminputfile' => 'widget/sfWidgetFormInputFile.class.php',
+    'sfwidgetforminputfilemulti' => 'widget/sfWidgetFormInputFileMulti.class.php',
     'sfwidgetforminputfileeditable' => 'widget/sfWidgetFormInputFileEditable.class.php',
     'sfwidgetforminputhidden' => 'widget/sfWidgetFormInputHidden.class.php',
     'sfwidgetforminputpassword' => 'widget/sfWidgetFormInputPassword.class.php',

lib/validator/sfValidatorFileMulti.class.php

@@ -0,0 +1,20 @@
+<?php
+
+class sfValidatorFileMulti extends sfValidatorFile
+{
+
+  /**
+   * @see sfValidatorBase
+   */
+  protected function doClean($value)
+  {
+    $clean = array();
+
+    foreach ($value as $file)
+    {
+      $clean[] = parent::doClean($file);
+    }
+
+    return $clean;
+  }
+}

lib/widget/sfWidgetFormInputFile.class.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */

lib/widget/sfWidgetFormInputFileMulti.class.php

@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * sfWidgetFormInputFileMulti represents an upload HTML input tag with multiple option.
+ *
+ * @package    symfony
+ * @subpackage widget
+ * @author     Vincent Chabot <vchabot@groupe-exp.com>
+ * @version    SVN: $Id$
+ */
+class sfWidgetFormInputFileMulti extends sfWidgetFormInputFile
+{
+  /**
+   * Configures the current widget.
+   *
+   * @param array $options     An array of options
+   * @param array $attributes  An array of default HTML attributes
+   *
+   * @see sfWidgetFormInput
+   */
+  protected function configure($options = array(), $attributes = array())
+  {
+    parent::configure($options, $attributes);
+
+    $this->addOption('multiple', true);
+  }
+
+  /**
+   * Renders the widget.
+   *
+   * @param  string $name        The element name
+   * @param  string $value       The value displayed in this widget
+   * @param  array  $attributes  An array of HTML attributes to be merged with the default HTML attributes
+   * @param  array  $errors      An array of errors for the field
+   *
+   * @return string An HTML tag string
+   *
+   * @see sfWidgetForm
+   */
+  public function render($name, $value = null, $attributes = array(), $errors = array())
+  {
+    $name .= $this->getOption('multiple') ? '[]' : '';
+    return $this->renderTag('input', array_merge(array('type' => $this->getOption('type'), 'name' => $name, 'value' => $value, 'multiple' => $this->getOption('multiple')), $attributes));
+  }
+}

test/unit/validator/sfValidatorFileMultiTest.php

@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(9);
+
+$tmpDir = sys_get_temp_dir();
+$content = 'This is an ASCII file.';
+$content2 = 'This is an ASCII file. And another one.';
+file_put_contents($tmpDir.'/test.txt', $content);
+file_put_contents($tmpDir.'/test2.txt', $content2);
+
+// ->clean()
+$t->diag('->clean()');
+$v = new sfValidatorFileMulti();
+
+$f = $v->clean(array(
+  array('tmp_name' => $tmpDir.'/test.txt'),
+  array('tmp_name' => $tmpDir.'/test2.txt'),
+));
+
+$t->ok(is_array($f), '->clean() returns an array of sfValidatedFile instances');
+
+$t->ok($f[0] instanceof sfValidatedFile, '->clean() returns an array of sfValidatedFile');
+$t->is($f[0]->getOriginalName(), '', '->clean() returns an array of sfValidatedFile with an empty original name if the name is not passed in the initial value');
+$t->is($f[0]->getSize(), strlen($content), '->clean() returns an array of sfValidatedFile with a computed file size if the size is not passed in the initial value');
+$t->is($f[0]->getType(), 'text/plain', '->clean() returns an array of sfValidatedFile with a guessed content type');
+
+$t->ok($f[1] instanceof sfValidatedFile, '->clean() returns an array of sfValidatedFile');
+$t->is($f[1]->getOriginalName(), '', '->clean() returns an array of sfValidatedFile with an empty original name if the name is not passed in the initial value');
+$t->is($f[1]->getSize(), strlen($content2), '->clean() returns an array of sfValidatedFile with a computed file size if the size is not passed in the initial value');
+$t->is($f[1]->getType(), 'text/plain', '->clean() returns an array of sfValidatedFile with a guessed content type');
+
+unlink($tmpDir.'/test.txt');
+unlink($tmpDir.'/test2.txt');
+sfToolkit::clearDirectory($tmpDir.'/foo');

test/unit/widget/sfWidgetFormInputFileMultiTest.php

@@ -0,0 +1,13 @@
+<?php
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(1);
+
+$w = new sfWidgetFormInputFileMulti();
+
+// ->render()
+$t->diag('->render() multiple file upload');
+$t->is($w->render('foo'), '<input type="file" name="foo[]" multiple="1" id="foo" />', '->render() renders the widget as HTML');
+
+