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

Fixed exception text and some warnings.

pull/4845/head
Niels Keurentjes 2016-01-28 01:06:05 +01:00
parent 5489586436
commit 358cb3f4fc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,10 +594,10 @@ class Filesystem
$cmd = sprintf('mklink /J %s %s', $cmd = sprintf('mklink /J %s %s',
ProcessExecutor::escape(str_replace('/', DIRECTORY_SEPARATOR, $targetDir)), ProcessExecutor::escape(str_replace('/', DIRECTORY_SEPARATOR, $targetDir)),
ProcessExecutor::escape(realpath($originDir))); ProcessExecutor::escape(realpath($originDir)));
if ($this->getProcess()->execute($cmd, $output) === 0) if ($this->getProcess()->execute($cmd) === 0)
return; return;
} }
throw new IOException(sprintf('Failed to create symbolic link from "%s" to "%s".', $originDir, $targetDir), 0, null, $targetDir); throw new IOException(sprintf('Failed to create junction from "%s" to "%s".', $originDir, $targetDir), 0, null, $targetDir);
} }
/** /**
@ -629,6 +629,6 @@ class Filesystem
} }
$junction = rtrim(str_replace('/', DIRECTORY_SEPARATOR, $junction), DIRECTORY_SEPARATOR); $junction = rtrim(str_replace('/', DIRECTORY_SEPARATOR, $junction), DIRECTORY_SEPARATOR);
$cmd = sprintf('rmdir /S /Q %s', ProcessExecutor::escape($junction)); $cmd = sprintf('rmdir /S /Q %s', ProcessExecutor::escape($junction));
return $this->getProcess()->execute($cmd, $output) === 0; return $this->getProcess()->execute($cmd) === 0;
} }
} }