merge conflict resolved

Author: sujancse

README.md

@@ -19,14 +19,14 @@ $columns = [
     'email'
 ];
 
-$exporter = new Export(
-    User::query(), // Query Builder
-    $columns
-);
+$users = User::query(); // Query builder
 
-$exporter->export();
+Exporter::init($users, $columns, 'users.csv');
+Exporter::export();
 ```
 
+Or you can pass `Collection` or `Array`. But it is **highly recommended** to pass the **`Query Builder`** as it will use generator to save memory usage.
+
 **For eloquent relation**
 ```$xslt
 $columns = [
@@ -46,3 +46,43 @@ $exporter->export();
 ```
 
 Where `user` is the relation name, which is same as is in the `$columns` variable.
+
+## Usage with raw PHP (PDOStatement)
+
+Usage with PDO is straight forward. You **MUST** have to add the following code
+```$xslt
+$stmt->setFetchMode(PDO::FETCH_ASSOC); // N.B. must be included
+```
+
+And then pass the `$stmt` to `Exporter`
+```$xslt
+    $servername = "localhost";
+    $username = "root";
+    $password = "password";
+    $dbname = "laravel";
+
+    $columns = [
+        'id',
+        'name',
+        'email'
+    ];
+
+    try {
+        $conn = new PDO("mysql:host=$servername;dbname=$dbname", $username, $password);
+        $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        $stmt = $conn->prepare("SELECT id, name, email FROM users");
+        $stmt->execute();
+
+        // set the resulting array to associative
+        $stmt->setFetchMode(PDO::FETCH_ASSOC);
+
+        Exporter::init($stmt, $userData, 'users.csv');
+        Exporter::export();
+    }
+    catch(PDOException $e) {
+        echo "Error: " . $e->getMessage();
+    }
+    $conn = null;
+```
+
+## You are always welcome to contribute

composer.json

@@ -10,7 +10,10 @@
         }
     ],
     "minimum-stability": "dev",
-    "require": {},
+    "require": {
+        "php": "^5.5",
+        "ext-pdo": "*"
+    },
     "autoload": {
         "psr-4": {
             "Sujan\\Exporter\\": "src/"

src/Export.php

@@ -4,8 +4,10 @@
 namespace Sujan\Exporter;
 
 
+use Exception;
 use Generator;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 
 class Export
 {
@@ -27,7 +29,7 @@ class Export
     /**
      * @var string
      */
-    private $contentType;
+    private $contentType = 'application/csv';
 
     /**
      * @var string
@@ -37,43 +39,39 @@ class Export
     /**
      * @var string
      */
-    private $delimiter;
+    private $delimiter = ";";
 
     /**
      * Export constructor.
-     * @param Builder|null $model
+     * @param object | array $model
      * @param array $columns
-     * @param string $contentType
      * @param string $filename
-     * @param string $delimiter
      */
     public function __construct(
-        Builder $model = null,
+        $model,
         array $columns = [],
-        string $contentType = 'application/csv',
-        string $filename = 'export.csv',
-        string $delimiter = ";"
+        string $filename = 'export.csv'
     )
     {
         $this->setModel($model);
         $this->setColumns($columns);
         $this->setHeading($columns);
         $this->setFilename($filename);
-        $this->setContentType($contentType);
-        $this->setDelimiter($delimiter);
+        $this->setContentType();
     }
 
     /**
-     * @param $contentType
+     * Set content type
      */
-    public function setContentType($contentType)
+    public function setContentType()
     {
-        header("Content-Type: {$contentType}");
+        header("Content-Type: {$this->contentType}");
         header("Content-Disposition: attachment; filename={$this->filename};");
     }
 
     /**
      * return generated CSV
+     * @throws Exception
      */
     public function export()
     {
@@ -88,6 +86,7 @@ public function export()
 
     /**
      * @return Generator
+     * @throws Exception
      */
     public function write()
     {
@@ -96,10 +95,40 @@ public function write()
 
         fputcsv($file, $this->heading, $this->delimiter);
 
-        foreach ($this->model->get() as $data) {
-            $line = $this->getLine($data);
+        if (is_array($this->model)) {
+            foreach ($this->model as $data) {
+                $line = $this->getLine($data);
 
-            yield fputcsv($file, $line, $this->delimiter);
+                yield fputcsv($file, $line, $this->delimiter);
+            }
+        } else {
+            $className = !is_string($this->model) ? class_basename($this->model) : null;
+
+            switch ($className) {
+                case 'Collection':
+                    foreach ($this->model as $data) {
+                        $line = $this->getLine($data);
+
+                        yield fputcsv($file, $line, $this->delimiter);
+                    }
+                    break;
+                case 'Builder':
+                    foreach ($this->model->get() as $data) {
+                        $line = $this->getLine($data);
+
+                        yield fputcsv($file, $line, $this->delimiter);
+                    }
+                    break;
+                case 'PDOStatement':
+                    foreach ($this->model->fetchAll() as $data) {
+                        $line = $this->getLine($data);
+
+                        yield fputcsv($file, $line, $this->delimiter);
+                    }
+                    break;
+                default:
+                    throw new Exception('Type unknown');
+            }
         }
 
         fclose($file);
@@ -118,7 +147,8 @@ public function getLine($data)
                 $value = $this->getNestedData($data, $key, $k);
                 array_push($line, $value);
             } else {
-                array_push($line, $data->{$key});
+                $value = is_array($data) ? $data[$key] : $data->{$key};
+                array_push($line, $value);
             }
         }
 
@@ -134,7 +164,11 @@ public function getLine($data)
     public function getNestedData($data, $keys, $k)
     {
         foreach ($keys as $kk => $key) {
-            $data = isset($data->{$k}->{$key}) ? $data->{$k}->{$key} : '';
+            if (is_array($data)) {
+                $data = isset($data[$k][$key]) ? $data[$k][$key] : '';
+            } else {
+                $data = isset($data->{$k}->{$key}) ? $data->{$k}->{$key} : '';
+            }
 
             if (is_array($data)) {
                 $this->getNestedData($data, $key, $kk);
@@ -153,9 +187,9 @@ protected function setDelimiter(string $delimiter): void
     }
 
     /**
-     * @param Builder $model
+     * @param object | array $model
      */
-    protected function setModel(Builder $model): void
+    protected function setModel($model): void
     {
         $this->model = $model;
     }

src/Exporter.php

@@ -0,0 +1,33 @@
+<?php
+
+
+namespace Sujan\Exporter;
+
+
+use Exception;
+
+class Exporter
+{
+    protected static $exporter;
+
+    /**
+     * @param $model
+     * @param array $columns
+     * @param string $filename
+     * @throws Exception
+     */
+    public static function init($model, array $columns, string $filename): void
+    {
+        if (gettype($model) == 'string') throw new Exception('Type string for model is not allowed.');
+
+        self::$exporter = new Export($model, $columns, $filename);
+    }
+
+    /**
+     * Export the data and die
+     */
+    public static function export(): void
+    {
+        self::$exporter->export();
+    }
+}

src/contracts/ExporterContract.php

@@ -0,0 +1,12 @@
+<?php
+
+
+namespace Sujan\Exporter\contracts;
+
+
+
+interface ExporterContract
+{
+    public function init($model, array $columns, $filename): void;
+    public function export(): void;
+}