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

switched to use the ProcessExecutor utility class

pull/940/head
Johannes M. Schmitt 2012-08-10 10:14:02 +02:00
parent 2a6b12fb65
commit e3a93d5c84
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,13 @@ namespace Composer\Util;
*/
class Filesystem
{
private $processExecutor;
public function __construct(ProcessExecutor $executor = null)
{
$this->processExecutor = $executor ?: new ProcessExecutor();
}
public function removeDirectory($directory)
{
if (!is_dir($directory)) {
@ -62,9 +69,14 @@ class Filesystem
return;
}
exec('mv '.escapeshellarg($source).' '.escapeshellarg($target), $output, $returnCode);
if (0 !== $returnCode) {
throw new \RuntimeException(sprintf('Could not rename "%s" to "%s".', $source, $target));
// We do not use PHP's "rename" function here since it does not support
// the case where $source, and $target are located on different partitions.
if (0 !== $this->processExecutor->execute('mv '.escapeshellarg($source).' '.escapeshellarg($target))) {
if (true === @rename($source, $target)) {
return;
}
throw new \RuntimeException(sprintf('Could not rename "%s" to "%s".', $source, $target));
}
}