DBAL-26 - Fix nasty bug with null values in Date, DateTime, DateTimeT…

…z and Time fields introduced with the DBAL-22 fix
doctrine · Jun 27, 2010 · bb2ffc4 · bb2ffc4
1 parent 1442262
commit bb2ffc4
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 8 deletions.
diff --git a/lib/Doctrine/DBAL/Types/DateTimeType.php b/lib/Doctrine/DBAL/Types/DateTimeType.php
@@ -46,8 +46,11 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
 
     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());
         }

diff --git a/lib/Doctrine/DBAL/Types/DateTimeTzType.php b/lib/Doctrine/DBAL/Types/DateTimeTzType.php
@@ -66,8 +66,11 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
 
     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());
         }

diff --git a/lib/Doctrine/DBAL/Types/DateType.php b/lib/Doctrine/DBAL/Types/DateType.php
@@ -46,8 +46,11 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
 
     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());
         }

diff --git a/lib/Doctrine/DBAL/Types/TimeType.php b/lib/Doctrine/DBAL/Types/TimeType.php
@@ -55,8 +55,11 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
      */
     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());
         }

diff --git a/tests/Doctrine/Tests/DBAL/Types/DateTest.php b/tests/Doctrine/Tests/DBAL/Types/DateTest.php
@@ -67,4 +67,9 @@ public function testInvalidDateFormatConversion()
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
         $this->_type->convertToPHPValue('abcdefg', $this->_platform);
     }
+
+    public function testNullConversion()
+    {
+        $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
+    }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Types/DateTimeTest.php b/tests/Doctrine/Tests/DBAL/Types/DateTimeTest.php
@@ -42,4 +42,9 @@ public function testInvalidDateTimeFormatConversion()
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
         $this->_type->convertToPHPValue('abcdefg', $this->_platform);
     }
+
+    public function testNullConversion()
+    {
+        $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
+    }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Types/DateTimeTzTest.php b/tests/Doctrine/Tests/DBAL/Types/DateTimeTzTest.php
@@ -42,4 +42,9 @@ public function testInvalidDateFormatConversion()
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
         $this->_type->convertToPHPValue('abcdefg', $this->_platform);
     }
+
+    public function testNullConversion()
+    {
+        $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
+    }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Types/TimeTest.php b/tests/Doctrine/Tests/DBAL/Types/TimeTest.php
@@ -39,4 +39,9 @@ public function testInvalidTimeFormatConversion()
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
         $this->_type->convertToPHPValue('abcdefg', $this->_platform);
     }
+
+    public function testNullConversion()
+    {
+        $this->assertNull($this->_type->convertToPHPValue(null, $this->_platform));
+    }
 }