backport change (#61)

nick-zh · web-flow · commit 6c9f01da6db6 · 2022-11-23T20:01:01.000+01:00
* backport change

* fix obsolete test (only 3.x)

* fix cs
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 number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`final class SchemaGenerator implements SchemaGeneratorInterface`
`13`	`13`	`{`
`14`		`-`
`15`	`14`	`/**`
`16`	`15`	`* @var int[]`
`17`	`16`	`*/`
`@@ -89,7 +88,7 @@ public function generate(): array`
`89`	`88`	`$schema['fields'][] = $field;`
`90`	`89`	`}`
`91`	`90`
`92`		`- $schemas[$schema['namespace'] . '.' . $schema['name']] = json_encode($schema);`
	`91`	`+ $schemas[$schema['namespace'] . '.' . $schema['name']] = json_encode($schema, JSON_PRESERVE_ZERO_FRACTION);`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`return $schemas;`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function exportSchema(`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`/** @var string $fileContents */`
`179`		`- $fileContents = json_encode($rootSchemaDefinition);`
	`179`	`+ $fileContents = json_encode($rootSchemaDefinition, JSON_PRESERVE_ZERO_FRACTION);`
`180`	`180`
`181`	`181`	`file_put_contents($this->getOutputDirectory() . '/' . $schemaFilename, $fileContents);`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`
`11`	`11`	`interface SchemaMergerInterface`
`12`	`12`	`{`
`13`		`-`
`14`	`13`	`/**`
`15`	`14`	`* @return SchemaRegistryInterface`
`16`	`15`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function optimize(string $definition): string`
`17`	`17`
`18`	`18`	`$data = $this->processSchema($data);`
`19`	`19`
`20`		`- return json_encode($data, JSON_THROW_ON_ERROR);`
	`20`	`+ return json_encode($data, JSON_THROW_ON_ERROR \| JSON_PRESERVE_ZERO_FRACTION);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function optimize(string $definition): string`
`18`	`18`	`$currentNamespace = $data['namespace'] ?? '';`
`19`	`19`	`$data = $this->processSchema($currentNamespace, $data, true);`
`20`	`20`
`21`		`- return json_encode($data, JSON_THROW_ON_ERROR);`
	`21`	`+ return json_encode($data, JSON_THROW_ON_ERROR \| JSON_PRESERVE_ZERO_FRACTION);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function optimize(string $definition, bool $isPrimitive = false): string`
`22`	`22`
`23`	`23`	`$data = $this->processSchema($data);`
`24`	`24`
`25`		`- return json_encode($data, JSON_THROW_ON_ERROR);`
	`25`	`+ return json_encode($data, JSON_THROW_ON_ERROR \| JSON_PRESERVE_ZERO_FRACTION);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`class PhpClassProperty implements PhpClassPropertyInterface`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`/**`
`11`	`10`	`* @var string`
`12`	`11`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`
`15`	`15`	`final class ClassRegistry implements ClassRegistryInterface`
`16`	`16`	`{`
`17`		`-`
`18`	`17`	`/**`
`19`	`18`	`* @var array<string,int>`
`20`	`19`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`
`9`	`9`	`interface ClassRegistryInterface`
`10`	`10`	`{`
`11`		`-`
`12`	`11`	`/**`
`13`	`12`	`* @param string $classDirectory`
`14`	`13`	`* @return ClassRegistryInterface`