viliy / xlsx-writer

src/XlsxWriter.class.php

Spacing +30 added lines, -32 removed lines

@@ -189,7 +189,7 @@ 
     public function writeToFile($filename)
     {
         foreach ($this->sheets as $sheetName => $sheet) {
-            self::finalizeSheet($sheetName);//making sure all footers have been written
+            self::finalizeSheet($sheetName); //making sure all footers have been written
         }
 
         if (file_exists($filename)) {
@@ -216,7 +216,7 @@ 
             $zip->addFile($sheet->filename, "xl/worksheets/" . $sheet->xmlname);
         }
         $zip->addFromString("xl/workbook.xml", XlsxBuilder::buildWorkbookXML($this->sheets));
-        $zip->addFile($this->writeStylesXML(), "xl/styles.xml");  //$zip->addFromString("xl/styles.xml", self::buildStylesXML() );
+        $zip->addFile($this->writeStylesXML(), "xl/styles.xml"); //$zip->addFromString("xl/styles.xml", self::buildStylesXML() );
         $zip->addFromString("[Content_Types].xml", XlsxBuilder::buildContentTypesXML($this->sheets));
         $zip->addEmptyDir("xl/_rels/");
         $zip->addFromString("xl/_rels/workbook.xml.rels", self::buildWorkbookRelsXML());
@@ -242,8 +242,7 @@ 
             );
             foreach ($headerRow as $c => $v) {
                 $cellStyleIdx = empty($style) ?
-                    $sheet->columns[$c]['default_cell_style'] :
-                    $this->addCellStyle('GENERAL', json_encode(isset($style[0]) ? $style[$c] : $style));
+                    $sheet->columns[$c]['default_cell_style'] : $this->addCellStyle('GENERAL', json_encode(isset($style[0]) ? $style[$c] : $style));
                 $sheet->writeCell(0, $c, $v, 'n_string', $cellStyleIdx);
             }
             $writer->write('</row>');
@@ -257,7 +256,7 @@ 
             $numberFormat = Support::numberFormatStandardized($v);
             $cellStyleIdx = $this->addCellStyle($numberFormat, $styleString = null);
             $columns[] = [
-                'number_format' => $numberFormat,      //contains excel format like 'YYYY-MM-DD HH:MM:SS'
+                'number_format' => $numberFormat, //contains excel format like 'YYYY-MM-DD HH:MM:SS'
                 'number_format_type' => Support::determineNumberFormatType($numberFormat), //contains friendly format like 'datetime'
                 'default_cell_style' => $cellStyleIdx,
             ];
@@ -331,7 +330,7 @@ 
             $numberFormat_type = self::determineNumberFormatType($numberFormat);
             $cellStyleIdx = $this->addCellStyle($numberFormat, $styleString = null);
             $column_types[] = [
-                'number_format' => $numberFormat,      //contains excel format like 'YYYY-MM-DD HH:MM:SS'
+                'number_format' => $numberFormat, //contains excel format like 'YYYY-MM-DD HH:MM:SS'
                 'number_format_type' => $numberFormat_type, //contains friendly format like 'datetime'
                 'default_cell_style' => $cellStyleIdx,
             ];
@@ -387,7 +386,7 @@ 
         /* @var $sheet Sheet */
         $sheet = $this->sheets[$sheetName];
         if (count($sheet->columns) < count($row)) {
-            $default_column_types = $this->initColumnsTypes(array_fill($from = 0, $until = count($row), 'GENERAL'));//will map to n_auto
+            $default_column_types = $this->initColumnsTypes(array_fill($from = 0, $until = count($row), 'GENERAL')); //will map to n_auto
             $sheet->columns = array_merge((array)$sheet->columns, $default_column_types);
         }
 
@@ -407,8 +406,7 @@ 
 
             $numberFormat = $sheet->columns[$c]['number_format'];
             $numberFormatType = $sheet->columns[$c]['number_format_type'];
