Changeset 9535

Timestamp:

06/11/08 10:51:26 (2 years ago)

Author:

fabien

Message:

fixed sfValidatorDate Validation of Minutes '00' fails (closes #3729)

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

@@ -129 +129 @@
-      // but second can be empty
-      $empties =
-!$value['hour']
-!$value['minute']
-!$value['second']
+in_array($value['hour'], array(null, ''), true)
+in_array($value['minute'], array(null, ''), true)
+in_array($value['second'], array(null, ''), true)
-      ;
-      if ($empties > 0 && $empties < 3)
-      {
-empty($value['second']
+in_array($value['second'], array(null, '')
-        {
-          // OK

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-38
+40
-
-$v = new sfValidatorDate();
@@ -124 +124 @@
-$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');
+$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 0, 'minute' => 10)), '2005-10-15 00:10:00', '->clean() accepts an array as an input');
+$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => '0', 'minute' => 10)), '2005-10-15 00:10:00', '->clean() accepts an array as an input');
-try
-{