works again

Author: vearutop

src/ProcessingOptions.php

@@ -4,6 +4,8 @@
 
 class ProcessingOptions extends MagicMap
 {
+
+
     protected $import = true;
     /** @var DataPreProcessor */
     public $dataPreProcessor;
@@ -16,6 +18,15 @@ class ProcessingOptions extends MagicMap
     /** @var string */
     public $propagateObjectItemClass;
 
+    /**
+     * ProcessingOptions constructor.
+     * @param RemoteRefProvider $remoteRefProvider
+     */
+    public function __construct(RemoteRefProvider $remoteRefProvider = null)
+    {
+        $this->remoteRefProvider = $remoteRefProvider;
+    }
+
     /**
      * @return DataPreProcessor
      */

src/RefResolver.php

@@ -72,6 +72,16 @@ public function resolveReference($referencePath)
         if ($this->resolutionScope) {
             $referencePath = Helper::resolveURI($this->resolutionScope, $referencePath);
         }
+
+        $refParts = explode('#', $referencePath);
+        $url = Helper::resolveURI($this->resolutionScope, $refParts[0]);
+        $url = rtrim($url, '#');
+        $refLocalPath = isset($refParts[1]) ? '#' . $refParts[1] : '#';
+
+        if ($url === $this->url) {
+            $referencePath = $refLocalPath;
+        }
+
         $ref = &$this->refs[$referencePath];
 
         $refResolver = $this;
@@ -105,16 +115,14 @@ public function resolveReference($referencePath)
                     $ref->setData($branch);
                 }
             } else {
-                $refParts = explode('#', $referencePath);
-                $url = Helper::resolveURI($this->resolutionScope, $refParts[0]);
-                $url = rtrim($url, '#');
-                $refLocalPath = isset($refParts[1]) ? '#' . $refParts[1] : '#';
-                $refResolver = &$this->remoteRefResolvers[$url];
-                if (null === $refResolver) {
-                    $rootData = $this->getRefProvider()->getSchemaData($url);
-                    $refResolver = new RefResolver($rootData);
-                    $refResolver->refProvider = $this->refProvider;
-                    $refResolver->url = $url;
+                if ($url !== $this->url) {
+                    $refResolver = &$this->remoteRefResolvers[$url];
+                    if (null === $refResolver) {
+                        $rootData = $this->getRefProvider()->getSchemaData($url);
+                        $refResolver = new RefResolver($rootData);
+                        $refResolver->refProvider = $this->refProvider;
+                        $refResolver->url = $url;
+                    }
                 }
 
                 $ref = $refResolver->resolveReference($refLocalPath);

src/Schema.php

@@ -355,7 +355,6 @@ public function process($data, ProcessingOptions $options, $path = '#')
                             $result->fromRef = $refString;
 
                         }
-                        $result->fromPath = $refString;
                         $ref->setImported($result);
                         $path .= '->$ref:' . $refString;
 
@@ -375,6 +374,7 @@ public function process($data, ProcessingOptions $options, $path = '#')
             }
 
             // @todo better check for schema id
+
             if ($import && isset($data->id) && is_string($data->id) /*&& (!isset($this->properties['id']))/* && $this->isMetaSchema($data)*/) {
                 $refResolver = $options->refResolver;
                 $parentScope = $refResolver->updateResolutionScope($data->id);

tests/src/PHPUnit/JsonSchema/JsonSchemaTest.php

@@ -2,14 +2,16 @@
 namespace Swaggest\JsonSchema\Tests\PHPUnit\JsonSchema;
 
 use Swaggest\JsonSchema\JsonSchema;
+use Swaggest\JsonSchema\ProcessingOptions;
+use Swaggest\JsonSchema\RemoteRef\Preloaded;
 
 class JsonSchemaTest extends \PHPUnit_Framework_TestCase
 {
     public function testJsonSchema()
     {
         $schemaData = json_decode(file_get_contents(__DIR__ . '/../../../../spec/json-schema.json'));
         /** @var JsonSchema $schema */
-        $schema = JsonSchema::importToSchema($schemaData);
+        $schema = JsonSchema::importToSchema($schemaData, new ProcessingOptions(new Preloaded()));
         $this->assertSame('{"minimum":0,"type":"integer"}', json_encode($schema->properties->maxLength));
     }
 

tests/src/PHPUnit/RefTest.php

@@ -153,6 +153,7 @@ public function testRemoteRef()
     public function testSimple()
     {
         $refResolver = new RefResolver('{"$ref": "http://json-schema.org/draft-04/schema#"}');
+        $refResolver->setRemoteRefProvider(new Preloaded());
         $refResolver->setResolutionScope('http://json-schema.org/draft-04/schema#');
         $ref = $refResolver->resolveReference('#/definitions/positiveInteger');
         $this->assertSame('integer', $ref->getData()->type);

tests/src/PHPUnit/ReimportTest.php

@@ -5,6 +5,8 @@
 
 
 use Swaggest\JsonSchema\JsonSchema;
+use Swaggest\JsonSchema\ProcessingOptions;
+use Swaggest\JsonSchema\RemoteRef\Preloaded;
 
 class ReImportTest extends \PHPUnit_Framework_TestCase
 {
@@ -14,7 +16,7 @@ public function testJsonSchema()
         $data = file_get_contents(__DIR__ . '/../../../spec/json-schema.json');
         $data = json_decode($data);
 
-        $schema = JsonSchema::importToSchema($data);
+        $schema = JsonSchema::importToSchema($data, new ProcessingOptions(new Preloaded()));
     }
 
 
@@ -24,9 +26,9 @@ public function testDoubleImport()
         $data = json_decode($data);
         //print_r($data);
 
-        $schema = JsonSchema::importToSchema($data);
+        $schema = JsonSchema::importToSchema($data, new ProcessingOptions(new Preloaded()));
         //print_r(Properties::getFromSchema($schema)->enum);
-        //$jsonSchema = $schema->import($data); // @todo fix the test
+        $jsonSchema = $schema->import($data); // @todo fix the test
         //print_r($jsonSchema);
 // #->properties:definitions->additionalProperties->properties:items->anyOf:0->$ref:#->properties:dependencies->additionalProperties