8000 [Filesystem] Fixed makePathRelative by ausi · Pull Request #22321 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Filesystem] Fixed makePathRelative #22321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

[Filesystem] Fixed makePathRelative #22321

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fc745f4
Remove unnecessary if construct
ausi Apr 6, 2017
3a29c1d
Do not strip the beginning of relative paths, only drive letters
ausi Apr 6, 2017
15982d4
Normalize ./ path segments
ausi Apr 6, 2017
9586e88
Do not strip ../ segments from the beginning of relative paths
ausi Apr 6, 2017
cec473e
Fix parameter description
ausi Apr 6, 2017
1b795d7
Fixed compatibility with PHP 5.3
ausi Apr 7, 2017
fea3bb0
Fixed coding style
ausi Apr 7, 2017
28b29ee
Fixed compatibility with PHP 5.3
ausi Apr 7, 2017
193cdf8
Revert "Fix parameter description"
ausi Aug 9, 2017
bce33c4
Don’t use substr()
ausi Sep 14, 2017
23b4a56
Coding style
ausi Sep 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do not strip ../ segments from the beginning of relative paths
  • Loading branch information
@ausi
ausi committed Apr 6, 2017
commit 9586e880d69f613b10e23dd53cea877e622b221a
9 changes: 5 additions & 4 deletions src/Symfony/Component/Filesystem/Filesystem.php
View file
Open in desktop
D810
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,12 @@ public function makePathRelative($endPath, $startPath)
$startPathArr = explode('/', trim($startPath, '/'));
$endPathArr = explode('/', trim($endPath, '/'));

$normalizePathArray = function ($pathSegments) {
$normalizePathArray = function ($pathSegments, $path) {
$absolute = static::isAbsolutePath($path);
$result = array();

foreach ($pathSegments as $segment) {
if ('..' === $segment) {
if ('..' === $segment && ($absolute || count($result))) {
array_pop($result);
} elseif ('.' !== $segment) {
$result[] = $segment;
Expand All @@ -386,8 +387,8 @@ public function makePathRelative($endPath, $startPath)
return $result;
};

$startPathArr = $normalizePathArray($startPathArr);
$endPathArr = $normalizePathArray($endPathArr);
$startPathArr = $normalizePathArray($startPathArr, $startPath);
$endPathArr = $normalizePathArray($endPathArr, $endPath);

// Find for which directory the common path stops
$index = 0;
Expand Down
6 changes: 6 additions & 0 deletions src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,12 @@ public function providePathsForMakePathRelative()
array('aa/bb', 'aa/./cc', '../bb/'),
array('aa/./bb', 'aa/cc', '../bb/'),
array('aa/./bb', 'aa/./cc', '../bb/'),
array('../../', '../../', './'),
array('../aa/bb/', 'aa/bb/', '../../../aa/bb/'),
array('../../../', '../../', '../'),
array('', '', './'),
array('', 'aa/', '../'),
array('aa/', '', 'aa/'),
);

if ('\\' === DIRECTORY_SEPARATOR) {
Expand Down
0