Commit ea8d80d6 authored by Taylor Otwell's avatar Taylor Otwell

Merge pull request #371 from daylerees/patch-1

Allow File::cpdir() to return false on failure.
parents 41e066e2 2c4d35e6
...@@ -183,7 +183,7 @@ class File { ...@@ -183,7 +183,7 @@ class File {
*/ */
public static function mvdir($source, $destination, $options = fIterator::SKIP_DOTS) public static function mvdir($source, $destination, $options = fIterator::SKIP_DOTS)
{ {
static::cpdir($source, $destination, true, $options); return static::cpdir($source, $destination, true, $options);
} }
/** /**
...@@ -197,7 +197,7 @@ class File { ...@@ -197,7 +197,7 @@ class File {
*/ */
public static function cpdir($source, $destination, $delete = false, $options = fIterator::SKIP_DOTS) public static function cpdir($source, $destination, $delete = false, $options = fIterator::SKIP_DOTS)
{ {
if ( ! is_dir($source)) return; if ( ! is_dir($source)) return false;
// First we need to create the destination directory if it doesn't // First we need to create the destination directory if it doesn't
// already exists. This directory hosts all of the assets we copy // already exists. This directory hosts all of the assets we copy
...@@ -221,7 +221,7 @@ class File { ...@@ -221,7 +221,7 @@ class File {
{ {
$path = $item->getRealPath(); $path = $item->getRealPath();
static::cpdir($path, $location, $delete, $options); if (! static::cpdir($path, $location, $delete, $options)) return false;
if ($delete) @rmdir($item->getRealPath()); if ($delete) @rmdir($item->getRealPath());
} }
...@@ -231,13 +231,15 @@ class File { ...@@ -231,13 +231,15 @@ class File {
// files with the same name. // files with the same name.
else else
{ {
copy($item->getRealPath(), $location); if(! copy($item->getRealPath(), $location)) return false;
if ($delete) @unlink($item->getRealPath()); if ($delete) @unlink($item->getRealPath());
} }
} }
if ($delete) rmdir($source); if ($delete) rmdir($source);
return true;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment