Make sure 12:15PM validates

cakephp · May 29, 2015 · 252267c · brandon-hoffman · May 29, 2015 · dereuromark
1 parent a4ad1cb
commit 252267c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Validation/Validation.php b/src/Validation/Validation.php
@@ -1037,6 +1037,9 @@ protected static function _getDateString($value)
 
         if (isset($value['hour'])) {
             if (isset($value['meridian'])) {
+                if ($value['hour'] === 12) {
+                    $value['hour'] = 0;
+                }
                 $value['hour'] = strtolower($value['meridian']) === 'am' ? $value['hour'] : $value['hour'] + 12;
             }
             $value += ['minute' => 0, 'second' => 0];

diff --git a/tests/TestCase/Validation/ValidationTest.php b/tests/TestCase/Validation/ValidationTest.php
@@ -1519,6 +1519,12 @@ public function testTimeArray()
         ];
         $this->assertTrue(Validation::time($date));
 
+        $date = [
+            'hour' => 12, 'minute' => 14, 'second' => 15,
+            'meridian' => 'pm'
+        ];
+        $this->assertTrue(Validation::time($date));
+
         $date = [
             'hour' => 'farts', 'minute' => 'farts'
         ];