[DBAL-216] Add support for Date types to also handle already instantiated DateTime instances.

lib/Doctrine/DBAL/Types/DateTimeType.php

@@ -46,8 +46,8 @@ class DateTimeType extends Type
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        if ($value === null) {
-            return null;
+        if ($value === null || $value instanceof \DateTime) {
+            return $value;
         }
 
         $val = \DateTime::createFromFormat($platform->getDateTimeFormatString(), $value);
@@ -56,4 +56,4 @@ class DateTimeType extends Type
         }
         return $val;
     }
-}
\ No newline at end of file
+}

lib/Doctrine/DBAL/Types/DateTimeTzType.php

@@ -66,8 +66,8 @@ class DateTimeTzType extends Type
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        if ($value === null) {
-            return null;
+        if ($value === null || $value instanceof \DateTime) {
+            return $value;
         }
 
         $val = \DateTime::createFromFormat($platform->getDateTimeTzFormatString(), $value);
@@ -76,4 +76,4 @@ class DateTimeTzType extends Type
         }
         return $val;
     }
-}
\ No newline at end of file
+}

lib/Doctrine/DBAL/Types/DateType.php

@@ -46,8 +46,8 @@ class DateType extends Type
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        if ($value === null) {
-            return null;
+        if ($value === null || $value instanceof \DateTime) {
+            return $value;
         }
 
         $val = \DateTime::createFromFormat('!'.$platform->getDateFormatString(), $value);
@@ -56,4 +56,4 @@ class DateType extends Type
         }
         return $val;
     }
-}
\ No newline at end of file
+}

lib/Doctrine/DBAL/Types/TimeType.php

@@ -55,8 +55,8 @@ class TimeType extends Type
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        if ($value === null) {
-            return null;
+        if ($value === null || $value instanceof \DateTime) {
+            return $value;
         }
 
         $val = \DateTime::createFromFormat($platform->getTimeFormatString(), $value);
@@ -65,4 +65,4 @@ class TimeType extends Type
         }
         return $val;
     }
-}
\ No newline at end of file
+}

lib/Doctrine/DBAL/Types/VarDateTimeType.php

@@ -47,8 +47,8 @@ class VarDateTimeType extends DateTimeType
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        if ($value === null) {
-            return null;
+        if ($value === null || $value instanceof \DateTime) {
+            return $value;
         }
 
         $val = date_create($value);
@@ -57,4 +57,4 @@ class VarDateTimeType extends DateTimeType
         }
         return $val;
     }
-}
\ No newline at end of file
+}

tests/Doctrine/Tests/DBAL/Types/DateTest.php

@@ -72,4 +72,10 @@ class DateTest extends \Doctrine\Tests\DbalTestCase
     {
         $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
     }
-}
\ No newline at end of file
+
+    public function testConvertDateTimeToPHPValue()
+    {
+        $date = new \DateTime("now");
+        $this->assertSame($date, $this->_type->convertToPHPValue($date, $this->_platform));
+    }
+}

tests/Doctrine/Tests/DBAL/Types/DateTimeTest.php

@@ -47,4 +47,10 @@ class DateTimeTest extends \Doctrine\Tests\DbalTestCase
     {
         $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
     }
-}
\ No newline at end of file
+
+    public function testConvertDateTimeToPHPValue()
+    {
+        $date = new \DateTime("now");
+        $this->assertSame($date, $this->_type->convertToPHPValue($date, $this->_platform));
+    }
+}

tests/Doctrine/Tests/DBAL/Types/DateTimeTzTest.php

@@ -47,4 +47,10 @@ class DateTimeTzTest extends \Doctrine\Tests\DbalTestCase
     {
         $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
     }
-}
\ No newline at end of file
+
+    public function testConvertDateTimeToPHPValue()
+    {
+        $date = new \DateTime("now");
+        $this->assertSame($date, $this->_type->convertToPHPValue($date, $this->_platform));
+    }
+}

tests/Doctrine/Tests/DBAL/Types/TimeTest.php

@@ -44,4 +44,10 @@ class TimeTest extends \Doctrine\Tests\DbalTestCase
     {
         $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
     }
-}
\ No newline at end of file
+
+    public function testConvertDateTimeToPHPValue()
+    {
+        $date = new \DateTime("now");
+        $this->assertSame($date, $this->_type->convertToPHPValue($date, $this->_platform));
+    }
+}

tests/Doctrine/Tests/DBAL/Types/VarDateTimeTest.php

@@ -59,4 +59,10 @@ class VarDateTimeTest extends \Doctrine\Tests\DbalTestCase
     {
         $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
     }
-}
\ No newline at end of file
+
+    public function testConvertDateTimeToPHPValue()
+    {
+        $date = new \DateTime("now");
+        $this->assertSame($date, $this->_type->convertToPHPValue($date, $this->_platform));
+    }
+}