backport change (#61)

* backport change * fix obsolete test (only 3.x) * fix cs
php-kafka · Nov 23, 2022 · 6c9f01d · 6c9f01d
1 parent e272c9d
commit 6c9f01d
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 17 deletions.
diff --git a/src/Generator/SchemaGenerator.php b/src/Generator/SchemaGenerator.php
@@ -11,7 +11,6 @@
 
 final class SchemaGenerator implements SchemaGeneratorInterface
 {
-
     /**
      * @var int[]
      */
@@ -89,7 +88,7 @@ public function generate(): array
                 $schema['fields'][] = $field;
             }
 
-            $schemas[$schema['namespace'] . '.' . $schema['name']] = json_encode($schema);
+            $schemas[$schema['namespace'] . '.' . $schema['name']] = json_encode($schema, JSON_PRESERVE_ZERO_FRACTION);
         }
 
         return $schemas;

diff --git a/src/Merger/SchemaMerger.php b/src/Merger/SchemaMerger.php
@@ -176,7 +176,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/Merger/SchemaMergerInterface.php b/src/Merger/SchemaMergerInterface.php
@@ -10,7 +10,6 @@
 
 interface SchemaMergerInterface
 {
-
     /**
      * @return SchemaRegistryInterface
      */

diff --git a/src/Optimizer/FieldOrderOptimizer.php b/src/Optimizer/FieldOrderOptimizer.php
@@ -17,7 +17,7 @@ public function optimize(string $definition): string
 
         $data = $this->processSchema($data);
 
-        return json_encode($data, JSON_THROW_ON_ERROR);
+        return json_encode($data, JSON_THROW_ON_ERROR | JSON_PRESERVE_ZERO_FRACTION);
     }
 
     /**

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

diff --git a/src/Optimizer/PrimitiveSchemaOptimizer.php b/src/Optimizer/PrimitiveSchemaOptimizer.php
@@ -22,7 +22,7 @@ public function optimize(string $definition, bool $isPrimitive = false): string
 
         $data = $this->processSchema($data);
 
-        return json_encode($data, JSON_THROW_ON_ERROR);
+        return json_encode($data, JSON_THROW_ON_ERROR | JSON_PRESERVE_ZERO_FRACTION);
     }
 
     /**

diff --git a/src/PhpClass/PhpClassProperty.php b/src/PhpClass/PhpClassProperty.php
@@ -6,7 +6,6 @@
 
 class PhpClassProperty implements PhpClassPropertyInterface
 {
-
     /**
      * @var string
      */

diff --git a/src/Registry/ClassRegistry.php b/src/Registry/ClassRegistry.php
@@ -14,7 +14,6 @@
 
 final class ClassRegistry implements ClassRegistryInterface
 {
-
     /**
      * @var array<string,int>
      */

diff --git a/src/Registry/ClassRegistryInterface.php b/src/Registry/ClassRegistryInterface.php
@@ -8,7 +8,6 @@
 
 interface ClassRegistryInterface
 {
-
     /**
      * @param  string $classDirectory
      * @return ClassRegistryInterface

diff --git a/src/Registry/SchemaRegistry.php b/src/Registry/SchemaRegistry.php
@@ -135,11 +135,11 @@ private function registerSchemaFile(\SplFileInfo $fileInfo): void
         }
 
         $schemaData = json_decode($fileContent, true, JSON_THROW_ON_ERROR);
-	$namespace = '';
+        $namespace = '';
 
-	if (true === isset($schemaData['namespace'])) {
-	    $namespace = $schemaData['namespace'];
-	}
+        if (true === isset($schemaData['namespace'])) {
+            $namespace = $schemaData['namespace'];
+        }
 
         if (null === $schemaData) {
             throw new SchemaRegistryException(sprintf(SchemaRegistryException::FILE_INVALID, $fileName));

diff --git a/src/Registry/SchemaRegistryInterface.php b/src/Registry/SchemaRegistryInterface.php
@@ -8,7 +8,6 @@
 
 interface SchemaRegistryInterface
 {
-
     /**
      * @param  string $schemaTemplateDirectory
      * @return SchemaRegistryInterface

diff --git a/tests/Unit/Optimizer/FieldOrderOptimizerTest.php b/tests/Unit/Optimizer/FieldOrderOptimizerTest.php
@@ -51,6 +51,11 @@ public function testOptimize(): void
                     "type": "array",
                     "items": ["null", "com.example.Page"]
                 },
+                {
+                    "name": "price",
+                    "type": "float",
+                    "default": 99.0
+                },
                 {
                     "name": "defaultFont",
                     "type": "com.example.Font"
@@ -147,6 +152,11 @@ public function testOptimize(): void
                     "type": "array",
                     "items": ["null", "com.example.Page"]
                 },
+                {
+                    "name": "price",
+                    "type": "float",
+                    "default": 99.0
+                },
                 {
                     "name": "defaultFont",
                     "type": "com.example.Font"
@@ -201,7 +211,7 @@ public function testOptimize(): void
                     ]
                 }
             ]
-        }'));
+        }'), JSON_PRESERVE_ZERO_FRACTION);
 
         $optimizer = new FieldOrderOptimizer();
 

diff --git a/tests/Unit/Optimizer/FullNameOptimizerTest.php b/tests/Unit/Optimizer/FullNameOptimizerTest.php
@@ -51,6 +51,11 @@ public function testOptimize(): void
                     "type": "array",
                     "items": ["null","com.example.Page"]
                 },
+                {
+                    "name": "price",
+                    "type": "float",
+                    "default": 99.0
+                },
                 {
                     "name": "appendix",
                     "type": "array",
@@ -125,6 +130,11 @@ public function testOptimize(): void
                     "type": "array",
                     "items": ["null","Page"]
                 },
+                {
+                    "name": "price",
+                    "type": "float",
+                    "default": 99.0
+                },
                 {
                     "name": "appendix",
                     "type": "array",
@@ -158,7 +168,7 @@ public function testOptimize(): void
                 },
                 { "name": "backSide", "type": "com.example.other.Cover"}
             ]
-        }'));
+        }'), JSON_PRESERVE_ZERO_FRACTION);
 
         $optimizer = new FullNameOptimizer();
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ @@
     interface SchemaMergerInterface
     {
         /**
          * @return SchemaRegistryInterface
          */
@@ Expand Down @@