Merge pull request #873 from fredden/composer-repo-different-sort

Sort objects according to the supplied schema
ergebnis · May 2, 2023 · c775d80 · c775d80
2 parents 7a66e58 + c4b3db3
commit c775d80
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ For a full diff see [`4.0.2...main`][4.0.2...main].
 ### Fixed
 
 - Adjusted `SchemaNormalizer` to account for objects with string and integer-like properties ([#868]), by [@alexis-saransig-lullabot] and [@fredden]
+- Adjusted `SchemaNormalizer` to account for objects where schema describes additional properties ([#873]), by [@fredden] and [@localheinz]
 
 ## [`4.0.2`][4.0.2]
 
@@ -608,6 +609,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
 [#861]: https://github.com/ergebnis/json-normalizer/pull/861
 [#863]: https://github.com/ergebnis/json-normalizer/pull/863
 [#868]: https://github.com/ergebnis/json-normalizer/pull/868
+[#873]: https://github.com/ergebnis/json-normalizer/pull/873
 [#889]: https://github.com/ergebnis/json-normalizer/pull/889
 
 [@alexis-saransig-lullabot]: https://github.com/alexis-saransig-lullabot

diff --git a/src/SchemaNormalizer.php b/src/SchemaNormalizer.php
@@ -230,6 +230,16 @@ private function normalizeObject(
 
         $valueSchema = new \stdClass();
 
+        /**
+         * @see https://json-schema.org/understanding-json-schema/reference/object.html#additional-properties
+         */
+        if (
+            \property_exists($schema, 'additionalProperties')
+            && \is_object($schema->additionalProperties)
+        ) {
+            $valueSchema = $schema->additionalProperties;
+        }
+
         foreach ($additionalProperties as $name => $value) {
             $normalized->{$name} = $this->normalizeData(
                 $value,

diff --git a/...n/IsObject/HasEntries/Yes/HasProperty/Repositories/HasEntries/Yes/IsArray/normalized.json b/...n/IsObject/HasEntries/Yes/HasProperty/Repositories/HasEntries/Yes/IsArray/normalized.json
@@ -17,7 +17,10 @@
     "repositories": [
         {
             "type": "composer",
-            "url": "http://packages.example.com"
+            "url": "http://packages.example.com",
+            "only": [
+                "example/*"
+            ]
         },
         {
             "type": "composer",

diff --git a/...son/IsObject/HasEntries/Yes/HasProperty/Repositories/HasEntries/Yes/IsArray/original.json b/...son/IsObject/HasEntries/Yes/HasProperty/Repositories/HasEntries/Yes/IsArray/original.json
@@ -16,8 +16,9 @@
   "homepage": "https://getcomposer.org/doc/04-schema.md#repositories",
   "repositories": [
     {
-      "type": "composer",
-      "url": "http://packages.example.com"
+      "url": "http://packages.example.com",
+      "only": [ "example/*" ],
+      "type": "composer"
     },
     {
       "type": "composer",

diff --git a/.../IsObject/HasEntries/Yes/HasProperty/Repositories/HasEntries/Yes/IsObject/normalized.json b/.../IsObject/HasEntries/Yes/HasProperty/Repositories/HasEntries/Yes/IsObject/normalized.json
@@ -17,7 +17,10 @@
     "repositories": {
         "foo": {
             "type": "composer",
-            "url": "http://packages.foo.com"
+            "url": "http://packages.foo.com",
+            "only": [
+                "foo/*"
+            ]
         },
         "bar": {
             "type": "composer",

diff --git a/...on/IsObject/HasEntries/Yes/HasProperty/Repositories/HasEntries/Yes/IsObject/original.json b/...on/IsObject/HasEntries/Yes/HasProperty/Repositories/HasEntries/Yes/IsObject/original.json
@@ -16,8 +16,9 @@
   "homepage": "https://getcomposer.org/doc/04-schema.md#repositories",
   "repositories": {
     "foo": {
-      "type": "composer",
-      "url": "http://packages.foo.com"
+      "url": "http://packages.foo.com",
+      "only": [ "foo/*" ],
+      "type": "composer"
     },
     "bar": {
       "type": "composer",