Merge pull request #720 from TerjeBr/json_type-update

Type json_array is not consistent with NULL values

lib/Doctrine/DBAL/Types/JsonArrayType.php

@@ -54,7 +54,7 @@ class JsonArrayType extends Type
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        if ($value === null) {
+        if ($value === null || $value === '') {
             return array();
         }
 

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

@@ -48,6 +48,11 @@ class JsonArrayTest extends \Doctrine\Tests\DbalTestCase
         $this->assertSame(array(), $this->type->convertToPHPValue(null, $this->platform));
     }
 
+    public function testJsonEmptyStringConvertsToPHPValue()
+    {
+        $this->assertSame(array(), $this->type->convertToPHPValue('', $this->platform));
+    }
+
     public function testJsonStringConvertsToPHPValue()
     {
         $value         = array('foo' => 'bar', 'bar' => 'foo');