reading swagger

Author: vearutop

src/Constraint/Ref.php

@@ -4,8 +4,6 @@
 
 class Ref implements Constraint
 {
-    public $resolutionScope;
-
     public $ref;
     public function __construct($ref, $data = null)
     {

src/RefResolver.php

@@ -20,6 +20,9 @@ class RefResolver
     public function setResolutionScope($resolutionScope)
     {
         $rootResolver = $this->rootResolver ? $this->rootResolver : $this;
+        if ($resolutionScope === $rootResolver->resolutionScope) {
+            return $resolutionScope;
+        }
         $prev = $rootResolver->resolutionScope;
         $rootResolver->resolutionScope = $resolutionScope;
         return $prev;
@@ -37,12 +40,12 @@ public function getResolutionScope()
 
     public function updateResolutionScope($id)
     {
+        $id = rtrim($id, '#');
         $rootResolver = $this->rootResolver ? $this->rootResolver : $this;
-        $prev = $rootResolver->resolutionScope;
         if (strpos($id, '://') !== false) {
-            $rootResolver->resolutionScope = $id;
+            $prev = $rootResolver->setResolutionScope($id);
         } else {
-            $rootResolver->resolutionScope = Helper::resolveURI($rootResolver->resolutionScope, $id);
+            $prev = $rootResolver->setResolutionScope(Helper::resolveURI($rootResolver->resolutionScope, $id));
         }
 
         return $prev;
@@ -130,17 +133,10 @@ public function resolveReference($referencePath)
             if ($referencePath[0] === '#') {
                 if ($referencePath === '#') {
                     $ref = new Ref($referencePath, $refResolver->rootData);
-                    $ref->resolutionScope = $this->getResolutionScope();
                 } else {
                     $ref = new Ref($referencePath);
                     $path = explode('/', trim($referencePath, '#/'));
 
-                    $prevResScope = $refResolver->getResolutionScope();
-                    /** @noinspection PhpUnusedLocalVariableInspection */
-                    $defer = new ScopeExit(function () use ($prevResScope, $refResolver) {
-                        $refResolver->setResolutionScope($prevResScope);
-                    });
-
                     /** @var JsonSchema $branch */
                     $branch = &$refResolver->rootData;
                     while (!empty($path)) {
@@ -160,11 +156,10 @@ public function resolveReference($referencePath)
                         } elseif (is_array($branch) && isset($branch[$folder])) {
                             $branch = &$branch[$folder];
                         } else {
-                            throw new InvalidValue('Could not resolve ' . $referencePath . '@' . $this->resolutionScope . ': ' . $folder);
+                            throw new InvalidValue('Could not resolve ' . $referencePath . '@' . $this->getResolutionScope() . ': ' . $folder);
                         }
                     }
                     $ref->setData($branch);
-                    $ref->resolutionScope = $refResolver->getResolutionScope();
                 }
             } else {
                 if ($url !== $this->url) {

src/Schema.php

@@ -378,6 +378,11 @@ public function process($data, ProcessingOptions $options, $path = '#', $result
                         && !isset($this->properties['$ref'])
                     ) {
                         $refString = $data->{'$ref'};
+                        $preRefScope = $options->refResolver->getResolutionScope();
+                        /** @noinspection PhpUnusedLocalVariableInspection */
+                        $deferRefScope = new ScopeExit(function () use ($preRefScope, $options) {
+                            $options->refResolver->setResolutionScope($preRefScope);
+                        });
                         $ref = $options->refResolver->resolveReference($refString);
                         if ($ref->isImported()) {
                             return $ref->getImported();
@@ -387,14 +392,6 @@ public function process($data, ProcessingOptions $options, $path = '#', $result
                             $result->fromRef = $refString;
                         }
                         $ref->setImported($result);
-                        if ($ref->resolutionScope !== $options->refResolver->resolutionScope) {
-                            $parentRefScope = $options->refResolver->updateResolutionScope($ref->resolutionScope);
-                            /** @noinspection PhpUnusedLocalVariableInspection */
-                            $deferRef = new ScopeExit(function () use ($parentRefScope, $options) {
-                                $options->refResolver->setResolutionScope($parentRefScope);
-                            });
-                        }
-
                         return $this->process($data, $options, $path . '->ref:' . $refString, $result);
                     }
                 } catch (InvalidValue $exception) {

tests/src/PHPUnit/Swagger/SwaggerTest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Swaggest\JsonSchema\Tests\PHPUnit\Swagger;
+
+
+use Swaggest\JsonSchema\JsonSchema;
+use Swaggest\JsonSchema\ProcessingOptions;
+use Swaggest\JsonSchema\RemoteRef\Preloaded;
+
+class SwaggerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testReadSwaggerSchema()
+    {
+        $schemaData = json_decode(file_get_contents(__DIR__ . '/../../../../spec/swagger-schema.json'));
+
+
+        $refProvider = new Preloaded();
+        $refProvider->setSchemaData('http://swagger.io/v2/schema.json', $schemaData);
+
+        $options = new ProcessingOptions();
+        $options->setRemoteRefProvider($refProvider);
+
+
+        $schema = JsonSchema::importToSchema($schemaData, $options);
+    }
+
+}