Keep underlying file / output stream open

Author: thekid

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

@@ -0,0 +1,16 @@
+<?php namespace io\archive\zip;
+
+use io\streams\OutputStream;
+
+/** Needs explicit closing */
+class RemainsOpen implements OutputStream {
+  private $out;
+
+  public function __construct(OutputStream $out) { $this->out= $out; }
+
+  public function write($bytes) { $this->out->write($bytes); }
+
+  public function flush() { $this->out->flush(); }
+
+  public function close($force= false) { $force && $this->out->close(); }
+}

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

@@ -31,7 +31,7 @@ class ZipArchiveWriter implements Closeable {
    * @param  bool $unicode whether to use unicode for entry names
    */
   public function __construct(OutputStream $stream, $unicode= false) {
-    $this->stream= $stream;
+    $this->stream= new RemainsOpen($stream);
     $this->unicode= $unicode;
   }
 
@@ -261,7 +261,7 @@ public function close() {
       strlen($comment)
     ));
     $this->stream->write($comment);
-    $this->stream->close();
+    $this->stream->close(true);
     $this->dir= null;
   }
 

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

@@ -76,10 +76,6 @@ public function close() {
         $this->name
       );
       $out= $encryption->out($this->writer, $crc32);
-      while ($this->data->available()) {
-        $out->write($this->data->read());
-      }
-      $out->close();
     } else {
       $this->writer->addEntry(
         0,
@@ -91,12 +87,13 @@ public function close() {
         $this->name,
         ''
       );
-      while ($this->data->available()) {
-        $this->writer->stream->write($this->data->read());
-      }
-      // Leave underlying stream open
+      $out= $this->writer->stream;
     }
 
+    while ($this->data->available()) {
+      $out->write($this->data->read());
+    }
+    $out->close();
     $this->data= null;
   }
 }