Merge pull request #6348 from cakephp/master-fix-datetime

Allow BC for nullish DB values as strings.
cakephp · Apr 16, 2015 · d58cfbb · d58cfbb
2 parents cc7ebbb + 960d3df
commit d58cfbb
Show file tree

Hide file tree

Showing 3 changed files with 3 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) {
+        if ($value === null || (int)$value === 0) {
             return null;
         }
 

diff --git a/tests/TestCase/Database/Type/DateTimeTypeTest.php b/tests/TestCase/Database/Type/DateTimeTypeTest.php
@@ -65,6 +65,7 @@ public function tearDown()
     public function testToPHP()
     {
         $this->assertNull($this->type->toPHP(null, $this->driver));
+        $this->assertNull($this->type->toPHP('0000-00-00 00:00:00', $this->driver));
 
         $result = $this->type->toPHP('2001-01-04 12:13:14', $this->driver);
         $this->assertInstanceOf('Cake\I18n\Time', $result);

diff --git a/tests/TestCase/Database/Type/DateTypeTest.php b/tests/TestCase/Database/Type/DateTypeTest.php
@@ -45,6 +45,7 @@ public function setUp()
     public function testToPHP()
     {
         $this->assertNull($this->type->toPHP(null, $this->driver));
+        $this->assertNull($this->type->toPHP('0000-00-00', $this->driver));
 
         $result = $this->type->toPHP('2001-01-04', $this->driver);
         $this->assertInstanceOf('DateTime', $result);