viliy / xlsx-writer

src/Support.php

Spacing +13 added lines, -13 removed lines

@@ -22,13 +22,13 @@ 
     {
         $n = $columnNumber;
         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.'$'.($rowNumber + 1);
+            return '$' . $r . '$' . ($rowNumber + 1);
         }
 
-        return $r.($rowNumber + 1);
+        return $r . ($rowNumber + 1);
     }
 
     /**
@@ -82,7 +82,7 @@ 
                 $ignoreUntil = '';
             }
             if ('' == $ignoreUntil && (' ' == $c || '-' == $c || '(' == $c || ')' == $c) && (0 == $i || '_' != $numFormat[$i - 1])) {
-                $escaped .= '\\'.$c;
+                $escaped .= '\\' . $c;
             } else {
                 $escaped .= $c;
             }
@@ -156,8 +156,8 @@ 
      */
     public static function convertDateTime($dateInput)
     {
-        $seconds = 0;    // Time expressed as fraction of 24h hours in seconds
-        $year    = $month    = $day    = 0;
+        $seconds = 0; // Time expressed as fraction of 24h hours in seconds
+        $year    = $month = $day = 0;
 
         $date_time = $dateInput;
         if (preg_match("/(\d{4})\-(\d{2})\-(\d{2})/", $date_time, $matches)) {
@@ -202,13 +202,13 @@ 
             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;
@@ -225,6 +225,6 @@ 
         $sheetname        = mb_substr($sheetname, 0, 31);
         $sheetname        = trim(trim(trim($sheetname), "'")); //trim before and after trimming single quotes
 
-        return !empty($sheetname) ? $sheetname : 'Sheet'.((rand() % 900) + 100);
+        return !empty($sheetname) ? $sheetname : 'Sheet' . ((rand() % 900) + 100);
     }
 }

src/Writer/XlsxBuilder.php

Spacing +13 added lines, -13 removed lines

@@ -46,7 +46,7 @@ 
         $author   = Support::xmlSpecialChars($author);
         $keywords = Support::xmlSpecialChars(implode(',', $keywords));
         if ($keywords) {
-            $keywords = '<cp:keywords>'.$keywords.'</cp:keywords>';
+            $keywords = '<cp:keywords>' . $keywords . '</cp:keywords>';
         }
         $description = Support::xmlSpecialChars($description);
         $date        = date("Y-m-d\TH:i:s.00\Z");
@@ -67,7 +67,7 @@ 
     public static function buildRelationshipsXML()
     {
         $relsXml = '';
-        $relsXml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+        $relsXml .= '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
         $relsXml .= '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
         $relsXml .= '<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>';
         $relsXml .= '<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>';
@@ -92,17 +92,17 @@ 
 EOF;
         foreach ($sheets as $sheetName => $sheet) {
             $sheetname = Support::sanitizeSheetname($sheet->sheetname);
-            $workbookXml .= '<sheet name="'.Support::xmlSpecialChars($sheetname).
-                '" sheetId="'.($i + 1).'" state="visible" r:id="rId'.($i + 2).'"/>';
+            $workbookXml .= '<sheet name="' . Support::xmlSpecialChars($sheetname) .
+                '" sheetId="' . ($i + 1) . '" state="visible" r:id="rId' . ($i + 2) . '"/>';
             ++$i;
         }
         $workbookXml .= '</sheets><definedNames>';
         foreach ($sheets as $sheetName => $sheet) {
             if ($sheet->autoFilter) {
                 $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>';
+                $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>';
                 ++$i;
             }
         }
@@ -124,12 +124,12 @@ 
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>
 EOF;
         foreach ($sheets as $sheetName => $sheet) {
-            $wkbkrelsXml .= '<Relationship Id="rId'.($i + 2).
-                '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/'.
-                ($sheet->xmlname).'"/>';
+            $wkbkrelsXml .= '<Relationship Id="rId' . ($i + 2) .
+                '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/' .
+                ($sheet->xmlname) . '"/>';
             ++$i;
         }
-        $wkbkrelsXml .= "\n".'</Relationships>';
+        $wkbkrelsXml .= "\n" . '</Relationships>';
 
         return $wkbkrelsXml;
     }
