Enhance error reporting in date related types when a ConversionException is thrown

lib/Doctrine/DBAL/Types/ConversionException.php

@@ -45,4 +45,18 @@ class ConversionException extends \Doctrine\DBAL\DBALException
         $value = (strlen($value) > 32) ? substr($value, 0, 20) . "..." : $value;
         return new self('Could not convert database value "' . $value . '" to Doctrine Type ' . $toType);
     }
+    
+    /**
+     * Thrown when a Database to Doctrine Type Conversion fails and we can make a statement
+     * about the expected format.
+     * 
+     * @param  string $value
+     * @param  string $toType
+     * @return ConversionException
+     */
+    static public function conversionFailedFormat($value, $toType, $expectedFormat)
+    {
+        $value = (strlen($value) > 32) ? substr($value, 0, 20) . "..." : $value;
+        return new self('Could not convert database value "' . $value . '" to Doctrine Type ' . $toType);
+    }
 }
\ No newline at end of file

lib/Doctrine/DBAL/Types/DateTimeType.php

@@ -52,7 +52,7 @@ class DateTimeType extends Type
 
         $val = \DateTime::createFromFormat($platform->getDateTimeFormatString(), $value);
         if (!$val) {
-            throw ConversionException::conversionFailed($value, $this->getName());
+            throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getDateTimeFormatString());
         }
         return $val;
     }

lib/Doctrine/DBAL/Types/DateTimeTzType.php

@@ -72,7 +72,7 @@ class DateTimeTzType extends Type
 
         $val = \DateTime::createFromFormat($platform->getDateTimeTzFormatString(), $value);
         if (!$val) {
-            throw ConversionException::conversionFailed($value, $this->getName());
+            throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getDateTimeTzFormatString());
         }
         return $val;
     }

lib/Doctrine/DBAL/Types/DateType.php

@@ -52,7 +52,7 @@ class DateType extends Type
 
         $val = \DateTime::createFromFormat('!'.$platform->getDateFormatString(), $value);
         if (!$val) {
-            throw ConversionException::conversionFailed($value, $this->getName());
+            throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getDateFormatString());
         }
         return $val;
     }

lib/Doctrine/DBAL/Types/TimeType.php

@@ -61,7 +61,7 @@ class TimeType extends Type
 
         $val = \DateTime::createFromFormat($platform->getTimeFormatString(), $value);
         if (!$val) {
-            throw ConversionException::conversionFailed($value, $this->getName());
+            throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getTimeFormatString());
         }
         return $val;
     }