Merge branch 'master' into patch-1

Author: bayareawebpro

src/SimpleCsvService.php

@@ -2,8 +2,9 @@
 
 namespace BayAreaWebPro\SimpleCsv;
 
-use Iterator;
-use SplFileObject;
+use \Iterator;
+use \SplFileObject;
+use \Exception;
 use Illuminate\Support\Collection;
 use Illuminate\Support\LazyCollection;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -14,19 +15,8 @@ class SimpleCsvService
     const ENCLOSURE = '"';
     const ESCAPE = '\\';
 
-    /**
-     * @var string
-     */
     protected $delimiter, $enclosure, $escape;
-
-    /**
-     * @var array|null
-     */
     protected $headers;
-
-    /**
-     * @var SplFileObject|null
-     */
     protected $file;
 
     public function __construct(
@@ -52,9 +42,16 @@ public function import(string $path): LazyCollection
                     yield array_combine($this->headers, $line);
                 }
             }
+            $this->resetState();
         });
     }
 
+    protected function resetState(): void
+    {
+        $this->headers = null;
+        $this->file = null;
+    }
+
     protected function isInValidLine(array $line): bool
     {
         return count($line) === 1 && is_null($line[0]);
@@ -65,7 +62,7 @@ public function export($collection, string $path): self
         if (!file_exists($path)) touch($path);
         $this->openFileObject($path, 'w');
         $this->writeLines($collection);
-        $this->closeFileObject();
+        $this->resetState();
         return $this;
     }
 
@@ -74,9 +71,9 @@ public function download($collection, string $filename, $headers = []): Streamed
         return response()->streamDownload(function () use ($collection) {
             $this->openFileObject('php://output', 'w');
             $this->writeLines($collection);
-            $this->closeFileObject();
+            $this->resetState();
         }, $filename, array_merge([
-            'Content-Type'  => 'text/csv',
+            'Content-Type' => 'text/csv',
         ], $headers));
     }
 
@@ -100,12 +97,6 @@ protected function openFileObject(string $path, string $mode = 'r'): void
         $this->file = new \SplFileObject($path, $mode);
     }
 
-    protected function closeFileObject(): void
-    {
-        $this->file = null;
-        $this->headers = null;
-    }
-
     protected function writeLines($collection): void
     {
         if (
@@ -114,15 +105,14 @@ protected function writeLines($collection): void
             !$collection instanceof LazyCollection &&
             !is_array($collection)
         ) {
-            throw new \Exception("Non-Iterable Object cannot be iterated.");
+            throw new Exception("Non-Iterable Object cannot be iterated.");
         }
         foreach ($collection as $entry) {
             if (!$this->headers) {
                 $this->headers = array_keys($this->flattenRow($entry));
                 $this->writeLine($this->headers);
             }
             $this->writeLine(array_values($this->flattenRow($entry)));
-            unset($entry);
         }
     }
 }