-            $cellStyleIdx = empty($style) ? $sheet->columns[$c]['default_cell_style'] :
-                $this->addCellStyle($numberFormat, json_encode(isset($style[0]) ? $style[$c] : $style));
+            $cellStyleIdx = empty($style) ? $sheet->columns[$c]['default_cell_style'] : $this->addCellStyle($numberFormat, json_encode(isset($style[0]) ? $style[$c] : $style));
             $this->writeCell($sheet->fileWriter, $sheet->rowCount, $c, $v, $numberFormatType, $cellStyleIdx);
             $c++;
         }
@@ -532,12 +530,12 @@ 
         } elseif ($numFormatType == 'n_datetime') {
             $file->write('<c r="' . $cell_name . '" s="' . $cellStyleIdx . '" t="n"><v>' . self::convertDateTime($value) . '</v></c>');
         } elseif ($numFormatType == 'n_numeric') {
-            $file->write('<c r="' . $cell_name . '" s="' . $cellStyleIdx . '" t="n"><v>' . self::xmlSpecialChars($value) . '</v></c>');//int,float,currency
+            $file->write('<c r="' . $cell_name . '" s="' . $cellStyleIdx . '" t="n"><v>' . self::xmlSpecialChars($value) . '</v></c>'); //int,float,currency
         } elseif ($numFormatType == 'n_string') {
             $file->write('<c r="' . $cell_name . '" s="' . $cellStyleIdx . '" t="inlineStr"><is><t>' . self::xmlSpecialChars($value) . '</t></is></c>');
         } elseif ($numFormatType == '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="' . $cellStyleIdx . '" t="n"><v>' . self::xmlSpecialChars($value) . '</v></c>');//int,float,currency
+                $file->write('<c r="' . $cell_name . '" s="' . $cellStyleIdx . '" t="n"><v>' . self::xmlSpecialChars($value) . '</v></c>'); //int,float,currency
             } else { //implied: ($cell_format=='string')
                 $file->write('<c r="' . $cell_name . '" s="' . $cellStyleIdx . '" t="inlineStr"><is><t>' . self::xmlSpecialChars($value) . '</t></is></c>');
             }
@@ -554,9 +552,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->cellStyles as $i => $cellStyleString) {
             $semi_colon_pos = strpos($cellStyleString, ";");
@@ -564,7 +562,7 @@ 
             $style_json_string = substr($cellStyleString, $semi_colon_pos + 1);
             $style = @json_decode($style_json_string, $as_assoc = true);
 
-            $style_indexes[$i] = array('num_fmt_idx' => $numberFormatIdx);//initialize entry
+            $style_indexes[$i] = array('num_fmt_idx' => $numberFormatIdx); //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);
@@ -573,14 +571,14 @@ 
                 }
                 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
+                    $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::add2listGetIndex($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
+                $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::add2listGetIndex($fills, "FF" . strtoupper($v));
             }
             if (isset($style['halign']) && in_array($style['halign'], $horizontal_allowed)) {
@@ -598,7 +596,7 @@ 
 
             $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') {
@@ -628,7 +626,7 @@ 
             }
             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
+                $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) {
@@ -799,7 +797,7 @@ 
         $coreXml = "";
         $coreXml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n";
         $coreXml .= '<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">';
-        $coreXml .= '<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';
+        $coreXml .= '<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';
         $coreXml .= '<dc:title>' . self::xmlSpecialChars($this->title) . '</dc:title>';
         $coreXml .= '<dc:subject>' . self::xmlSpecialChars($this->subject) . '</dc:subject>';
         $coreXml .= '<dc:creator>' . self::xmlSpecialChars($this->author) . '</dc:creator>';
@@ -948,7 +946,7 @@ 
         static $goodchars = '        ';
         $sheetname = strtr($sheetname, $badchars, $goodchars);
         $sheetname = mb_substr($sheetname, 0, 31);
-        $sheetname = trim(trim(trim($sheetname), "'"));//trim before and after trimming single quotes
+        $sheetname = trim(trim(trim($sheetname), "'")); //trim before and after trimming single quotes
 
         return !empty($sheetname) ? $sheetname : 'Sheet' . ((rand() % 900) + 100);
     }