@@ -142,12 +142,12 @@ 
     public static function buildContentTypesXML(array $sheets)
     {
         $contentTypesXml = '';
-        $contentTypesXml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+        $contentTypesXml .= '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
         $contentTypesXml .= '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">';
         $contentTypesXml .= '<Override PartName="/_rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
         $contentTypesXml .= '<Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
         foreach ($sheets as $sheetName => $sheet) {
-            $contentTypesXml .= '<Override PartName="/xl/worksheets/'.($sheet->xmlname).'" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
+            $contentTypesXml .= '<Override PartName="/xl/worksheets/' . ($sheet->xmlname) . '" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
         }
         $contentTypesXml .= '<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>';
         $contentTypesXml .= '<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>';

src/Writer/Builder.php

Spacing +32 added lines, -34 removed lines

@@ -155,15 +155,15 @@ 
             if (is_writable($filename)) {
                 @unlink($filename); //if the zip already exists, remove it
             } else {
-                throw new XlsxException('Error in '.__CLASS__.'::'.__FUNCTION__.', file is not writeable.');
+                throw new XlsxException('Error in ' . __CLASS__ . '::' . __FUNCTION__ . ', file is not writeable.');
             }
         }
         $zip = new \ZipArchive();
         if (empty($this->sheets)) {
-            throw new XlsxException('Error in '.__CLASS__.'::'.__FUNCTION__.', no worksheets defined.');
+            throw new XlsxException('Error in ' . __CLASS__ . '::' . __FUNCTION__ . ', no worksheets defined.');
         }
         if (!$zip->open($filename, \ZipArchive::CREATE)) {
-            throw new XlsxException('Error in '.__CLASS__.'::'.__FUNCTION__.', unable to create zip.');
+            throw new XlsxException('Error in ' . __CLASS__ . '::' . __FUNCTION__ . ', unable to create zip.');
         }
         $zip->addEmptyDir('docProps/');
         $zip->addFromString('docProps/app.xml', XlsxBuilder::buildAppXML($this->company));
@@ -178,10 +178,10 @@ 
         $zip->addFromString('_rels/.rels', XlsxBuilder::buildRelationshipsXML());
         $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', 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));
@@ -204,22 +204,22 @@ 
         $sheet = $this->getSheet();
         if (count($sheet->columns) < count($row)) {
             $defaultColumnTypes = $this->initColumnsTypes(array_fill($from = 0, count($row), 'GENERAL')); //will map to n_auto
-            $sheet->columns     = array_merge((array) $sheet->columns, $defaultColumnTypes);
+            $sheet->columns     = array_merge((array)$sheet->columns, $defaultColumnTypes);
         }
 
         if (!empty($rowOptions)) {
             $ht        = isset($rowOptions['height']) ? floatval($rowOptions['height']) : 12.1;
             $customHt  = isset($rowOptions['height']) ? true : false;
-            $hidden    = isset($rowOptions['hidden']) ? (bool) ($rowOptions['hidden']) : false;
-            $collapsed = isset($rowOptions['collapsed']) ? (bool) ($rowOptions['collapsed']) : false;
+            $hidden    = isset($rowOptions['hidden']) ? (bool)($rowOptions['hidden']) : false;
+            $collapsed = isset($rowOptions['collapsed']) ? (bool)($rowOptions['collapsed']) : false;
             $sheet->fileWriter->write(
-                '<row collapsed="'.($collapsed).'" customFormat="false" customHeight="'.($customHt).
-                '" hidden="'.($hidden).'" ht="'.($ht).'" outlineLevel="0" r="'.($sheet->rowCount + 1).'">'
+                '<row collapsed="' . ($collapsed) . '" customFormat="false" customHeight="' . ($customHt) .
+                '" hidden="' . ($hidden) . '" ht="' . ($ht) . '" outlineLevel="0" r="' . ($sheet->rowCount + 1) . '">'
             );
         } else {
             $sheet->fileWriter->write(
-                '<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'.
-                ($sheet->rowCount + 1).'">'
+                '<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="' .
+                ($sheet->rowCount + 1) . '">'
             );
         }
 
@@ -228,8 +228,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;
         }
@@ -265,14 +264,14 @@ 
 
         $temporaryFilename = $this->tempFilename();
         $file              = new XlsxWriterBuffer($temporaryFilename);
-        $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->numberFormats).'">');
+        $file->write('<numFmts count="' . count($this->numberFormats) . '">');
         foreach ($this->numberFormats as $i => $v) {
-            $file->write('<numFmt numFmtId="'.(164 + $i).'" formatCode="'.Support::xmlSpecialChars($v).'" />');
+            $file->write('<numFmt numFmtId="' . (164 + $i) . '" formatCode="' . Support::xmlSpecialChars($v) . '" />');
         }
         $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>');
@@ -282,10 +281,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"/>');
@@ -304,23 +303,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 (['left', 'right', 'top', 'bottom'] as $side) {
                     $show_side = in_array($side, $pieces['side']) ? true : false;
@@ -358,7 +357,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($styleIndexes)).'">');
+        $file->write('<cellXfs count="' . (count($styleIndexes)) . '">');
         foreach ($styleIndexes as $v) {
             $applyAlignment = isset($v['alignment']) ? 'true' : 'false';
             $wrapText       = !empty($v['wrap_text']) ? 'true' : 'false';
@@ -369,8 +368,8 @@ 
             $borderIdx      = isset($v['border_idx']) ? intval($v['border_idx']) : 0;
             $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('	<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>');
         }
