Merge pull request #34 from swaggest/issue-33

wrong absolute uri resolving, fixes #33

Author: vearutop

src/Helper.php

@@ -55,7 +55,7 @@ public static function resolveURI($parent, $current)
             } elseif ('/' === substr($currentParts[0], 0, 1)) {
                 $resultParts[0] = $currentParts[0];
                 if ($pos = strpos($parentParts[0], '://')) {
-                    $resultParts[0] = substr($parentParts[0], 0, strpos($parentParts[0], '/', $pos)) . $resultParts[0];
+                    $resultParts[0] = substr($parentParts[0], 0, strpos($parentParts[0], '/', $pos + 3)) . $resultParts[0];
                 }
             } elseif (false !== $pos = strrpos($parentParts[0], '/')) {
                 $resultParts[0] = substr($parentParts[0], 0, $pos + 1) . $currentParts[0];

tests/src/PHPUnit/Suite/Issue33Test.php

@@ -0,0 +1,53 @@
+<?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 Issue33Test extends \PHPUnit_Framework_TestCase
+{
+    public function testRef() {
+        $schemaJson = <<<'JSON'
+{
+    "id": "https://some-domain/Entity/Foo/Bar/Baz/1.1#",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "allOf": [
+        {
+            "$ref": "/Entity/1.1#"
+        },
+        {
+            "type": "object",
+            "properties": {
+                "appId": {
+                    "$ref": "/definition/AppID/1.1#"
+                },
+                "date": {
+                    "$ref": "/definition/Date/1.1#"
+                },
+                "timestamp": {
+                    "$ref": "/definition/Date/UnixTimestamp/1.1#"
+                }
+            }
+        }
+    ]
+}
+JSON;
+        $provider = new Preloaded();
+        $provider->setSchemaData("https://some-domain/Entity/1.1", json_decode('{}'));
+        $provider->setSchemaData("https://some-domain/definition/AppID/1.1", json_decode('{"type":"integer"}'));
+        $provider->setSchemaData("https://some-domain/definition/Date/1.1", json_decode('{}'));
+        $provider->setSchemaData("https://some-domain/definition/Date/UnixTimestamp/1.1", json_decode('{}'));
+
+        $options = new Context();
+        $options->setRemoteRefProvider($provider);
+        $schema = Schema::import(json_decode($schemaJson), $options);
+        $schema->in(json_decode('{"appId":123}'));
+        $this->setExpectedException(get_class(new InvalidValue()));
+        $schema->in(json_decode('{"appId":"some-string"}'));
+    }
+
+}