luyadev / luya

core/helpers/ExportHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
 
     /**
      * @param array $input
-     * @param $delimiter
+     * @param string $delimiter
      * @return null|string
      * @since 1.0.4
      */

Spacing +3 added lines, -3 removed lines

@@ -140,7 +140,7 @@ 
     {
         $output = null;
         foreach ($input as $row) {
-            $output.= self::generateRow($row, $delimiter, '"');
+            $output .= self::generateRow($row, $delimiter, '"');
         }
 
         return $output;
@@ -157,13 +157,13 @@ 
      */
     protected static function generateRow(array $row, $delimiter, $enclose)
     {
-        array_walk($row, function (&$item) use ($enclose) {
+        array_walk($row, function(&$item) use ($enclose) {
             if (!is_scalar($item)) {
                 $item = "array";
             }
             $item = $enclose.Html::encode($item).$enclose;
         });
 
-        return implode($delimiter, $row) . PHP_EOL;
+        return implode($delimiter, $row).PHP_EOL;
     }
 }

core/helpers/XLSXWriter.php

Doc Comments +26 added lines

@@ -109,6 +109,9 @@ 
         return $string;
     }
 
+    /**
+     * @param string $filename
+     */
     public function writeToFile($filename)
     {
         foreach ($this->sheets as $sheet_name => $sheet) {
@@ -237,6 +240,9 @@ 
         $sheet->file_writer->write('<sheetData>');
     }
 
+    /**
+     * @param null|string $cell_style_string
+     */
     private function addCellStyle($number_format, $cell_style_string)
     {
         $number_format_idx = self::add_to_list_get_index($this->number_formats, $number_format);
@@ -261,6 +267,9 @@ 
         return $column_types;
     }
 
+    /**
+     * @param string $sheet_name
+     */
     public function writeSheetHeader($sheet_name, array $header_types, $col_options = null)
     {
         if (empty($sheet_name) || empty($header_types) || !empty($this->sheets[$sheet_name])) {
@@ -296,6 +305,9 @@ 
         $this->current_sheet = $sheet_name;
     }
 
+    /**
+     * @param string $sheet_name
+     */
     public function writeSheetRow($sheet_name, array $row, $row_options = null)
     {
         if (empty($sheet_name)) {
@@ -409,6 +421,10 @@ 
         $this->finalizeSheet($sheet_name);
     }
 
+    /**
+     * @param integer $row_number
+     * @param integer $column_number
+     */
     protected function writeCell(
         XLSXWriter_BuffererWriter &$file,
         $row_number,
@@ -863,6 +879,10 @@ 
     }
 
     //------------------------------------------------------------------
+
+    /**
+     * @param string $num_format
+     */
     private static function determineNumberFormatType($num_format)
     {
         $num_format = preg_replace("/\[(Black|Blue|Cyan|Green|Magenta|Red|White|Yellow)\]/i", "", $num_format);
@@ -1053,6 +1073,9 @@ 
     protected $buffer = '';
     protected $check_utf8 = false;
 
+    /**
+     * @param string $filename
+     */
     public function __construct($filename, $fd_fopen_flags = 'w', $check_utf8 = false)
     {
         $this->check_utf8 = $check_utf8;
@@ -1114,6 +1137,9 @@ 
         return -1;
     }
 
+    /**
+     * @param string $string
+     */
     protected static function isValidUTF8($string)
     {
         if (function_exists('mb_check_encoding')) {

Spacing +119 added lines, -119 removed lines

@@ -112,24 +112,24 @@ 
     public function writeToFile($filename)
     {
         foreach ($this->sheets as $sheet_name => $sheet) {
-            self::finalizeSheet($sheet_name);//making sure all footers have been written
+            self::finalizeSheet($sheet_name); //making sure all footers have been written
         }
 
         if (file_exists($filename)) {
             if (is_writable($filename)) {
                 @unlink($filename); //if the zip already exists, remove it
             } else {
-                self::log("Error in " . __CLASS__ . "::" . __FUNCTION__ . ", file is not writeable.");
+                self::log("Error in ".__CLASS__."::".__FUNCTION__.", file is not writeable.");
                 return;
             }
         }
         $zip = new ZipArchive();
         if (empty($this->sheets)) {
-            self::log("Error in " . __CLASS__ . "::" . __FUNCTION__ . ", no worksheets defined.");
+            self::log("Error in ".__CLASS__."::".__FUNCTION__.", no worksheets defined.");
             return;
         }
         if (!$zip->open($filename, ZipArchive::CREATE)) {
-            self::log("Error in " . __CLASS__ . "::" . __FUNCTION__ . ", unable to create zip.");
+            self::log("Error in ".__CLASS__."::".__FUNCTION__.", unable to create zip.");
             return;
         }
 
@@ -142,11 +142,11 @@ 
 
         $zip->addEmptyDir("xl/worksheets/");
         foreach ($this->sheets as $sheet) {
-            $zip->addFile($sheet->filename, "xl/worksheets/" . $sheet->xmlname);
+            $zip->addFile($sheet->filename, "xl/worksheets/".$sheet->xmlname);
         }
         $zip->addFromString("xl/workbook.xml", self::buildWorkbookXML());
         $zip->addFile($this->writeStylesXML(),
-            "xl/styles.xml");  //$zip->addFromString("xl/styles.xml"           , self::buildStylesXML() );
+            "xl/styles.xml"); //$zip->addFromString("xl/styles.xml"           , self::buildStylesXML() );
         $zip->addFromString("[Content_Types].xml", self::buildContentTypesXML());
 
         $zip->addEmptyDir("xl/_rels/");
@@ -167,8 +167,8 @@ 
         }
 
         $sheet_filename = $this->tempFilename();
-        $sheet_xmlname = 'sheet' . (count($this->sheets) + 1) . ".xml";
-        $this->sheets[$sheet_name] = (object)array(
+        $sheet_xmlname = 'sheet'.(count($this->sheets) + 1).".xml";
+        $this->sheets[$sheet_name] = (object) array(
             'filename' => $sheet_filename,
             'sheetname' => $sheet_name,
             'xmlname' => $sheet_xmlname,
@@ -184,41 +184,41 @@ 
             'finalized' => false,
         );
         $sheet = &$this->sheets[$sheet_name];
-        $tabselected = count($this->sheets) == 1 ? 'true' : 'false';//only first sheet is selected
-        $max_cell = XLSXWriter::xlsCell(self::EXCEL_2007_MAX_ROW, self::EXCEL_2007_MAX_COL);//XFE1048577
-        $sheet->file_writer->write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n");
+        $tabselected = count($this->sheets) == 1 ? 'true' : 'false'; //only first sheet is selected
+        $max_cell = XLSXWriter::xlsCell(self::EXCEL_2007_MAX_ROW, self::EXCEL_2007_MAX_COL); //XFE1048577
+        $sheet->file_writer->write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
         $sheet->file_writer->write('<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">');
         $sheet->file_writer->write('<sheetPr filterMode="false">');
         $sheet->file_writer->write('<pageSetUpPr fitToPage="false"/>');
         $sheet->file_writer->write('</sheetPr>');
         $sheet->max_cell_tag_start = $sheet->file_writer->ftell();
-        $sheet->file_writer->write('<dimension ref="A1:' . $max_cell . '"/>');
+        $sheet->file_writer->write('<dimension ref="A1:'.$max_cell.'"/>');
         $sheet->max_cell_tag_end = $sheet->file_writer->ftell();
         $sheet->file_writer->write('<sheetViews>');
-        $sheet->file_writer->write('<sheetView colorId="64" defaultGridColor="true" rightToLeft="false" showFormulas="false" showGridLines="true" showOutlineSymbols="true" showRowColHeaders="true" showZeros="true" tabSelected="' . $tabselected . '" topLeftCell="A1" view="normal" windowProtection="false" workbookViewId="0" zoomScale="100" zoomScaleNormal="100" zoomScalePageLayoutView="100">');
+        $sheet->file_writer->write('<sheetView colorId="64" defaultGridColor="true" rightToLeft="false" showFormulas="false" showGridLines="true" showOutlineSymbols="true" showRowColHeaders="true" showZeros="true" tabSelected="'.$tabselected.'" topLeftCell="A1" view="normal" windowProtection="false" workbookViewId="0" zoomScale="100" zoomScaleNormal="100" zoomScalePageLayoutView="100">');
         if ($sheet->freeze_rows && $sheet->freeze_columns) {
-            $sheet->file_writer->write('<pane ySplit="' . $sheet->freeze_rows . '" xSplit="' . $sheet->freeze_columns . '" topLeftCell="' . self::xlsCell($sheet->freeze_rows,
-                    $sheet->freeze_columns) . '" activePane="bottomRight" state="frozen"/>');
-            $sheet->file_writer->write('<selection activeCell="' . self::xlsCell($sheet->freeze_rows,
-                    0) . '" activeCellId="0" pane="topRight" sqref="' . self::xlsCell($sheet->freeze_rows, 0) . '"/>');
-            $sheet->file_writer->write('<selection activeCell="' . self::xlsCell(0,
-                    $sheet->freeze_columns) . '" activeCellId="0" pane="bottomLeft" sqref="' . self::xlsCell(0,
-                    $sheet->freeze_columns) . '"/>');
-            $sheet->file_writer->write('<selection activeCell="' . self::xlsCell($sheet->freeze_rows,
-                    $sheet->freeze_columns) . '" activeCellId="0" pane="bottomRight" sqref="' . self::xlsCell($sheet->freeze_rows,
-                    $sheet->freeze_columns) . '"/>');
+            $sheet->file_writer->write('<pane ySplit="'.$sheet->freeze_rows.'" xSplit="'.$sheet->freeze_columns.'" topLeftCell="'.self::xlsCell($sheet->freeze_rows,
+                    $sheet->freeze_columns).'" activePane="bottomRight" state="frozen"/>');
+            $sheet->file_writer->write('<selection activeCell="'.self::xlsCell($sheet->freeze_rows,
+                    0).'" activeCellId="0" pane="topRight" sqref="'.self::xlsCell($sheet->freeze_rows, 0).'"/>');
+            $sheet->file_writer->write('<selection activeCell="'.self::xlsCell(0,
+                    $sheet->freeze_columns).'" activeCellId="0" pane="bottomLeft" sqref="'.self::xlsCell(0,
+                    $sheet->freeze_columns).'"/>');
+            $sheet->file_writer->write('<selection activeCell="'.self::xlsCell($sheet->freeze_rows,
+                    $sheet->freeze_columns).'" activeCellId="0" pane="bottomRight" sqref="'.self::xlsCell($sheet->freeze_rows,
+                    $sheet->freeze_columns).'"/>');
         } elseif ($sheet->freeze_rows) {
-            $sheet->file_writer->write('<pane ySplit="' . $sheet->freeze_rows . '" topLeftCell="' . self::xlsCell($sheet->freeze_rows,
-                    0) . '" activePane="bottomLeft" state="frozen"/>');
-            $sheet->file_writer->write('<selection activeCell="' . self::xlsCell($sheet->freeze_rows,
-                    0) . '" activeCellId="0" pane="bottomLeft" sqref="' . self::xlsCell($sheet->freeze_rows,
-                    0) . '"/>');
+            $sheet->file_writer->write('<pane ySplit="'.$sheet->freeze_rows.'" topLeftCell="'.self::xlsCell($sheet->freeze_rows,
+                    0).'" activePane="bottomLeft" state="frozen"/>');
+            $sheet->file_writer->write('<selection activeCell="'.self::xlsCell($sheet->freeze_rows,
+                    0).'" activeCellId="0" pane="bottomLeft" sqref="'.self::xlsCell($sheet->freeze_rows,
+                    0).'"/>');
         } elseif ($sheet->freeze_columns) {
-            $sheet->file_writer->write('<pane xSplit="' . $sheet->freeze_columns . '" topLeftCell="' . self::xlsCell(0,
-                    $sheet->freeze_columns) . '" activePane="topRight" state="frozen"/>');
-            $sheet->file_writer->write('<selection activeCell="' . self::xlsCell(0,
-                    $sheet->freeze_columns) . '" activeCellId="0" pane="topRight" sqref="' . self::xlsCell(0,
-                    $sheet->freeze_columns) . '"/>');
+            $sheet->file_writer->write('<pane xSplit="'.$sheet->freeze_columns.'" topLeftCell="'.self::xlsCell(0,
+                    $sheet->freeze_columns).'" activePane="topRight" state="frozen"/>');
+            $sheet->file_writer->write('<selection activeCell="'.self::xlsCell(0,
+                    $sheet->freeze_columns).'" activeCellId="0" pane="topRight" sqref="'.self::xlsCell(0,
+                    $sheet->freeze_columns).'"/>');
         } else { // not frozen
             $sheet->file_writer->write('<selection activeCell="A1" activeCellId="0" pane="topLeft" sqref="A1"/>');
         }
@@ -228,11 +228,11 @@ 
         $i = 0;
         if (!empty($col_widths)) {
             foreach ($col_widths as $column_width) {
-                $sheet->file_writer->write('<col collapsed="false" hidden="false" max="' . ($i + 1) . '" min="' . ($i + 1) . '" style="0" customWidth="true" width="' . floatval($column_width) . '"/>');
+                $sheet->file_writer->write('<col collapsed="false" hidden="false" max="'.($i + 1).'" min="'.($i + 1).'" style="0" customWidth="true" width="'.floatval($column_width).'"/>');
                 $i++;
             }
         }
-        $sheet->file_writer->write('<col collapsed="false" hidden="false" max="1024" min="' . ($i + 1) . '" style="0" customWidth="false" width="11.5"/>');
+        $sheet->file_writer->write('<col collapsed="false" hidden="false" max="1024" min="'.($i + 1).'" style="0" customWidth="false" width="11.5"/>');
         $sheet->file_writer->write('</cols>');
         $sheet->file_writer->write('<sheetData>');
     }
@@ -240,7 +240,7 @@ 
     private function addCellStyle($number_format, $cell_style_string)
     {
         $number_format_idx = self::add_to_list_get_index($this->number_formats, $number_format);
-        $lookup_string = $number_format_idx . ";" . $cell_style_string;
+        $lookup_string = $number_format_idx.";".$cell_style_string;
         $cell_style_idx = self::add_to_list_get_index($this->cell_styles, $lookup_string);
         return $cell_style_idx;
     }
@@ -253,7 +253,7 @@ 
             $number_format_type = self::determineNumberFormatType($number_format);
             $cell_style_idx = $this->addCellStyle($number_format, $style_string = null);
             $column_types[] = array(
-                'number_format' => $number_format,//contains excel format like 'YYYY-MM-DD HH:MM:SS'
+                'number_format' => $number_format, //contains excel format like 'YYYY-MM-DD HH:MM:SS'
                 'number_format_type' => $number_format_type, //contains friendly format like 'datetime'
                 'default_cell_style' => $cell_style_idx,
             );
@@ -274,7 +274,7 @@ 
         }
         $style = &$col_options;
 
-        $col_widths = isset($col_options['widths']) ? (array)$col_options['widths'] : array();
+        $col_widths = isset($col_options['widths']) ? (array) $col_options['widths'] : array();
         $auto_filter = isset($col_options['auto_filter']) ? intval($col_options['auto_filter']) : false;
         $freeze_rows = isset($col_options['freeze_rows']) ? intval($col_options['freeze_rows']) : false;
         $freeze_columns = isset($col_options['freeze_columns']) ? intval($col_options['freeze_columns']) : false;
@@ -284,7 +284,7 @@ 
         if (!$suppress_row) {
             $header_row = array_keys($header_types);
 
-            $sheet->file_writer->write('<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="' . (1) . '">');
+            $sheet->file_writer->write('<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'.(1).'">');
             foreach ($header_row as $c => $v) {
                 $cell_style_idx = empty($style) ? $sheet->columns[$c]['default_cell_style'] : $this->addCellStyle('GENERAL',
                     json_encode(isset($style[0]) ? $style[$c] : $style));
@@ -306,18 +306,18 @@ 
         $sheet = &$this->sheets[$sheet_name];
         if (count($sheet->columns) < count($row)) {
             $default_column_types = $this->initializeColumnTypes(array_fill($from = 0, $until = count($row),
-                'GENERAL'));//will map to n_auto
-            $sheet->columns = array_merge((array)$sheet->columns, $default_column_types);
+                'GENERAL')); //will map to n_auto
+            $sheet->columns = array_merge((array) $sheet->columns, $default_column_types);
         }
 
         if (!empty($row_options)) {
             $ht = isset($row_options['height']) ? floatval($row_options['height']) : 12.1;
             $customHt = isset($row_options['height']) ? true : false;
-            $hidden = isset($row_options['hidden']) ? (bool)($row_options['hidden']) : false;
-            $collapsed = isset($row_options['collapsed']) ? (bool)($row_options['collapsed']) : false;
-            $sheet->file_writer->write('<row collapsed="' . ($collapsed) . '" customFormat="false" customHeight="' . ($customHt) . '" hidden="' . ($hidden) . '" ht="' . ($ht) . '" outlineLevel="0" r="' . ($sheet->row_count + 1) . '">');
+            $hidden = isset($row_options['hidden']) ? (bool) ($row_options['hidden']) : false;
+            $collapsed = isset($row_options['collapsed']) ? (bool) ($row_options['collapsed']) : false;
+            $sheet->file_writer->write('<row collapsed="'.($collapsed).'" customFormat="false" customHeight="'.($customHt).'" hidden="'.($hidden).'" ht="'.($ht).'" outlineLevel="0" r="'.($sheet->row_count + 1).'">');
         } else {
-            $sheet->file_writer->write('<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="' . ($sheet->row_count + 1) . '">');
+            $sheet->file_writer->write('<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'.($sheet->row_count + 1).'">');
         }
 
         $style = &$row_options;
@@ -354,7 +354,7 @@ 
         if (!empty($sheet->merge_cells)) {
             $sheet->file_writer->write('<mergeCells>');
             foreach ($sheet->merge_cells as $range) {
-                $sheet->file_writer->write('<mergeCell ref="' . $range . '"/>');
+                $sheet->file_writer->write('<mergeCell ref="'.$range.'"/>');
             }
             $sheet->file_writer->write('</mergeCells>');
         }
@@ -362,7 +362,7 @@ 
         $max_cell = self::xlsCell($sheet->row_count - 1, count($sheet->columns) - 1);
 
         if ($sheet->auto_filter) {
-            $sheet->file_writer->write('<autoFilter ref="A1:' . $max_cell . '"/>');
+            $sheet->file_writer->write('<autoFilter ref="A1:'.$max_cell.'"/>');
         }
 
         $sheet->file_writer->write('<printOptions headings="false" gridLines="false" gridLinesSet="true" horizontalCentered="false" verticalCentered="false"/>');
@@ -374,10 +374,10 @@ 
         $sheet->file_writer->write('</headerFooter>');
         $sheet->file_writer->write('</worksheet>');
 
-        $max_cell_tag = '<dimension ref="A1:' . $max_cell . '"/>';
+        $max_cell_tag = '<dimension ref="A1:'.$max_cell.'"/>';
         $padding_length = $sheet->max_cell_tag_end - $sheet->max_cell_tag_start - strlen($max_cell_tag);
         $sheet->file_writer->fseek($sheet->max_cell_tag_start);
-        $sheet->file_writer->write($max_cell_tag . str_repeat(" ", $padding_length));
+        $sheet->file_writer->write($max_cell_tag.str_repeat(" ", $padding_length));
         $sheet->file_writer->close();
         $sheet->finalized = true;
     }
@@ -393,7 +393,7 @@ 
 
         $startCell = self::xlsCell($start_cell_row, $start_cell_column);
         $endCell = self::xlsCell($end_cell_row, $end_cell_column);
-        $sheet->merge_cells[] = $startCell . ":" . $endCell;
+        $sheet->merge_cells[] = $startCell.":".$endCell;
     }
 
     public function writeSheet(array $data, $sheet_name = '', array $header_types = array())
@@ -420,24 +420,24 @@ 
         $cell_name = self::xlsCell($row_number, $column_number);
 
         if (!is_scalar($value) || $value === '') { //objects, array, empty
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '"/>');
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'"/>');
         } elseif (is_string($value) && $value{0} == '=') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="s"><f>' . self::xmlspecialchars($value) . '</f></c>');
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="s"><f>'.self::xmlspecialchars($value).'</f></c>');
         } elseif ($num_format_type == 'n_date') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="n"><v>' . intval(self::convert_date_time($value)) . '</v></c>');
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="n"><v>'.intval(self::convert_date_time($value)).'</v></c>');
         } elseif ($num_format_type == 'n_datetime') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="n"><v>' . self::convert_date_time($value) . '</v></c>');
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="n"><v>'.self::convert_date_time($value).'</v></c>');
         } elseif ($num_format_type == 'n_numeric') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="n"><v>' . self::xmlspecialchars($value) . '</v></c>');//int,float,currency
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="n"><v>'.self::xmlspecialchars($value).'</v></c>'); //int,float,currency
         } elseif ($num_format_type == 'n_string') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="inlineStr"><is><t>' . self::xmlspecialchars($value) . '</t></is></c>');
