Allow relative and abolute paths for url-argument

makeRelative allows relative and absolute paths
as first argument and assumes it belongs to the
same hostname.

Author: SenseException

src/Url.php

@@ -45,11 +45,22 @@ public static function makeRelative($url, $baseUrl)
     {
         Assert::string($url, 'The URL must be a string. Got: %s');
         Assert::string($baseUrl, 'The base URL must be a string. Got: %s');
+        Assert::contains($baseUrl, '://', '%s is not an absolute Url.');
 
-        list($host, $path) = self::split($url);
         list($baseHost, $basePath) = self::split($baseUrl);
 
-        if ('' !== $host && '' !== $baseHost && $host !== $baseHost) {
+        if (false === strpos($url, '://')) {
+            if (0 === strpos($url, '/')) {
+                $host = $baseHost;
+            } else {
+                $host = '';
+            }
+            $path = $url;
+        } else {
+            list($host, $path) = self::split($url);
+        }
+
+        if ('' !== $host && $host !== $baseHost) {
             throw new InvalidArgumentException(sprintf(
                 'The URL "%s" cannot be made relative to "%s" since their host names are different.',
                 $host,
@@ -79,13 +90,7 @@ public static function makeRelative($url, $baseUrl)
      */
     private static function split($url)
     {
-        if (false === ($pos = strpos($url, '://'))) {
-            throw new InvalidArgumentException(sprintf(
-                '"%s" is not an absolute Url.',
-                $url
-            ));
-        }
-
+        $pos = strpos($url, '://');
         $scheme = substr($url, 0, $pos + 3);
         $url = substr($url, $pos + 3);
 

tests/UrlTest.php

@@ -31,28 +31,32 @@ public function testMakeRelative($absolutePath, $basePath, $relativePath)
 
         $relative = Url::makeRelative($host.$absolutePath, $host.$basePath);
         $this->assertSame($relativePath, $relative);
+        $relative = Url::makeRelative($absolutePath, $host.$basePath);
+        $this->assertSame($relativePath, $relative);
     }
 
     /**
-     * @dataProvider provideMakeRelativeTests
+     * @dataProvider provideMakeRelativeIsAlreadyRelativeTests
      * @covers Webmozart\PathUtil\Url
      */
-    public function testMakeRelativeWithFullUrl($absolutePath, $basePath, $relativePath)
+    public function testMakeRelativeIsAlreadyRelative($absolutePath, $basePath, $relativePath)
     {
-        $host = 'ftp://user:password@example.com:8080';
+        $host = 'http://example.com';
 
-        $relative = Url::makeRelative($host.$absolutePath, $host.$basePath);
+        $relative = Url::makeRelative($absolutePath, $host.$basePath);
         $this->assertSame($relativePath, $relative);
     }
 
     /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage "/webmozart/puli/css/style.css" is not an absolute Url.
+     * @dataProvider provideMakeRelativeTests
      * @covers Webmozart\PathUtil\Url
      */
-    public function testMakeRelativeWithoutFullUrl()
+    public function testMakeRelativeWithFullUrl($absolutePath, $basePath, $relativePath)
     {
-        Url::makeRelative('/webmozart/puli/css/style.css', 'http://example.com/webmozart/puli');
+        $host = 'ftp://user:password@example.com:8080';
+
+        $relative = Url::makeRelative($host.$absolutePath, $host.$basePath);
+        $this->assertSame($relativePath, $relative);
     }
 
     /**
@@ -149,6 +153,18 @@ public function provideMakeRelativeTests()
 
             // second argument shorter than first
             array('/webmozart/puli', '/css', '../webmozart/puli'),
+
+            array('', '', ''),
+        );
+    }
+
+    public function provideMakeRelativeIsAlreadyRelativeTests()
+    {
+        return array(
+            array('css/style.css', '/webmozart/puli', 'css/style.css'),
+            array('css/style.css', '', 'css/style.css'),
+            array('css/../style.css', '', 'style.css'),
+            array('css/./style.css', '', 'css/style.css'),
         );
     }
 }