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

Remove extra '/' when findShortestPath $from is a directory

pull/4105/head
gmsantosxl 2015-06-03 16:48:01 -03:00
parent 8c81ec0d0e
commit 84c9c30b63
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,7 @@ class Filesystem
$to = lcfirst($this->normalizePath($to));
if ($directories) {
$from .= '/dummy_file';
$from .= $this->isDirectory($from) ? 'dummy_file' : '/dummy_file';
}
if (dirname($from) === dirname($to)) {
@ -460,6 +460,17 @@ class Filesystem
{
return (bool) preg_match('{^(file://|/|[a-z]:[\\\\/]|\.\.[\\\\/]|[a-z0-9_.-]+[\\\\/])}i', $path);
}
/**
* Return if the given path is a directory
*
* @param string $path
* @return bool
*/
public static function isDirectory($path)
{
return substr($path, -1) === '/';
}
public static function getPlatformPath($path)
{

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/src', '../bar/src', true),
array('/foo/bar_vendor/src2', '/foo/bar/src/lib', '../../bar/src/lib', true),
array('C:/', 'C:/foo/bar/', "foo/bar", true),
);
}