Refactor: Align Uri::combineRelativePathWithBasePath

Concrete in **UriRetriever** and **UriResolver**.

Author: hakre

src/JsonSchema/Uri/UriResolver.php

@@ -100,11 +100,11 @@ public function resolve($uri, $baseUri = null)
 
     /**
      * Tries to glue a relative path onto an absolute one
-     * 
+     *
      * @param string $relativePath
      * @param string $basePath
      * @return string Merged path
-     * @throws UriResolverException 
+     * @throws UriResolverException
      */
     public static function combineRelativePathWithBasePath($relativePath, $basePath)
     {
@@ -117,12 +117,13 @@ public static function combineRelativePathWithBasePath($relativePath, $basePath)
         }
 
         $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);
 

src/JsonSchema/Uri/UriRetriever.php

@@ -14,6 +14,7 @@
 use JsonSchema\Validator;
 use JsonSchema\Exception\InvalidSchemaMediaTypeException;
 use JsonSchema\Exception\JsonDecodingException;
+use JsonSchema\Exception\UriResolverException;
 
 /**
  * Retrieves JSON Schema URIs
@@ -271,12 +272,19 @@ public function resolve($uri, $baseUri = null)
     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 \JsonSchema\Exception\UriResolverException(sprintf("Unable to resolve URI '%s' from base '%s'", $relativePath, $basePath));
+            throw new UriResolverException(sprintf("Unable to resolve URI '%s' from base '%s'", $relativePath, $basePath));
         }
 
         $basePathSegments = array_slice($basePathSegments, 0, -$numLevelUp);