|
@@ -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)
|
|
|
{
|