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

Merge remote-tracking branch 'romainneutron/zip-downloader'

pull/1552/merge
Jordi Boggiano 2013-02-11 22:53:26 +01:00
parent 1dd7700fc2 72d4bea89e
commit 8bcb442d2b
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Composer/Downloader/ZipDownloader.php
View File

@ -33,6 +33,19 @@ class ZipDownloader extends ArchiveDownloader
protected function extract($file, $path) protected function extract($file, $path)
{ {
$processError = null;
// try to use unzip on *nix
if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
$command = 'unzip '.escapeshellarg($file).' -d '.escapeshellarg($path);
if (0 === $this->process->execute($command, $ignoredOutput)) {
return;
}
$processError = 'Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput();
}
if (!class_exists('ZipArchive')) { if (!class_exists('ZipArchive')) {
// php.ini path is added to the error message to help users find the correct file // php.ini path is added to the error message to help users find the correct file
$iniPath = php_ini_loaded_file(); $iniPath = php_ini_loaded_file();
@ -43,19 +56,12 @@ class ZipDownloader extends ArchiveDownloader
$iniMessage = 'A php.ini file does not exist. You will have to create one.'; $iniMessage = 'A php.ini file does not exist. You will have to create one.';
} }
$error = "You need the zip extension enabled to use the ZipDownloader.\n". $error = "Could not decompress the archive, enable the PHP zip extension or install unzip.\n".
$iniMessage; $iniMessage . "\n" . $processError;
// try to use unzip on *nix
if (!defined('PHP_WINDOWS_VERSION_BUILD')) { if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
$command = 'unzip '.escapeshellarg($file).' -d '.escapeshellarg($path); $error = "You need the zip extension enabled to use the ZipDownloader.\n".
if (0 === $this->process->execute($command, $ignoredOutput)) { $iniMessage;
return;
}
$error = "Could not decompress the archive, enable the PHP zip extension or install unzip.\n".
$iniMessage . "\n" .
'Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput();
} }
throw new \RuntimeException($error); throw new \RuntimeException($error);