diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index a8701533cbd38..e2812f8e2252b 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -455,28 +455,19 @@ public function makePathRelative($endPath, $startPath)
$startPath = str_replace('\\', '/', $startPath);
}
- $stripDriveLetter = function ($path) {
- if (\strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0])) {
- return substr($path, 2);
- }
-
- return $path;
+ $splitDriveLetter = function ($path) {
+ return (\strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0]))
+ ? [substr($path, 2), strtoupper($path[0])]
+ : [$path, null];
};
- $endPath = $stripDriveLetter($endPath);
- $startPath = $stripDriveLetter($startPath);
-
- // Split the paths into arrays
- $startPathArr = explode('/', trim($startPath, '/'));
- $endPathArr = explode('/', trim($endPath, '/'));
-
- $normalizePathArray = function ($pathSegments, $absolute) {
+ $splitPath = function ($path, $absolute) {
$result = [];
- foreach ($pathSegments as $segment) {
+ foreach (explode('/', trim($path, '/')) as $segment) {
if ('..' === $segment && ($absolute || \count($result))) {
array_pop($result);
- } elseif ('.' !== $segment) {
+ } elseif ('.' !== $segment && '' !== $segment) {
$result[] = $segment;
}
}
@@ -484,8 +475,16 @@ public function makePathRelative($endPath, $startPath)
return $result;
};
- $startPathArr = $normalizePathArray($startPathArr, static::isAbsolutePath($startPath));
- $endPathArr = $normalizePathArray($endPathArr, static::isAbsolutePath($endPath));
+ list($endPath, $endDriveLetter) = $splitDriveLetter($endPath);
+ list($startPath, $startDriveLetter) = $splitDriveLetter($startPath);
+
+ $startPathArr = $splitPath($startPath, static::isAbsolutePath($startPath));
+ $endPathArr = $splitPath($endPath, static::isAbsolutePath($endPath));
+
+ if ($endDriveLetter && $startDriveLetter && $endDriveLetter != $startDriveLetter) {
+ // End path is on another drive, so no relative path exists
+ return $endDriveLetter.':/'.($endPathArr ? implode('/', $endPathArr).'/' : '');
+ }
// Find for which directory the common path stops
$index = 0;
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index e9e7784a3af40..8ac80437fe5dc 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1111,10 +1111,14 @@ public function providePathsForMakePathRelative()
['/../aa/bb/cc', '/aa/dd/..', 'bb/cc/'],
['/../../aa/../bb/cc', '/aa/dd/..', '../bb/cc/'],
['C:/aa/bb/cc', 'C:/aa/dd/..', 'bb/cc/'],
+ ['C:/aa/bb/cc', 'c:/aa/dd/..', 'bb/cc/'],
['c:/aa/../bb/cc', 'c:/aa/dd/..', '../bb/cc/'],
['C:/aa/bb/../../cc', 'C:/aa/../dd/..', 'cc/'],
['C:/../aa/bb/cc', 'C:/aa/dd/..', 'bb/cc/'],
['C:/../../aa/../bb/cc', 'C:/aa/dd/..', '../bb/cc/'],
+ ['D:/', 'C:/aa/../bb/cc', 'D:/'],
+ ['D:/aa/bb', 'C:/aa', 'D:/aa/bb/'],
+ ['D:/../../aa/../bb/cc', 'C:/aa/dd/..', 'D:/bb/cc/'],
];
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