Merge pull request #17 from SenseException/relative-path-fix

Remove ../ from relative path when already in base path's root

Author: webmozart

src/Path.php

@@ -676,6 +676,11 @@ public static function makeRelative($path, $basePath)
         // relative, consider it to be relative to the given absolute path
         // already
         if ('' === $root && '' !== $baseRoot) {
+            // If base path is already in its root
+            if ('' === $relativeBasePath) {
+                $relativePath = ltrim($relativePath, './\\');
+            }
+
             return $relativePath;
         }
 

tests/PathTest.php

@@ -823,6 +823,39 @@ public function provideMakeRelativeTests()
             array('phar://C:/webmozart/css/style.css', 'phar://C:/webmozart/puli', '../css/style.css'),
             array('phar://C:/css/style.css', 'phar://C:/webmozart/puli', '../../css/style.css'),
 
+            // already relative + already in root basepath
+            array('../style.css', '/', 'style.css'),
+            array('./style.css', '/', 'style.css'),
+            array('../../style.css', '/', 'style.css'),
+            array('..\\style.css', 'C:\\', 'style.css'),
+            array('.\\style.css', 'C:\\', 'style.css'),
+            array('..\\..\\style.css', 'C:\\', 'style.css'),
+            array('../style.css', 'C:/', 'style.css'),
+            array('./style.css', 'C:/', 'style.css'),
+            array('../../style.css', 'C:/', 'style.css'),
+            array('..\\style.css', '\\', 'style.css'),
+            array('.\\style.css', '\\', 'style.css'),
+            array('..\\..\\style.css', '\\', 'style.css'),
+            array('../style.css', 'phar:///', 'style.css'),
+            array('./style.css', 'phar:///', 'style.css'),
+            array('../../style.css', 'phar:///', 'style.css'),
+            array('..\\style.css', 'phar://C:\\', 'style.css'),
+            array('.\\style.css', 'phar://C:\\', 'style.css'),
+            array('..\\..\\style.css', 'phar://C:\\', 'style.css'),
+
+            array('css/../style.css', '/', 'style.css'),
+            array('css/./style.css', '/', 'css/style.css'),
+            array('css\\..\\style.css', 'C:\\', 'style.css'),
+            array('css\\.\\style.css', 'C:\\', 'css/style.css'),
+            array('css/../style.css', 'C:/', 'style.css'),
+            array('css/./style.css', 'C:/', 'css/style.css'),
+            array('css\\..\\style.css', '\\', 'style.css'),
+            array('css\\.\\style.css', '\\', 'css/style.css'),
+            array('css/../style.css', 'phar:///', 'style.css'),
+            array('css/./style.css', 'phar:///', 'css/style.css'),
+            array('css\\..\\style.css', 'phar://C:\\', 'style.css'),
+            array('css\\.\\style.css', 'phar://C:\\', 'css/style.css'),
+
             // already relative
             array('css/style.css', '/webmozart/puli', 'css/style.css'),
             array('css\\style.css', '\\webmozart\\puli', 'css/style.css'),