Merge pull request #6408 from cakephp/master-time

Add fix and tests for #6402
cakephp · Apr 24, 2015 · d33c5e1 · d33c5e1
2 parents f0f88bf + 41935cf
commit d33c5e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Database/Type/DateTimeType.php b/src/Database/Type/DateTimeType.php
@@ -103,7 +103,7 @@ public function toDatabase($value, Driver $driver)
      */
     public function toPHP($value, Driver $driver)
     {
-        if ($value === null || (int)$value === 0) {
+        if ($value === null || strpos($value, '0000-00-00') === 0) {
             return null;
         }
 

diff --git a/tests/TestCase/Database/Type/TimeTypeTest.php b/tests/TestCase/Database/Type/TimeTypeTest.php
@@ -46,6 +46,12 @@ public function testToPHP()
     {
         $this->assertNull($this->type->toPHP(null, $this->driver));
 
+        $result = $this->type->toPHP('00:00:00', $this->driver);
+        $this->assertEquals('00', $result->format('s'));
+
+        $result = $this->type->toPHP('00:00:15', $this->driver);
+        $this->assertEquals('15', $result->format('s'));
+
         $result = $this->type->toPHP('16:30:15', $this->driver);
         $this->assertInstanceOf('DateTime', $result);
         $this->assertEquals('16', $result->format('H'));