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

swap tests to prevent conflicting error-messages

pull/7399/head
Rasmus Schultz 2018-06-07 11:08:50 +02:00 committed by Jordi Boggiano
parent 07867724d0
commit 5bae1913ab
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,14 @@ class ZipDownloader extends ArchiveDownloader
self::$hasZipArchive = class_exists('ZipArchive'); self::$hasZipArchive = class_exists('ZipArchive');
} }
if (!self::$hasZipArchive && !self::$hasSystemUnzip) {
// php.ini path is added to the error message to help users find the correct file
$iniMessage = IniHelper::getMessage();
$error = "The zip extension and unzip command are both missing, skipping.\n" . $iniMessage;
throw new \RuntimeException($error);
}
if (null === self::$isWindows) { if (null === self::$isWindows) {
self::$isWindows = Platform::isWindows(); self::$isWindows = Platform::isWindows();
@ -65,14 +73,6 @@ class ZipDownloader extends ArchiveDownloader
} }
} }
if (!self::$hasZipArchive && !self::$hasSystemUnzip) {
// php.ini path is added to the error message to help users find the correct file
$iniMessage = IniHelper::getMessage();
$error = "The zip extension and unzip command are both missing, skipping.\n" . $iniMessage;
throw new \RuntimeException($error);
}
return parent::download($package, $path, $output); return parent::download($package, $path, $output);
} }