Add ability to set instance of StreamInterface as output stream (#172)

* Add ability to set instance of StreamInterface as output stream

PSR-7's StreamInterface
ZipStream\Option\Archive::outputStream

* Format some code to run CI trigger

Author: defaultpage

src/Option/Archive.php

@@ -3,6 +3,8 @@
 
 namespace ZipStream\Option;
 
+use Psr\Http\Message\StreamInterface;
+
 final class Archive
 {
     const DEFAULT_DEFLATE_LEVEL = 6;
@@ -104,7 +106,7 @@ final class Archive
     private $deflateLevel = 6;
 
     /**
-     * @var resource
+     * @var StreamInterface|resource
      */
     private $outputStream;
 
@@ -228,15 +230,15 @@ public function setContentType(string $contentType): void
     }
 
     /**
-     * @return resource
+     * @return StreamInterface|resource
      */
     public function getOutputStream()
     {
         return $this->outputStream;
     }
 
     /**
-     * @param resource $outputStream
+     * @param StreamInterface|resource $outputStream
      */
     public function setOutputStream($outputStream): void
     {

src/ZipStream.php

@@ -459,7 +459,13 @@ public function send(string $str): void
         }
         $this->need_headers = false;
 
-        fwrite($this->opt->getOutputStream(), $str);
+        $outputStream = $this->opt->getOutputStream();
+
+        if ($outputStream instanceof StreamInterface) {
+            $outputStream->write($str);
+        } else {
+            fwrite($outputStream, $str);
+        }
 
         if ($this->opt->isFlushOutput()) {
             // flush output buffer if it is on and flushable

test/ZipStreamTest.php

@@ -10,6 +10,7 @@
 use ZipStream\Option\Archive as ArchiveOptions;
 use ZipStream\Option\File as FileOptions;
 use ZipStream\Option\Method;
+use ZipStream\Stream;
 use ZipStream\ZipStream;
 
 /**
@@ -504,6 +505,33 @@ public function testAddFileFromPsr7Stream(): void
         $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
     }
 
+    public function testAddFileFromPsr7StreamWithOutputToPsr7Stream(): void
+    {
+        [$tmp, $resource] = $this->getTmpFileStream();
+        $psr7OutputStream = new Stream($resource);
+
+        $options = new ArchiveOptions();
+        $options->setOutputStream($psr7OutputStream);
+
+        $zip = new ZipStream(null, $options);
+
+        $body = 'Sample String Data';
+        $response = new Response(200, [], $body);
+
+        $fileOptions = new FileOptions();
+        $fileOptions->setMethod(Method::STORE());
+
+        $zip->addFileFromPsr7Stream('sample.json', $response->getBody(), $fileOptions);
+        $zip->finish();
+        $psr7OutputStream->close();
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+        $files = $this->getRecursiveFileList($tmpDir);
+
+        $this->assertEquals(array('sample.json'), $files);
+        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+    }
+
     public function testAddFileFromPsr7StreamWithFileSizeSet(): void
     {
         [$tmp, $stream] = $this->getTmpFileStream();