Merge pull request #47 from localheinz/fix/one-of-has-reference

Fix: Resolve referenced schema in oneOf combination
ergebnis · Feb 15, 2018 · 39c3a43 · 39c3a43
2 parents 432ccef + c91a39b
commit 39c3a43
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 1 deletion.
diff --git a/src/SchemaNormalizer.php b/src/SchemaNormalizer.php
@@ -239,7 +239,10 @@ private function resolveSchema($data, \stdClass $schema): \stdClass
         if (\property_exists($schema, 'oneOf') && \is_array($schema->oneOf)) {
             foreach ($schema->oneOf as $oneOfSchema) {
                 if ($this->schemaValidator->isValid($data, $oneOfSchema)) {
-                    return $oneOfSchema;
+                    return $this->resolveSchema(
+                        $data,
+                        $oneOfSchema
+                    );
                 }
             }
         }

diff --git a/...a/IsArray/Schema/HasOneOf/normalized.json → ...ay/Schema/HasOneOf/Direct/normalized.json b/...a/IsArray/Schema/HasOneOf/normalized.json → ...ay/Schema/HasOneOf/Direct/normalized.json
diff --git a/...ata/IsArray/Schema/HasOneOf/original.json → ...rray/Schema/HasOneOf/Direct/original.json b/...ata/IsArray/Schema/HasOneOf/original.json → ...rray/Schema/HasOneOf/Direct/original.json
diff --git a/.../Data/IsArray/Schema/HasOneOf/schema.json → ...sArray/Schema/HasOneOf/Direct/schema.json b/.../Data/IsArray/Schema/HasOneOf/schema.json → ...sArray/Schema/HasOneOf/Direct/schema.json
diff --git a/...aNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasOneOf/HasReference/normalized.json b/...aNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasOneOf/HasReference/normalized.json
@@ -0,0 +1,11 @@
+[
+    {
+        "type": "Website",
+        "url": "https://localheinz.com"
+    },
+    "https://github.com/localheinz",
+    {
+        "type": "Twitter",
+        "url": "https://twitter.com/localheinz"
+    }
+]
diff --git a/...emaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasOneOf/HasReference/original.json b/...emaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasOneOf/HasReference/original.json
@@ -0,0 +1,11 @@
+[
+    {
+        "url": "https://localheinz.com",
+        "type": "Website"
+    },
+    "https://github.com/localheinz",
+    {
+        "url": "https://twitter.com/localheinz",
+        "type": "Twitter"
+    }
+]
diff --git a/...chemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasOneOf/HasReference/schema.json b/...chemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasOneOf/HasReference/schema.json
@@ -0,0 +1,30 @@
+{
+    "type": "array",
+    "items": {
+        "oneOf": [
+            {
+                "$ref": "#/definitions/url-object"
+            },
+            {
+                "$ref": "#/definitions/url-string"
+            }
+        ]
+    },
+    "definitions": {
+        "url-object": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            }
+        },
+        "url-string": {
+            "type": "string"
+        }
+    }
+}