Merge pull request #36 from swaggest/issue-35

trimming resource url to canonical form, fixes #35

Author: vearutop

src/RefResolver.php

@@ -45,7 +45,7 @@ public function getResolutionScope()
      */
     public function updateResolutionScope($id)
     {
-        $id = rtrim($id, '#');
+        $id = rtrim($id, '#'); // safe to trim because # in hashCode must be urlencoded to %23
         $rootResolver = $this->rootResolver ? $this->rootResolver : $this;
         if (strpos($id, '://') !== false) {
             $prev = $rootResolver->setResolutionScope($id);

src/RemoteRef/Preloaded.php

@@ -57,13 +57,13 @@ public function populateSchemas(RefResolver $refResolver, Context $options = nul
 
     public function setSchemaData($url, $schemaData)
     {
-        $this->storage[$url] = $schemaData;
+        $this->storage[rtrim($url, '#')] = $schemaData;
         return $this;
     }
 
     public function setSchemaFile($url, $path)
     {
-        $this->schemaFiles[$url] = $path;
+        $this->schemaFiles[rtrim($url, '#')] = $path;
         return $this;
     }
 

tests/src/PHPUnit/Suite/Issue35Test.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace Swaggest\JsonSchema\Tests\PHPUnit\Suite;
+
+
+use Swaggest\JsonSchema\Context;
+use Swaggest\JsonSchema\InvalidValue;
+use Swaggest\JsonSchema\RemoteRef\Preloaded;
+use Swaggest\JsonSchema\Schema;
+
+class Issue35Test extends \PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+        $options = new Context();
+        $provider = new Preloaded();
+        $provider->setSchemaData('https://some-domain/Baz/Bar#', (object)['type' => 'integer']);
+        $options->setRemoteRefProvider($provider);
+        $schemaData = (object)[
+            'id' => 'https://some-domain/Foo/Bar#',
+            'oneOf' => [
+                (object)['$ref' => '/Baz/Bar#']
+            ]
+        ];
+        $schema = Schema::import($schemaData, $options);
+        $schema->in(1);
+        
+        $this->assertSame('{"id":"https://some-domain/Foo/Bar#","oneOf":[{"type":"integer"}]}', json_encode($schema, JSON_UNESCAPED_SLASHES));
+
+        $this->setExpectedException(get_class(new InvalidValue()));
+        $schema->in("not integer");
+    }
+
+    public function testTwo()
+    {
+        $options = new Context();
+        $provider = new Preloaded();
+        $provider->setSchemaData('https://some-domain/Baz/Bar', (object)['type' => 'integer']);
+        $options->setRemoteRefProvider($provider);
+        $schemaData = (object)[
+            'id' => 'https://some-domain/Foo/Bar#',
+            'oneOf' => [
+                (object)['$ref' => '/Baz/Bar#']
+            ]
+        ];
+        $schema = Schema::import($schemaData, $options);
+        $schema->in(1);
+
+        $this->assertSame('{"id":"https://some-domain/Foo/Bar#","oneOf":[{"type":"integer"}]}', json_encode($schema, JSON_UNESCAPED_SLASHES));
+
+        $this->setExpectedException(get_class(new InvalidValue()));
+        $schema->in("not integer");
+    }
+
+    public function testThree()
+    {
+        $options = new Context();
+        $provider = new Preloaded();
+        $provider->setSchemaData('https://some-domain/Baz/Bar', (object)['type' => 'integer']);
+        $options->setRemoteRefProvider($provider);
+        $schemaData = (object)[
+            'id' => 'https://some-domain/Foo/Bar#',
+            'oneOf' => [
+                (object)['$ref' => '/Baz/Bar']
+            ]
+        ];
+        $schema = Schema::import($schemaData, $options);
+        $schema->in(1);
+
+        $this->assertSame('{"id":"https://some-domain/Foo/Bar#","oneOf":[{"type":"integer"}]}', json_encode($schema, JSON_UNESCAPED_SLASHES));
+
+        $this->setExpectedException(get_class(new InvalidValue()));
+        $schema->in("not integer");
+    }
+
+    public function testFour()
+    {
+        $options = new Context();
+        $provider = new Preloaded();
+        $provider->setSchemaData('https://some-domain/Baz/Bar#', (object)['type' => 'integer']);
+        $options->setRemoteRefProvider($provider);
+        $schemaData = (object)[
+            'id' => 'https://some-domain/Foo/Bar#',
+            'oneOf' => [
+                (object)['$ref' => '/Baz/Bar']
+            ]
+        ];
+        $schema = Schema::import($schemaData, $options);
+        $schema->in(1);
+
+        $this->assertSame('{"id":"https://some-domain/Foo/Bar#","oneOf":[{"type":"integer"}]}', json_encode($schema, JSON_UNESCAPED_SLASHES));
+
+        $this->setExpectedException(get_class(new InvalidValue()));
+        $schema->in("not integer");
+    }
+
+}