+            $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="inlineStr"><is><t>'.self::xmlspecialchars($value).'</t></is></c>');
         } elseif ($num_format_type == 'n_auto' || 1) { //auto-detect unknown column types
             if (!is_string($value) || $value == '0' || ($value[0] != '0' && ctype_digit($value)) || preg_match("/^\-?(0|[1-9][0-9]*)(\.[0-9]+)?$/",
                     $value)
             ) {
-                $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="n"><v>' . self::xmlspecialchars($value) . '</v></c>');//int,float,currency
+                $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="n"><v>'.self::xmlspecialchars($value).'</v></c>'); //int,float,currency
             } else { //implied: ($cell_format=='string')
-                $file->write('<c r="' . $cell_name . '" s="' . $cell_style_idx . '" t="inlineStr"><is><t>' . self::xmlspecialchars($value) . '</t></is></c>');
+                $file->write('<c r="'.$cell_name.'" s="'.$cell_style_idx.'" t="inlineStr"><is><t>'.self::xmlspecialchars($value).'</t></is></c>');
             }
         }
     }
@@ -463,9 +463,9 @@ 
         static $horizontal_allowed = array('general', 'left', 'right', 'justify', 'center');
         static $vertical_allowed = array('bottom', 'center', 'distributed', 'top');
         $default_font = array('size' => '10', 'name' => 'Arial', 'family' => '2');
