#869 - DBAL-1293 - simplified conversion logic for readability

lib/Doctrine/DBAL/Types/DateTimeType.php

@@ -49,12 +49,15 @@ class DateTimeType extends Type
      */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        if ($value !== null && !$value instanceof \DateTime) {
-            throw ConversionException::conversionFailedInvalidType($value, $this->getName(), "DateTime");
+        if (null === $value) {
+            return $value;
+        }
+
+        if ($value instanceof \DateTime) {
+            return $value->format($platform->getDateTimeFormatString());
         }
 
-        return ($value !== null)
-            ? $value->format($platform->getDateTimeFormatString()) : null;
+        throw ConversionException::conversionFailedInvalidType($value, $this->getName(), 'DateTime');
     }
 
     /**

lib/Doctrine/DBAL/Types/DateTimeTzType.php

@@ -67,12 +67,15 @@ class DateTimeTzType extends Type
      */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        if ($value !== null && !$value instanceof \DateTime) {
-            throw ConversionException::conversionFailedInvalidType($value, $this->getName(), "DateTime");
+        if (null === $value) {
+            return $value;
+        }
+
+        if ($value instanceof \DateTime) {
+            return $value->format($platform->getDateTimeTzFormatString());
         }
 
-        return ($value !== null)
-            ? $value->format($platform->getDateTimeTzFormatString()) : null;
+        throw ConversionException::conversionFailedInvalidType($value, $this->getName(), 'DateTime');
     }
 
     /**

lib/Doctrine/DBAL/Types/DateType.php

@@ -49,12 +49,15 @@ class DateType extends Type
      */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        if ($value !== null && !$value instanceof \DateTime) {
-            throw ConversionException::conversionFailedInvalidType($value, $this->getName(), "DateTime");
+        if (null === $value) {
+            return $value;
+        }
+
+        if ($value instanceof \DateTime) {
+            return $value->format($platform->getDateFormatString());
         }
 
-        return ($value !== null)
-            ? $value->format($platform->getDateFormatString()) : null;
+        throw ConversionException::conversionFailedInvalidType($value, $this->getName(), 'DateTime');
     }
 
     /**