Changeset 8885

Timestamp:

05/09/08 23:37:08 (1 week ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch

Files:

• branches/dwhittle/1.1/lib/form/sfForm.class.php (modified) (2 diffs)
• branches/dwhittle/1.1/lib/helper/sfRichTextEditorFCK.class.php (modified) (1 diff)
• branches/dwhittle/1.1/test/unit/form/sfFormTest.php (modified) (2 diffs)

branches/dwhittle/1.1/lib/form/sfForm.class.php

@@ -126 +126 @@
-   * @param array An array of uploaded files (in the $_FILES or $_GET format)
-   */
-array()
+null
-  {
-    $this->taintedValues = $taintedValues;
@@ -136 +136 @@
-    {
-      $this->taintedValues = array();
+    }
+
+    if (is_null($this->taintedFiles))
+    {
+      if ($this->isMultipart())
+      {
+        throw new InvalidArgumentException('This form is multipart, which means you need to supply a files array as the bind() method second argument.');
+      }
+
+      $this->taintedFiles = array();
-    }
-

branches/dwhittle/1.1/lib/helper/sfRichTextEditorFCK.class.php

@@ -45 +45 @@
-    // FCKEditor.php class is written with backward compatibility of PHP4.
-    // This reportings are to turn off errors with public properties and already declared constructor
-
-
+
-
-    require_once(sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.$php_file);

branches/dwhittle/1.1/test/unit/form/sfFormTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-7
+8
-
-class FormTest extends sfForm
@@ -214 +214 @@
-  'file' => new sfValidatorFile(array('max_size' => 2)),
-)));
-
-
-
-
-
+
+
+
+
-$t->is($f->getErrorSchema()->getCode(), '1 [min_length] file [max_size]', '->bind() behaves correctly with files');
+
+try
+{
+  $f->bind(array(1 => 'f', 2 => 'potencier'));
+  $t->fail('->bind() second argument is mandatory if the form is multipart');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->bind() second argument is mandatory if the form is multipart');
+}
-
-// ->renderGlobalErrors()