Refactor: Remove duplicate code.

UriResolver instead of self.

Additionally some minor CS fixes.

Author: hakre

src/JsonSchema/Uri/UriResolver.php

@@ -72,7 +72,7 @@ public function generate(array $components)
      * Resolves a URI
      * 
      * @param string $uri Absolute or relative
-     * @param type $baseUri Optional base URI
+     * @param string $baseUri Optional base URI
      * @return string Absolute URI
      */
     public function resolve($uri, $baseUri = null)

src/JsonSchema/Uri/UriRetriever.php

@@ -14,7 +14,6 @@
 use JsonSchema\Validator;
 use JsonSchema\Exception\InvalidSchemaMediaTypeException;
 use JsonSchema\Exception\JsonDecodingException;
-use JsonSchema\Exception\UriResolverException;
 
 /**
  * Retrieves JSON Schema URIs
@@ -23,12 +22,23 @@
  */
 class UriRetriever
 {
+    /**
+     * @var null|UriRetrieverInterface
+     */
     protected $uriRetriever = null;
 
+    /**
+     * @var array|object[]
+     * @see loadSchema
+     */
+    private $schemaCache = array();
+
     /**
      * Guarantee the correct media type was encountered
      *
-     * @throws InvalidSchemaMediaTypeException
+     * @param UriRetrieverInterface $uriRetriever
+     * @param $uri
+     * @return bool|void
      */
     public function confirmMediaType($uriRetriever, $uri)
     {
@@ -120,8 +130,8 @@ public function resolvePointer($jsonSchema, $uri)
      * Retrieve a URI
      *
      * @param string $uri JSON Schema URI
+     * @param null $baseUri
      * @return object JSON Schema contents
-     * @throws InvalidSchemaMediaType for invalid media tyeps
      */
     public function retrieve($uri, $baseUri = null)
     {
@@ -241,7 +251,7 @@ public function generate(array $components)
      * Resolves a URI
      *
      * @param string $uri Absolute or relative
-     * @param type $baseUri Optional base URI
+     * @param string $baseUri Optional base URI
      * @return string
      */
     public function resolve($uri, $baseUri = null)
@@ -256,57 +266,11 @@ public function resolve($uri, $baseUri = null)
         $baseComponents = $this->parse($baseUri);
         $basePath = $baseComponents['path'];
 
-        $baseComponents['path'] = self::combineRelativePathWithBasePath($path, $basePath);
+        $baseComponents['path'] = UriResolver::combineRelativePathWithBasePath($path, $basePath);
 
         return $this->generate($baseComponents);
     }
 
-    /**
-     * Tries to glue a relative path onto an absolute one
-     *
-     * @param string $relativePath
-     * @param string $basePath
-     * @return string Merged path
-     * @throws UriResolverException
-     */
-    private static function combineRelativePathWithBasePath($relativePath, $basePath)
-    {
-        $relativePath = self::normalizePath($relativePath);
-        if ($relativePath == '') {
-            return $basePath;
-        }
-        if ($relativePath[0] == '/') {
-            return $relativePath;
-        }
-
-        $basePathSegments = explode('/', $basePath);
-
-        preg_match('|^/?(\.\./(?:\./)*)*|', $relativePath, $match);
-        $numLevelUp = strlen($match[0]) /3 + 1;
-        if ($numLevelUp >= count($basePathSegments)) {
-            throw new UriResolverException(sprintf("Unable to resolve URI '%s' from base '%s'", $relativePath, $basePath));
-        }
-
-        $basePathSegments = array_slice($basePathSegments, 0, -$numLevelUp);
-        $path = preg_replace('|^/?(\.\./(\./)*)*|', '', $relativePath);
-
-        return implode('/', $basePathSegments) . '/' . $path;
-    }
-
-    /**
-     * Normalizes a URI path component by removing dot-slash and double slashes
-     *
-     * @param string $path
-     * @return string
-     */
-    private static function normalizePath($path)
-    {
-        $path = preg_replace('|((?<!\.)\./)*|', '', $path);
-        $path = preg_replace('|//|', '/', $path);
-
-        return $path;
-    }
-
     /**
      * @param string $uri
      * @return boolean