Merge pull request #65 from sparkison/master

fix required param after optional for PHP 8+; add option for CSV save to disk
Jimmy-JS · Aug 25, 2021 · 6130ad1 · 6130ad1
2 parents d6fd6a8 + bcb342b
commit 6130ad1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/ReportGenerator.php b/src/ReportGenerator.php
@@ -29,7 +29,7 @@ public function __construct()
 		$this->applyFlush = (bool) Config::get('report-generator.flush', true);
 	}
 
-	public function of($title, Array $meta = [], $query, Array $columns)
+	public function of($title, Array $meta, $query, Array $columns)
 	{
 		$this->headers = [
 			'title' => $title,

diff --git a/src/ReportMedia/CSVReport.php b/src/ReportMedia/CSVReport.php
@@ -10,13 +10,17 @@ class CSVReport extends ReportGenerator
 {
     protected $showMeta = false;
 
-    public function download($filename)
+    public function download($filename, $save = false)
     {
         if (!class_exists(Writer::class)) {
             throw new Exception('Please install league/csv to generate CSV Report!');
         }
 
-        $csv = Writer::createFromFileObject(new \SplTempFileObject());
+        if ($save) {
+            $csv = Writer::createFromPath($filename, 'w');
+        } else {
+            $csv = Writer::createFromFileObject(new \SplTempFileObject());
+        }
 
         if ($this->showMeta) {
             foreach ($this->headers['meta'] as $key => $value) {
@@ -48,7 +52,14 @@ public function download($filename)
             $ctr++;
         }
 
-        $csv->output($filename . '.csv');
+        if (!$save) {
+            $csv->output($filename . '.csv');
+        }
+    }
+
+    public function store($filename)
+    {
+        $this->download($filename, true);
     }
 
     private function formatRow($result)
@@ -77,4 +88,4 @@ private function formatRow($result)
 
         return $rows;
     }
-}
+}