some fixes

Author: vearutop

spec/swagger-schema.json

@@ -40,11 +40,19 @@
     },
     "consumes": {
       "description": "A list of MIME types accepted by the API.",
-      "$ref": "#/definitions/mediaTypeList"
+      "allOf": [
+        {
+          "$ref": "#/definitions/mediaTypeList"
+        }
+      ]
     },
     "produces": {
       "description": "A list of MIME types the API can produce.",
-      "$ref": "#/definitions/mediaTypeList"
+      "allOf": [
+        {
+          "$ref": "#/definitions/mediaTypeList"
+        }
+      ]
     },
     "paths": {
       "$ref": "#/definitions/paths"
@@ -263,11 +271,19 @@
         },
         "produces": {
           "description": "A list of MIME types the API can produce.",
-          "$ref": "#/definitions/mediaTypeList"
+          "allOf": [
+            {
+              "$ref": "#/definitions/mediaTypeList"
+            }
+          ]
         },
         "consumes": {
           "description": "A list of MIME types the API can consume.",
-          "$ref": "#/definitions/mediaTypeList"
+          "allOf": [
+            {
+              "$ref": "#/definitions/mediaTypeList"
+            }
+          ]
         },
         "parameters": {
           "$ref": "#/definitions/parametersList"

src/Constraint/Ref.php

@@ -2,36 +2,34 @@
 
 namespace Swaggest\JsonSchema\Constraint;
 
-use Swaggest\JsonSchema\Schema;
-
 class Ref implements Constraint
 {
     public $ref;
-    public function __construct($ref, Schema $schema = null)
+    public function __construct($ref, $data = null)
     {
         $this->ref = $ref;
-        $this->schema = $schema;
+        $this->data = $data;
     }
 
-    /** @var Schema */
-    private $schema;
+    /** @var mixed */
+    private $data;
 
     /**
-     * @param Schema $schema
+     * @param mixed $data
      * @return Ref
      */
-    public function setSchema($schema)
+    public function setData($data)
     {
-        $this->schema = $schema;
+        $this->data = $data;
         return $this;
     }
 
     /**
-     * @return Schema
+     * @return mixed
      * @throws \Exception
      */
-    public function getSchema()
+    public function getData()
     {
-        return $this->schema;
+        return $this->data;
     }
 }

src/Constraint/UniqueItems.php

@@ -3,6 +3,8 @@
 namespace Swaggest\JsonSchema\Constraint;
 
 
+use Swaggest\JsonSchema\Structure\ObjectItem;
+
 class UniqueItems
 {
     /**
@@ -20,7 +22,9 @@ public static function isValid(array $data)
             if (is_bool($value)) {
                 $value = '_______BOOL' . $value;
             }
-
+            if ($value instanceof ObjectItem) {
+                $value = json_encode($value);
+            }
             $tmp = &$index[$value];
             if ($tmp !== null) {
                 return false;