Merge branch 'pr/26' into yield

* pr/26:
  Whoops, fixed wrong variable name.
  Added yieldContents() to keep contents() backward compatibility.
  Use yield in contents() instead of returning a single array with all results.

Author: splitbrain

src/Tar.php

@@ -87,24 +87,43 @@ public function open($file)
      * @returns FileInfo[]
      */
     public function contents()
+    {
+        $result = array();
+
+        foreach ($this->yieldContents() as $fileinfo) {
+            $result[] = $fileinfo;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Read the contents of a TAR archive and return each entry using yield
+     * for memory efficiency.
+     *
+     * @see contents()
+     * @throws ArchiveIOException
+     * @throws ArchiveCorruptedException
+     * @returns FileInfo[]
+     */
+    public function yieldContents()
     {
         if ($this->closed || !$this->file) {
             throw new ArchiveIOException('Can not read from a closed archive');
         }
 
-        $result = array();
         while ($read = $this->readbytes(512)) {
             $header = $this->parseHeader($read);
             if (!is_array($header)) {
                 continue;
             }
 
             $this->skipbytes(ceil($header['size'] / 512) * 512);
-            $result[] = $this->header2fileinfo($header);
+            yield $this->header2fileinfo($header);
         }
 
         $this->close();
-        return $result;
+
     }
 
     /**

src/Zip.php

@@ -73,24 +73,40 @@ public function open($file)
      * @return FileInfo[]
      */
     public function contents()
+    {
+        $result = array();
+
+        foreach ($this->yieldContents() as $fileinfo) {
+            $result[] = $fileinfo;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Read the contents of a ZIP archive and return each entry using yield
+     * for memory efficiency.
+     *
+     * @see contents()
+     * @throws ArchiveIOException
+     * @return FileInfo[]
+     */
+    public function yieldContents()
     {
         if ($this->closed || !$this->file) {
             throw new ArchiveIOException('Can not read from a closed archive');
         }
 
-        $result = array();
-
         $centd = $this->readCentralDir();
 
         @rewind($this->fh);
         @fseek($this->fh, $centd['offset']);
 
         for ($i = 0; $i < $centd['entries']; $i++) {
-            $result[] = $this->header2fileinfo($this->readCentralFileHeader());
+            yield $this->header2fileinfo($this->readCentralFileHeader());
         }
 
         $this->close();
-        return $result;
     }
 
     /**