Accept file names, io.Channel instances as well as streams

Author: thekid

ChangeLog.md

@@ -5,6 +5,9 @@ ZIP File support for the XP Framework ChangeLog
 
 ## 10.0.0 / 2021-10-21
 
+* Made `ZipFile::create()` and `ZipFile::open()` accept file names, 
+  `io.Channel` instances as well as in- and output streams
+  (@thekid)
 * Implemented xp-framework/rfc#341, dropping compatibility with XP 9
   (@thekid)
 

README.md

@@ -15,7 +15,7 @@ Usage (creating a zip file)
 use io\archive\zip\{ZipFile, ZipDirEntry, ZipFileEntry};
 use io\File;
 
-$z= ZipFile::create((new File('dist.zip'))->out());
+$z= ZipFile::create(new File('dist.zip'));
 
 // Add a directory
 $dir= $z->add(new ZipDirEntry('META-INF'));
@@ -36,7 +36,7 @@ use io\archive\zip\ZipFile;
 use io\streams\Streams;
 use io\File;
 
-$z= ZipFile::open((new File('dist.zip'))->in());
+$z= ZipFile::open(new File('dist.zip'));
 foreach ($z->entries() as $entry) {
   if ($entry->isDirectory()) {
     // Create dir

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

@@ -1,6 +1,7 @@
 <?php namespace io\archive\zip;
 
-use io\streams\{InputStream, OutputStream};
+use io\Channel;
+use io\streams\{InputStream, FileInputStream, OutputStream, FileOutputStream};
 
 /**
  * Zip archives hanadling
@@ -47,20 +48,32 @@ abstract class ZipFile {
   /**
    * Creation constructor
    *
-   * @param   io.streams.OutputStream stream
+   * @param   string|io.Channel|io.streams.OutputStream $arg
    * @return  io.archive.zip.ZipArchiveWriter
    */
-  public static function create(OutputStream $stream) {
-    return new ZipArchiveWriter($stream);
+  public static function create($arg) {
+    if ($arg instanceof Channel) {
+      return new ZipArchiveWriter($arg->out());
+    } else if ($arg instanceof OutputStream) {
+      return new ZipArchiveWriter($arg);
+    } else {
+      return new ZipArchiveWriter(new FileOutputStream($arg));
+    }
   }
 
   /**
    * Read constructor
    *
-   * @param   io.streams.InputStream stream
+   * @param   string|io.Channel|io.streams.InputStream $arg
    * @return  io.archive.zip.ZipArchiveReader
    */
-  public static function open(InputStream $stream) {
-    return new ZipArchiveReader($stream);
+  public static function open($arg) {
+    if ($arg instanceof Channel) {
+      return new ZipArchiveReader($arg->in());
+    } else if ($arg instanceof InputStream) {
+      return new ZipArchiveReader($arg);
+    } else {
+      return new ZipArchiveReader(new FileInputStream($arg));
+    }
   }   
 }