Merge pull request #54 from iBiryukov/master

Fix for ConversionException throw when the value is empty
doctrine · Sep 7, 2011 · 3d82e0d · 3d82e0d
2 parents 4ae13fa + 869cb96
commit 3d82e0d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/Doctrine/DBAL/Types/ArrayType.php b/lib/Doctrine/DBAL/Types/ArrayType.php
@@ -38,10 +38,11 @@ public function convertToDatabaseValue($value, \Doctrine\DBAL\Platforms\Abstract
 
     public function convertToPHPValue($value, \Doctrine\DBAL\Platforms\AbstractPlatform $platform)
     {
-        if ($value === null) {
-            return null;
+        if (empty($value)) {
+            return array();
         }
 
+
         $value = (is_resource($value)) ? stream_get_contents($value) : $value;
         $val = unserialize($value);
         if ($val === false && $value != 'b:0;') {