Added more tests to allow for files to be opened too which will be helpful in my other project I'm integrating this library with.

Author: orware

src/GzStreamGuzzle.php

@@ -45,7 +45,7 @@ public function readOnlyStream()
         return new self($this->stream, true, $this->level);
     }
 
-    public function read($length)
+    public function read($length = 65536)
     {
         $ret = $this->stream->read($length);
         return $ret;

src/String.php

@@ -13,14 +13,23 @@ class String
     protected $stream = null;
     protected $streamObject = null;
     protected $compressionLevel = 6;
+    protected $isRealFile = false;
 
-    public function __construct($readOnly = false, $compressionLevel = 6)
+    public function __construct($readOnly = false, $compressionLevel = 6, $filepath = 'php://memory')
     {
-        $this->compressionLevel = $compressionLevel;
-        $this->stream = fopen('php://memory', 'w');
+        $this->replaceStream($readOnly, $compressionLevel, $filepath);
+    }
+
+	public function replaceStream($readOnly = false, $compressionLevel = 6, $filepath = 'php://memory')
+	{
+		if (substr($filepath, 0, 6) !== 'php://') {
+			$this->isRealFile = true;
+		}
+		$this->compressionLevel = $compressionLevel;
+        $this->stream = fopen($filepath, 'r+');
         $this->streamObject = Psr7\stream_for($this->stream);
         $this->gzStream = new GzStreamGuzzle($this->streamObject, $readOnly, $this->compressionLevel);
-    }
+	}
 
     public function write($string, $options = 0, $depth = 512)
     {
@@ -31,19 +40,22 @@ public function write($string, $options = 0, $depth = 512)
         return $this->getGzStream()->write($string);
     }
 
+    public function read($length = 65536)
+    {
+        $ret = $this->getGzStream()->read($length);
+        return $ret;
+    }
+
     public function prepend($string, $compressionLevel = 6)
     {
         $this->prepareForRead();
         $gzStreamReadOnly = $this->getGzStream()->readOnlyStream();
 
-        $this->compressionLevel = $compressionLevel;
-        $this->stream = fopen('php://memory', 'w');
-        $this->streamObject = Psr7\stream_for($this->stream);
-        $this->gzStream = new GzStreamGuzzle($this->streamObject, false, $compressionLevel);
+        $this->replaceStream(false, $compressionLevel, 'php://memory');
 
         $this->getGzStream()->write($string);
 
-        while ($buffer = $gzStreamReadOnly->read(4096)) {
+        while ($buffer = $gzStreamReadOnly->read()) {
             $this->getGzStream()->write($buffer);
         }
     }
@@ -102,6 +114,11 @@ public function getStreamObject()
 
     public function getReadOnlyStream()
     {
+    	if ($this->isRealFile) {
+			return $this->getGzStream();
+    	}
+
+		// More specifically for the in-memory streams:
         $this->prepareForRead();
         $gzStreamReadOnly = $this->getGzStream()->readOnlyStream();
 

tests/StringTest.php

@@ -72,8 +72,8 @@ public function testPrependStream()
 
         $this->memoryUsage(__METHOD__, 'Finish');
 
-        $compressedString->writeDecompressedContents('tests/files/tmp/prepended_test_decompressed.txt');
-        $compressedString->writeCompressedContents('tests/files/tmp/prepended_test_compressed.gz');
+        $compressedString->writeDecompressedContents(__DIR__.'/files/tmp/prepended_test_decompressed.txt');
+        $compressedString->writeCompressedContents(__DIR__.'/files/tmp/prepended_test_compressed.gz');
     }
 
     public function testPrependAndWriteStream()
@@ -90,8 +90,8 @@ public function testPrependAndWriteStream()
 
         $this->assertEquals($textToPrepend.$content.$textToAppend, $compressedString->getDecompressedContents());
 
-        $compressedString->writeDecompressedContents('tests/files/tmp/appended_test_decompressed.txt');
-        $compressedString->writeCompressedContents('tests/files/tmp/appended_test_compressed.gz');
+        $compressedString->writeDecompressedContents(__DIR__.'/files/tmp/appended_test_decompressed.txt');
+        $compressedString->writeCompressedContents(__DIR__.'/files/tmp/appended_test_compressed.gz');
     }
 
     public function testDifferentCompressionModes()
@@ -115,6 +115,57 @@ public function testDifferentCompressionModes()
         $this->assertGreaterThan($size2, $size1, 'Gzip Mode 1 should result in the larger file');
     }
 
+    public function testReadGzipFile()
+    {
+		$this->memoryUsage(__METHOD__, 'Start');
+        $compressedStringFile = new String(true, 6, __DIR__.'/files/companies_first_10.gz');
+
+        $readOnlyStream = $compressedStringFile->getReadOnlyStream();
+		$i = 0;
+		$firstLineOutput = '';
+		while($buffer = $readOnlyStream->read()) {
+			if ($i < 1) {
+				$firstLineOutput = $buffer;
+			}
+
+			$i++;
+		}
+
+		$this->assertContains('_id', $firstLineOutput);
+
+        $this->log(__METHOD__, false);
+        $this->memoryUsage(__METHOD__, 'Finish');
+
+    }
+
+    public function testWriteFileAndReadStream()
+    {
+    	$this->memoryUsage(__METHOD__, 'Start');
+
+        $compressedString = new String();
+
+        $content = file_get_contents(__DIR__.'/files/companies_first_10.json');
+        $compressedString->write($content);
+
+        $compressedString->writeCompressedContents(__DIR__.'/files/tmp/write_test.gz');
+
+		$readOnlyStream = $compressedString->getReadOnlyStream();
+        $i = 0;
+		$firstLineOutput = '';
+		while($buffer = $readOnlyStream->read()) {
+			if ($i < 1) {
+				$firstLineOutput = $buffer;
+			}
+
+			$i++;
+		}
+
+		$this->assertContains('_id', $firstLineOutput);
+
+		$this->log(__METHOD__, false);
+        $this->memoryUsage(__METHOD__, 'Finish');
+    }
+
     /*public function testWriteAfterReadOnlyStream()
     {
 		$compressedString = new String();