-        $fills = array('', '');//2 placeholders for static xml later
-        $fonts = array('', '', '', '');//4 placeholders for static xml later
-        $borders = array('');//1 placeholder for static xml later
+        $fills = array('', ''); //2 placeholders for static xml later
+        $fonts = array('', '', '', ''); //4 placeholders for static xml later
+        $borders = array(''); //1 placeholder for static xml later
         $style_indexes = array();
         foreach ($this->cell_styles as $i => $cell_style_string) {
             $semi_colon_pos = strpos($cell_style_string, ";");
@@ -473,7 +473,7 @@ 
             $style_json_string = substr($cell_style_string, $semi_colon_pos + 1);
             $style = @json_decode($style_json_string, $as_assoc = true);
 
-            $style_indexes[$i] = array('num_fmt_idx' => $number_format_idx);//initialize entry
+            $style_indexes[$i] = array('num_fmt_idx' => $number_format_idx); //initialize entry
             if (isset($style['border']) && is_string($style['border']))//border is a comma delimited str
             {
                 $border_value['side'] = array_intersect(explode(",", $style['border']), $border_allowed);
@@ -482,15 +482,15 @@ 
                 }
                 if (isset($style['border-color']) && is_string($style['border-color']) && $style['border-color'][0] == '#') {
                     $v = substr($style['border-color'], 1, 6);
-                    $v = strlen($v) == 3 ? $v[0] . $v[0] . $v[1] . $v[1] . $v[2] . $v[2] : $v;// expand cf0 => ccff00
-                    $border_value['color'] = "FF" . strtoupper($v);
+                    $v = strlen($v) == 3 ? $v[0].$v[0].$v[1].$v[1].$v[2].$v[2] : $v; // expand cf0 => ccff00
+                    $border_value['color'] = "FF".strtoupper($v);
                 }
                 $style_indexes[$i]['border_idx'] = self::add_to_list_get_index($borders, json_encode($border_value));
             }
             if (isset($style['fill']) && is_string($style['fill']) && $style['fill'][0] == '#') {
                 $v = substr($style['fill'], 1, 6);
-                $v = strlen($v) == 3 ? $v[0] . $v[0] . $v[1] . $v[1] . $v[2] . $v[2] : $v;// expand cf0 => ccff00
-                $style_indexes[$i]['fill_idx'] = self::add_to_list_get_index($fills, "FF" . strtoupper($v));
+                $v = strlen($v) == 3 ? $v[0].$v[0].$v[1].$v[1].$v[2].$v[2] : $v; // expand cf0 => ccff00
+                $style_indexes[$i]['fill_idx'] = self::add_to_list_get_index($fills, "FF".strtoupper($v));
             }
             if (isset($style['halign']) && in_array($style['halign'], $horizontal_allowed)) {
                 $style_indexes[$i]['alignment'] = true;
@@ -502,12 +502,12 @@ 
             }
             if (isset($style['wrap_text'])) {
                 $style_indexes[$i]['alignment'] = true;
-                $style_indexes[$i]['wrap_text'] = (bool)$style['wrap_text'];
+                $style_indexes[$i]['wrap_text'] = (bool) $style['wrap_text'];
             }
 
             $font = $default_font;
             if (isset($style['font-size'])) {
-                $font['size'] = floatval($style['font-size']);//floatval to allow "10.5" etc
+                $font['size'] = floatval($style['font-size']); //floatval to allow "10.5" etc
             }
             if (isset($style['font']) && is_string($style['font'])) {
                 if ($style['font'] == 'Comic Sans MS') {
@@ -537,8 +537,8 @@ 
             }
             if (isset($style['color']) && is_string($style['color']) && $style['color'][0] == '#') {
                 $v = substr($style['color'], 1, 6);
-                $v = strlen($v) == 3 ? $v[0] . $v[0] . $v[1] . $v[1] . $v[2] . $v[2] : $v;// expand cf0 => ccff00
-                $font['color'] = "FF" . strtoupper($v);
+                $v = strlen($v) == 3 ? $v[0].$v[0].$v[1].$v[1].$v[2].$v[2] : $v; // expand cf0 => ccff00
+                $font['color'] = "FF".strtoupper($v);
             }
             if ($font != $default_font) {
                 $style_indexes[$i]['font_idx'] = self::add_to_list_get_index($fonts, json_encode($font));
@@ -557,11 +557,11 @@ 
 
         $temporary_filename = $this->tempFilename();
         $file = new XLSXWriter_BuffererWriter($temporary_filename);
-        $file->write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n");
+        $file->write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
         $file->write('<styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">');
-        $file->write('<numFmts count="' . count($this->number_formats) . '">');
+        $file->write('<numFmts count="'.count($this->number_formats).'">');
         foreach ($this->number_formats as $i => $v) {
-            $file->write('<numFmt numFmtId="' . (164 + $i) . '" formatCode="' . self::xmlspecialchars($v) . '" />');
+            $file->write('<numFmt numFmtId="'.(164 + $i).'" formatCode="'.self::xmlspecialchars($v).'" />');
         }
         //$file->write(		'<numFmt formatCode="GENERAL" numFmtId="164"/>');
         //$file->write(		'<numFmt formatCode="[$$-1009]#,##0.00;[RED]\-[$$-1009]#,##0.00" numFmtId="165"/>');
@@ -569,7 +569,7 @@ 
         //$file->write(		'<numFmt formatCode="YYYY-MM-DD" numFmtId="167"/>');
         $file->write('</numFmts>');
 
-        $file->write('<fonts count="' . (count($fonts)) . '">');
+        $file->write('<fonts count="'.(count($fonts)).'">');
         $file->write('<font><name val="Arial"/><charset val="1"/><family val="2"/><sz val="10"/></font>');
         $file->write('<font><name val="Arial"/><family val="0"/><sz val="10"/></font>');
         $file->write('<font><name val="Arial"/><family val="0"/><sz val="10"/></font>');
@@ -579,10 +579,10 @@ 
             if (!empty($font)) { //fonts have 4 empty placeholders in array to offset the 4 static xml entries above
                 $f = json_decode($font, true);
                 $file->write('<font>');
-                $file->write('<name val="' . htmlspecialchars($f['name']) . '"/><charset val="1"/><family val="' . intval($f['family']) . '"/>');
-                $file->write('<sz val="' . intval($f['size']) . '"/>');
+                $file->write('<name val="'.htmlspecialchars($f['name']).'"/><charset val="1"/><family val="'.intval($f['family']).'"/>');
+                $file->write('<sz val="'.intval($f['size']).'"/>');
                 if (!empty($f['color'])) {
-                    $file->write('<color rgb="' . strval($f['color']) . '"/>');
+                    $file->write('<color rgb="'.strval($f['color']).'"/>');
                 }
                 if (!empty($f['bold'])) {
                     $file->write('<b val="true"/>');
@@ -601,23 +601,23 @@ 
         }
         $file->write('</fonts>');
 
-        $file->write('<fills count="' . (count($fills)) . '">');
+        $file->write('<fills count="'.(count($fills)).'">');
         $file->write('<fill><patternFill patternType="none"/></fill>');
         $file->write('<fill><patternFill patternType="gray125"/></fill>');
         foreach ($fills as $fill) {
             if (!empty($fill)) { //fills have 2 empty placeholders in array to offset the 2 static xml entries above
-                $file->write('<fill><patternFill patternType="solid"><fgColor rgb="' . strval($fill) . '"/><bgColor indexed="64"/></patternFill></fill>');
+                $file->write('<fill><patternFill patternType="solid"><fgColor rgb="'.strval($fill).'"/><bgColor indexed="64"/></patternFill></fill>');
             }
         }
         $file->write('</fills>');
 
-        $file->write('<borders count="' . (count($borders)) . '">');
+        $file->write('<borders count="'.(count($borders)).'">');
         $file->write('<border diagonalDown="false" diagonalUp="false"><left/><right/><top/><bottom/><diagonal/></border>');
         foreach ($borders as $border) {
             if (!empty($border)) { //fonts have an empty placeholder in the array to offset the static xml entry above
                 $pieces = json_decode($border, true);
                 $border_style = !empty($pieces['style']) ? $pieces['style'] : 'hair';
-                $border_color = !empty($pieces['color']) ? '<color rgb="' . strval($pieces['color']) . '"/>' : '';
+                $border_color = !empty($pieces['color']) ? '<color rgb="'.strval($pieces['color']).'"/>' : '';
                 $file->write('<border diagonalDown="false" diagonalUp="false">');
                 foreach (array('left', 'right', 'top', 'bottom') as $side) {
                     $show_side = in_array($side, $pieces['side']) ? true : false;
@@ -655,7 +655,7 @@ 
         $file->write('<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="1" numFmtId="9"/>');
         $file->write('</cellStyleXfs>');
 
-        $file->write('<cellXfs count="' . (count($style_indexes)) . '">');
+        $file->write('<cellXfs count="'.(count($style_indexes)).'">');
         //$file->write(		'<xf applyAlignment="false" applyBorder="false" applyFont="false" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="164" xfId="0"/>');
         //$file->write(		'<xf applyAlignment="false" applyBorder="false" applyFont="false" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="165" xfId="0"/>');
         //$file->write(		'<xf applyAlignment="false" applyBorder="false" applyFont="false" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="166" xfId="0"/>');
@@ -671,8 +671,8 @@ 
             $fillIdx = isset($v['fill_idx']) ? intval($v['fill_idx']) : 0;
             $fontIdx = isset($v['font_idx']) ? intval($v['font_idx']) : 0;
             //$file->write('<xf applyAlignment="'.$applyAlignment.'" applyBorder="'.$applyBorder.'" applyFont="'.$applyFont.'" applyProtection="false" borderId="'.($borderIdx).'" fillId="'.($fillIdx).'" fontId="'.($fontIdx).'" numFmtId="'.(164+$v['num_fmt_idx']).'" xfId="0"/>');
-            $file->write('<xf applyAlignment="' . $applyAlignment . '" applyBorder="' . $applyBorder . '" applyFont="' . $applyFont . '" applyProtection="false" borderId="' . ($borderIdx) . '" fillId="' . ($fillIdx) . '" fontId="' . ($fontIdx) . '" numFmtId="' . (164 + $v['num_fmt_idx']) . '" xfId="0">');
-            $file->write('	<alignment horizontal="' . $horizAlignment . '" vertical="' . $vertAlignment . '" textRotation="0" wrapText="' . $wrapText . '" indent="0" shrinkToFit="false"/>');
+            $file->write('<xf applyAlignment="'.$applyAlignment.'" applyBorder="'.$applyBorder.'" applyFont="'.$applyFont.'" applyProtection="false" borderId="'.($borderIdx).'" fillId="'.($fillIdx).'" fontId="'.($fontIdx).'" numFmtId="'.(164 + $v['num_fmt_idx']).'" xfId="0">');
+            $file->write('	<alignment horizontal="'.$horizAlignment.'" vertical="'.$vertAlignment.'" textRotation="0" wrapText="'.$wrapText.'" indent="0" shrinkToFit="false"/>');
             $file->write('	<protection locked="true" hidden="false"/>');
             $file->write('</xf>');
         }
@@ -693,10 +693,10 @@ 
     protected function buildAppXML()
     {
         $app_xml = "";
-        $app_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n";
+        $app_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
         $app_xml .= '<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">';
         $app_xml .= '<TotalTime>0</TotalTime>';
-        $app_xml .= '<Company>' . self::xmlspecialchars($this->company) . '</Company>';
+        $app_xml .= '<Company>'.self::xmlspecialchars($this->company).'</Company>';
         $app_xml .= '</Properties>';
         return $app_xml;
     }
@@ -704,17 +704,17 @@ 
     protected function buildCoreXML()
     {
         $core_xml = "";
-        $core_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n";
+        $core_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
         $core_xml .= '<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
-        $core_xml .= '<dcterms:created xsi:type="dcterms:W3CDTF">' . date("Y-m-d\TH:i:s.00\Z") . '</dcterms:created>';//$date_time = '2014-10-25T15:54:37.00Z';
-        $core_xml .= '<dc:title>' . self::xmlspecialchars($this->title) . '</dc:title>';
-        $core_xml .= '<dc:subject>' . self::xmlspecialchars($this->subject) . '</dc:subject>';
-        $core_xml .= '<dc:creator>' . self::xmlspecialchars($this->author) . '</dc:creator>';
+        $core_xml .= '<dcterms:created xsi:type="dcterms:W3CDTF">'.date("Y-m-d\TH:i:s.00\Z").'</dcterms:created>'; //$date_time = '2014-10-25T15:54:37.00Z';
+        $core_xml .= '<dc:title>'.self::xmlspecialchars($this->title).'</dc:title>';
+        $core_xml .= '<dc:subject>'.self::xmlspecialchars($this->subject).'</dc:subject>';
+        $core_xml .= '<dc:creator>'.self::xmlspecialchars($this->author).'</dc:creator>';
         if (!empty($this->keywords)) {
-            $core_xml .= '<cp:keywords>' . self::xmlspecialchars(implode(", ",
-                    (array)$this->keywords)) . '</cp:keywords>';
+            $core_xml .= '<cp:keywords>'.self::xmlspecialchars(implode(", ",
+                    (array) $this->keywords)).'</cp:keywords>';
         }
-        $core_xml .= '<dc:description>' . self::xmlspecialchars($this->description) . '</dc:description>';
+        $core_xml .= '<dc:description>'.self::xmlspecialchars($this->description).'</dc:description>';
         $core_xml .= '<cp:revision>0</cp:revision>';
         $core_xml .= '</cp:coreProperties>';
         return $core_xml;
@@ -723,7 +723,7 @@ 
     protected function buildRelationshipsXML()
     {
         $rels_xml = "";
-        $rels_xml .= '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
+        $rels_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
         $rels_xml .= '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
         $rels_xml .= '<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>';
         $rels_xml .= '<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>';
@@ -737,14 +737,14 @@ 
     {
         $i = 0;
         $workbook_xml = "";
-        $workbook_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n";
+        $workbook_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
         $workbook_xml .= '<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">';
         $workbook_xml .= '<fileVersion appName="Calc"/><workbookPr backupFile="false" showObjects="all" date1904="false"/><workbookProtection/>';
         $workbook_xml .= '<bookViews><workbookView activeTab="0" firstSheet="0" showHorizontalScroll="true" showSheetTabs="true" showVerticalScroll="true" tabRatio="212" windowHeight="8192" windowWidth="16384" xWindow="0" yWindow="0"/></bookViews>';
         $workbook_xml .= '<sheets>';
         foreach ($this->sheets as $sheet_name => $sheet) {
             $sheetname = self::sanitize_sheetname($sheet->sheetname);
-            $workbook_xml .= '<sheet name="' . self::xmlspecialchars($sheetname) . '" sheetId="' . ($i + 1) . '" state="visible" r:id="rId' . ($i + 2) . '"/>';
+            $workbook_xml .= '<sheet name="'.self::xmlspecialchars($sheetname).'" sheetId="'.($i + 1).'" state="visible" r:id="rId'.($i + 2).'"/>';
             $i++;
         }
         $workbook_xml .= '</sheets>';
@@ -752,8 +752,8 @@ 
         foreach ($this->sheets as $sheet_name => $sheet) {
             if ($sheet->auto_filter) {
                 $sheetname = self::sanitize_sheetname($sheet->sheetname);
-                $workbook_xml .= '<definedName name="_xlnm._FilterDatabase" localSheetId="0" hidden="1">\'' . self::xmlspecialchars($sheetname) . '\'!$A$1:' . self::xlsCell($sheet->row_count - 1,
-                        count($sheet->columns) - 1, true) . '</definedName>';
+                $workbook_xml .= '<definedName name="_xlnm._FilterDatabase" localSheetId="0" hidden="1">\''.self::xmlspecialchars($sheetname).'\'!$A$1:'.self::xlsCell($sheet->row_count - 1,
+                        count($sheet->columns) - 1, true).'</definedName>';
                 $i++;
             }
         }
@@ -766,11 +766,11 @@ 
     {
         $i = 0;
         $wkbkrels_xml = "";
-        $wkbkrels_xml .= '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
+        $wkbkrels_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
         $wkbkrels_xml .= '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
         $wkbkrels_xml .= '<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>';
         foreach ($this->sheets as $sheet_name => $sheet) {
-            $wkbkrels_xml .= '<Relationship Id="rId' . ($i + 2) . '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/' . ($sheet->xmlname) . '"/>';
+            $wkbkrels_xml .= '<Relationship Id="rId'.($i + 2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/'.($sheet->xmlname).'"/>';
             $i++;
         }
         $wkbkrels_xml .= "\n";
@@ -781,12 +781,12 @@ 
     protected function buildContentTypesXML()
     {
         $content_types_xml = "";
-        $content_types_xml .= '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
+        $content_types_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
         $content_types_xml .= '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">';
         $content_types_xml .= '<Override PartName="/_rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
         $content_types_xml .= '<Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
         foreach ($this->sheets as $sheet_name => $sheet) {
-            $content_types_xml .= '<Override PartName="/xl/worksheets/' . ($sheet->xmlname) . '" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
+            $content_types_xml .= '<Override PartName="/xl/worksheets/'.($sheet->xmlname).'" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
         }
         $content_types_xml .= '<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>';
         $content_types_xml .= '<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>';
@@ -808,19 +808,19 @@ 
     {
         $n = $column_number;
         for ($r = ""; $n >= 0; $n = intval($n / 26) - 1) {
-            $r = chr($n % 26 + 0x41) . $r;
+            $r = chr($n % 26 + 0x41).$r;
         }
         if ($absolute) {
-            return '$' . $r . '$' . ($row_number + 1);
+            return '$'.$r.'$'.($row_number + 1);
         }
-        return $r . ($row_number + 1);
+        return $r.($row_number + 1);
     }
 
     //------------------------------------------------------------------
     public static function log($string)
     {
         file_put_contents("php://stderr",
-            date("Y-m-d H:i:s:") . rtrim(is_array($string) ? json_encode($string) : $string) . "\n");
+            date("Y-m-d H:i:s:").rtrim(is_array($string) ? json_encode($string) : $string)."\n");
     }
 
     //------------------------------------------------------------------
@@ -840,8 +840,8 @@ 
         static $goodchars = '        ';
         $sheetname = strtr($sheetname, $badchars, $goodchars);
         $sheetname = substr($sheetname, 0, 31);
-        $sheetname = trim(trim(trim($sheetname), "'"));//trim before and after trimming single quotes
-        return !empty($sheetname) ? $sheetname : 'Sheet' . ((rand() % 900) + 100);
+        $sheetname = trim(trim(trim($sheetname), "'")); //trim before and after trimming single quotes
+        return !empty($sheetname) ? $sheetname : 'Sheet'.((rand() % 900) + 100);
     }
 
     //------------------------------------------------------------------
@@ -851,7 +851,7 @@ 
         static $badchars = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0b\x0c\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x7f";
         static $goodchars = "                              ";
         return strtr(htmlspecialchars($val, ENT_QUOTES | ENT_XML1), $badchars,
-            $goodchars);//strtr appears to be faster than str_replace
+            $goodchars); //strtr appears to be faster than str_replace
     }
 
     //------------------------------------------------------------------
@@ -955,7 +955,7 @@ 
                 }
             }
             if ($ignore_until == '' && ($c == ' ' || $c == '-' || $c == '(' || $c == ')') && ($i == 0 || $num_format[$i - 1] != '_')) {
-                $escaped .= "\\" . $c;
+                $escaped .= "\\".$c;
             } else {
                 $escaped .= $c;
             }
@@ -977,8 +977,8 @@ 
     //------------------------------------------------------------------
     public static function convert_date_time($date_input) //thanks to Excel::Writer::XLSX::Worksheet.pm (perl)
     {
-        $days = 0;    # Number of days since epoch
-        $seconds = 0;    # Time expressed as fraction of 24h hours in seconds
+        $days = 0; # Number of days since epoch
+        $seconds = 0; # Time expressed as fraction of 24h hours in seconds
         $year = $month = $day = 0;
         $hour = $min = $sec = 0;
 
@@ -1029,13 +1029,13 @@ 
         }
 
         # Accumulate the number of days since the epoch.
-        $days = $day;    # Add days for current month
-        $days += array_sum(array_slice($mdays, 0, $month - 1));    # Add days for past months
-        $days += $range * 365;                      # Add days for past years
-        $days += intval(($range) / 4);             # Add leapdays
+        $days = $day; # Add days for current month
+        $days += array_sum(array_slice($mdays, 0, $month - 1)); # Add days for past months
+        $days += $range * 365; # Add days for past years
+        $days += intval(($range) / 4); # Add leapdays
         $days -= intval(($range + $offset) / 100); # Subtract 100 year leapdays
-        $days += intval(($range + $offset + $norm) / 400);  # Add 400 year leapdays
-        $days -= $leap;                                      # Already counted above
+        $days += intval(($range + $offset + $norm) / 400); # Add 400 year leapdays
+        $days -= $leap; # Already counted above
 
         # Adjust for Excel erroneously treating 1900 as a leap year.
         if ($days > 59) {

Braces +3 added lines, -1 removed lines

@@ -474,9 +474,11 @@
             $style = @json_decode($style_json_string, $as_assoc = true);
 
             $style_indexes[$i] = array('num_fmt_idx' => $number_format_idx);//initialize entry
-            if (isset($style['border']) && is_string($style['border']))//border is a comma delimited str
+            if (isset($style['border']) && is_string($style['border'])) {
+                //border is a comma delimited str
             {
                 $border_value['side'] = array_intersect(explode(",", $style['border']), $border_allowed);
+            }
                 if (isset($style['border-style']) && in_array($style['border-style'], $border_style_allowed)) {
                     $border_value['style'] = $style['border-style'];
                 }