Merge pull request #46 from barracudanetworks/feature/write-to-output-stream

Pass in an output stream to allow output to files.

Author: zacherystuart

README.md

@@ -9,9 +9,10 @@ A library for dynamically streaming dynamic tar or zip files without the need to
 /**
  * Construct Parameters:
  *
- *   $name - Name of output file (optional).
- *   $opt  - Hash of archive options (optional, see "Archive Options"
- *           below).
+ *   $name          - Name of output file (optional).
+ *   $opt           - Hash of archive options (optional, see "Archive Options"
+ *                    below).
+ *   $output_stream - Output stream for archive (optional - defaults to STDOUT)
  *
  * Archive Options:
  *
@@ -141,6 +142,7 @@ disable) the HTTP headers.  See the class file for details.
 - Andrew Borek
 - Rafael Corral
 - John Maguire
+- Zachery Stuart
 
 ## License
 

src/Archive.php

@@ -50,12 +50,20 @@ class Archive
 	/**
 	 * Create a new ArchiveStream object.
 	 *
-	 * @param string $name      The name of the resulting archive (optional).
-	 * @param array  $opt       Hash of archive options (see archive options in readme).
-	 * @param string $base_path An optional base path for files to be named under.
+	 * @param string   $name          The name of the resulting archive (optional).
+	 * @param array    $opt           Hash of archive options (see archive options in readme).
+	 * @param string   $base_path     An optional base path for files to be named under.
+	 * @param resource $output_stream Output stream for archive contents.
 	 */
-	public function __construct($name = null, array $opt = array(), $base_path = null)
+	public function __construct(
+		$name = null,
+		array $opt = array(),
+		$base_path = null,
+		$output_stream = STDOUT
+	)
 	{
+		$this->output_stream = $output_stream;
+
 		// save options
 		$this->opt = $opt;
 
@@ -90,25 +98,30 @@ public function __construct($name = null, array $opt = array(), $base_path = nul
 	/**
 	 * Create instance based on useragent string
 	 *
-	 * @param string $base_filename A name for the resulting archive (without an extension).
-	 * @param array  $opt           Map of archive options (see above for list).
+	 * @param string   $base_filename A name for the resulting archive (without an extension).
+	 * @param array    $opt           Map of archive options (see above for list).
+	 * @param resource $output_stream Output stream for archive contents.
 	 * @return ArchiveStream for either zip or tar
 	 */
-	public static function instance_by_useragent($base_filename = null, array $opt = array())
+	public static function instance_by_useragent(
+		$base_filename = null,
+		array $opt = array(),
+		$output_stream = STDOUT
+	)
 	{
 		$user_agent = (isset($_SERVER['HTTP_USER_AGENT']) ? strtolower($_SERVER['HTTP_USER_AGENT']) : '');
 
 		// detect windows and use zip
 		if (strpos($user_agent, 'windows') !== false)
 		{
 			$filename = (($base_filename === null) ? null : $base_filename . '.zip');
-			return new Zip($filename, $opt, $base_filename);
+			return new Zip($filename, $opt, $base_filename, $output_stream);
 		}
 		// fallback to tar
 		else
 		{
 			$filename = (($base_filename === null) ? null : $base_filename . '.tar');
-			return new Tar($filename, $opt, $base_filename);
+			return new Tar($filename, $opt, $base_filename, $output_stream);
 		}
 	}
 
@@ -327,7 +340,7 @@ protected function send($data)
 
 		$this->need_headers = false;
 
-		echo $data;
+		fwrite($this->output_stream, $data);
 	}
 
 	/**