@@ -966,7 +964,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
+        return strtr(htmlspecialchars($val, ENT_QUOTES | ENT_XML1), $badchars, $goodchars); //strtr appears to be faster than str_replace
     }
 
     /**
@@ -1108,7 +1106,7 @@ 
      */
     public static function convertDateTime($dateInput)
     {
-        $seconds = 0;    # Time expressed as fraction of 24h hours in seconds
+        $seconds = 0; # Time expressed as fraction of 24h hours in seconds
         $year = $month = $day = 0;
 
         $date_time = $dateInput;
@@ -1123,9 +1121,9 @@ 
 
         //using 1900 as epoch, not 1904, ignoring 1904 special case
         # Special cases for Excel.
-        if ("$year-$month-$day" == '1899-12-31') return $seconds;    # Excel 1900 epoch
-        if ("$year-$month-$day" == '1900-01-00') return $seconds;    # Excel 1900 epoch
-        if ("$year-$month-$day" == '1900-02-29') return 60 + $seconds;    # Excel false leapday
+        if ("$year-$month-$day" == '1899-12-31') return $seconds; # Excel 1900 epoch
+        if ("$year-$month-$day" == '1900-01-00') return $seconds; # Excel 1900 epoch
+        if ("$year-$month-$day" == '1900-02-29') return 60 + $seconds; # Excel false leapday
         # We calculate the date by calculating the number of days since the epoch
         # and adjust for the number of leap days. We calculate the number of leap
         # days by normalising the year in relation to the epoch. Thus the year 2000
@@ -1142,13 +1140,13 @@ 
         if ($month < 1 || $month > 12) return 0;
         if ($day < 1 || $day > $mdays[$month - 1]) return 0;
         # 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) {
             $days++;

Braces +81 added lines, -36 removed lines

@@ -346,8 +346,9 @@ 
      */
     public function writeSheetHeader($sheetName, array $headerTypes, $colOptions = null)
     {
-        if (empty($sheetName) || empty($headerTypes) || !empty($this->sheets[$sheetName]))
-            return;
+        if (empty($sheetName) || empty($headerTypes) || !empty($this->sheets[$sheetName])) {
+                    return;
+        }
 
         $suppress_row = isset($colOptions['suppress_row']) ? intval($colOptions['suppress_row']) : false;
         if (is_bool($colOptions)) {
@@ -380,8 +381,9 @@ 
      */
     public function writeSheetRow($sheetName, array $row, $rowOptions = null)
     {
-        if (empty($sheetName))
-            return;
+        if (empty($sheetName)) {
+                    return;
+        }
 
         $this->initSheet($sheetName);
         /* @var $sheet Sheet */
@@ -434,8 +436,9 @@ 
      */
     protected function finalizeSheet($sheetName)
     {
-        if (empty($sheetName) || $this->sheets[$sheetName]->finalized)
-            return;
+        if (empty($sheetName) || $this->sheets[$sheetName]->finalized) {
+                    return;
+        }
 
         /* @var $sheet Sheet */
         $sheet = &$this->sheets[$sheetName];
@@ -482,8 +485,9 @@ 
      */
     public function markMergedCell($sheetName, $startCellRow, $startCellColumn, $endCellRow, $endCellColumn)
     {
-        if (empty($sheetName) || $this->sheets[$sheetName]->finalized)
-            return;
+        if (empty($sheetName) || $this->sheets[$sheetName]->finalized) {
+                    return;
+        }
 
         $this->initSheet($sheetName);
         $sheet = &$this->sheets[$sheetName];
@@ -565,9 +569,11 @@ 
             $style = @json_decode($style_json_string, $as_assoc = true);
 
             $style_indexes[$i] = array('num_fmt_idx' => $numberFormatIdx);//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'];
                 }
@@ -993,17 +999,39 @@ 
     private static function determineNumberFormatType($numFormat)
     {
         $numFormat = preg_replace("/\[(Black|Blue|Cyan|Green|Magenta|Red|White|Yellow)\]/i", "", $numFormat);
-        if ($numFormat == 'GENERAL') return 'n_auto';
-        if ($numFormat == '@') return 'n_string';
-        if ($numFormat == '0') return 'n_numeric';
-        if (preg_match('/[H]{1,2}:[M]{1,2}(?![^"]*+")/i', $numFormat)) return 'n_datetime';
-        if (preg_match('/[M]{1,2}:[S]{1,2}(?![^"]*+")/i', $numFormat)) return 'n_datetime';
-        if (preg_match('/[Y]{2,4}(?![^"]*+")/i', $numFormat)) return 'n_date';
-        if (preg_match('/[D]{1,2}(?![^"]*+")/i', $numFormat)) return 'n_date';
-        if (preg_match('/[M]{1,2}(?![^"]*+")/i', $numFormat)) return 'n_date';
-        if (preg_match('/$(?![^"]*+")/', $numFormat)) return 'n_numeric';
-        if (preg_match('/%(?![^"]*+")/', $numFormat)) return 'n_numeric';
-        if (preg_match('/0(?![^"]*+")/', $numFormat)) return 'n_numeric';
+        if ($numFormat == 'GENERAL') {
+            return 'n_auto';
+        }
+        if ($numFormat == '@') {
+            return 'n_string';
+        }
+        if ($numFormat == '0') {
+            return 'n_numeric';
+        }
+        if (preg_match('/[H]{1,2}:[M]{1,2}(?![^"]*+")/i', $numFormat)) {
+            return 'n_datetime';
+        }
+        if (preg_match('/[M]{1,2}:[S]{1,2}(?![^"]*+")/i', $numFormat)) {
+            return 'n_datetime';
+        }
+        if (preg_match('/[Y]{2,4}(?![^"]*+")/i', $numFormat)) {
+            return 'n_date';
+        }
+        if (preg_match('/[D]{1,2}(?![^"]*+")/i', $numFormat)) {
+            return 'n_date';
+        }
+        if (preg_match('/[M]{1,2}(?![^"]*+")/i', $numFormat)) {
+            return 'n_date';
+        }
+        if (preg_match('/$(?![^"]*+")/', $numFormat)) {
+            return 'n_numeric';
+        }
+        if (preg_match('/%(?![^"]*+")/', $numFormat)) {
+            return 'n_numeric';
+        }
+        if (preg_match('/0(?![^"]*+")/', $numFormat)) {
+            return 'n_numeric';
+        }
         return 'n_auto';
 
         switch ($numFormat) {
@@ -1070,16 +1098,18 @@ 
         $escaped = '';
         for ($i = 0, $ix = strlen($numFormat); $i < $ix; $i++) {
             $c = $numFormat[$i];
-            if ($ignoreUntil == '' && $c == '[')
-                $ignoreUntil = ']';
-            else if ($ignoreUntil == '' && $c == '"')
-                $ignoreUntil = '"';
-            else if ($ignoreUntil == $c)
-                $ignoreUntil = '';
-            if ($ignoreUntil == '' && ($c == ' ' || $c == '-' || $c == '(' || $c == ')') && ($i == 0 || $numFormat[$i - 1] != '_'))
-                $escaped .= "\\" . $c;
-            else
-                $escaped .= $c;
+            if ($ignoreUntil == '' && $c == '[') {
+                            $ignoreUntil = ']';
+            } else if ($ignoreUntil == '' && $c == '"') {
+                            $ignoreUntil = '"';
+            } else if ($ignoreUntil == $c) {
+                            $ignoreUntil = '';
+            }
+            if ($ignoreUntil == '' && ($c == ' ' || $c == '-' || $c == '(' || $c == ')') && ($i == 0 || $numFormat[$i - 1] != '_')) {
+                            $escaped .= "\\" . $c;
+            } else {
+                            $escaped .= $c;
+            }
         }
 
         return $escaped;
@@ -1123,9 +1153,18 @@ 
 
         //using 1900 as epoch, not 1904, ignoring 1904 special case
         # Special cases for Excel.
-        if ("$year-$month-$day" == '1899-12-31') return $seconds;    # Excel 1900 epoch
-        if ("$year-$month-$day" == '1900-01-00') return $seconds;    # Excel 1900 epoch
-        if ("$year-$month-$day" == '1900-02-29') return 60 + $seconds;    # Excel false leapday
+        if ("$year-$month-$day" == '1899-12-31') {
+            return $seconds;
+        }
+        # Excel 1900 epoch
+        if ("$year-$month-$day" == '1900-01-00') {
+            return $seconds;
+        }
+        # Excel 1900 epoch
+        if ("$year-$month-$day" == '1900-02-29') {
+            return 60 + $seconds;
+        }
+        # Excel false leapday
         # We calculate the date by calculating the number of days since the epoch
         # and adjust for the number of leap days. We calculate the number of leap
         # days by normalising the year in relation to the epoch. Thus the year 2000
@@ -1138,9 +1177,15 @@ 
         $leap = (($year % 400 == 0) || (($year % 4 == 0) && ($year % 100))) ? 1 : 0;
         $mdays = array(31, ($leap ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
         # Some boundary checks
-        if ($year < $epoch || $year > 9999) return 0;
-        if ($month < 1 || $month > 12) return 0;
-        if ($day < 1 || $day > $mdays[$month - 1]) return 0;
+        if ($year < $epoch || $year > 9999) {
+            return 0;
+        }
+        if ($month < 1 || $month > 12) {
+            return 0;
+        }
+        if ($day < 1 || $day > $mdays[$month - 1]) {
+            return 0;
+        }
         # 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

src/Support.php

Spacing +12 added lines, -12 removed lines

@@ -145,7 +145,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
+        return strtr(htmlspecialchars($val, ENT_QUOTES | ENT_XML1), $badchars, $goodchars); //strtr appears to be faster than str_replace
     }
 
     /**
@@ -155,7 +155,7 @@ 
      */
     public static function convertDateTime($dateInput)
     {
-        $seconds = 0;    # Time expressed as fraction of 24h hours in seconds
+        $seconds = 0; # Time expressed as fraction of 24h hours in seconds
         $year    = $month = $day = 0;
 
         $date_time = $dateInput;
@@ -170,9 +170,9 @@ 
 
         //using 1900 as epoch, not 1904, ignoring 1904 special case
         # Special cases for Excel.
-        if ("$year-$month-$day" == '1899-12-31') return $seconds;    # Excel 1900 epoch
-        if ("$year-$month-$day" == '1900-01-00') return $seconds;    # Excel 1900 epoch
-        if ("$year-$month-$day" == '1900-02-29') return 60 + $seconds;    # Excel false leapday
+        if ("$year-$month-$day" == '1899-12-31') return $seconds; # Excel 1900 epoch
+        if ("$year-$month-$day" == '1900-01-00') return $seconds; # Excel 1900 epoch
+        if ("$year-$month-$day" == '1900-02-29') return 60 + $seconds; # Excel false leapday
         # We calculate the date by calculating the number of days since the epoch
         # and adjust for the number of leap days. We calculate the number of leap
         # days by normalising the year in relation to the epoch. Thus the year 2000
@@ -189,13 +189,13 @@ 
         if ($month < 1 || $month > 12) return 0;
         if ($day < 1 || $day > $mdays[$month - 1]) return 0;
         # 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) {
             $days++;
@@ -210,7 +210,7 @@ 
         static $goodchars = '        ';
         $sheetname = strtr($sheetname, $badchars, $goodchars);
         $sheetname = mb_substr($sheetname, 0, 31);
-        $sheetname = trim(trim(trim($sheetname), "'"));//trim before and after trimming single quotes
+        $sheetname = trim(trim(trim($sheetname), "'")); //trim before and after trimming single quotes
 
         return !empty($sheetname) ? $sheetname : 'Sheet' . ((rand() % 900) + 100);
     }

Braces +33 added lines, -16 removed lines

@@ -76,16 +76,18 @@ 
         $escaped     = '';
         for ($i = 0, $ix = strlen($numFormat); $i < $ix; $i++) {
             $c = $numFormat[$i];
-            if ($ignoreUntil == '' && $c == '[')
-                $ignoreUntil = ']';
-            else if ($ignoreUntil == '' && $c == '"')
-                $ignoreUntil = '"';
-            else if ($ignoreUntil == $c)
-                $ignoreUntil = '';
-            if ($ignoreUntil == '' && ($c == ' ' || $c == '-' || $c == '(' || $c == ')') && ($i == 0 || $numFormat[$i - 1] != '_'))
-                $escaped .= "\\" . $c;
-            else
-                $escaped .= $c;
+            if ($ignoreUntil == '' && $c == '[') {
+                            $ignoreUntil = ']';
+            } else if ($ignoreUntil == '' && $c == '"') {
+                            $ignoreUntil = '"';
+            } else if ($ignoreUntil == $c) {
+                            $ignoreUntil = '';
+            }
+            if ($ignoreUntil == '' && ($c == ' ' || $c == '-' || $c == '(' || $c == ')') && ($i == 0 || $numFormat[$i - 1] != '_')) {
+                            $escaped .= "\\" . $c;
+            } else {
+                            $escaped .= $c;
+            }
         }
 
         return $escaped;
@@ -170,9 +172,18 @@ 
 
         //using 1900 as epoch, not 1904, ignoring 1904 special case
         # Special cases for Excel.
-        if ("$year-$month-$day" == '1899-12-31') return $seconds;    # Excel 1900 epoch
-        if ("$year-$month-$day" == '1900-01-00') return $seconds;    # Excel 1900 epoch
-        if ("$year-$month-$day" == '1900-02-29') return 60 + $seconds;    # Excel false leapday
+        if ("$year-$month-$day" == '1899-12-31') {
+            return $seconds;
+        }
+        # Excel 1900 epoch
+        if ("$year-$month-$day" == '1900-01-00') {
+            return $seconds;
+        }
+        # Excel 1900 epoch
+        if ("$year-$month-$day" == '1900-02-29') {
+            return 60 + $seconds;
+        }
+        # Excel false leapday
         # We calculate the date by calculating the number of days since the epoch
         # and adjust for the number of leap days. We calculate the number of leap
         # days by normalising the year in relation to the epoch. Thus the year 2000
@@ -185,9 +196,15 @@ 
         $leap  = (($year % 400 == 0) || (($year % 4 == 0) && ($year % 100))) ? 1 : 0;
         $mdays = array(31, ($leap ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
         # Some boundary checks
-        if ($year < $epoch || $year > 9999) return 0;
-        if ($month < 1 || $month > 12) return 0;
-        if ($day < 1 || $day > $mdays[$month - 1]) return 0;
+        if ($year < $epoch || $year > 9999) {
+            return 0;
+        }
+        if ($month < 1 || $month > 12) {
+            return 0;
+        }
+        if ($day < 1 || $day > $mdays[$month - 1]) {
+            return 0;
+        }
         # 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

src/Writer/Style.php

Spacing +8 added lines, -8 removed lines

@@ -67,16 +67,16 @@ 
 
     public function styleFontIndexes(array $cellStyles)
     {
-        $fills        = ['', ''];//2 placeholders for static xml later
-        $fonts        = ['', '', '', ''];//4 placeholders for static xml later
-        $borders      = [''];//1 placeholder for static xml later
+        $fills        = ['', '']; //2 placeholders for static xml later
+        $fonts        = ['', '', '', '']; //4 placeholders for static xml later
+        $borders      = ['']; //1 placeholder for static xml later
         $styleIndexes = [];
         foreach ($cellStyles as $i => $cellStyleString) {
             $semiColonPos     = strpos($cellStyleString, ";");
             $numberFormatIdx  = substr($cellStyleString, 0, $semiColonPos);
             $styleJsonString  = substr($cellStyleString, $semiColonPos + 1);
             $style            = @json_decode($styleJsonString, true);
-            $styleIndexes[$i] = ['num_fmt_idx' => $numberFormatIdx];//initialize entry
+            $styleIndexes[$i] = ['num_fmt_idx' => $numberFormatIdx]; //initialize entry
             if (isset($style['border']) && is_string($style['border'])) { //border is a comma delimited str
                 $borderValue['side'] = array_intersect(explode(",", $style['border']), $this->borderAllowed);
                 if (isset($style['border-style']) && in_array($style['border-style'], $this->borderStyleAllowed)) {
@@ -84,14 +84,14 @@ 
                 }
                 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
+                    $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);
                 }
                 $styleIndexes[$i]['border_idx'] = Support::add2listGetIndex($borders, json_encode($borderValue));
             }
             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
+                $v                            = strlen($v) == 3 ? $v[0] . $v[0] . $v[1] . $v[1] . $v[2] . $v[2] : $v; // expand cf0 => ccff00
                 $styleIndexes[$i]['fill_idx'] = Support::add2listGetIndex($fills, "FF" . strtoupper($v));
             }
             if (isset($style['halign']) && in_array($style['halign'], $this->horizontalAllowed)) {
@@ -109,7 +109,7 @@ 
 
             $font = $this->defaultFont;
             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') {
@@ -139,7 +139,7 @@ 
             }
             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
+                $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 != $this->defaultFont) {

src/Writer/XlsxBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 <workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><fileVersion appName="Calc"/><workbookPr backupFile="false" showObjects="all" date1904="false"/><workbookProtection/><bookViews><workbookView activeTab="0" firstSheet="0" showHorizontalScroll="true" showSheetTabs="true" showVerticalScroll="true" tabRatio="212" windowHeight="8192" windowWidth="16384" xWindow="0" yWindow="0"/></bookViews><sheets>
 EOF;
         foreach ($sheets as $sheetName => $sheet) {
-            $sheetname   = Support::sanitizeSheetname($sheet->sheetname);
+            $sheetname = Support::sanitizeSheetname($sheet->sheetname);
             $workbookXml .= '<sheet name="' . Support::xmlSpecialChars($sheetname) .
                 '" sheetId="' . ($i + 1) . '" state="visible" r:id="rId' . ($i + 2) . '"/>';
             $i++;
@@ -102,7 +102,7 @@ 
         $workbookXml .= '</sheets><definedNames>';
         foreach ($sheets as $sheetName => $sheet) {
             if ($sheet->autoFilter) {
-                $sheetname   = Support::sanitizeSheetname($sheet->sheetname);
+                $sheetname = Support::sanitizeSheetname($sheet->sheetname);
                 $workbookXml .= '<definedName name="_xlnm._FilterDatabase" localSheetId="0" hidden="1">\'' .
                     Support::xmlSpecialChars($sheetname) . '\'!$A$1:' .
                     Support::xlsCell($sheet->rowCount - 1, count($sheet->columns) - 1, true) . '</definedName>';

src/Writer/Builder.php

Spacing +6 added lines, -8 removed lines

@@ -154,7 +154,7 @@ 
     public function writeToFile($filename)
     {
         foreach ($this->sheets as $sheetName => $sheet) {
-            $this->finalizeSheet($sheetName);//making sure all footers have been written
+            $this->finalizeSheet($sheetName); //making sure all footers have been written
         }
 
         if (file_exists($filename)) {
@@ -187,7 +187,7 @@ 
             $zip->addFile($sheet->filename, "xl/worksheets/" . $sheet->xmlname);
         }
         $zip->addFromString("xl/workbook.xml", XlsxBuilder::buildWorkbookXML($this->sheets));
-        $zip->addFile($this->writeStylesXML(), "xl/styles.xml");  //$zip->addFromString("xl/styles.xml", self::buildStylesXML() );
+        $zip->addFile($this->writeStylesXML(), "xl/styles.xml"); //$zip->addFromString("xl/styles.xml", self::buildStylesXML() );
         $zip->addFromString("[Content_Types].xml", XlsxBuilder::buildContentTypesXML($this->sheets));
         $zip->addEmptyDir("xl/_rels/");
         $zip->addFromString("xl/_rels/workbook.xml.rels", XlsxBuilder::buildWorkbookRelsXML($this->sheets));
@@ -208,7 +208,7 @@ 
         $this->initSheet($sheetName);
         $sheet = $this->getSheet();
         if (count($sheet->columns) < count($row)) {
-            $defaultColumnTypes = $this->initColumnsTypes(array_fill($from = 0, count($row), 'GENERAL'));//will map to n_auto
+            $defaultColumnTypes = $this->initColumnsTypes(array_fill($from = 0, count($row), 'GENERAL')); //will map to n_auto
             $sheet->columns = array_merge((array)$sheet->columns, $defaultColumnTypes);
         }
 
@@ -233,8 +233,7 @@ 
         foreach ($row as $v) {
             $numberFormat = $sheet->columns[$c]['number_format'];
             $numberFormatType = $sheet->columns[$c]['number_format_type'];
-            $cellStyleIdx = empty($style) ? $sheet->columns[$c]['default_cell_style'] :
-                $this->addCellStyle($numberFormat, json_encode(isset($style[0]) ? $style[$c] : $style));
+            $cellStyleIdx = empty($style) ? $sheet->columns[$c]['default_cell_style'] : $this->addCellStyle($numberFormat, json_encode(isset($style[0]) ? $style[$c] : $style));
             $sheet->writeCell($sheet->rowCount, $c, $v, $numberFormatType, $cellStyleIdx);
             $c++;
         }
@@ -432,8 +431,7 @@ 
             );
             foreach ($headerRow as $c => $v) {
                 $cellStyleIdx = empty($style) ?
-                    $sheet->columns[$c]['default_cell_style'] :
-                    $this->addCellStyle('GENERAL', json_encode(isset($style[0]) ? $style[$c] : $style));
+                    $sheet->columns[$c]['default_cell_style'] : $this->addCellStyle('GENERAL', json_encode(isset($style[0]) ? $style[$c] : $style));
                 $sheet->writeCell(0, $c, $v, 'n_string', $cellStyleIdx);
             }
             $writer->write('</row>');
@@ -447,7 +445,7 @@ 
             $numberFormat = Support::numberFormatStandardized($v);
             $cellStyleIdx = $this->addCellStyle($numberFormat, $styleString = null);
             $columns[] = [
-                'number_format' => $numberFormat,      //contains excel format like 'YYYY-MM-DD HH:MM:SS'
+                'number_format' => $numberFormat, //contains excel format like 'YYYY-MM-DD HH:MM:SS'
                 'number_format_type' => Support::determineNumberFormatType($numberFormat), //contains friendly format like 'datetime'
                 'default_cell_style' => $cellStyleIdx,
             ];

Braces +6 added lines, -4 removed lines

@@ -202,8 +202,9 @@ 
      */
     public function writeSheetRow($sheetName, array $row, $rowOptions = null)
     {
-        if (empty($sheetName))
-            return;
+        if (empty($sheetName)) {
+                    return;
+        }
 
         $this->initSheet($sheetName);
         $sheet = $this->getSheet();
@@ -249,8 +250,9 @@ 
      */
     protected function finalizeSheet($sheetName)
     {
-        if (empty($sheetName) || $this->sheets[$sheetName]->finalized)
-            return;
+        if (empty($sheetName) || $this->sheets[$sheetName]->finalized) {
+                    return;
+        }
 
         $sheet = $this->sheets[$sheetName];
         $sheet->finallyContent();

src/Writer/Sheet.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
                     break;
                 case 'n_numeric':
                     $file->write('<c r="' . $cellName . '" s="' . $cellStyleIdx . '" t="n"><v>' .
-                        Support::xmlSpecialChars($value) . '</v></c>');//int,float,currency
+                        Support::xmlSpecialChars($value) . '</v></c>'); //int,float,currency
                     break;
                 case 'n_string':
                     $file->write('<c r="' . $cellName . '" s="' . $cellStyleIdx . '" t="inlineStr"><is><t>' .
@@ -115,7 +115,7 @@ 
     {
         $writer      = $this->getFileWriter();
         $tabSelected = $isTabSelected ? 'true' : 'false';
-        $maxCell     = Support::xlsCell(XlsxWriter::EXCEL_2007_MAX_ROW, XlsxWriter::EXCEL_2007_MAX_COL);//XFE1048577
+        $maxCell     = Support::xlsCell(XlsxWriter::EXCEL_2007_MAX_ROW, XlsxWriter::EXCEL_2007_MAX_COL); //XFE1048577
         $writer->write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n");
         $writer->write(<<<EOF
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><sheetPr filterMode="false"><pageSetUpPr fitToPage="false"/></sheetPr>

example.php

Spacing +3 added lines, -3 removed lines

@@ -99,9 +99,9 @@
 {
     return [
         'SKU' => 'string',
-        '尺码' => 'string',  // sku
-        '净重' => 'string',  // sku
-        '单价' => 'prices',  // sku
+        '尺码' => 'string', // sku
+        '净重' => 'string', // sku
+        '单价' => 'prices', // sku
     ];
 }