fix(extractDownload): Check for presence of zip extension + log Libzi…

…p version detected Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
nextcloud · May 30, 2024 · ed1c2b5 · ed1c2b5
1 parent 703f99d
commit ed1c2b5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/index.php b/index.php
@@ -751,6 +751,13 @@ public function extractDownload(): void {
 		$this->silentLog('[info] extractDownload()');
 		$downloadedFilePath = $this->getDownloadedFilePath();
 
+		if (!extension_loaded('zip')) {
+			throw new \Exception('Required PHP extension missing: zip');
+		}
+
+		$libzip_version = defined("ZipArchive::LIBZIP_VERSION") ? \ZipArchive::LIBZIP_VERSION : "Unknown (but old)";
+		$this->silentLog('[info] Libzip version detected: ' . $libzip_version);
+
 		$zip = new \ZipArchive;
 		$zipState = $zip->open($downloadedFilePath);
 		if ($zipState === true) {

diff --git a/lib/Updater.php b/lib/Updater.php
@@ -713,6 +713,13 @@ public function extractDownload(): void {
 		$this->silentLog('[info] extractDownload()');
 		$downloadedFilePath = $this->getDownloadedFilePath();
 
+		if (!extension_loaded('zip')) {
+			throw new \Exception('Required PHP extension missing: zip');
+		}
+
+		$libzip_version = defined("ZipArchive::LIBZIP_VERSION") ? \ZipArchive::LIBZIP_VERSION : "Unknown (but old)";
+		$this->silentLog('[info] Libzip version detected: ' . $libzip_version);
+
 		$zip = new \ZipArchive;
 		$zipState = $zip->open($downloadedFilePath);
 		if ($zipState === true) {

diff --git a/updater.phar b/updater.phar