Merge pull request #3 from mgldev/master

Adds support for recognising null values on DateTime fields when conv…
zucchi · Nov 4, 2015 · 1881705 · 1881705
2 parents 60ba4c6 + 2c0cc6c
commit 1881705
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/ZucchiDoctrine/Datatype/DateTimeType.php b/src/ZucchiDoctrine/Datatype/DateTimeType.php
@@ -16,7 +16,7 @@
  * Type that maps an SQL DATETIME/TIMESTAMP to an Extended PHP DateTime object.
  *
  * @author Matt Cockayne <matt@zucchi.co.uk>
- * @package ZucchiDoctrine 
+ * @package ZucchiDoctrine
  * @subpackage Datatype
  */
 class DateTimeType extends Type
@@ -33,9 +33,13 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
 
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        return ($value instanceof \DateTime)
-            ? $value->format($platform->getDateTimeFormatString())
-            : date($platform->getDateTimeFormatString(), strtotime($value));
+        if (is_null($value)) {
+            return $value;
+        } else if ($value instanceof \DateTime) {
+            return $value->format($platform->getDateTimeFormatString());
+        } else {
+            return date($platform->getDateTimeFormatString(), strtotime($value));
+        }
     }
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
@@ -45,7 +49,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
         }
 
         $val = DateTime::createFromFormat($platform->getDateTimeFormatString(), $value);
-        if ( ! $val) {
+        if (!$val) {
             throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getDateTimeFormatString());
         }
         return $val;