Fix Strict Simulation for empty files (#301)

maennchen · Apr 22, 2024 · 3d2f6e7 · 3d2f6e7
1 parent e0ff7b8
commit 3d2f6e7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/File.php b/src/File.php
@@ -107,11 +107,11 @@ public function process(): string
 
         $this->addFileHeader();
 
-        $detectedSize = $forecastSize ?? $this->compressedSize;
+        $detectedSize = $forecastSize ?? ($this->compressedSize > 0 ? $this->compressedSize : null);
 
         if (
             $this->isSimulation() &&
-            $detectedSize > 0
+            $detectedSize !== null
         ) {
             ($this->recordSentBytes)($detectedSize);
         } else {

diff --git a/test/ZipStreamTest.php b/test/ZipStreamTest.php
@@ -1104,7 +1104,8 @@ public function testAddFileCallbackLax(): void
     public function testExecuteSimulation(): void
     {
         $zip = new ZipStream(
-            operationMode: OperationMode::SIMULATE_LAX,
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultCompressionMethod: CompressionMethod::STORE,
             defaultEnableZeroHeader: false,
             sendHttpHeaders: false,
             outputStream: $this->tempfileStream,
@@ -1118,6 +1119,14 @@ public function testExecuteSimulation(): void
             }
         );
 
+        $zip->addFileFromCallback(
+            '.gitkeep',
+            exactSize: 0,
+            callback: function () {
+                return '';
+            }
+        );
+
         $size = $zip->finish();
 
         $this->assertEquals(filesize($this->tempfile), 0);
@@ -1131,7 +1140,7 @@ public function testExecuteSimulation(): void
         $tmpDir = $this->validateAndExtractZip($this->tempfile);
 
         $files = $this->getRecursiveFileList($tmpDir);
-        $this->assertSame(['sample.txt'], $files);
+        $this->assertSame(['.gitkeep', 'sample.txt'], $files);
     }
 
     public function testExecuteSimulationBeforeFinish(): void