Changeset 6875

Timestamp:

01/01/08 11:01:15 (10 months ago)

Author:

fabien

Message:

fixed special cases for sfValidatorDate

Files:

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

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

@@ -78 +78 @@
-    }
-
-
+$clean === $this->getEmptyValue() ? $clean : 
-  }
-
@@ -92 +92 @@
-  protected function convertDateArrayToTimestamp($value)
-  {
+    // all elements must be empty or a number
+    foreach (array('year', 'month', 'day', 'hour', 'minute', 'second') as $key)
+    {
+      if (isset($value[$key]) && !preg_match('#^\d+$#', $value[$key]) && !empty($value[$key]))
+      {
+        throw new sfValidatorError($this, 'invalid', array('value' => $value));
+      }
+    }
+
+    // if one date value is empty, all others must be empty too
+    $empties =
+      (!isset($value['year']) || !$value['year'] ? 1 : 0) +
+      (!isset($value['month']) || !$value['month'] ? 1 : 0) +
+      (!isset($value['day']) || !$value['day'] ? 1 : 0)
+    ;
+    if ($empties > 0 && $empties < 3)
+    {
+      throw new sfValidatorError($this, 'invalid', array('value' => $value));
+    }
+    else if (3 == $empties)
+    {
+      return $this->getEmptyValue();
+    }
+
-    if ($this->getOption('with_time'))
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else
-    {
-$value['month'], $value['day'], $value['year']
+intval($value['month']), intval($value['day']), intval($value['year'])
-    }
-

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-18
+26
-
-$v = new sfValidatorDate();
@@ -43 +43 @@
-$t->diag('validate date array');
-$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15)), '2005-10-15', '->clean() accepts an array as an input');
-
+
+
+
+
+
+
+
+
+
+
+
-try
-{
@@ -88 +98 @@
-$v->setOption('with_time', true);
-$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 10, 'second' => 15)), '2005-10-15 12:10:15', '->clean() accepts an array as an input');
+$t->is($v->clean(array('year' => '2005', 'month' => '10', 'day' => '15', 'hour' => '12', 'minute' => '10', 'second' => '15')), '2005-10-15 12:10:15', '->clean() accepts an array as an input');
+$t->is($v->clean(array('year' => '', 'month' => '', 'day' => '', 'hour' => '', 'minute' => '', 'second' => '')), null, '->clean() accepts an array as an input');
+$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 10, 'second' => '')), '2005-10-15 12:10:00', '->clean() accepts an array as an input');
+$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 10)), '2005-10-15 12:10:00', '->clean() accepts an array as an input');
+try
+{
+  $v->clean(array('year' => 2005, 'month' => 1, 'day' => 15, 'hour' => 12, 'minute' => '', 'second' => 12));
+  $t->fail('->clean() throws a sfValidatorError if the time is not valid');
+}
+catch (sfValidatorError $e)
+{
+  $t->pass('->clean() throws a sfValidatorError if the time is not valid');
+}
-$t->is($v->clean('18 october 2005 12:30'), '2005-10-18 12:30:00', '->clean() can accept date time with the with_time option');
-$t->is($v->clean(time()), date('Y-m-d H:i:s', time()), '->clean() can accept date time with the with_time option');