Sort out UriRetriever unit test issues

Author: Andy Raines

src/JsonSchema/Uri/UriRetriever.php

@@ -103,7 +103,13 @@ public function resolvePointer($jsonSchema, $uri)
 
         $pointer = new Pointer($jsonSchema);
 
-        return $pointer->get($parsed['fragment']);
+        $reference = $pointer->get($parsed['fragment']);
+
+        if (!is_object($reference)) {
+            throw new ResourceNotFoundException("Pointer was not an object");
+        }
+
+        return $reference;
     }
 
     /**
@@ -231,30 +237,6 @@ public function generate(array $components)
         return $uri;
     }
 
-    /**
-     * Resolves a URI
-     *
-     * @param string $uri Absolute or relative
-     * @param string $baseUri Optional base URI
-     * @return string
-     */
-    public function resolve($uri, $baseUri = null)
-    {
-        $components = $this->parse($uri);
-        $path = $components['path'];
-
-        if ((array_key_exists('scheme', $components)) && ('http' === $components['scheme'])) {
-            return $uri;
-        }
-
-        $baseComponents = $this->parse($baseUri);
-        $basePath = $baseComponents['path'];
-
-        $baseComponents['path'] = UriResolver::combineRelativePathWithBasePath($path, $basePath);
-
-        return $this->generate($baseComponents);
-    }
-
     /**
      * @param string $uri
      * @return boolean

tests/JsonSchema/Tests/Uri/UriRetrieverTest.php

@@ -222,15 +222,4 @@ public function testResolvePointerFragmentNoArray()
             $schema, 'http://example.org/schema.json#/definitions/foo'
         );
     }
-    
-    /**
-     * @expectedException JsonSchema\Exception\UriResolverException
-     */
-    public function testResolveExcessLevelUp()
-    {
-        $retriever = new \JsonSchema\Uri\UriRetriever();
-        $retriever->resolve(
-            '../schema.json#', 'http://example.org/schema.json#'
-        );
-    }
 }