spec compliance done!

Author: vearutop

composer.json

@@ -3,7 +3,8 @@
   "description": "PHP Schema",
   "type": "library",
   "require": {
-    "php": ">=5.3"
+    "php": ">=5.3",
+    "phplang/scope-exit": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "4.8.23",

src/Helper.php

@@ -28,4 +28,34 @@ public static function toPregPattern($jsonPattern)
         return $pattern;
     }
 
+    public static function resolveURI($parent, $current)
+    {
+        if (false !== $pos = strpos($current, '://')) {
+            if (strpos($current, '/') > $pos) {
+                return $current;
+            }
+        }
+
+        if ($current === '') {
+            return $parent;
+        }
+
+        $result = $parent;
+        if ($current[0] === '#') {
+            if (false !== $pos = strpos($parent, '#')) {
+                $result = substr($parent, 0, $pos) . $current;
+            }
+        } elseif ($current[0] === '/') {
+        } else {
+            if (false !== $pos = strrpos($parent, '/')) {
+                $result = substr($parent, 0, $pos + 1) . $current;
+            }
+        }
+        if (false === strpos($result, '#')) {
+            $result .= '#';
+        }
+        return $result;
+    }
+
+
 }

src/SchemaLoader.php

@@ -2,13 +2,16 @@
 
 namespace Yaoi\Schema;
 
+use PhpLang\ScopeExit;
 use Yaoi\Schema\Constraint\Properties;
 use Yaoi\Schema\Constraint\Ref;
 use Yaoi\Schema\Constraint\Type;
 use Yaoi\Schema\RemoteRef\BasicFetcher;
 
 class SchemaLoader extends Base
 {
+    const ID = 'id';
+
     const TYPE = 'type';
 
     const PROPERTIES = 'properties';
@@ -77,6 +80,12 @@ public function readSchema($schemaData)
         return $this->readSchemaDeeper($schemaData);
     }
 
+    private $resolutionScope;
+
+    public function __construct()
+    {
+        $this->resolutionScope = new StackTraceStorage();
+    }
 
     protected function readSchemaDeeper($schemaArray, Schema $parentSchema = null)
     {
@@ -90,6 +99,14 @@ protected function readSchemaDeeper($schemaArray, Schema $parentSchema = null)
             $schemaArray = (array)$schemaArray;
         }
 
+        if (isset($schemaArray[self::ID])) {
+            $parentScope = $this->resolutionScope;
+            $this->resolutionScope = Helper::resolveURI($parentScope, $schemaArray[self::ID]);
+            $defer = new ScopeExit(function () use ($parentScope) {
+                $this->resolutionScope = $parentScope;
+            });
+        }
+
         if (isset($schemaArray[self::TYPE])) {
             $schema->type = new Type($schemaArray[self::TYPE]);
         }
@@ -276,7 +293,8 @@ private function resolveReference($referencePath)
                 }
             } else {
                 $refParts = explode('#', $referencePath);
-                $url = $refParts[0];
+                $url = Helper::resolveURI($this->resolutionScope, $refParts[0]);
+                $url = rtrim($url, '#');
                 $refLocalPath = isset($refParts[1]) ? '#' . $refParts[1] : '#';
                 $schemaLoader = &$this->remoteSchemaLoaders[$url];
                 if (null === $schemaLoader) {

tests/src/PHPUnit/Misc/ResolveURITest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Yaoi\Schema\Tests\PHPUnit\Misc;
+
+
+use Yaoi\Schema\Helper;
+
+class ResolveURITest extends \PHPUnit_Framework_TestCase
+{
+    public function testResolve()
+    {
+        $root = 'http://x.y.z/rootschema.json#';
+        $this->assertSame('http://x.y.z/rootschema.json#foo', Helper::resolveURI($root, "#foo"));
+        $deeper = Helper::resolveURI($root, "otherschema.json");
+        $this->assertSame('http://x.y.z/otherschema.json#', $deeper);
+        $this->assertSame('http://x.y.z/otherschema.json#bar', Helper::resolveURI($deeper, "#bar"));
+        $this->assertSame('http://x.y.z/t/inner.json#a', Helper::resolveURI($deeper, "t/inner.json#a"));
+        $this->assertSame("some://where.else/completely#", Helper::resolveURI($root, "some://where.else/completely#"));
+    }
+
+}