Return null in JsonType (#448)

sonata-project · Sep 1, 2022 · 45a6e9e · 45a6e9e
1 parent 96731c9
commit 45a6e9e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Types/JsonType.php b/src/Types/JsonType.php
@@ -29,11 +29,19 @@ class JsonType extends Type
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
+        if (null === $value) {
+            return null;
+        }
+
         return json_decode((string) $value, true, 512, \JSON_THROW_ON_ERROR);
     }
 
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
+        if (null === $value) {
+            return null;
+        }
+
         return json_encode($value, \JSON_THROW_ON_ERROR);
     }
 

diff --git a/tests/Types/JsonTypeTest.php b/tests/Types/JsonTypeTest.php
@@ -43,6 +43,10 @@ public function testConvertToDatabaseValue(): void
             '{"foo":"bar"}',
             Type::getType('json')->convertToDatabaseValue(['foo' => 'bar'], $platform)
         );
+
+        static::assertNull(
+            Type::getType('json')->convertToDatabaseValue(null, $platform)
+        );
     }
 
     public function testConvertToPHPValue(): void
@@ -53,6 +57,10 @@ public function testConvertToPHPValue(): void
             ['foo' => 'bar'],
             Type::getType('json')->convertToPHPValue('{"foo":"bar"}', $platform)
         );
+
+        static::assertNull(
+            Type::getType('json')->convertToPHPValue(null, $platform)
+        );
     }
 }