Merge pull request #5173 from Kova101/fix-json-float-zero-preserve

Fix JSON Dbal type to properly encode whole number float values, preserving zero fractions.

Author: morozov

src/Types/JsonType.php

@@ -10,6 +10,7 @@
 use function json_encode;
 use function stream_get_contents;
 
+use const JSON_PRESERVE_ZERO_FRACTION;
 use const JSON_THROW_ON_ERROR;
 
 /**
@@ -35,7 +36,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
         }
 
         try {
-            return json_encode($value, JSON_THROW_ON_ERROR);
+            return json_encode($value, JSON_THROW_ON_ERROR | JSON_PRESERVE_ZERO_FRACTION);
         } catch (JsonException $e) {
             throw ConversionException::conversionFailedSerialization($value, 'json', $e->getMessage(), $e);
         }

tests/Types/JsonTest.php

@@ -14,6 +14,7 @@
 use function fopen;
 use function json_encode;
 
+use const JSON_PRESERVE_ZERO_FRACTION;
 use const JSON_THROW_ON_ERROR;
 
 class JsonTest extends TestCase
@@ -62,7 +63,7 @@ public function testJsonEmptyStringConvertsToPHPValue(): void
     public function testJsonStringConvertsToPHPValue(): void
     {
         $value         = ['foo' => 'bar', 'bar' => 'foo'];
-        $databaseValue = json_encode($value, 0, JSON_THROW_ON_ERROR);
+        $databaseValue = json_encode($value, 0, JSON_THROW_ON_ERROR | JSON_PRESERVE_ZERO_FRACTION);
         $phpValue      = $this->type->convertToPHPValue($databaseValue, $this->platform);
 
         self::assertEquals($value, $phpValue);
@@ -87,7 +88,10 @@ public function testJsonResourceConvertsToPHPValue(): void
     {
         $value         = ['foo' => 'bar', 'bar' => 'foo'];
         $databaseValue = fopen(
-            'data://text/plain;base64,' . base64_encode(json_encode($value, JSON_THROW_ON_ERROR)),
+            'data://text/plain;base64,' . base64_encode(json_encode(
+                $value,
+                JSON_THROW_ON_ERROR | JSON_PRESERVE_ZERO_FRACTION
+            )),
             'r'
         );
         $phpValue      = $this->type->convertToPHPValue($databaseValue, $this->platform);
@@ -100,6 +104,27 @@ public function testRequiresSQLCommentHint(): void
         self::assertTrue($this->type->requiresSQLCommentHint($this->platform));
     }
 
+    public function testPHPNullValueConvertsToJsonNull(): void
+    {
+        self::assertNull($this->type->convertToDatabaseValue(null, $this->platform));
+    }
+
+    public function testPHPValueConvertsToJsonString(): void
+    {
+        $source        = ['foo' => 'bar', 'bar' => 'foo'];
+        $databaseValue = $this->type->convertToDatabaseValue($source, $this->platform);
+
+        self::assertSame('{"foo":"bar","bar":"foo"}', $databaseValue);
+    }
+
+    public function testPHPFloatValueConvertsToJsonString(): void
+    {
+        $source        = ['foo' => 11.4, 'bar' => 10.0];
+        $databaseValue = $this->type->convertToDatabaseValue($source, $this->platform);
+
+        self::assertSame('{"foo":11.4,"bar":10.0}', $databaseValue);
+    }
+
     public function testSerializationFailure(): void
     {
         $object            = (object) [];