public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #5095 from schlessera/schlessera-4451-relative-path 

Make sure to use an absolute path for symlinking in PathDownloader.
pull/5116/head
Jordi Boggiano 2016-03-26 09:37:17 +01:00
parent f18f383a7b 4e9885e9bc
commit 340d9789c8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Downloader/PathDownloader.php
View File

@ -79,7 +79,11 @@ class PathDownloader extends FileDownloader
$this->filesystem->junction($realUrl, $path); $this->filesystem->junction($realUrl, $path);
$this->io->writeError(sprintf(' Junctioned from %s', $url)); $this->io->writeError(sprintf(' Junctioned from %s', $url));
} else { } else {
$shortestPath = $this->filesystem->findShortestPath($path, $realUrl); $absolutePath = $path;
if ( ! $this->filesystem->isAbsolutePath($absolutePath)) {
$absolutePath = getcwd() . DIRECTORY_SEPARATOR . $path;
}
$shortestPath = $this->filesystem->findShortestPath($absolutePath, $realUrl);
$fileSystem->symlink($shortestPath, $path); $fileSystem->symlink($shortestPath, $path);
$this->io->writeError(sprintf(' Symlinked from %s', $url)); $this->io->writeError(sprintf(' Symlinked from %s', $url));
} }