viliy / xlsx-writer

src/Writer/Builder.php

Spacing +4 added lines, -6 removed lines

@@ -184,7 +184,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));
@@ -231,8 +231,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;
         }
@@ -430,8 +429,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>');
@@ -445,7 +443,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,
             ];

src/Writer/Sheet.php

Spacing +40 added lines, -40 removed lines

@@ -63,39 +63,39 @@ 
         $cellName = Support::xlsCell($rowNumber, $columnNumber);
         $file     = $this->getFileWriter();
         if (!is_scalar($value) || '' === $value) { //objects, array, empty
-            $file->write('<c r="'.$cellName.'" s="'.$cellStyleIdx.'"/>');
+            $file->write('<c r="' . $cellName . '" s="' . $cellStyleIdx . '"/>');
         } elseif (is_string($value) && '=' == $value[0]) {
-            $file->write('<c r="'.$cellName.'" s="'.$cellStyleIdx.'" t="s"><f>'.Support::xmlSpecialChars($value).'</f></c>');
+            $file->write('<c r="' . $cellName . '" s="' . $cellStyleIdx . '" t="s"><f>' . Support::xmlSpecialChars($value) . '</f></c>');
         } else {
             switch ($numFormatType) {
                 case 'n_date':
-                    $file->write('<c r="'.$cellName.'" s="'.$cellStyleIdx.'" t="n"><v>'.
-                        intval(Support::convertDateTime($value)).'</v></c>');
+                    $file->write('<c r="' . $cellName . '" s="' . $cellStyleIdx . '" t="n"><v>' .
+                        intval(Support::convertDateTime($value)) . '</v></c>');
                     break;
                 case 'n_datetime':
-                    $file->write('<c r="'.$cellName.'" s="'.$cellStyleIdx.'" t="n"><v>'.
-                        Support::convertDateTime($value).'</v></c>');
+                    $file->write('<c r="' . $cellName . '" s="' . $cellStyleIdx . '" t="n"><v>' .
+                        Support::convertDateTime($value) . '</v></c>');
                     break;
                 case 'n_numeric':
-                    $file->write('<c r="'.$cellName.'" s="'.$cellStyleIdx.'" t="n"><v>'.
-                        Support::xmlSpecialChars($value).'</v></c>'); //int,float,currency
+                    $file->write('<c r="' . $cellName . '" s="' . $cellStyleIdx . '" t="n"><v>' .
+                        Support::xmlSpecialChars($value) . '</v></c>'); //int,float,currency
                     break;
                 case 'n_string':
-                    $file->write('<c r="'.$cellName.'" s="'.$cellStyleIdx.'" t="inlineStr"><is><t>'.
-                        Support::xmlSpecialChars($value).'</t></is></c>');
+                    $file->write('<c r="' . $cellName . '" s="' . $cellStyleIdx . '" t="inlineStr"><is><t>' .
+                        Support::xmlSpecialChars($value) . '</t></is></c>');
                     break;
                 case 'n_auto':
                 default: //auto-detect unknown column types
                     if (!is_string($value) || '0' == $value || ('0' != $value[0] && ctype_digit($value)) || preg_match("/^\-?(0|[1-9][0-9]*)(\.[0-9]+)?$/", $value)
                     ) { //int,float,currency
                         $file->write(
-                            '<c r="'.$cellName.'" s="'.$cellStyleIdx.'" t="n"><v>'.
-                            Support::xmlSpecialChars($value).'</v></c>'
+                            '<c r="' . $cellName . '" s="' . $cellStyleIdx . '" t="n"><v>' .
+                            Support::xmlSpecialChars($value) . '</v></c>'
                         );
                     } else { //implied: ($cell_format=='string')
                         $file->write(
-                            '<c r="'.$cellName.'" s="'.$cellStyleIdx.'" t="inlineStr"><is><t>'.
-                            Support::xmlSpecialChars($value).'</t></is></c>'
+                            '<c r="' . $cellName . '" s="' . $cellStyleIdx . '" t="inlineStr"><is><t>' .
+                            Support::xmlSpecialChars($value) . '</t></is></c>'
                         );
                     }
                     break;
@@ -112,14 +112,14 @@ 
         $writer      = $this->getFileWriter();
         $tabSelected = $isTabSelected ? 'true' : 'false';
         $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('<?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>
 EOF
         );
         $this->maxCellTagStart = $this->fileWriter->ftell();
-        $writer->write('<dimension ref="A1:'.$maxCell.'"/>');
+        $writer->write('<dimension ref="A1:' . $maxCell . '"/>');
         $this->maxCellTagEnd = $this->fileWriter->ftell();
         $writer->write('<sheetViews>');
         $writer->write(
@@ -141,15 +141,15 @@ 
         if (!empty($colWidths)) {
             foreach ($colWidths as $colWidth) {
                 $writer->write(
-                    '<col collapsed="false" hidden="false" max="'.($i + 1).'" min="'.($i + 1).
-                    '" style="0" customWidth="true" width="'.floatval($colWidth).'"/>'
+                    '<col collapsed="false" hidden="false" max="' . ($i + 1) . '" min="' . ($i + 1) .
+                    '" style="0" customWidth="true" width="' . floatval($colWidth) . '"/>'
                 );
                 ++$i;
             }
         }
         $writer->write(
-            '<col collapsed="false" hidden="false" max="1024" min="'.($i + 1).
-            '" style="0" customWidth="false" width="11.5"/>'.'</cols><sheetData>'
+            '<col collapsed="false" hidden="false" max="1024" min="' . ($i + 1) .
+            '" style="0" customWidth="false" width="11.5"/>' . '</cols><sheetData>'
         );
     }
 
@@ -160,7 +160,7 @@ 
         if (!empty($this->merge_cells)) {
             $this->fileWriter->write('<mergeCells>');
             foreach ($this->mergeCells as $range) {
-                $this->fileWriter->write('<mergeCell ref="'.$range.'"/>');
+                $this->fileWriter->write('<mergeCell ref="' . $range . '"/>');
             }
             $this->fileWriter->write('</mergeCells>');
         }
@@ -168,7 +168,7 @@ 
         $max_cell = Support::xlsCell($this->rowCount - 1, count($this->columns) - 1);
 
         if ($this->autoFilter) {
-            $this->fileWriter->write('<autoFilter ref="A1:'.$max_cell.'"/>');
+            $this->fileWriter->write('<autoFilter ref="A1:' . $max_cell . '"/>');
         }
 
         $this->fileWriter->write('<printOptions headings="false" gridLines="false" gridLinesSet="true" horizontalCentered="false" verticalCentered="false"/>');
@@ -180,10 +180,10 @@ 
         $this->fileWriter->write('</headerFooter>');
         $this->fileWriter->write('</worksheet>');
 
-        $max_cell_tag   = '<dimension ref="A1:'.$max_cell.'"/>';
+        $max_cell_tag   = '<dimension ref="A1:' . $max_cell . '"/>';
         $padding_length = $this->maxCellTagEnd - $this->maxCellTagStart - strlen($max_cell_tag);
         $this->fileWriter->fseek($this->maxCellTagStart);
-        $this->fileWriter->write($max_cell_tag.str_repeat(' ', $padding_length));
+        $this->fileWriter->write($max_cell_tag . str_repeat(' ', $padding_length));
         $this->fileWriter->close();
         $this->finalized = true;
     }
@@ -192,14 +192,14 @@ 
     {
         $writer = $this->getFileWriter();
         $writer->write(
-            '<pane ySplit="'.$this->freezeRows.'" xSplit="'.$this->freezeColumns.
-            '" topLeftCell="'.Support::xlsCell($this->freezeRows, $this->freezeColumns).
-            '" activePane="bottomRight" state="frozen"/>'.'<selection activeCell="'.Support::xlsCell($this->freezeRows, 0).
-            '" activeCellId="0" pane="topRight" sqref="'.Support::xlsCell($this->freezeRows, 0).'"/>'.
-            '<selection activeCell="'.Support::xlsCell(0, $this->freezeColumns).
-            '" activeCellId="0" pane="bottomLeft" sqref="'.Support::xlsCell(0, $this->freezeColumns).'"/>'.
-            '<selection activeCell="'.Support::xlsCell($this->freezeRows, $this->freezeColumns).
-            '" activeCellId="0" pane="bottomRight" sqref="'.Support::xlsCell($this->freezeRows, $this->freezeColumns).'"/>'
+            '<pane ySplit="' . $this->freezeRows . '" xSplit="' . $this->freezeColumns .
+            '" topLeftCell="' . Support::xlsCell($this->freezeRows, $this->freezeColumns) .
+            '" activePane="bottomRight" state="frozen"/>' . '<selection activeCell="' . Support::xlsCell($this->freezeRows, 0) .
+            '" activeCellId="0" pane="topRight" sqref="' . Support::xlsCell($this->freezeRows, 0) . '"/>' .
+            '<selection activeCell="' . Support::xlsCell(0, $this->freezeColumns) .
+            '" activeCellId="0" pane="bottomLeft" sqref="' . Support::xlsCell(0, $this->freezeColumns) . '"/>' .
+            '<selection activeCell="' . Support::xlsCell($this->freezeRows, $this->freezeColumns) .
+            '" activeCellId="0" pane="bottomRight" sqref="' . Support::xlsCell($this->freezeRows, $this->freezeColumns) . '"/>'
         );
     }
 
@@ -207,10 +207,10 @@ 
     {
         $writer = $this->getFileWriter();
         $writer->write(
-            '<pane ySplit="'.$this->freezeRows.'" topLeftCell="'.
-            Support::xlsCell($this->freezeRows, 0).'" activePane="bottomLeft" state="frozen"/>'.
-            '<selection activeCell="'.Support::xlsCell($this->freezeRows, 0).
-            '" activeCellId="0" pane="bottomLeft" sqref="'.Support::xlsCell($this->freezeRows, 0).'"/>'
+            '<pane ySplit="' . $this->freezeRows . '" topLeftCell="' .
+            Support::xlsCell($this->freezeRows, 0) . '" activePane="bottomLeft" state="frozen"/>' .
+            '<selection activeCell="' . Support::xlsCell($this->freezeRows, 0) .
+            '" activeCellId="0" pane="bottomLeft" sqref="' . Support::xlsCell($this->freezeRows, 0) . '"/>'
         );
     }
 
@@ -218,10 +218,10 @@ 
     {
         $writer = $this->getFileWriter();
         $writer->write(
-            '<pane xSplit="'.$this->freezeColumns.'" topLeftCell="'.
-            Support::xlsCell(0, $this->freezeColumns).'" activePane="topRight" state="frozen"/>'.
-            '<selection activeCell="'.Support::xlsCell(0, $this->freezeColumns).
-            '" activeCellId="0" pane="topRight" sqref="'.Support::xlsCell(0, $this->freezeColumns).'"/>'
+            '<pane xSplit="' . $this->freezeColumns . '" topLeftCell="' .
+            Support::xlsCell(0, $this->freezeColumns) . '" activePane="topRight" state="frozen"/>' .
+            '<selection activeCell="' . Support::xlsCell(0, $this->freezeColumns) .
+            '" activeCellId="0" pane="topRight" sqref="' . Support::xlsCell(0, $this->freezeColumns) . '"/>'
         );
     }