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

Fix broken junctions leading to installation failure on Windows (#11550)

pull/11536/head
Attia A. Ahmed 2023-07-21 11:58:54 +03:00 committed by Jordi Boggiano
parent 4b210d916e
commit ce876e7a6f
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -785,6 +785,12 @@ class Filesystem
if (!is_dir($target)) { if (!is_dir($target)) {
throw new IOException(sprintf('Cannot junction to "%s" as it is not a directory.', $target), 0, null, $target); throw new IOException(sprintf('Cannot junction to "%s" as it is not a directory.', $target), 0, null, $target);
} }
// Removing any previously junction to ensure clean execution.
if (!is_dir($junction) || $this->isJunction($junction)) {
@rmdir($junction);
}
$cmd = sprintf( $cmd = sprintf(
'mklink /J %s %s', 'mklink /J %s %s',
ProcessExecutor::escape(str_replace('/', DIRECTORY_SEPARATOR, $junction)), ProcessExecutor::escape(str_replace('/', DIRECTORY_SEPARATOR, $junction)),

33
tests/Composer/Test/Util/FilesystemTest.php
View File

@ -12,6 +12,7 @@
namespace Composer\Test\Util; namespace Composer\Test\Util;
use Composer\Util\Platform;
use Composer\Util\Filesystem; use Composer\Util\Filesystem;
use Composer\Test\TestCase; use Composer\Test\TestCase;
@ -317,6 +318,38 @@ class FilesystemTest extends TestCase
$this->assertDirectoryDoesNotExist($junction, $junction . ' is not a directory'); $this->assertDirectoryDoesNotExist($junction, $junction . ' is not a directory');
} }
public function testOverrideJunctions(): void
{
if (!Platform::isWindows()) {
$this->markTestSkipped('Only runs on windows');
}
@mkdir($this->workingDir.'/real/nesting/testing', 0777, true);
$fs = new Filesystem();
$old_target = $this->workingDir.'/real/nesting/testing';
$target = $this->workingDir.'/real/../real/nesting';
$junction = $this->workingDir.'/junction';
// Override non-broken junction
$fs->junction($old_target, $junction);
$fs->junction($target, $junction);
$this->assertTrue($fs->isJunction($junction), $junction.': is a junction');
$this->assertTrue($fs->isJunction($target.'/../../junction'), $target.'/../../junction: is a junction');
//Remove junction
$this->assertTrue($fs->removeJunction($junction), $junction . ' has been removed');
// Override broken junction
$fs->junction($old_target, $junction);
$fs->removeDirectory($old_target);
$fs->junction($target, $junction);
$this->assertTrue($fs->isJunction($junction), $junction.': is a junction');
$this->assertTrue($fs->isJunction($target.'/../../junction'), $target.'/../../junction: is a junction');
}
public function testCopy(): void public function testCopy(): void
{ {
@mkdir($this->workingDir . '/foo/bar', 0777, true); @mkdir($this->workingDir . '/foo/bar', 0777, true);