json_encode with preserve zero fraction flag (#60)

* json_encode with preserve zero fraction flag * remove leftovers
php-kafka · Nov 23, 2022 · 3cb9923 · 3cb9923
1 parent 2a00b0b
commit 3cb9923
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 7 deletions.
diff --git a/src/Generator/SchemaGenerator.php b/src/Generator/SchemaGenerator.php
@@ -89,7 +89,7 @@ public function generate(): array
                 $namespace = $schema['namespace'] . '.' . $schema['name'];
             }
 
-            $schemas[$namespace] = json_encode($schema);
+            $schemas[$namespace] = json_encode($schema, JSON_PRESERVE_ZERO_FRACTION);
         }
 
         return $schemas;

diff --git a/src/Merger/SchemaMerger.php b/src/Merger/SchemaMerger.php
@@ -192,7 +192,7 @@ public function exportSchema(
         }
 
         /** @var string $fileContents */
-        $fileContents = json_encode($rootSchemaDefinition);
+        $fileContents = json_encode($rootSchemaDefinition, JSON_PRESERVE_ZERO_FRACTION);
 
         file_put_contents($this->getOutputDirectory() . '/' . $schemaFilename, $fileContents);
     }

diff --git a/src/Optimizer/FieldOrderOptimizer.php b/src/Optimizer/FieldOrderOptimizer.php
@@ -19,7 +19,9 @@ public function optimize(SchemaTemplateInterface $schemaTemplate): SchemaTemplat
 
         $data = $this->processSchema($data);
 
-        return $schemaTemplate->withSchemaDefinition(json_encode($data, JSON_THROW_ON_ERROR));
+        return $schemaTemplate->withSchemaDefinition(
+            json_encode($data, JSON_THROW_ON_ERROR | JSON_PRESERVE_ZERO_FRACTION)
+        );
     }
 
     /**

diff --git a/src/Optimizer/FullNameOptimizer.php b/src/Optimizer/FullNameOptimizer.php
@@ -20,7 +20,9 @@ public function optimize(SchemaTemplateInterface $schemaTemplate): SchemaTemplat
         $currentNamespace = $data['namespace'] ?? '';
         $data = $this->processSchema($currentNamespace, $data, true);
 
-        return $schemaTemplate->withSchemaDefinition(json_encode($data, JSON_THROW_ON_ERROR));
+        return $schemaTemplate->withSchemaDefinition(
+            json_encode($data, JSON_THROW_ON_ERROR | JSON_PRESERVE_ZERO_FRACTION)
+        );
     }
 
     /**

diff --git a/src/Optimizer/PrimitiveSchemaOptimizer.php b/src/Optimizer/PrimitiveSchemaOptimizer.php
@@ -23,7 +23,9 @@ public function optimize(SchemaTemplateInterface $schemaTemplate): SchemaTemplat
 
         $data = $this->processSchema($data);
 
-        return $schemaTemplate->withSchemaDefinition(json_encode($data, JSON_THROW_ON_ERROR));
+        return $schemaTemplate->withSchemaDefinition(
+            json_encode($data, JSON_THROW_ON_ERROR | JSON_PRESERVE_ZERO_FRACTION)
+        );
     }
 
     /**

diff --git a/tests/Unit/Generator/SchemaGeneratorTest.php b/tests/Unit/Generator/SchemaGeneratorTest.php
@@ -109,6 +109,48 @@ public function testGenerate()
         self::assertCount(2, $result);
     }
 
+    public function testGeneratePreservesZeroFraction()
+    {
+        $expectedResult = [
+            'name.space.TestClass' => json_encode([
+                'type' => 'record',
+                'name' => 'TestClass',
+                'namespace' => 'name.space',
+                'fields' => [
+                    [
+                        'name' => 'name',
+                        'type' => 'double',
+                        'default' => 0.0,
+                        'doc' => 'test',
+                        'logicalType' => 'test'
+                    ]
+                ]
+            ], JSON_PRESERVE_ZERO_FRACTION)
+        ];
+
+        $property = $this->getMockForAbstractClass(PhpClassPropertyInterface::class);
+        $property->expects(self::exactly(1))->method('getPropertyType')->willReturn('double');
+        $property->expects(self::exactly(1))->method('getPropertyName')->willReturn('name');
+        $property->expects(self::exactly(2))->method('getPropertyDefault')->willReturn(0.0);
+        $property->expects(self::exactly(3))->method('getPropertyDoc')->willReturn('test');
+        $property->expects(self::exactly(2))->method('getPropertyLogicalType')->willReturn('test');
+
+
+        $class = $this->getMockForAbstractClass(PhpClassInterface::class);
+        $class->expects(self::once())->method('getClassName')->willReturn('TestClass');
+        $class->expects(self::exactly(2))->method('getClassNamespace')->willReturn('name\\space');
+        $class->expects(self::once())->method('getClassProperties')->willReturn([$property]);
+
+        $registry = $this->getMockForAbstractClass(ClassRegistryInterface::class);
+        $registry->expects(self::once())->method('getClasses')->willReturn([$class]);
+
+        $generator = new SchemaGenerator();
+        $generator->setClassRegistry($registry);
+        $result = $generator->generate();
+        self::assertEquals($expectedResult, $result);
+        self::assertCount(1, $result);
+    }
+
     public function testExportSchemas()
     {
         $schemas = [

diff --git a/tests/Unit/Optimizer/FieldOrderOptimizerTest.php b/tests/Unit/Optimizer/FieldOrderOptimizerTest.php
@@ -47,6 +47,11 @@ public function testOptimize(): void
                     },
                     "default": []
                 },
+                {
+                    "name": "price",
+                    "type": "float",
+                    "default": 99.0
+                },
                 {
                     "name": "foreword",
                     "type": "array",
@@ -143,6 +148,11 @@ public function testOptimize(): void
                     },
                     "default": []
                 },
+                {
+                    "name": "price",
+                    "type": "float",
+                    "default": 99.0
+                },
                 {
                     "name": "foreword",
                     "type": "array",
@@ -202,7 +212,7 @@ public function testOptimize(): void
                     ]
                 }
             ]
-        }'));
+        }'),JSON_PRESERVE_ZERO_FRACTION);
 
         $schemaTemplate = $this->getMockForAbstractClass(SchemaTemplateInterface::class);
         $schemaTemplate

diff --git a/tests/Unit/Optimizer/FullNameOptimizerTest.php b/tests/Unit/Optimizer/FullNameOptimizerTest.php
@@ -47,6 +47,11 @@ public function testOptimize(): void
                     },
                     "default": []
                 },
+                {
+                    "name": "price",
+                    "type": "float",
+                    "default": 99.0
+                },
                 {
                     "name": "foreword",
                     "type": "array",
@@ -121,6 +126,11 @@ public function testOptimize(): void
                     },
                     "default": []
                 },
+                {
+                    "name": "price",
+                    "type": "float",
+                    "default": 99.0
+                },
                 {
                     "name": "foreword",
                     "type": "array",
@@ -159,7 +169,7 @@ public function testOptimize(): void
                 },
                 { "name": "backSide", "type": "com.example.other.Cover"}
             ]
-        }'));
+        }'), JSON_PRESERVE_ZERO_FRACTION);
 
 
         $schemaTemplate = $this->getMockForAbstractClass(SchemaTemplateInterface::class);