Commit88f47ff

committed

handle paths on different drives

1 parent08ded7f commit88f47ffCopy full SHA for 88f47ff

File tree

+11

-7

lines changed

src/Symfony/Component/Filesystem
- Filesystem.php
- Tests
  - FilesystemTest.php

+11

-7

lines changed

Lines changed: 10 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -456,15 +456,18 @@ public function makePathRelative($endPath, $startPath)`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`$stripDriveLetter =function ($path) {`
`459`		`-if (\strlen($path) >2 &&':' ===$path[1] &&'/' ===$path[2] &&ctype_alpha($path[0])) {`
`460`		`-returnsubstr($path,2);`
`461`		`- }`
`462`		`-`
`463`		`-return$path;`
	`459`	`+return (\strlen($path) >2 &&':' ===$path[1] &&'/' ===$path[2] &&ctype_alpha($path[0]))`
	`460`	`+ ? [substr($path,2),$path[0]]`
	`461`	`+ : [$path,null];`
`464`	`462`	`};`
`465`	`463`
`466`		`-$endPath =$stripDriveLetter($endPath);`
`467`		`-$startPath =$stripDriveLetter($startPath);`
	`464`	`+list($endPath,$endDriveLetter) =$stripDriveLetter($endPath);`
	`465`	`+list($startPath,$startDriveLetter) =$stripDriveLetter($startPath);`
	`466`	`+`
	`467`	`+if ($endDriveLetter &&$startDriveLetter &&$endDriveLetter <>$startDriveLetter) {`
	`468`	`+// Different drives`
	`469`	`+return$endDriveLetter.':'.$endPath;`
	`470`	`+ }`
`468`	`471`
`469`	`472`	`// Split the paths into arrays`
`470`	`473`	`$startPathArr =explode('/',trim($startPath,'/'));`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1115,6 +1115,7 @@ public function providePathsForMakePathRelative()`
`1115`	`1115`	`['C:/aa/bb/../../cc','C:/aa/../dd/..','cc/'],`
`1116`	`1116`	`['C:/../aa/bb/cc','C:/aa/dd/..','bb/cc/'],`
`1117`	`1117`	`['C:/../../aa/../bb/cc','C:/aa/dd/..','../bb/cc/'],`
	`1118`	`+ ['D:/aa/bb','C:/aa','D:/aa/bb'],`
`1118`	`1119`	`];`
`1119`	`1120`
`1120`	`1121`	`if ('\\' === \DIRECTORY_SEPARATOR) {`

Comments

(0)