fix UriRetriever not propperly handling missing domain name

Author: janmentzel

composer.lock

@@ -23,6 +23,7 @@
 class UriRetriever
 {
     protected $uriRetriever = null;
+    protected $currentSchema = null;
 
     /**
      * Guarantee the correct media type was encountered
@@ -112,7 +113,8 @@ public function resolvePointer($jsonSchema, $uri)
     public function retrieve($uri, $baseUri = null)
     {
         $resolver = new UriResolver();
-        $resolvedUri = $resolver->resolve($uri, $baseUri);
+
+        $resolvedUri = $resolver->resolveWithoutFragment($uri, $baseUri);
         $uriRetriever = $this->getUriRetriever();
         $contents = $this->uriRetriever->retrieve($resolvedUri);
         $this->confirmMediaType($uriRetriever);
@@ -207,7 +209,7 @@ public function resolve($uri, $baseUri = null)
         $components = $this->parse($uri);
         $path = $components['path'];
 
-        if ((array_key_exists('scheme', $components)) && ('http' === $components['scheme'])) {
+        if (!empty($components['scheme'])) {
             return $uri;
         }
 

src/JsonSchema/Uri/UriRetriever.php

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace JsonSchema\Tests\Uri;
+namespace JsonSchema\Uri;
 
 use JsonSchema\Validator;
 
@@ -104,4 +104,20 @@ public function jsonProvider()
             array($childSchema, $parentSchema)
         );
     }
+
+    function testResolve() {
+        $retriever = new UriRetriever();
+
+        $this->assertEquals('http://me.com/base/uri/foo.json'   , $retriever->resolve('foo.json', 'http://me.com/base/uri/dir.json'));
+        $this->assertEquals('https://mee.com/base/uri/foo.json' , $retriever->resolve('foo.json', 'https://mee.com/base/uri/dir.json'));
+        $this->assertEquals('http://you.net/other-dir/foo.json' , $retriever->resolve('http://you.net/other-dir/foo.json', 'http://mee.com/base/uri/dir.json'));
+        $this->assertEquals('https://you.net/other-dir/foo.json', $retriever->resolve('https://you.net/other-dir/foo.json', 'http:///base/uri/dir.json'));
+        $this->assertEquals('https://you.net/other-dir/foo.json', $retriever->resolve('https://you.net/other-dir/foo.json', 'https:///base/uri/dir.json'));
+        $this->assertEquals('file:///other-dir/foo.json'        , $retriever->resolve('file:///other-dir/foo.json', 'file:///base/uri/dir.json'));
+
+        // question: query and fragmet are dropped. Is this the desired behaviour?
+        $this->assertEquals('http://me.com/base/uri/foo.json'   , $retriever->resolve('foo.json?query#fragment', 'http://me.com/base/uri/dir.json'));
+
+    }
+
 }