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

Merge pull request #4105 from gmsantosxl/master 

Remove extra '/' when findShortestPath $from is a directory
pull/4051/merge
Jordi Boggiano 2015-06-05 13:18:07 +01:00
parent d3d3bb4698 a060c536bb
commit 7351136205
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Util/Filesystem.php
View File

@ -316,7 +316,7 @@ class Filesystem
$to = lcfirst($this->normalizePath($to)); $to = lcfirst($this->normalizePath($to));
if ($directories) { if ($directories) {
$from .= '/dummy_file'; $from = rtrim($from, '/') . '/dummy_file';
} }
if (dirname($from) === dirname($to)) { if (dirname($from) === dirname($to)) {

1
tests/Composer/Test/Util/FilesystemTest.php
View File

@ -112,6 +112,7 @@ class FilesystemTest extends TestCase
array('/foo/bar_vendor', '/foo/bar', '../bar', true), array('/foo/bar_vendor', '/foo/bar', '../bar', true),
array('/foo/bar_vendor', '/foo/bar/src', '../bar/src', true), array('/foo/bar_vendor', '/foo/bar/src', '../bar/src', true),
array('/foo/bar_vendor/src2', '/foo/bar/src/lib', '../../bar/src/lib', true), array('/foo/bar_vendor/src2', '/foo/bar/src/lib', '../../bar/src/lib', true),
array('C:/', 'C:/foo/bar/', "foo/bar", true),
); );
} }