Merge pull request #82 from swaggest/loose-dereferencing

Add option to dereference by default

Author: vearutop

src/Context.php

@@ -51,6 +51,15 @@ class Context extends MagicMap
 
     public $isRef = false;
 
+    /**
+     * Dereference $ref unless there is a $ref property defined with format not equal to `uri-reference`.
+     * Default JSON Schema behavior is to dereference only if there is a $ref property defined with format
+     * equal to `uri-reference`.
+     *
+     * @var bool
+     */
+    public $dereference = false;
+
     /**
      * @param boolean $skipValidation
      * @return Context

src/Schema.php

@@ -663,7 +663,7 @@ private function processObject($data, Context $options, $path, $result = null)
             try {
 
                 $refProperty = null;
-                $dereference = false;
+                $dereference = $options->dereference;
 
                 if ($this->properties !== null && isset($array[self::PROP_REF])) {
                     $refPropName = self::PROP_REF;
@@ -675,8 +675,8 @@ private function processObject($data, Context $options, $path, $result = null)
 
                     $refProperty = $this->properties[$refPropName];
 
-                    if (isset($refProperty) && ($refProperty->format === Format::URI_REFERENCE)) {
-                        $dereference = true;
+                    if (isset($refProperty)) {
+                        $dereference = $refProperty->format === Format::URI_REFERENCE;
                     }
                 }
 

src/Structure/ClassStructure.php

@@ -2,7 +2,7 @@
 
 namespace Swaggest\JsonSchema\Structure;
 
-abstract class ClassStructure implements ClassStructureContract
+abstract class ClassStructure implements ClassStructureContract, WithResolvedValue
 {
     use ClassStructureTrait;
 }