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

rmdir needs to be used on windows to remove symbolic links to directories

pull/3158/head
hakre 2014-07-28 23:42:53 +02:00
parent ed507dec9f
commit 0ad2449fe8
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,9 +181,9 @@ class Filesystem
*/ */
public function unlink($path) public function unlink($path)
{ {
if (!@unlink($path)) { if (!@$this->unlinkImplementation($path)) {
// retry after a bit on windows since it tends to be touchy with mass removals // retry after a bit on windows since it tends to be touchy with mass removals
if (!defined('PHP_WINDOWS_VERSION_BUILD') || (usleep(350000) && !@unlink($path))) { if (!defined('PHP_WINDOWS_VERSION_BUILD') || (usleep(350000) && !@$this->unlinkImplementation($path))) {
$error = error_get_last(); $error = error_get_last();
$message = 'Could not delete '.$path.': ' . @$error['message']; $message = 'Could not delete '.$path.': ' . @$error['message'];
if (defined('PHP_WINDOWS_VERSION_BUILD')) { if (defined('PHP_WINDOWS_VERSION_BUILD')) {
@ -473,4 +473,22 @@ class Filesystem
{ {
return new ProcessExecutor; return new ProcessExecutor;
} }
/**
* delete symbolic link implementation (commonly known as "unlink()")
*
* symbolic links on windows which link to directories need rmdir instead of unlink
*
* @param string $path
*
* @return bool
*/
private function unlinkImplementation($path)
{
if (defined('PHP_WINDOWS_VERSION_BUILD') && is_dir($path) && is_link($path)) {
return rmdir($path);
}
return unlink($path);
}
} }