DBAL-26 - Array and Object data-types also affected by conversion exception error

lib/Doctrine/DBAL/Types/ArrayType.php

@@ -40,6 +40,10 @@ class ArrayType extends Type
 
     public function convertToPHPValue($value, \Doctrine\DBAL\Platforms\AbstractPlatform $platform)
     {
+        if ($value === null) {
+            return null;
+        }
+
         $value = (is_resource($value)) ? stream_get_contents($value) : $value;
         $val = unserialize($value);
         if ($val === false) {

lib/Doctrine/DBAL/Types/ObjectType.php

@@ -21,6 +21,10 @@ class ObjectType extends Type
 
     public function convertToPHPValue($value, \Doctrine\DBAL\Platforms\AbstractPlatform $platform)
     {
+        if ($value === null) {
+            return null;
+        }
+
         $value = (is_resource($value)) ? stream_get_contents($value) : $value;
         $val = unserialize($value);
         if ($val === false) {

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

@@ -46,4 +46,8 @@ class ArrayTest extends \Doctrine\Tests\DbalTestCase
         $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/ObjectTest.php

@@ -44,4 +44,9 @@ class ObjectTest 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