Fix: Encode with default options

ergebnis · Dec 26, 2022 · b47929e · b47929e
1 parent b20a9ad
commit b47929e
Show file tree

Hide file tree

Showing 49 changed files with 656 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@ For a full diff see [`3.0.0...main`][3.0.0...main].
 - Adjusted `Vendor\Composer\ComposerJsonNormalizer` to stop sorting `config.allow-plugins` ([#778]), by [@localheinz]
 - Adjusted `Vendor\Composer\ComposerJsonNormalizer` to stop sorting `config.preferred-install` ([#779]), by [@localheinz]
 - Adjusted `Vendor\Composer\ComposerJsonNormalizer` to stop sorting children of `extra.patches` ([#780]), by [@localheinz]
+- Adjusted `SchemaNormalizer`, `Vendor\Composer\BinNormalizer`, `Vendor\Composer\PackageHashNormalizer`, and `Vendor\Composer\VersionConstraintNormalizer` to use encode JSON with `JSON_PRETTY_PRINT`, `JSON_UNESCAPED_SLASHES`, and `JSON_UNESCAPED_UNICODE` flags ([#795]), by [@localheinz]
 
 ### Removed
 
@@ -546,6 +547,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
 [#781]: https://github.com/ergebnis/json-normalizer/pull/781
 [#793]: https://github.com/ergebnis/json-normalizer/pull/793
 [#794]: https://github.com/ergebnis/json-normalizer/pull/794
+[#795]: https://github.com/ergebnis/json-normalizer/pull/795
 
 [@BackEndTea]: https://github.com/BackEndTea
 [@dependabot]: https://github.com/dependabot

diff --git a/src/Format/JsonEncodeOptions.php b/src/Format/JsonEncodeOptions.php
@@ -27,7 +27,7 @@ private function __construct(private int $value)
 
     public static function default(): self
     {
-        return new self(\JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE | \JSON_PRESERVE_ZERO_FRACTION);
+        return new self(\JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE);
     }
 
     /**

diff --git a/...ecification/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitions/normalized.json b/...ecification/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitions/normalized.json
@@ -1 +1,13 @@
-{"foo":{},"bar":{"baz":{"qux":"quux","quuz":"corge"},"grault":{"fred":"plugh","garply":"waldo"}}}
+{
+    "foo": {},
+    "bar": {
+        "baz": {
+            "qux": "quux",
+            "quuz": "corge"
+        },
+        "grault": {
+            "fred": "plugh",
+            "garply": "waldo"
+        }
+    }
+}
diff --git a/...ct/Schema/HasType/IsScalar/WithPropertyDefinitionsAndAdditionalProperties/normalized.json b/...ct/Schema/HasType/IsScalar/WithPropertyDefinitionsAndAdditionalProperties/normalized.json
@@ -1 +1,14 @@
-{"foo":{},"bar":{"baz":{"qux":"quux","quuz":"corge"},"grault":{"fred":"plugh","garply":"waldo"}},"thud":"xyzzy"}
+{
+    "foo": {},
+    "bar": {
+        "baz": {
+            "qux": "quux",
+            "quuz": "corge"
+        },
+        "grault": {
+            "fred": "plugh",
+            "garply": "waldo"
+        }
+    },
+    "thud": "xyzzy"
+}
diff --git a/...fication/Data/IsObject/Schema/HasType/IsScalar/WithoutPropertyDefinitions/normalized.json b/...fication/Data/IsObject/Schema/HasType/IsScalar/WithoutPropertyDefinitions/normalized.json
@@ -1 +1,13 @@
-{"bar":{"baz":{"qux":"quux","quuz":"corge"},"grault":{"fred":"plugh","garply":"waldo"}},"foo":{}}
+{
+    "bar": {
+        "baz": {
+            "qux": "quux",
+            "quuz": "corge"
+        },
+        "grault": {
+            "fred": "plugh",
+            "garply": "waldo"
+        }
+    },
+    "foo": {}
+}
diff --git a/...ormalizes/WithCustomJsonPointerSpecification/Data/IsObject/Schema/IsEmpty/normalized.json b/...ormalizes/WithCustomJsonPointerSpecification/Data/IsObject/Schema/IsEmpty/normalized.json
@@ -1 +1,16 @@
-{"bar":[{"foo":9000,"bar":["foo","bar","baz"]},{"foo":9001}],"foo":"bar"}
+{
+    "bar": [
+        {
+            "foo": 9000,
+            "bar": [
+                "foo",
+                "bar",
+                "baz"
+            ]
+        },
+        {
+            "foo": 9001
+        }
+    ],
+    "foo": "bar"
+}
diff --git a/...s/WithDefaultJsonPointerSpecification/Data/IsArray/Schema/HasAnyOf/Direct/normalized.json b/...s/WithDefaultJsonPointerSpecification/Data/IsArray/Schema/HasAnyOf/Direct/normalized.json
@@ -1 +1,11 @@
-[{"type":"Website","url":"https:\/\/localheinz.com"},"https:\/\/github.com\/localheinz",{"type":"Twitter","url":"https:\/\/twitter.com\/localheinz"}]
+[
+    {
+        "type": "Website",
+        "url": "https://localheinz.com"
+    },
+    "https://github.com/localheinz",
+    {
+        "type": "Twitter",
+        "url": "https://twitter.com/localheinz"
+    }
+]
diff --git a/...DefaultJsonPointerSpecification/Data/IsArray/Schema/HasAnyOf/HasReference/normalized.json b/...DefaultJsonPointerSpecification/Data/IsArray/Schema/HasAnyOf/HasReference/normalized.json
@@ -1 +1,11 @@
-[{"type":"Website","url":"https:\/\/localheinz.com"},"https:\/\/github.com\/localheinz",{"type":"Twitter","url":"https:\/\/twitter.com\/localheinz"}]
+[
+    {
+        "type": "Website",
+        "url": "https://localheinz.com"
+    },
+    "https://github.com/localheinz",
+    {
+        "type": "Twitter",
+        "url": "https://twitter.com/localheinz"
+    }
+]
diff --git a/...s/WithDefaultJsonPointerSpecification/Data/IsArray/Schema/HasOneOf/Direct/normalized.json b/...s/WithDefaultJsonPointerSpecification/Data/IsArray/Schema/HasOneOf/Direct/normalized.json
@@ -1 +1,11 @@
-[{"type":"Website","url":"https:\/\/localheinz.com"},"https:\/\/github.com\/localheinz",{"type":"Twitter","url":"https:\/\/twitter.com\/localheinz"}]
+[
+    {
+        "type": "Website",
+        "url": "https://localheinz.com"
+    },
+    "https://github.com/localheinz",
+    {
+        "type": "Twitter",
+        "url": "https://twitter.com/localheinz"
+    }
+]
diff --git a/...DefaultJsonPointerSpecification/Data/IsArray/Schema/HasOneOf/HasReference/normalized.json b/...DefaultJsonPointerSpecification/Data/IsArray/Schema/HasOneOf/HasReference/normalized.json
@@ -1 +1,11 @@
-[{"type":"Website","url":"https:\/\/localheinz.com"},"https:\/\/github.com\/localheinz",{"type":"Twitter","url":"https:\/\/twitter.com\/localheinz"}]
+[
+    {
+        "type": "Website",
+        "url": "https://localheinz.com"
+    },
+    "https://github.com/localheinz",
+    {
+        "type": "Twitter",
+        "url": "https://twitter.com/localheinz"
+    }
+]
diff --git a/...izes/WithDefaultJsonPointerSpecification/Data/IsArray/Schema/HasReference/normalized.json b/...izes/WithDefaultJsonPointerSpecification/Data/IsArray/Schema/HasReference/normalized.json
@@ -1 +1,14 @@
-[{"type":"Website","url":"https:\/\/localheinz.com"},{"type":"GitHub","url":"https:\/\/github.com\/localheinz"},{"type":"Twitter","url":"https:\/\/twitter.com\/localheinz"}]
+[
+    {
+        "type": "Website",
+        "url": "https://localheinz.com"
+    },
+    {
+        "type": "GitHub",
+        "url": "https://github.com/localheinz"
+    },
+    {
+        "type": "Twitter",
+        "url": "https://twitter.com/localheinz"
+    }
+]
diff --git a/...ecification/Data/IsArray/Schema/HasType/IsArray/WithItemDefinition/IsList/normalized.json b/...ecification/Data/IsArray/Schema/HasType/IsArray/WithItemDefinition/IsList/normalized.json
@@ -1 +1,5 @@
-["foo","bar","baz"]
+[
+    "foo",
+    "bar",
+    "baz"
+]
diff --git a/...cification/Data/IsArray/Schema/HasType/IsArray/WithItemDefinition/IsTuple/normalized.json b/...cification/Data/IsArray/Schema/HasType/IsArray/WithItemDefinition/IsTuple/normalized.json
@@ -1 +1,10 @@
-[9001,false,null,"Andreas M\u00f6ller",{"type":"Website","url":"https:\/\/localheinz.com"}]
+[
+    9001,
+    false,
+    null,
+    "Andreas Möller",
+    {
+        "type": "Website",
+        "url": "https://localheinz.com"
+    }
+]
diff --git a/...erSpecification/Data/IsArray/Schema/HasType/IsArray/WithoutItemDefinition/normalized.json b/...erSpecification/Data/IsArray/Schema/HasType/IsArray/WithoutItemDefinition/normalized.json
@@ -1 +1,5 @@
-["foo","bar","baz"]
+[
+    "foo",
+    "bar",
+    "baz"
+]
diff --git a/...cification/Data/IsArray/Schema/HasType/IsScalar/WithItemDefinition/IsList/normalized.json b/...cification/Data/IsArray/Schema/HasType/IsScalar/WithItemDefinition/IsList/normalized.json
@@ -1 +1,5 @@
-["foo","bar","baz"]
+[
+    "foo",
+    "bar",
+    "baz"
+]
diff --git a/...ification/Data/IsArray/Schema/HasType/IsScalar/WithItemDefinition/IsTuple/normalized.json b/...ification/Data/IsArray/Schema/HasType/IsScalar/WithItemDefinition/IsTuple/normalized.json
@@ -1 +1,10 @@
-[9001,false,null,"Andreas M\u00f6ller",{"type":"Website","url":"https:\/\/localheinz.com"}]
+[
+    9001,
+    false,
+    null,
+    "Andreas Möller",
+    {
+        "type": "Website",
+        "url": "https://localheinz.com"
+    }
+]
diff --git a/...rSpecification/Data/IsArray/Schema/HasType/IsScalar/WithoutItemDefinition/normalized.json b/...rSpecification/Data/IsArray/Schema/HasType/IsScalar/WithoutItemDefinition/normalized.json
@@ -1 +1,8 @@
-[{"baz":9000},{"baz":9001}]
+[
+    {
+        "baz": 9000
+    },
+    {
+        "baz": 9001
+    }
+]
diff --git a/...ormalizes/WithDefaultJsonPointerSpecification/Data/IsArray/Schema/IsEmpty/normalized.json b/...ormalizes/WithDefaultJsonPointerSpecification/Data/IsArray/Schema/IsEmpty/normalized.json
@@ -1 +1,9 @@
-["foo","bar","baz",{"baz":"qux","foo":"bar"}]
+[
+    "foo",
+    "bar",
+    "baz",
+    {
+        "baz": "qux",
+        "foo": "bar"
+    }
+]
diff --git a/...malizes/WithDefaultJsonPointerSpecification/Data/IsObject/Schema/HasAnyOf/normalized.json b/...malizes/WithDefaultJsonPointerSpecification/Data/IsObject/Schema/HasAnyOf/normalized.json
@@ -1 +1,8 @@
-{"name":"Andreas M\u00f6ller","urls":["https:\/\/localheinz.com","https:\/\/github.com\/localheinz","https:\/\/twitter.com\/localheinz"]}
+{
+    "name": "Andreas Möller",
+    "urls": [
+        "https://localheinz.com",
+        "https://github.com/localheinz",
+        "https://twitter.com/localheinz"
+    ]
+}
diff --git a/...malizes/WithDefaultJsonPointerSpecification/Data/IsObject/Schema/HasOneOf/normalized.json b/...malizes/WithDefaultJsonPointerSpecification/Data/IsObject/Schema/HasOneOf/normalized.json
@@ -1 +1,8 @@
-{"name":"Andreas M\u00f6ller","urls":["https:\/\/localheinz.com","https:\/\/github.com\/localheinz","https:\/\/twitter.com\/localheinz"]}
+{
+    "name": "Andreas Möller",
+    "urls": [
+        "https://localheinz.com",
+        "https://github.com/localheinz",
+        "https://twitter.com/localheinz"
+    ]
+}
diff --git a/...zes/WithDefaultJsonPointerSpecification/Data/IsObject/Schema/HasReference/normalized.json b/...zes/WithDefaultJsonPointerSpecification/Data/IsObject/Schema/HasReference/normalized.json
@@ -1 +1,17 @@
-{"name":"Andreas M\u00f6ller","urls":[{"type":"Website","url":"https:\/\/localheinz.com"},{"type":"GitHub","url":"https:\/\/github.com\/localheinz"},{"type":"Twitter","url":"https:\/\/twitter.com\/localheinz"}]}
+{
+    "name": "Andreas Möller",
+    "urls": [
+        {
+            "type": "Website",
+            "url": "https://localheinz.com"
+        },
+        {
+            "type": "GitHub",
+            "url": "https://github.com/localheinz"
+        },
+        {
+            "type": "Twitter",
+            "url": "https://twitter.com/localheinz"
+        }
+    ]
+}
diff --git a/...pecification/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitions/normalized.json b/...pecification/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitions/normalized.json
@@ -1 +1,17 @@
-{"name":"Andreas M\u00f6ller","urls":[{"type":"Website","url":"https:\/\/localheinz.com"},{"type":"GitHub","url":"https:\/\/github.com\/localheinz"},{"type":"Twitter","url":"https:\/\/twitter.com\/localheinz"}]}
+{
+    "name": "Andreas Möller",
+    "urls": [
+        {
+            "type": "Website",
+            "url": "https://localheinz.com"
+        },
+        {
+            "type": "GitHub",
+            "url": "https://github.com/localheinz"
+        },
+        {
+            "type": "Twitter",
+            "url": "https://twitter.com/localheinz"
+        }
+    ]
+}
diff --git a/...ect/Schema/HasType/IsArray/WithPropertyDefinitionsAndAdditionalProperties/normalized.json b/...ect/Schema/HasType/IsArray/WithPropertyDefinitionsAndAdditionalProperties/normalized.json
@@ -1 +1,6 @@
-{"name":"Andreas M\u00f6ller","url-github":"https:\/\/github.com\/localheinz","url-twitter":"https:\/\/twitter.com\/localheinz","url-website":"https:\/\/localheinz.com"}
+{
+    "name": "Andreas Möller",
+    "url-github": "https://github.com/localheinz",
+    "url-twitter": "https://twitter.com/localheinz",
+    "url-website": "https://localheinz.com"
+}
diff --git a/...ification/Data/IsObject/Schema/HasType/IsArray/WithoutPropertyDefinitions/normalized.json b/...ification/Data/IsObject/Schema/HasType/IsArray/WithoutPropertyDefinitions/normalized.json
@@ -1 +1,11 @@
-{"bar":[{"baz":9000},{"baz":9001}],"foo":"hello"}
+{
+    "bar": [
+        {
+            "baz": 9000
+        },
+        {
+            "baz": 9001
+        }
+    ],
+    "foo": "hello"
+}
diff --git a/...ecification/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitions/normalized.json b/...ecification/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitions/normalized.json
@@ -1 +1,17 @@
-{"name":"Andreas M\u00f6ller","urls":[{"type":"Website","url":"https:\/\/localheinz.com"},{"type":"GitHub","url":"https:\/\/github.com\/localheinz"},{"type":"Twitter","url":"https:\/\/twitter.com\/localheinz"}]}
+{
+    "name": "Andreas Möller",
+    "urls": [
+        {
+            "type": "Website",
+            "url": "https://localheinz.com"
+        },
+        {
+            "type": "GitHub",
+            "url": "https://github.com/localheinz"
+        },
+        {
+            "type": "Twitter",
+            "url": "https://twitter.com/localheinz"
+        }
+    ]
+}
diff --git a/...ct/Schema/HasType/IsScalar/WithPropertyDefinitionsAndAdditionalProperties/normalized.json b/...ct/Schema/HasType/IsScalar/WithPropertyDefinitionsAndAdditionalProperties/normalized.json
@@ -1 +1,6 @@
-{"name":"Andreas M\u00f6ller","url-github":"https:\/\/github.com\/localheinz","url-twitter":"https:\/\/twitter.com\/localheinz","url-website":"https:\/\/localheinz.com"}
+{
+    "name": "Andreas Möller",
+    "url-github": "https://github.com/localheinz",
+    "url-twitter": "https://twitter.com/localheinz",
+    "url-website": "https://localheinz.com"
+}
diff --git a/...fication/Data/IsObject/Schema/HasType/IsScalar/WithoutPropertyDefinitions/normalized.json b/...fication/Data/IsObject/Schema/HasType/IsScalar/WithoutPropertyDefinitions/normalized.json
@@ -1 +1,11 @@
-{"bar":[{"baz":9000},{"baz":9001}],"foo":"hello"}
+{
+    "bar": [
+        {
+            "baz": 9000
+        },
+        {
+            "baz": 9001
+        }
+    ],
+    "foo": "hello"
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ private function __construct(private int $value) @@
         public static function default(): self
         {
-            return new self(\JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE | \JSON_PRESERVE_ZERO_FRACTION);
+            return new self(\JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE);
         }
         /**
@@ Expand Down @@