diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index e1d62fa427e0f..b4b79a8665212 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -367,10 +367,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
index 58badcc271877..b0dc47a602a8e 100644
--- 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) {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy