bug #19478 fixed Filesystem:makePathRelative and added 2 more testcases (muhammedeminakbulut)

fabpot · fabpot · commit 287713fd6a3c · 2016-10-14T07:26:34.000-07:00
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #19478). Discussion ---------- fixed Filesystem:makePathRelative and added 2 more testcases | Q | A | ------------- | --- | Branch? |2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT The 2 new test cases where broken on the old code. The old testcases and the new one succeed with the given code. Commits ------- cd3206c fixed Filesystem:makePathRelative and added 2 more testcases
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -369,10 +369,14 @@ public function makePathRelative($endPath, $startPath)
         }
 
         // Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)
-        $depth = count($startPathArr) - $index;
+        if (count($startPathArr) === 1 && $startPathArr[0] === '') {
+            $depth = 0;
+        } else {
+            $depth = count($startPathArr) - $index;
+        }
 
         // When we need to traverse from the start, and we are starting from a root path, don't add '../'
-        if ('/' === $startPath[0] && 0 === $index && 1 === $depth) {
+        if ('/' === $startPath[0] && 0 === $index && 0 === $depth) {
             $traverser = '';
         } else {
             // Repeated "../" for each level need to reach the common path
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -840,6 +840,8 @@ public function providePathsForMakePathRelative()
             array('/a/aab/bb/', '/a/aa/', '../aab/bb/'),
             array('/a/aab/bb/', '/', 'a/aab/bb/'),
             array('/a/aab/bb/', '/b/aab', '../../a/aab/bb/'),
+            array('/aab/bb', '/aa', '../aab/bb/'),
+            array('/aab', '/aa', '../aab/'),
         );
 
         if ('\\' === DIRECTORY_SEPARATOR) {
