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

Merge remote-tracking branch 'johnstevenson/unlink-fix-2'

pull/1537/merge
Jordi Boggiano 2013-01-28 18:10:07 +01:00
parent f67754997b ff1cf15cb4
commit 16a9839688
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Factory.php
View File

@ -17,6 +17,7 @@ use Composer\Json\JsonFile;
use Composer\IO\IOInterface; use Composer\IO\IOInterface;
use Composer\Repository\ComposerRepository; use Composer\Repository\ComposerRepository;
use Composer\Repository\RepositoryManager; use Composer\Repository\RepositoryManager;
use Composer\Util\Filesystem;
use Composer\Util\ProcessExecutor; use Composer\Util\ProcessExecutor;
use Composer\Util\RemoteFilesystem; use Composer\Util\RemoteFilesystem;
use Symfony\Component\Console\Formatter\OutputFormatterStyle; use Symfony\Component\Console\Formatter\OutputFormatterStyle;
@ -86,6 +87,7 @@ class Factory
'cache-vcs-dir' => array('/cache.git' => '/*', '/cache.hg' => '/*'), 'cache-vcs-dir' => array('/cache.git' => '/*', '/cache.hg' => '/*'),
'cache-files-dir' => array('/cache.files' => '/*'), 'cache-files-dir' => array('/cache.files' => '/*'),
); );
$filesystem = new Filesystem();
foreach ($legacyPaths as $key => $oldPaths) { foreach ($legacyPaths as $key => $oldPaths) {
foreach ($oldPaths as $oldPath => $match) { foreach ($oldPaths as $oldPath => $match) {
$dir = $config->get($key); $dir = $config->get($key);
@ -105,7 +107,7 @@ class Factory
@rename($child, $dir.'/'.basename($child)); @rename($child, $dir.'/'.basename($child));
} }
} }
@unlink($oldPath); $filesystem->removeDirectory($oldPath);
} }
} }
} }