Merge pull request #44 from swaggest/ref-testcase

self-reference test case

Author: vearutop

tests/resources/suite/ref.json

@@ -1,5 +1,6 @@
 [
   {
+    "description": "remote ref",
     "schema": {
       "$ref": "http://json-schema.org/draft-04/schema#/definitions/positiveIntegerDefault0"
     },
@@ -15,5 +16,63 @@
         "valid": false
       }
     ]
+  },
+  {
+    "description": "enum-terminated self-reference",
+    "schema": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Foo"
+        }
+      ],
+      "definitions": {
+        "Foo": {
+          "oneOf": [
+            {
+              "enum": [
+                "A",
+                "B"
+              ]
+            },
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/Foo"
+              }
+            }
+          ]
+        }
+      }
+    },
+    "tests": [
+      {
+        "description": "valid against enum",
+        "data": {
+          "test": "A",
+          "test1": "B",
+          "test2": {
+            "test4": "A",
+            "test5": {
+              "test6": "B"
+            }
+          }
+        },
+        "valid": true
+      },
+      {
+        "description": "invalid against enum",
+        "data": {
+          "test": "A",
+          "test1": "B",
+          "test2": {
+            "test4": "A",
+            "test5": {
+              "test6": "C"
+            }
+          }
+        },
+        "valid": false
+      }
+    ]
   }
 ]

tests/resources/suite/refRemote.json

@@ -159,6 +159,7 @@
     ]
   },
   {
+    "description": "remote reference with url fragment",
     "schema": {
       "$ref": "http://json-schema.org/draft-04/schema#/definitions/positiveIntegerDefault0"
     },

tests/src/PHPUnit/ClassStructure/ExportSchemaTest.php

@@ -3,6 +3,8 @@
 namespace Swaggest\JsonSchema\Tests\PHPUnit\ClassStructure;
 
 
+use Swaggest\JsonSchema\Context;
+use Swaggest\JsonSchema\RemoteRef\Preloaded;
 use Swaggest\JsonSchema\Schema;
 use Swaggest\JsonSchema\Tests\Helper\DbId;
 use Swaggest\JsonSchema\Tests\Helper\DeepRefRoot;
@@ -125,7 +127,7 @@ public function testDeepRefSchema()
 JSON;
         $schemaData = json_decode($schemaJson);
 
-        $schema = Schema::import($schemaData);
+        $schema = Schema::import($schemaData, new Context(new Preloaded()));
         $exported = Schema::export($schema);
         $this->assertSame($schemaJson, json_encode($exported, JSON_PRETTY_PRINT + JSON_UNESCAPED_SLASHES));
     }