Merge pull request #1 from cjprinse/patch-1

Update JmsJsonType.php
dbojdo · Apr 23, 2018 · 33f78cf · 33f78cf
2 parents 5e428c5 + 164d1a5
commit 33f78cf
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/src/DBAL/JmsJsonType.php b/src/DBAL/JmsJsonType.php
@@ -72,6 +72,10 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
+        if($value === null) {
+            return null;
+        }
+
         @list($type, $json) = explode('::', $value, 2);
 
         $phpValue = $this->serializer()->deserialize($json, $type, 'json');

diff --git a/tests/DBAL/JmsJsonTypeFunctionalTest.php b/tests/DBAL/JmsJsonTypeFunctionalTest.php
@@ -89,6 +89,7 @@ public function values()
         $date = new \DateTime();
 
         return array(
+            array(null, null),
             array(1, 'integer::1'),
             array(1.25, 'double::1.25'),
             array(true, 'boolean::true'),

diff --git a/tests/DBAL/JmsJsonTypeTest.php b/tests/DBAL/JmsJsonTypeTest.php
@@ -102,6 +102,32 @@ public function shouldConvertToDatabaseValueUsingSerializer()
         );
     }
 
+    /**
+     * @test
+     */
+    public function shouldNotConvertNullToDatabaseValue()
+    {
+        $this->initializeJmsJsonType($this->serializer, $this->typeResolver);
+
+        $value = null;
+        $databaseValue = null;
+
+        $this->assertEquals($value, $this->type->convertToDatabaseValue($databaseValue, $this->platform));
+    }
+
+    /**
+     * @test
+     */
+    public function shouldNotConvertNullToPhpValue()
+    {
+        $this->initializeJmsJsonType($this->serializer, $this->typeResolver);
+
+        $value = null;
+        $databaseValue = null;
+
+        $this->assertEquals($value, $this->type->convertToPHPValue($databaseValue, $this->platform));
+    }
+
     /**
      * @test
      */