Merge pull request #38 from swaggest/export-references

exporting references, resolves #37

Author: vearutop

composer.json

@@ -5,7 +5,7 @@
   "require": {
     "php": ">=5.4",
     "phplang/scope-exit": "^1.0",
-    "swaggest/json-diff": "^3.1.1"
+    "swaggest/json-diff": "^3.4.2"
   },
   "require-dev": {
     "phpunit/phpunit": "4.8.35",

composer.lock

@@ -1599,7 +1599,8 @@
       "additionalProperties": false,
       "properties": {
         "$ref": {
-          "type": "string"
+          "type": "string",
+          "format": "uri-reference"
         }
       }
     }

spec/swagger-schema.json

@@ -90,4 +90,9 @@ public function getNestedProperties()
     {
         return $this->nestedProperties;
     }
+
+    public function isEmpty()
+    {
+        return (count($this->__arrayOfData) + count($this->nestedProperties)) === 0;
+    }
 }

src/Constraint/Properties.php

@@ -21,9 +21,6 @@ class Context extends MagicMap
     /** @var bool Apply default values */
     public $applyDefaults = true;
 
-    /** @var string */
-    public $propagateObjectItemClass;
-
     /** @var \SplObjectStorage */
     public $circularReferences;
 
@@ -50,6 +47,7 @@ class Context extends MagicMap
 
     public $version = Schema::VERSION_AUTO;
 
+    public $exportedDefinitions = [];
     /**
      * @param boolean $skipValidation
      * @return Context

src/Context.php

@@ -6,6 +6,7 @@
 
 namespace Swaggest\JsonSchema;
 
+use Swaggest\JsonSchema\Constraint\Format;
 use Swaggest\JsonSchema\Constraint\Properties;
 use Swaggest\JsonSchema\Constraint\Type;
 use Swaggest\JsonSchema\Schema as JsonBasicSchema;
@@ -279,6 +280,7 @@ public static function setUpProperties($properties, JsonBasicSchema $ownerSchema
 		$properties->type->anyOf[1]->uniqueItems = true;
 		$properties->format = JsonBasicSchema::string();
 		$properties->ref = JsonBasicSchema::string();
+		$properties->ref->format = Format::URI_REFERENCE;
 		$ownerSchema->addPropertyMapping('$ref', self::names()->ref);
 		$properties->allOf = JsonBasicSchema::arr();
 		$properties->allOf->items = JsonBasicSchema::schema();
@@ -296,6 +298,7 @@ public static function setUpProperties($properties, JsonBasicSchema $ownerSchema
 		$ownerSchema->description = 'Core schema meta-schema';
 		$ownerSchema->default = (object)array (
 		);
+		$ownerSchema->setFromRef(false);
 		// disabled by draft6
 		/*
 		$ownerSchema->dependencies = (object)array (