Update composer (include breaking) (#2019)

* Update composer (include breaking) * fix phpstan * fix header
LycheeOrg · Sep 17, 2023 · cf7b952 · cf7b952
1 parent 2133267
commit cf7b952
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 144 deletions.
diff --git a/app/Actions/Album/Archive.php b/app/Actions/Album/Archive.php
@@ -21,11 +21,9 @@
 use function Safe\set_time_limit;
 use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\StreamedResponse;
+use ZipStream\CompressionMethod as ZipMethod;
 use ZipStream\Exception\FileNotFoundException;
 use ZipStream\Exception\FileNotReadableException;
-use ZipStream\Option\Archive as ZipArchiveOption;
-use ZipStream\Option\File as ZipFileOption;
-use ZipStream\Option\Method as ZipMethod;
 use ZipStream\ZipStream;
 
 class Archive extends Action
@@ -62,10 +60,10 @@ public function do(Collection $albums): StreamedResponse
 		$this->deflateLevel = Configs::getValueAsInt('zip_deflate_level');
 
 		$responseGenerator = function () use ($albums) {
-			$options = new ZipArchiveOption();
-			$options->setEnableZip64(Configs::getValueAsBool('zip64'));
-			$options->setZeroHeader(true);
-			$zip = new ZipStream(null, $options);
+			$zip = new ZipStream(defaultCompressionMethod: $this->deflateLevel === -1 ? ZipMethod::STORE : ZipMethod::DEFLATE,
+				defaultDeflateLevel: $this->deflateLevel,
+				enableZip64: Configs::getValueAsBool('zip64'),
+				defaultEnableZeroHeader: true, sendHttpHeaders: false);
 
 			$usedDirNames = [];
 			foreach ($albums as $album) {
@@ -216,14 +214,7 @@ private function compressAlbum(AbstractAlbum $album, array &$usedDirNames, ?stri
 				} catch (InfoException) {
 					// Silently do nothing, if `set_time_limit` is denied.
 				}
-				$zipFileOption = new ZipFileOption();
-				$zipFileOption->setMethod($this->deflateLevel === -1 ? ZipMethod::STORE() : ZipMethod::DEFLATE());
-				$zipFileOption->setDeflateLevel($this->deflateLevel);
-				$zipFileOption->setComment($photo->title);
-				if ($photo->taken_at !== null) {
-					$zipFileOption->setTime($photo->taken_at);
-				}
-				$zip->addFileFromStream($fileName, $file->read(), $zipFileOption);
+				$zip->addFileFromStream(fileName: $fileName, stream: $file->read(), comment: $photo->title, lastModificationDateTime: $photo->taken_at);
 				$file->close();
 			} catch (\Throwable $e) {
 				Handler::reportSafely($e);

diff --git a/app/Actions/Photo/Archive.php b/app/Actions/Photo/Archive.php
@@ -22,8 +22,7 @@
 use function Safe\stream_copy_to_stream;
 use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use ZipStream\Option\File as ZipFileOption;
-use ZipStream\Option\Method as ZipMethod;
+use ZipStream\CompressionMethod as ZipMethod;
 use ZipStream\ZipStream;
 
 class Archive
@@ -142,10 +141,7 @@ protected function zip(Collection $photos, DownloadVariantType $downloadVariant)
 		$this->deflateLevel = Configs::getValueAsInt('zip_deflate_level');
 
 		$responseGenerator = function () use ($downloadVariant, $photos) {
-			$options = new \ZipStream\Option\Archive();
-			$options->setEnableZip64(Configs::getValueAsBool('zip64'));
-			$options->setZeroHeader(true);
-			$zip = new ZipStream(null, $options);
+			$zip = new ZipStream(enableZip64: Configs::getValueAsBool('zip64'), defaultEnableZeroHeader: true, sendHttpHeaders: false);
 
 			// We first need to scan the whole array of files to avoid
 			// problems with duplicate file names.
@@ -236,10 +232,9 @@ protected function zip(Collection $photos, DownloadVariantType $downloadVariant)
 						);
 					} while (array_key_exists($filename, $uniqueFilenames));
 				}
-				$zipFileOption = new ZipFileOption();
-				$zipFileOption->setMethod($this->deflateLevel === -1 ? ZipMethod::STORE() : ZipMethod::DEFLATE());
-				$zipFileOption->setDeflateLevel($this->deflateLevel);
-				$zip->addFileFromStream($filename, $archiveFileInfo->getFile()->read(), $zipFileOption);
+				$zip->addFileFromStream(fileName: $filename, stream: $archiveFileInfo->getFile()->read(),
+					compressionMethod: $this->deflateLevel === -1 ? ZipMethod::STORE : ZipMethod::DEFLATE,
+					deflateLevel: $this->deflateLevel);
 				$archiveFileInfo->getFile()->close();
 				// Reset the execution timeout for every iteration.
 				try {

diff --git a/composer.json b/composer.json
@@ -54,7 +54,7 @@
         "laravel/framework": "^10.0",
         "lychee-org/nestedset": "^8.0",
         "lychee-org/php-exif": "^1.0.0",
-        "maennchen/zipstream-php": "^2.1",
+        "maennchen/zipstream-php": "^3.1",
         "opcodesio/log-viewer": "dev-lycheeOrg",
         "php-ffmpeg/php-ffmpeg": "^1.0",
         "php-http/guzzle7-adapter": "^1.0",