Changeset 7081

Timestamp:

01/17/08 11:54:54 (8 months ago)

Author:

fabien

Message:

fixed sfValidatorDate for empty arrays

Files:

• branches/1.1/lib/validator/sfValidatorDate.class.php (modified) (1 diff)
• branches/1.1/test/unit/validator/sfValidatorDateTest.php (modified) (2 diffs)

branches/1.1/lib/validator/sfValidatorDate.class.php

@@ -159 +159 @@
-    return $clean;
-  }
+
+  /**
+   * @see sfValidator
+   */
+  protected function isEmpty($value)
+  {
+    if (is_array($value))
+    {
+      $filtered = array_filter($value);
+
+      return empty($filtered);
+    }
+
+    return parent::isEmpty($value);
+  }
-}

branches/1.1/test/unit/validator/sfValidatorDateTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-29
+33
-
-$v = new sfValidatorDate();
@@ -133 +133 @@
-$v->setOption('with_time', true);
-$t->is($v->clean(time()), time(), '->clean() output format can be change with the date_output option');
+
+// required
+$v = new sfValidatorDate();
+foreach (array(
+  array('year' => '', 'month' => '', 'day' => ''),
+  array('year' => null, 'month' => null, 'day' => null),
+  '',
+  null,
+) as $input)
+{
+  try
+  {
+    $v->clean($input);
+    $t->fail('->clean() throws an exception if the date is empty and required is true');
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->pass('->clean() throws an exception if the date is empty and required is true');
+  }
+}