DBAL-26 - Fix nasty bug with null values in Date, DateTime, DateTimeTz and...

DBAL-26 - Fix nasty bug with null values in Date, DateTime, DateTimeTz and Time fields introduced with the DBAL-22 fix

lib/Doctrine/DBAL/Types/DateTimeType.php

@@ -46,8 +46,11 @@ class DateTimeType extends Type
     
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        $val = ($value !== null)
-            ? \DateTime::createFromFormat($platform->getDateTimeFormatString(), $value) : null;
+        if (!$value) {
+            return $value;
+        }
+
+        $val = \DateTime::createFromFormat($platform->getDateTimeFormatString(), $value);
         if (!$val) {
             throw ConversionException::conversionFailed($value, $this->getName());
         }

lib/Doctrine/DBAL/Types/DateTimeTzType.php

@@ -66,8 +66,11 @@ class DateTimeTzType extends Type
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        $val = ($value !== null)
-            ? \DateTime::createFromFormat($platform->getDateTimeTzFormatString(), $value) : null;
+        if (!$value) {
+            return $value;
+        }
+
+        $val = \DateTime::createFromFormat($platform->getDateTimeTzFormatString(), $value);
         if (!$val) {
             throw ConversionException::conversionFailed($value, $this->getName());
         }

lib/Doctrine/DBAL/Types/DateType.php

@@ -46,8 +46,11 @@ class DateType extends Type
     
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        $val = ($value !== null)
-            ? \DateTime::createFromFormat('!'.$platform->getDateFormatString(), $value) : null;
+        if (!$value) {
+            return $value;
+        }
+
+        $val = \DateTime::createFromFormat('!'.$platform->getDateFormatString(), $value);
         if (!$val) {
             throw ConversionException::conversionFailed($value, $this->getName());
         }

lib/Doctrine/DBAL/Types/TimeType.php

@@ -55,8 +55,11 @@ class TimeType extends Type
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        $val = ($value !== null)
-            ? \DateTime::createFromFormat($platform->getTimeFormatString(), $value) : null;
+        if (!$value) {
+            return $value;
+        }
+
+        $val = \DateTime::createFromFormat($platform->getTimeFormatString(), $value);
         if (!$val) {
             throw ConversionException::conversionFailed($value, $this->getName());
         }

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

@@ -67,4 +67,9 @@ class DateTest extends \Doctrine\Tests\DbalTestCase
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
         $this->_type->convertToPHPValue('abcdefg', $this->_platform);
     }
+
+    public function testNullConversion()
+    {
+        $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
+    }
 }
\ No newline at end of file

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

@@ -42,4 +42,9 @@ class DateTimeTest extends \Doctrine\Tests\DbalTestCase
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
         $this->_type->convertToPHPValue('abcdefg', $this->_platform);
     }
+
+    public function testNullConversion()
+    {
+        $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
+    }
 }
\ No newline at end of file

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

@@ -42,4 +42,9 @@ class DateTimeTzTest extends \Doctrine\Tests\DbalTestCase
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
         $this->_type->convertToPHPValue('abcdefg', $this->_platform);
     }
+
+    public function testNullConversion()
+    {
+        $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
+    }
 }
\ No newline at end of file

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

@@ -39,4 +39,9 @@ class TimeTest extends \Doctrine\Tests\DbalTestCase
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
         $this->_type->convertToPHPValue('abcdefg', $this->_platform);
     }
+
+    public function testNullConversion()
+    {
+        $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
+    }
 }
\ No newline at end of file