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

Merge pull request #940 from schmittjoh/renameError 

fixes rename bug (closes #900)
pull/976/merge
Jordi Boggiano 2012-08-10 06:59:04 -07:00
parent 198a40fc63 3db8419569
commit 730c76ef85
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Downloader/ArchiveDownloader.php
View File

@ -50,12 +50,12 @@ abstract class ArchiveDownloader extends FileDownloader
// Rename the content directory to avoid error when moving up // Rename the content directory to avoid error when moving up
// a child folder with the same name // a child folder with the same name
$temporaryName = md5(time().rand()); $temporaryName = md5(time().rand());
rename($contentDir, $temporaryName); $this->filesystem->rename($contentDir, $temporaryName);
$contentDir = $temporaryName; $contentDir = $temporaryName;
foreach (array_merge(glob($contentDir . '/.*'), glob($contentDir . '/*')) as $file) { foreach (array_merge(glob($contentDir . '/.*'), glob($contentDir . '/*')) as $file) {
if (trim(basename($file), '.')) { if (trim(basename($file), '.')) {
rename($file, $path . '/' . basename($file)); $this->filesystem->rename($file, $path . '/' . basename($file));
} }
} }
rmdir($contentDir); rmdir($contentDir);

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

@ -14,9 +14,17 @@ namespace Composer\Util;
/** /**
* @author Jordi Boggiano <j.boggiano@seld.be> * @author Jordi Boggiano <j.boggiano@seld.be>
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
*/ */
class Filesystem class Filesystem
{ {
private $processExecutor;
public function __construct(ProcessExecutor $executor = null)
{
$this->processExecutor = $executor ?: new ProcessExecutor();
}
public function removeDirectory($directory) public function removeDirectory($directory)
{ {
if (!is_dir($directory)) { if (!is_dir($directory)) {
@ -53,6 +61,25 @@ class Filesystem
} }
} }
public function rename($source, $target)
{
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
rename($source, $target);
return;
}
// 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));
}
}
/** /**
* Returns the shortest path from $from to $to * Returns the shortest path from $from to $to
* *