@@ -413,7 +412,7 @@ 
         if ($this->sheetName == $sheetName || $this->hasSheet($sheetName)) {
             return;
         }
-        $colWidths = isset($colOptions['widths']) ? (array) $colOptions['widths'] : [];
+        $colWidths = isset($colOptions['widths']) ? (array)$colOptions['widths'] : [];
         $this->createSheet($sheetName, $colOptions);
         $sheet = $this->getSheet();
         $sheet->initContent($colWidths, $this->isTabSelected());
@@ -422,12 +421,11 @@ 
             $headerRow      = array_keys($headerTypes);
             $writer         = $sheet->getFileWriter();
             $writer->write(
-                '<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'. 1 .'">'
+                '<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="' . 1 . '">'
             );
             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>');
@@ -441,7 +439,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,
             ];
@@ -497,7 +495,7 @@ 
     protected function createSheet(string $sheetName, array $colOptions = [])
     {
         $sheetFilename = $this->tempFilename();
-        $sheetXmlName  = 'sheet'.(count($this->sheets) + 1).'.xml';
+        $sheetXmlName  = 'sheet' . (count($this->sheets) + 1) . '.xml';
         $autoFilter    = isset($colOptions['auto_filter']) ? intval($colOptions['auto_filter']) : false;
         $freezeRows    = isset($colOptions['freeze_rows']) ? intval($colOptions['freeze_rows']) : false;
         $freezeColumns = isset($colOptions['freeze_columns']) ? intval($colOptions['freeze_columns']) : false;

src/Writer/Sheet.php

Spacing +40 added lines, -40 removed lines

@@ -64,39 +64,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;
@@ -113,14 +113,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(
@@ -142,15 +142,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>'
         );
     }
 
@@ -161,7 +161,7 @@ 
         if (!empty($this->merge_cells)) {
             $this->fileWriter->write('<mergeCells>');
             foreach ($this->merge_cells as $range) {
-                $this->fileWriter->write('<mergeCell ref="'.$range.'"/>');
+                $this->fileWriter->write('<mergeCell ref="' . $range . '"/>');
             }
             $this->fileWriter->write('</mergeCells>');
         }
@@ -169,7 +169,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"/>');
@@ -181,10 +181,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;
     }
@@ -193,14 +193,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) . '"/>'
         );
     }
 
@@ -208,10 +208,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) . '"/>'
         );
     }
 
@@ -219,10 +219,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) . '"/>'
         );
     }
 

src/Writer/Style.php

Spacing +8 added lines, -8 removed lines

@@ -56,7 +56,7 @@ 
     protected function addCellStyle($numberFormat, $cellStyleString)
     {
         $numberFormatIdx = Support::add2listGetIndex($this->numberFormats, $numberFormat);
-        $lookupString    = $numberFormatIdx.';'.$cellStyleString;
+        $lookupString    = $numberFormatIdx . ';' . $cellStyleString;
 
         return Support::add2listGetIndex($this->cellStyles, $lookupString);
     }
@@ -80,15 +80,15 @@ 
                 }
                 if (isset($style['border-color']) && is_string($style['border-color']) && '#' == $style['border-color'][0]) {
                     $v                     = substr($style['border-color'], 1, 6);
-                    $v                     = 3 == strlen($v) ? $v[0].$v[0].$v[1].$v[1].$v[2].$v[2] : $v; // expand cf0 => ccff00
-                    $border_value['color'] = 'FF'.strtoupper($v);
+                    $v                     = 3 == strlen($v) ? $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                            = 3 == strlen($v) ? $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));
+                $v                            = 3 == strlen($v) ? $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)) {
                 $styleIndexes[$i]['alignment'] = true;
@@ -100,7 +100,7 @@ 
             }
             if (isset($style['wrap_text'])) {
                 $styleIndexes[$i]['alignment'] = true;
-                $styleIndexes[$i]['wrap_text'] = (bool) $style['wrap_text'];
+                $styleIndexes[$i]['wrap_text'] = (bool)$style['wrap_text'];
             }
 
             $font = $this->defaultFont;
@@ -135,8 +135,8 @@ 
             }
             if (isset($style['color']) && is_string($style['color']) && '#' == $style['color'][0]) {
                 $v             = substr($style['color'], 1, 6);
-                $v             = 3 == strlen($v) ? $v[0].$v[0].$v[1].$v[1].$v[2].$v[2] : $v; // expand cf0 => ccff00
-                $font['color'] = 'FF'.strtoupper($v);
+                $v             = 3 == strlen($v) ? $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) {
                 $styleIndexes[$i]['font_idx'] = Support::add2listGetIndex($fonts, json_encode($font));