Remove extra '/' when findShortestPath $from ends with '/'
parent
84c9c30b63
commit
a060c536bb
|
@ -316,7 +316,7 @@ class Filesystem
|
|||
$to = lcfirst($this->normalizePath($to));
|
||||
|
||||
if ($directories) {
|
||||
$from .= $this->isDirectory($from) ? 'dummy_file' : '/dummy_file';
|
||||
$from = rtrim($from, '/') . '/dummy_file';
|
||||
}
|
||||
|
||||
if (dirname($from) === dirname($to)) {
|
||||
|
@ -460,17 +460,6 @@ 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)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue