generator code refactored

Author: Sujan Mahmud

src/Contracts/ExporterContract.php

@@ -4,11 +4,8 @@
 namespace Sujan\Exporter\Contracts;
 
 
-
-use Generator;
-
 interface ExporterContract
 {
-    public function set(): Generator;
-    public function get(): void;
+    public function makeGenerator(): \Generator;
+    public function export(): void;
 }

src/Export.php

@@ -4,7 +4,6 @@
 namespace Sujan\Exporter;
 
 
-
 class Export
 {
     /**
@@ -17,7 +16,7 @@ class Export
      */
     protected $columns;
 
-    /*
+    /**
      * @var array
      */
     private $heading = [];
@@ -27,15 +26,15 @@ class Export
      */
     protected $filename;
 
-    /*
+    /**
      * Array of content types
      */
     private $contentTypes = [
         'csv' => 'application/csv',
         'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
     ];
 
-    /*
+    /**
      * Content type
      */
     private $contentType;

src/ExportFromArray.php

@@ -21,7 +21,7 @@ public function __construct(array $model, array $columns, string $filename)
     /**
      * @return Generator
      */
-    public function set(): Generator
+    public function makeGenerator(): Generator
     {
         $this->openOutputStream();
 
@@ -35,9 +35,9 @@ public function set(): Generator
     /**
      * Get data out of generator
      */
-    public function get(): void
+    public function export(): void
     {
-        $generator = $this->set();
+        $generator = $this->makeGenerator();
 
         while ($generator->valid()) {
             $generator->next();

src/ExportFromPDOStatement.php

@@ -22,7 +22,7 @@ public function __construct(PDOStatement $model, array $columns, string $filenam
     /**
      * @return Generator
      */
-    public function set(): Generator
+    public function makeGenerator(): Generator
     {
         $this->openOutputStream();
 
@@ -36,9 +36,9 @@ public function set(): Generator
     /**
      * Get data from PDO statement
      */
-    public function get(): void
+    public function export(): void
     {
-        $generator = $this->set();
+        $generator = $this->makeGenerator();
 
         while ($generator->valid()) {
             $generator->next();

src/ExportFromQueryBuilder.php

@@ -22,7 +22,7 @@ public function __construct(Builder $model, array $columns, string $filename)
     /**
      * @return Generator
      */
-    public function set(): Generator
+    public function makeGenerator(): Generator
     {
         $this->openOutputStream();
 
@@ -36,9 +36,9 @@ public function set(): Generator
     /*
      * Get data from query builder
      */
-    public function get(): void
+    public function export(): void
     {
-        $generator = $this->set();
+        $generator = $this->makeGenerator();
 
         while ($generator->valid()) {
             $generator->next();

src/Exporter.php

@@ -7,7 +7,6 @@
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use PDOStatement;
-use Sujan\Exporter\Contracts\ExporterContract;
 
 class Exporter
 {
@@ -62,8 +61,6 @@ private function setExporter($model, $columns, $filename)
                 throw new Exception('Type unknown');
         }
 
-        $this->exporter->set();
-
         return $this;
     }
 
@@ -72,6 +69,6 @@ private function setExporter($model, $columns, $filename)
      */
     public function export(): void
     {
-        $this->exporter->get();
+        $this->exporter->export();
     }
 }