From 5bae1913abfea7bdea9fc13c81f26403e36b3d68 Mon Sep 17 00:00:00 2001 From: Rasmus Schultz Date: Thu, 7 Jun 2018 11:08:50 +0200 Subject: [PATCH] swap tests to prevent conflicting error-messages --- src/Composer/Downloader/ZipDownloader.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Composer/Downloader/ZipDownloader.php b/src/Composer/Downloader/ZipDownloader.php index aeade031b..6217aaa53 100644 --- a/src/Composer/Downloader/ZipDownloader.php +++ b/src/Composer/Downloader/ZipDownloader.php @@ -56,6 +56,14 @@ class ZipDownloader extends ArchiveDownloader 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) { 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); }