keep intermediate references in path

Author: vearutop

src/Context.php

@@ -48,6 +48,9 @@ class Context extends MagicMap
     public $version = Schema::VERSION_AUTO;
 
     public $exportedDefinitions = [];
+
+    public $isRef = false;
+
     /**
      * @param boolean $skipValidation
      * @return Context

src/Schema.php

@@ -1034,26 +1034,31 @@ public function process($data, Context $options, $path = '#', $result = null)
                 });
             }
 
-            if ('#' !== $path && $refs = $data->getFromRefs()) {
-                $ref = $refs[0];
-                if (!array_key_exists($ref, $options->exportedDefinitions)) {
-                    $exported = null;
-                    $options->exportedDefinitions[$ref] = &$exported;
-                    $exported = $this->process($data, $options /*, $ref*/);
-                    unset($exported);
-                }
+            if ($options->isRef) {
+                $options->isRef = false;
+            } else {
+                if ('#' !== $path && $refs = $data->getFromRefs()) {
+                    $ref = $refs[0];
+                    if (!array_key_exists($ref, $options->exportedDefinitions) && strpos($ref, '://') === false) {
+                        $exported = null;
+                        $options->exportedDefinitions[$ref] = &$exported;
+                        $options->isRef = true;
+                        $exported = $this->process($data, $options, $ref);
+                        unset($exported);
+                    }
 
-                for ($i = 1; $i < count($refs); $i++) {
-                    $ref = $refs[$i];
-                    if (!array_key_exists($ref, $options->exportedDefinitions)) {
-                        $exported = new \stdClass();
-                        $exported->{self::PROP_REF} = $refs[$i-1];
-                        $options->exportedDefinitions[$ref] = $exported;
+                    for ($i = 1; $i < count($refs); $i++) {
+                        $ref = $refs[$i];
+                        if (!array_key_exists($ref, $options->exportedDefinitions) && strpos($ref, '://') === false) {
+                            $exported = new \stdClass();
+                            $exported->{self::PROP_REF} = $refs[$i - 1];
+                            $options->exportedDefinitions[$ref] = $exported;
+                        }
                     }
-                }
 
-                $result->{self::PROP_REF} = $refs[count($refs) - 1];
-                return $result;
+                    $result->{self::PROP_REF} = $refs[count($refs) - 1];
+                    return $result;
+                }
             }
 
             if ($options->circularReferences->contains($data)) {

tests/src/Helper/DeepRefRoot.php

@@ -9,6 +9,10 @@
 
 class DeepRefRoot extends ClassStructure
 {
+    public $directTitle;
+
+    public $intermediateTitle;
+
     public $prop;
 
     /**
@@ -18,6 +22,12 @@ class DeepRefRoot extends ClassStructure
     public static function setUpProperties($properties, Schema $ownerSchema)
     {
         $properties->prop = DeepRefProperty::schema();
+
+        $properties->directTitle = new Schema();
+        $properties->directTitle->ref = 'http://json-schema.org/draft-04/schema#/properties/title';
+
+        $properties->intermediateTitle = DeepRefTitle::schema();
+
         $ownerSchema->type = Schema::STRING;
     }
 }

tests/src/Helper/DeepRefTitle.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Swaggest\JsonSchema\Tests\Helper;
+
+
+use Swaggest\JsonSchema\Constraint\Properties;
+use Swaggest\JsonSchema\Schema;
+use Swaggest\JsonSchema\Structure\ClassStructure;
+
+class DeepRefTitle extends ClassStructure
+{
+    /**
+     * @param Properties|static $properties
+     * @param Schema $ownerSchema
+     */
+    public static function setUpProperties($properties, Schema $ownerSchema)
+    {
+        $ownerSchema->setFromRef('http://json-schema.org/draft-04/schema#/properties/title');
+        $ownerSchema->setFromRef('#/definitions/title');
+    }
+}

tests/src/PHPUnit/ClassStructure/ExportSchemaTest.php

@@ -45,6 +45,12 @@ public function testDeepRef()
     "properties": {
         "prop": {
             "$ref": "#/definitions/lvlD"
+        },
+        "directTitle": {
+            "$ref": "http://json-schema.org/draft-04/schema#/properties/title"
+        },
+        "intermediateTitle": {
+            "$ref": "#/definitions/title"
         }
     },
     "type": "string",
@@ -60,6 +66,9 @@ public function testDeepRef()
         },
         "lvlD": {
             "$ref": "#/definitions/lvlC"
+        },
+        "title": {
+            "$ref": "http://json-schema.org/draft-04/schema#/properties/title"
         }
     }
 }