Config settings for strict null comparision for array export, fixes i…

…ssue #135
SpartnerNL · May 29, 2014 · 0bd516b · 0bd516b
1 parent fa9cd5e
commit 0bd516b
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 0 deletions.
diff --git a/src/Maatwebsite/Excel/Classes/LaravelExcelWorksheet.php b/src/Maatwebsite/Excel/Classes/LaravelExcelWorksheet.php
@@ -365,6 +365,26 @@ public function fromModel($source = NULL, $headingGeneration = true)
         return parent::fromArray($this->data);
     }
 
+    /**
+     * Fill worksheet from values in array
+     *
+     * @param array $source Source array
+     * @param mixed $nullValue Value in source array that stands for blank cell
+     * @param string $startCell Insert array starting from this cell address as the top left coordinate
+     * @param boolean $strictNullComparison Apply strict comparison when testing for null values in the array
+     * @throws PHPExcel_Exception
+     * @return PHPExcel_Worksheet
+     */
+    public function fromArray($source = null, $nullValue = null, $startCell = false, $strictNullComparison = false)
+    {
+        // Set defaults
+        $nullValue = !is_null($nullValue) ? $nullValue : $this->getDefaultNullValue();
+        $startCell = $startCell ? $startCell : $this->getDefaultStartCell();
+        $strictNullComparison = $strictNullComparison ? $strictNullComparison : $this->getDefaultStrictNullComparison();
+
+        return parent::fromArray($source, $nullValue, $startCell, $strictNullComparison);
+    }
+
     /**
      * Add vars to the data array
      * @param [type]  $key   [description]
@@ -909,6 +929,34 @@ protected function getStartRow()
         return $this->getHighestRow() + 1;
     }
 
+    /**
+     * Return default null value
+     * @return string/integer/null
+     */
+    protected function getDefaultNullValue()
+    {
+        return Config::get('excel::export.sheets.nullValue', null);
+    }
+
+    /**
+     * Return default null value
+     * @return string/integer/null
+     */
+    protected function getDefaultStartCell()
+    {
+        return Config::get('excel::export.sheets.startCell', 'A1');
+    }
+
+
+    /**
+     * Return default strict null comparison
+     * @return boolean
+     */
+    protected function getDefaultStrictNullComparison()
+    {
+        return Config::get('excel::export.sheets.strictNullComparison', false);
+    }
+
     /**
      * Dynamically call methods
      * @param  [type] $method [description]

diff --git a/src/config/export.php b/src/config/export.php
@@ -24,6 +24,36 @@
     */
     'generate_heading_by_indices'  => true,
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default sheet settings
+    |--------------------------------------------------------------------------
+    */
+    'sheets'    => array(
+
+        /*
+        |--------------------------------------------------------------------------
+        | Value in source array that stands for blank cell
+        |--------------------------------------------------------------------------
+        */
+        'nullValue'             => null,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Insert array starting from this cell address as the top left coordinate
+        |--------------------------------------------------------------------------
+        */
+        'startCell'             => 'A2',
+
+        /*
+        |--------------------------------------------------------------------------
+        | Apply strict comparison when testing for null values in the array
+        |--------------------------------------------------------------------------
+        */
+        'strictNullComparison'  => false
+    ),
+
     /*
     |--------------------------------------------------------------------------
     | Store settings