Fix ZipArchiveWriter potentially writing central directory more than once

Author: thekid

ChangeLog.md

@@ -3,6 +3,10 @@ ZIP File support for the XP Framework ChangeLog
 
 ## ?.?.? / ????-??-??
 
+* Fixed `ZipArchiveWriter` potentially appending the ZIP central directory
+ to the end of the file more than once.
+ (@thekid)
+
 ## 11.2.1 / 2025-11-20
 
 * Fixed issue #4: *Undefined property: [...]ZipFileOutputStream::$data*

src/main/php/io/archive/zip/AbstractZipReaderImpl.class.php

@@ -104,6 +104,8 @@ public function streamPosition($offset) {
 
  /**
  * Closes underlying stream
+ *
+ * @return void
  */
  public function close() {
  $this->stream->close();

src/main/php/io/archive/zip/ZipArchiveReader.class.php

@@ -1,6 +1,7 @@
 <?php namespace io\archive\zip;
 
 use io\streams\{InputStream, Seekable};
+use lang\Closeable;
 
 /**
  * Read from a zip file
@@ -25,13 +26,13 @@
  * }
  * ```
  *
+ * @see io.archive.zip.ZipArchive#open
  * @test io.archive.zip.unittest.ZipArchiveReaderTest
  * @test io.archive.zip.unittest.ZipFileEntriesTest
  * @test io.archive.zip.unittest.ZipFileIteratorTest
- * @see io.archive.zip.ZipArchive#open
  */
-class ZipArchiveReader {
- protected $impl= NULL;
+class ZipArchiveReader implements Closeable {
+ protected $impl;
 
  /**
  * Creation constructor

src/main/php/io/archive/zip/ZipArchiveWriter.class.php

@@ -1,16 +1,16 @@
 <?php namespace io\archive\zip;
 
 use io\streams\OutputStream;
-use lang\IllegalArgumentException;
+use lang\{Closeable, IllegalArgumentException};
 use util\Date;
 
 /**
  * Writes to a ZIP archive
  *
- * @see xp://io.archive.zip.ZipArchive#create
- * @test xp://io.archive.zip.unittest.ZipArchiveWriterTest
+ * @see io.archive.zip.ZipArchive#create
+ * @test io.archive.zip.unittest.ZipArchiveWriterTest
  */
-class ZipArchiveWriter {
+class ZipArchiveWriter implements Closeable {
  protected
  $stream = null,
  $dir = [], 
@@ -237,13 +237,16 @@ public function writeFile($file, $name, $size, $compressed, $crc32, $flags) {
  /**
  * Closes this zip archive
  *
+ * @return void
  */
  public function close() {
+ if (null === $this->dir) return;
+
+ // Close any open streams
  $this->out && $this->out->close();
 
- $comment= '';
- 
  // Build central directory
+ $comment= '';
  $l= 0;
  foreach ($this->dir as $name => $entry) {
  $s= (
@@ -272,6 +275,8 @@ public function close() {
  strlen($comment)
  ));
  $this->stream->write($comment);
+ $this->stream->close();
+ $this->dir= null;
  }
 
  /**

src/test/php/io/archive/zip/unittest/ZipArchiveWriterTest.class.php

@@ -131,4 +131,16 @@ public function transferring_a_file() {
 
  Assert::equals(['test.txt' => 'File contents'], $this->entriesWithContentIn($out));
  }
+
+ #[Test]
+ public function central_directory_added_only_once() {
+ $out= new MemoryOutputStream();
+
+ $fixture= new ZipArchiveWriter($out);
+ $fixture->close();
+ $size= $out->size();
+ $fixture->close();
+
+ Assert::equals($size, $out->size());
+ }
 }