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

Merge pull request #7969 from johnstevenson/remove-junction-tweak 

Remove junctions with PHP rather than system rmdir
pull/7971/head
Jordi Boggiano 2019-02-11 17:50:42 +01:00 committed by GitHub
parent 875a7dd924 d1cf69fa92
commit 603fe500f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -692,9 +692,7 @@ class Filesystem
if (!$this->isJunction($junction)) { if (!$this->isJunction($junction)) {
throw new IOException(sprintf('%s is not a junction and thus cannot be removed as one', $junction)); throw new IOException(sprintf('%s is not a junction and thus cannot be removed as one', $junction));
} }
$cmd = sprintf('rmdir /S /Q %s', ProcessExecutor::escape($junction));
clearstatcache(true, $junction);
return ($this->getProcess()->execute($cmd, $output) === 0); return $this->rmdir($junction);
} }
} }