Browse Source

swap tests to prevent conflicting error-messages

Rasmus Schultz 6 năm trước cách đây
mục cha
commit
5bae1913ab
1 tập tin đã thay đổi với 8 bổ sung8 xóa
  1. 8 8
      src/Composer/Downloader/ZipDownloader.php

+ 8 - 8
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);
     }