PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/IOFactory.php

Spacing +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@ 
      * @static
      */
     private static $searchLocations = array(
-        array( 'type' => 'IWriter', 'path' => 'PhpSpreadsheet/Writer/{0}.php', 'class' => '\\PhpSpreadsheet\\Writer\\{0}' ),
-        array( 'type' => 'IReader', 'path' => 'PhpSpreadsheet/Reader/{0}.php', 'class' => '\\PhpSpreadsheet\\Reader\\{0}' )
+        array('type' => 'IWriter', 'path' => 'PhpSpreadsheet/Writer/{0}.php', 'class' => '\\PhpSpreadsheet\\Writer\\{0}'),
+        array('type' => 'IReader', 'path' => 'PhpSpreadsheet/Reader/{0}.php', 'class' => '\\PhpSpreadsheet\\Reader\\{0}')
     );
 
     /**
@@ -103,7 +103,7 @@ 
      */
     public static function addSearchLocation($type = '', $location = '', $classname = '')
     {
-        self::$searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
+        self::$searchLocations[] = array('type' => $type, 'path' => $location, 'class' => $classname);
     }
 
     /**

src/PhpSpreadsheet/Reader/Excel5.php

Spacing +24 added lines, -24 removed lines

@@ -456,8 +456,8 @@ 
         // total byte size of Excel data (workbook global substream + sheet substreams)
         $this->dataSize = strlen($this->data);
 
-        $this->pos        = 0;
-        $this->sheets    = array();
+        $this->pos = 0;
+        $this->sheets = array();
 
         // Parse Workbook Global Substream
         while ($this->pos < $this->dataSize) {
@@ -1123,7 +1123,7 @@ 
                             // $range should look like one of these
                             //        Foo!$C$7:$J$66
                             //        Bar!$A$1:$IV$2
-                            $explodes = explode('!', $range);    // FIXME: what if sheetname contains exclamation mark?
+                            $explodes = explode('!', $range); // FIXME: what if sheetname contains exclamation mark?
                             $sheetName = trim($explodes[0], "'");
                             if (count($explodes) == 2) {
                                 if (strpos($explodes[1], ':') === false) {
@@ -1306,7 +1306,7 @@ 
         $secLength = self::getInt4d($this->summaryInformation, $secOffset);
 
         // offset: $secOffset+4; size: 4; property count
-        $countProperties = self::getInt4d($this->summaryInformation, $secOffset+4);
+        $countProperties = self::getInt4d($this->summaryInformation, $secOffset + 4);
 
         // initialize code page (used to resolve string values)
         $codePage = 'CP1252';
@@ -1315,11 +1315,11 @@ 
         // loop through property decarations and properties
         for ($i = 0; $i < $countProperties; ++$i) {
             // offset: ($secOffset+8) + (8 * $i); size: 4; property ID
-            $id = self::getInt4d($this->summaryInformation, ($secOffset+8) + (8 * $i));
+            $id = self::getInt4d($this->summaryInformation, ($secOffset + 8) + (8 * $i));
 
             // Use value of property id as appropriate
             // offset: ($secOffset+12) + (8 * $i); size: 4; offset from beginning of section (48)
-            $offset = self::getInt4d($this->summaryInformation, ($secOffset+12) + (8 * $i));
+            $offset = self::getInt4d($this->summaryInformation, ($secOffset + 12) + (8 * $i));
 
             $type = self::getInt4d($this->summaryInformation, $secOffset + $offset);
 
@@ -1444,7 +1444,7 @@ 
 //        echo '$secLength = ', $secLength,'<br />';
 
         //    offset: $secOffset+4;    size: 4;    property count
-        $countProperties = self::getInt4d($this->documentSummaryInformation, $secOffset+4);
+        $countProperties = self::getInt4d($this->documentSummaryInformation, $secOffset + 4);
 //        echo '$countProperties = ', $countProperties,'<br />';
 
         // initialize code page (used to resolve string values)
@@ -1455,12 +1455,12 @@ 
         for ($i = 0; $i < $countProperties; ++$i) {
 //            echo 'Property ', $i,'<br />';
             //    offset: ($secOffset+8) + (8 * $i);    size: 4;    property ID
-            $id = self::getInt4d($this->documentSummaryInformation, ($secOffset+8) + (8 * $i));
+            $id = self::getInt4d($this->documentSummaryInformation, ($secOffset + 8) + (8 * $i));
 //            echo 'ID is ', $id,'<br />';
 
             // Use value of property id as appropriate
             // offset: 60 + 8 * $i;    size: 4;    offset from beginning of section (48)
-            $offset = self::getInt4d($this->documentSummaryInformation, ($secOffset+12) + (8 * $i));
+            $offset = self::getInt4d($this->documentSummaryInformation, ($secOffset + 12) + (8 * $i));
 
             $type = self::getInt4d($this->documentSummaryInformation, $secOffset + $offset);
 //            echo 'Type is ', $type,', ';
@@ -1618,7 +1618,7 @@ 
                 //    Concatenate this extension with the currently set comment for the cell
                 $comment = $this->phpSheet->getComment($cellAddress);
                 $commentText = $comment->getText()->getPlainText();
-                $comment->setText($this->parseRichText($commentText.$noteText));
+                $comment->setText($this->parseRichText($commentText . $noteText));
             } else {
                 //    Set comment for the cell
                 $this->phpSheet->getComment($cellAddress)->setText($this->parseRichText($noteText));
@@ -1656,7 +1656,7 @@ 
         $text       = $this->getSplicedRecordData();
 
         $this->textObjects[$this->textObjRef] = array(
-            'text'      => substr($text["recordData"], $text["spliceOffsets"][0]+1, $cchText),
+            'text'      => substr($text["recordData"], $text["spliceOffsets"][0] + 1, $cchText),
             'format'    => substr($text["recordData"], $text["spliceOffsets"][1], $cbRuns),
             'alignment' => $grbitOpts,
             'rotation'  => $rot
@@ -2871,7 +2871,7 @@ 
             ++$pos;
 
             // bit: 0; mask: 0x01; 0 = compressed; 1 = uncompressed
-            $isCompressed = (($optionFlags & 0x01) == 0) ;
+            $isCompressed = (($optionFlags & 0x01) == 0);
 
             // bit: 2; mask: 0x02; 0 = ordinary; 1 = Asian phonetic
             $hasAsian = (($optionFlags & 0x04) != 0);
@@ -3385,7 +3385,7 @@ 
 
         // bit 0, mask 0x01; 1 = sheet is protected
         $bool = (0x01 & self::getInt2d($recordData, 0)) >> 0;
-        $this->phpSheet->getProtection()->setSheet((bool)$bool);
+        $this->phpSheet->getProtection()->setSheet((bool) $bool);
     }
 
 
@@ -3409,7 +3409,7 @@ 
         // bit: 0, mask 0x01; 1 = scenarios are protected
         $bool = (0x01 & self::getInt2d($recordData, 0)) >> 0;
 
-        $this->phpSheet->getProtection()->setScenarios((bool)$bool);
+        $this->phpSheet->getProtection()->setScenarios((bool) $bool);
     }
 
 
@@ -3433,7 +3433,7 @@ 
         // bit: 0, mask 0x01; 1 = objects are protected
         $bool = (0x01 & self::getInt2d($recordData, 0)) >> 0;
 
-        $this->phpSheet->getProtection()->setObjects((bool)$bool);
+        $this->phpSheet->getProtection()->setObjects((bool) $bool);
     }
 
 
@@ -3869,7 +3869,7 @@ 
             // get the base cell, grab tExp token
             $baseRow = self::getInt2d($formulaStructure, 3);
             $baseCol = self::getInt2d($formulaStructure, 5);
-            $this->_baseCell = \PhpSpreadsheet\Cell::stringFromColumnIndex($baseCol). ($baseRow + 1);
+            $this->_baseCell = \PhpSpreadsheet\Cell::stringFromColumnIndex($baseCol) . ($baseRow + 1);
         }
 
         // Read cell?
@@ -4298,7 +4298,7 @@ 
         $this->frozen = (bool) ((0x0008 & $options) >> 3);
 
         // bit: 6; mask: 0x0040; 0 = columns from left to right, 1 = columns from right to left
-        $this->phpSheet->setRightToLeft((bool)((0x0040 & $options) >> 6));
+        $this->phpSheet->setRightToLeft((bool) ((0x0040 & $options) >> 6));
 
         // bit: 10; mask: 0x0400; 0 = sheet not active, 1 = sheet active
         $isActive = (bool) ((0x0400 & $options) >> 10);
@@ -4873,9 +4873,9 @@ 
                 $objValidation = $this->phpSheet->getCell($coordinate)->getDataValidation();
                 $objValidation->setType($type);
                 $objValidation->setErrorStyle($errorStyle);
-                $objValidation->setAllowBlank((bool)$allowBlank);
-                $objValidation->setShowInputMessage((bool)$showInputMessage);
-                $objValidation->setShowErrorMessage((bool)$showErrorMessage);
+                $objValidation->setAllowBlank((bool) $allowBlank);
+                $objValidation->setShowInputMessage((bool) $showInputMessage);
+                $objValidation->setShowErrorMessage((bool) $showErrorMessage);
                 $objValidation->setShowDropDown(!$suppressDropDown);
                 $objValidation->setOperator($operator);
                 $objValidation->setErrorTitle($errorTitle);
@@ -5700,7 +5700,7 @@ 
                 $name = 'tNum';
                 $size = 9;
                 $data = self::extractNumber(substr($formulaData, 1));
-                $data = str_replace(',', '.', (string)$data); // in case non-English locale
+                $data = str_replace(',', '.', (string) $data); // in case non-English locale
                 break;
             case 0x20:    //    array constant
             case 0x40:
@@ -7470,7 +7470,7 @@ 
             $sign = ($rknum & 0x80000000) >> 31;
             $exp = ($rknum & 0x7ff00000) >> 20;
             $mantissa = (0x100000 | ($rknum & 0x000ffffc));
-            $value = $mantissa / pow(2, (20- ($exp - 1023)));
+            $value = $mantissa / pow(2, (20 - ($exp - 1023)));
             if ($sign) {
                 $value = -1 * $value;
             }
@@ -7539,7 +7539,7 @@ 
      */
     public static function getInt2d($data, $pos)
     {
-        return ord($data[$pos]) | (ord($data[$pos+1]) << 8);
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8);
     }
 
 
@@ -7562,7 +7562,7 @@ 
         } else {
             $_ord_24 = ($_or_24 & 127) << 24;
         }
-        return ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | $_ord_24;
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
     }
 
 

src/PhpSpreadsheet/Reader/SYLK.php

Spacing +18 added lines, -18 removed lines

@@ -218,8 +218,8 @@ 
         }
         $spreadsheet->setActiveSheetIndex($this->sheetIndex);
 
-        $fromFormats    = array('\-',    '\ ');
-        $toFormats        = array('-',    ' ');
+        $fromFormats = array('\-', '\ ');
+        $toFormats = array('-', ' ');
 
         // Loop through file
         $rowData = array();
@@ -252,7 +252,7 @@ 
                             break;
                         case 'S':
                             $styleSettings = substr($rowDatum, 1);
-                            for ($i=0; $i<strlen($styleSettings); ++$i) {
+                            for ($i = 0; $i < strlen($styleSettings); ++$i) {
                                 switch ($styleSettings{$i}) {
                                     case 'I':
                                         $formatArray['font']['italic'] = true;
@@ -277,7 +277,7 @@ 
                             break;
                     }
                 }
-                $this->formats['P'.$this->format++] = $formatArray;
+                $this->formats['P' . $this->format++] = $formatArray;
             //    Read cell value data
             } elseif ($dataType == 'C') {
                 $hasCalculatedValue = false;
@@ -296,14 +296,14 @@ 
                             $cellData = substr($rowDatum, 1);
                             break;
                         case 'E':
-                            $cellDataFormula = '='.substr($rowDatum, 1);
+                            $cellDataFormula = '=' . substr($rowDatum, 1);
                             //    Convert R1C1 style references to A1 style references (but only when not quoted)
                             $temp = explode('"', $cellDataFormula);
                             $key = false;
                             foreach ($temp as &$value) {
                                 //    Only count/replace in alternate array entries
                                 if ($key = !$key) {
-                                    preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
+                                    preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
                                     //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
                                     //        through the formula from left to right. Reversing means that we work right to left.through
                                     //        the formula
@@ -329,7 +329,7 @@ 
                                         if ($columnReference{0} == '[') {
                                             $columnReference = $column + trim($columnReference, '[]');
                                         }
-                                        $A1CellReference = \PhpSpreadsheet\Cell::stringFromColumnIndex($columnReference-1).$rowReference;
+                                        $A1CellReference = \PhpSpreadsheet\Cell::stringFromColumnIndex($columnReference - 1) . $rowReference;
 
                                         $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
                                     }
@@ -342,14 +342,14 @@ 
                             break;
                     }
                 }
-                $columnLetter = \PhpSpreadsheet\Cell::stringFromColumnIndex($column-1);
+                $columnLetter = \PhpSpreadsheet\Cell::stringFromColumnIndex($column - 1);
                 $cellData = \PhpSpreadsheet\Calculation::unwrapResult($cellData);
 
                 // Set cell value
-                $spreadsheet->getActiveSheet()->getCell($columnLetter.$row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
+                $spreadsheet->getActiveSheet()->getCell($columnLetter . $row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
                 if ($hasCalculatedValue) {
                     $cellData = \PhpSpreadsheet\Calculation::unwrapResult($cellData);
-                    $spreadsheet->getActiveSheet()->getCell($columnLetter.$row)->setCalculatedValue($cellData);
+                    $spreadsheet->getActiveSheet()->getCell($columnLetter . $row)->setCalculatedValue($cellData);
                 }
             //    Read cell formatting
             } elseif ($dataType == 'F') {
@@ -373,7 +373,7 @@ 
                             break;
                         case 'S':
                             $styleSettings = substr($rowDatum, 1);
-                            for ($i=0; $i<strlen($styleSettings); ++$i) {
+                            for ($i = 0; $i < strlen($styleSettings); ++$i) {
                                 switch ($styleSettings{$i}) {
                                     case 'I':
                                         $styleData['font']['italic'] = true;
@@ -399,22 +399,22 @@ 
                     }
                 }
                 if (($formatStyle > '') && ($column > '') && ($row > '')) {
-                    $columnLetter = \PhpSpreadsheet\Cell::stringFromColumnIndex($column-1);
+                    $columnLetter = \PhpSpreadsheet\Cell::stringFromColumnIndex($column - 1);
                     if (isset($this->formats[$formatStyle])) {
-                        $spreadsheet->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($this->formats[$formatStyle]);
+                        $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($this->formats[$formatStyle]);
                     }
                 }
                 if ((!empty($styleData)) && ($column > '') && ($row > '')) {
-                    $columnLetter = \PhpSpreadsheet\Cell::stringFromColumnIndex($column-1);
-                    $spreadsheet->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($styleData);
+                    $columnLetter = \PhpSpreadsheet\Cell::stringFromColumnIndex($column - 1);
+                    $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($styleData);
                 }
                 if ($columnWidth > '') {
                     if ($startCol == $endCol) {
-                        $startCol = \PhpSpreadsheet\Cell::stringFromColumnIndex($startCol-1);
+                        $startCol = \PhpSpreadsheet\Cell::stringFromColumnIndex($startCol - 1);
                         $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
                     } else {
-                        $startCol = \PhpSpreadsheet\Cell::stringFromColumnIndex($startCol-1);
-                        $endCol = \PhpSpreadsheet\Cell::stringFromColumnIndex($endCol-1);
+                        $startCol = \PhpSpreadsheet\Cell::stringFromColumnIndex($startCol - 1);
+                        $endCol = \PhpSpreadsheet\Cell::stringFromColumnIndex($endCol - 1);
                         $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
                         do {
                             $spreadsheet->getActiveSheet()->getColumnDimension(++$startCol)->setWidth($columnWidth);

src/PhpSpreadsheet/Reader/OOCalc.php

Spacing +19 added lines, -19 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function __construct()
     {
-        $this->readFilter     = new DefaultReadFilter();
+        $this->readFilter = new DefaultReadFilter();
     }
 
     /**
@@ -122,7 +122,7 @@ 
 
         $xml = new XMLReader();
         $res = $xml->xml(
-            $this->securityScanFile('zip://'.realpath($pFilename).'#content.xml'),
+            $this->securityScanFile('zip://' . realpath($pFilename) . '#content.xml'),
             null,
             \PhpSpreadsheet\Settings::getLibXmlLoaderOptions()
         );
@@ -178,7 +178,7 @@ 
 
         $xml = new XMLReader();
         $res = $xml->xml(
-            $this->securityScanFile('zip://'.realpath($pFilename).'#content.xml'),
+            $this->securityScanFile('zip://' . realpath($pFilename) . '#content.xml'),
             null,
             \PhpSpreadsheet\Settings::getLibXmlLoaderOptions()
         );
@@ -515,7 +515,7 @@ 
                                     foreach ($annotationText as $t) {
                                         if (isset($t->span)) {
                                             foreach ($t->span as $text) {
-                                                $textArray[] = (string)$text;
+                                                $textArray[] = (string) $text;
                                             }
                                         } else {
                                             $textArray[] = (string) $t;
@@ -523,7 +523,7 @@ 
                                     }
                                     $text = implode("\n", $textArray);
 //                                    echo $text, '<br />';
-                                    $spreadsheet->getActiveSheet()->getComment($columnID.$rowID)->setText($this->parseRichText($text));
+                                    $spreadsheet->getActiveSheet()->getComment($columnID . $rowID)->setText($this->parseRichText($text));
 //                                                                    ->setAuthor( $author )
                                 }
 
@@ -597,14 +597,14 @@ 
                                             list($year, $month, $day, $hour, $minute, $second) = explode(' ', $dateObj->format('Y m d H i s'));
                                             $dataValue = \PhpSpreadsheet\Shared\Date::formattedPHPToExcel($year, $month, $day, $hour, $minute, $second);
                                             if ($dataValue != floor($dataValue)) {
-                                                $formatting = \PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_XLSX15.' '.\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_TIME4;
+                                                $formatting = \PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_XLSX15 . ' ' . \PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_TIME4;
                                             } else {
                                                 $formatting = \PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_XLSX15;
                                             }
                                             break;
                                         case 'time':
                                             $type = \PhpSpreadsheet\Cell\DataType::TYPE_NUMERIC;
-                                            $dataValue = \PhpSpreadsheet\Shared\Date::PHPToExcel(strtotime('01-01-1970 '.implode(':', sscanf($cellDataOfficeAttributes['time-value'], 'PT%dH%dM%dS'))));
+                                            $dataValue = \PhpSpreadsheet\Shared\Date::PHPToExcel(strtotime('01-01-1970 ' . implode(':', sscanf($cellDataOfficeAttributes['time-value'], 'PT%dH%dM%dS'))));
                                             $formatting = \PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_TIME4;
                                             break;
                                     }
@@ -620,16 +620,16 @@ 
                                 if ($hasCalculatedValue) {
                                     $type = \PhpSpreadsheet\Cell\DataType::TYPE_FORMULA;
 //                                    echo 'Formula: ', $cellDataFormula, PHP_EOL;
-                                    $cellDataFormula = substr($cellDataFormula, strpos($cellDataFormula, ':=')+1);
+                                    $cellDataFormula = substr($cellDataFormula, strpos($cellDataFormula, ':=') + 1);
                                     $temp = explode('"', $cellDataFormula);
                                     $tKey = false;
                                     foreach ($temp as &$value) {
                                         //    Only replace in alternate array entries (i.e. non-quoted blocks)
                                         if ($tKey = !$tKey) {
-                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/Ui', '$1!$2:$3', $value);    //  Cell range reference in another sheet
-                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/Ui', '$1!$2', $value);       //  Cell reference in another sheet
-                                            $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/Ui', '$1:$2', $value);    //  Cell range reference
-                                            $value = preg_replace('/\[\.([^\.]+)\]/Ui', '$1', $value);                  //  Simple cell reference
+                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/Ui', '$1!$2:$3', $value); //  Cell range reference in another sheet
+                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/Ui', '$1!$2', $value); //  Cell reference in another sheet
+                                            $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/Ui', '$1:$2', $value); //  Cell range reference
+                                            $value = preg_replace('/\[\.([^\.]+)\]/Ui', '$1', $value); //  Simple cell reference
                                             $value = \PhpSpreadsheet\Calculation::translateSeparator(';', ',', $value, $inBraces);
                                         }
                                     }
@@ -648,18 +648,18 @@ 
                                         if ($type !== \PhpSpreadsheet\Cell\DataType::TYPE_NULL) {
                                             for ($rowAdjust = 0; $rowAdjust < $rowRepeats; ++$rowAdjust) {
                                                 $rID = $rowID + $rowAdjust;
-                                                $spreadsheet->getActiveSheet()->getCell($columnID.$rID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $dataValue), $type);
+                                                $spreadsheet->getActiveSheet()->getCell($columnID . $rID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $dataValue), $type);
                                                 if ($hasCalculatedValue) {
 //                                                    echo 'Forumla result is '.$dataValue.'<br />';
-                                                    $spreadsheet->getActiveSheet()->getCell($columnID.$rID)->setCalculatedValue($dataValue);
+                                                    $spreadsheet->getActiveSheet()->getCell($columnID . $rID)->setCalculatedValue($dataValue);
                                                 }
                                                 if ($formatting !== null) {
-                                                    $spreadsheet->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode($formatting);
+                                                    $spreadsheet->getActiveSheet()->getStyle($columnID . $rID)->getNumberFormat()->setFormatCode($formatting);
                                                 } else {
-                                                    $spreadsheet->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode(\PhpSpreadsheet\Style\NumberFormat::FORMAT_GENERAL);
+                                                    $spreadsheet->getActiveSheet()->getStyle($columnID . $rID)->getNumberFormat()->setFormatCode(\PhpSpreadsheet\Style\NumberFormat::FORMAT_GENERAL);
                                                 }
                                                 if ($hyperlink !== null) {
-                                                    $spreadsheet->getActiveSheet()->getCell($columnID.$rID)->getHyperlink()->setUrl($hyperlink);
+                                                    $spreadsheet->getActiveSheet()->getCell($columnID . $rID)->getHyperlink()->setUrl($hyperlink);
                                                 }
                                             }
                                         }
@@ -671,13 +671,13 @@ 
                                     if (($type !== \PhpSpreadsheet\Cell\DataType::TYPE_NULL) || (!$this->readDataOnly)) {
                                         $columnTo = $columnID;
                                         if (isset($cellDataTableAttributes['number-columns-spanned'])) {
-                                            $columnTo = \PhpSpreadsheet\Cell::stringFromColumnIndex(\PhpSpreadsheet\Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] -2);
+                                            $columnTo = \PhpSpreadsheet\Cell::stringFromColumnIndex(\PhpSpreadsheet\Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] - 2);
                                         }
                                         $rowTo = $rowID;
                                         if (isset($cellDataTableAttributes['number-rows-spanned'])) {
                                             $rowTo = $rowTo + $cellDataTableAttributes['number-rows-spanned'] - 1;
                                         }
-                                        $cellRange = $columnID.$rowID.':'.$columnTo.$rowTo;
+                                        $cellRange = $columnID . $rowID . ':' . $columnTo . $rowTo;
                                         $spreadsheet->getActiveSheet()->mergeCells($cellRange);
                                     }
                                 }

src/PhpSpreadsheet/Reader/Excel2003XML.php

Spacing +16 added lines, -16 removed lines

@@ -285,20 +285,20 @@ 
         $fromFormats    = array('\-', '\ ');
         $toFormats      = array('-', ' ');
 
-        $underlineStyles = array (
+        $underlineStyles = array(
             \PhpSpreadsheet\Style\Font::UNDERLINE_NONE,
             \PhpSpreadsheet\Style\Font::UNDERLINE_DOUBLE,
             \PhpSpreadsheet\Style\Font::UNDERLINE_DOUBLEACCOUNTING,
             \PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE,
             \PhpSpreadsheet\Style\Font::UNDERLINE_SINGLEACCOUNTING
         );
-        $verticalAlignmentStyles = array (
+        $verticalAlignmentStyles = array(
             \PhpSpreadsheet\Style\Alignment::VERTICAL_BOTTOM,
             \PhpSpreadsheet\Style\Alignment::VERTICAL_TOP,
             \PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER,
             \PhpSpreadsheet\Style\Alignment::VERTICAL_JUSTIFY
         );
-        $horizontalAlignmentStyles = array (
+        $horizontalAlignmentStyles = array(
             \PhpSpreadsheet\Style\Alignment::HORIZONTAL_GENERAL,
             \PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT,
             \PhpSpreadsheet\Style\Alignment::HORIZONTAL_RIGHT,
@@ -552,7 +552,7 @@ 
                 foreach ($worksheet->Table->Column as $columnData) {
                     $columnData_ss = $columnData->attributes($namespaces['ss']);
                     if (isset($columnData_ss['Index'])) {
-                        $columnID = \PhpSpreadsheet\Cell::stringFromColumnIndex($columnData_ss['Index']-1);
+                        $columnID = \PhpSpreadsheet\Cell::stringFromColumnIndex($columnData_ss['Index'] - 1);
                     }
                     if (isset($columnData_ss['Width'])) {
                         $columnWidth = $columnData_ss['Width'];
@@ -578,9 +578,9 @@ 
                     foreach ($rowData->Cell as $cell) {
                         $cell_ss = $cell->attributes($namespaces['ss']);
                         if (isset($cell_ss['Index'])) {
-                            $columnID = \PhpSpreadsheet\Cell::stringFromColumnIndex($cell_ss['Index']-1);
+                            $columnID = \PhpSpreadsheet\Cell::stringFromColumnIndex($cell_ss['Index'] - 1);
                         }
-                        $cellRange = $columnID.$rowID;
+                        $cellRange = $columnID . $rowID;
 
                         if ($this->getReadFilter() !== null) {
                             if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
@@ -591,14 +591,14 @@ 
                         if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
                             $columnTo = $columnID;
                             if (isset($cell_ss['MergeAcross'])) {
-                                $additionalMergedCells += (int)$cell_ss['MergeAcross'];
-                                $columnTo = \PhpSpreadsheet\Cell::stringFromColumnIndex(\PhpSpreadsheet\Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1);
+                                $additionalMergedCells += (int) $cell_ss['MergeAcross'];
+                                $columnTo = \PhpSpreadsheet\Cell::stringFromColumnIndex(\PhpSpreadsheet\Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] - 1);
                             }
                             $rowTo = $rowID;
                             if (isset($cell_ss['MergeDown'])) {
                                 $rowTo = $rowTo + $cell_ss['MergeDown'];
                             }
-                            $cellRange .= ':'.$columnTo.$rowTo;
+                            $cellRange .= ':' . $columnTo . $rowTo;
                             $spreadsheet->getActiveSheet()->mergeCells($cellRange);
                         }
 
@@ -703,7 +703,7 @@ 
                                                 if ($columnReference{0} == '[') {
                                                     $columnReference = $columnNumber + trim($columnReference, '[]');
                                                 }
-                                                $A1CellReference = \PhpSpreadsheet\Cell::stringFromColumnIndex($columnReference-1).$rowReference;
+                                                $A1CellReference = \PhpSpreadsheet\Cell::stringFromColumnIndex($columnReference - 1) . $rowReference;
                                                 $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
                                             }
                                         }
@@ -717,10 +717,10 @@ 
 
 //                            echo 'Cell '.$columnID.$rowID.' is a '.$type.' with a value of '.(($hasCalculatedValue) ? $cellDataFormula : $cellValue).'<br />';
 //
-                            $spreadsheet->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
+                            $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
                             if ($hasCalculatedValue) {
 //                                echo 'Formula result is '.$cellValue.'<br />';
-                                $spreadsheet->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($cellValue);
+                                $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setCalculatedValue($cellValue);
                             }
                             $cellIsSet = $rowHasData = true;
                         }
@@ -730,7 +730,7 @@ 
                             $commentAttributes = $cell->Comment->attributes($namespaces['ss']);
                             $author = 'unknown';
                             if (isset($commentAttributes->Author)) {
-                                $author = (string)$commentAttributes->Author;
+                                $author = (string) $commentAttributes->Author;
 //                                echo 'Author: ', $author,'<br />';
                             }
                             $node = $cell->Comment->Data->asXML();
@@ -738,7 +738,7 @@ 
 //                            echo $annotation,'<br />';
                             $annotation = strip_tags($node);
 //                            echo 'Annotation: ', $annotation,'<br />';
-                            $spreadsheet->getActiveSheet()->getComment($columnID.$rowID)->setAuthor(self::convertStringEncoding($author, $this->charSet))->setText($this->parseRichText($annotation));
+                            $spreadsheet->getActiveSheet()->getComment($columnID . $rowID)->setAuthor(self::convertStringEncoding($author, $this->charSet))->setText($this->parseRichText($annotation));
                         }
 
                         if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
@@ -748,8 +748,8 @@ 
 //                                echo 'Cell '.$columnID.$rowID.'<br />';
 //                                print_r($this->styles[$style]);
 //                                echo '<br />';
-                                if (!$spreadsheet->getActiveSheet()->cellExists($columnID.$rowID)) {
-                                    $spreadsheet->getActiveSheet()->getCell($columnID.$rowID)->setValue(null);
+                                if (!$spreadsheet->getActiveSheet()->cellExists($columnID . $rowID)) {
+                                    $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValue(null);
                                 }
                                 $spreadsheet->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styles[$style]);
                             }

src/PhpSpreadsheet/Writer/Excel5.php

Indentation +80 added lines, -80 removed lines

@@ -566,49 +566,49 @@ 
 
         // GKPIDDSI_CODEPAGE: CodePage
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
-                               'data'    => array('data' => 1252));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
+                                'data'    => array('data' => 1252));
         $dataSection_NumProps++;
 
         // GKPIDDSI_CATEGORY : Category
         if ($this->spreadsheet->getProperties()->getCategory()) {
             $dataProp = $this->spreadsheet->getProperties()->getCategory();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E),
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E),
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         // GKPIDDSI_VERSION :Version of the application that wrote the property storage
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x17),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x03),
-                               'data'    => array('pack' => 'V', 'data' => 0x000C0000));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x03),
+                                'data'    => array('pack' => 'V', 'data' => 0x000C0000));
         $dataSection_NumProps++;
         // GKPIDDSI_SCALE : FALSE
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0B),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x0B),
-                               'data'    => array('data' => false));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x0B),
+                                'data'    => array('data' => false));
         $dataSection_NumProps++;
         // GKPIDDSI_LINKSDIRTY : True if any of the values for the linked properties have changed outside of the application
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x10),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x0B),
-                               'data'    => array('data' => false));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x0B),
+                                'data'    => array('data' => false));
         $dataSection_NumProps++;
         // GKPIDDSI_SHAREDOC : FALSE
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x0B),
-                               'data'    => array('data' => false));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x0B),
+                                'data'    => array('data' => false));
         $dataSection_NumProps++;
         // GKPIDDSI_HYPERLINKSCHANGED : True if any of the values for the _PID_LINKS (hyperlink text) have changed outside of the application
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x16),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x0B),
-                               'data'    => array('data' => false));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x0B),
+                                'data'    => array('data' => false));
         $dataSection_NumProps++;
 
         // GKPIDDSI_DOCSPARTS
@@ -618,50 +618,50 @@ 
         $dataProp = pack('v', 0x0001);
         $dataProp .= pack('v', 0x0000);
         // array of UnalignedLpstr
-          // cch
-          $dataProp .= pack('v', 0x000A);
-          $dataProp .= pack('v', 0x0000);
-          // value
-          $dataProp .= 'Worksheet'.chr(0);
+            // cch
+            $dataProp .= pack('v', 0x000A);
+            $dataProp .= pack('v', 0x0000);
+            // value
+            $dataProp .= 'Worksheet'.chr(0);
 
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x101E),
-                               'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x101E),
+                                'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
         $dataSection_NumProps++;
 
         // GKPIDDSI_HEADINGPAIR
         // VtVecHeadingPairValue
-          // cElements
-          $dataProp = pack('v', 0x0002);
-          $dataProp .= pack('v', 0x0000);
-          // Array of vtHeadingPair
+            // cElements
+            $dataProp = pack('v', 0x0002);
+            $dataProp .= pack('v', 0x0000);
+            // Array of vtHeadingPair
             // vtUnalignedString - headingString
-              // stringType
-              $dataProp .= pack('v', 0x001E);
-              // padding
-              $dataProp .= pack('v', 0x0000);
-              // UnalignedLpstr
+                // stringType
+                $dataProp .= pack('v', 0x001E);
+                // padding
+                $dataProp .= pack('v', 0x0000);
+                // UnalignedLpstr
                 // cch
                 $dataProp .= pack('v', 0x0013);
                 $dataProp .= pack('v', 0x0000);
                 // value
                 $dataProp .= 'Feuilles de calcul';
             // vtUnalignedString - headingParts
-              // wType : 0x0003 = 32 bit signed integer
-              $dataProp .= pack('v', 0x0300);
-              // padding
-              $dataProp .= pack('v', 0x0000);
-              // value
-              $dataProp .= pack('v', 0x0100);
-              $dataProp .= pack('v', 0x0000);
-              $dataProp .= pack('v', 0x0000);
-              $dataProp .= pack('v', 0x0000);
+                // wType : 0x0003 = 32 bit signed integer
+                $dataProp .= pack('v', 0x0300);
+                // padding
+                $dataProp .= pack('v', 0x0000);
+                // value
+                $dataProp .= pack('v', 0x0100);
+                $dataProp .= pack('v', 0x0000);
+                $dataProp .= pack('v', 0x0000);
+                $dataProp .= pack('v', 0x0000);
 
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x100C),
-                               'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x100C),
+                                'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
         $dataSection_NumProps++;
 
         //         4     Section Length
@@ -762,88 +762,88 @@ 
 
         // CodePage : CP-1252
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
-                               'data'    => array('data' => 1252));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
+                                'data'    => array('data' => 1252));
         $dataSection_NumProps++;
 
         //    Title
         if ($this->spreadsheet->getProperties()->getTitle()) {
             $dataProp = $this->spreadsheet->getProperties()->getTitle();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Subject
         if ($this->spreadsheet->getProperties()->getSubject()) {
             $dataProp = $this->spreadsheet->getProperties()->getSubject();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x03),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Author (Creator)
         if ($this->spreadsheet->getProperties()->getCreator()) {
             $dataProp = $this->spreadsheet->getProperties()->getCreator();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x04),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Keywords
         if ($this->spreadsheet->getProperties()->getKeywords()) {
             $dataProp = $this->spreadsheet->getProperties()->getKeywords();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x05),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Comments (Description)
         if ($this->spreadsheet->getProperties()->getDescription()) {
             $dataProp = $this->spreadsheet->getProperties()->getDescription();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x06),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Last Saved By (LastModifiedBy)
         if ($this->spreadsheet->getProperties()->getLastModifiedBy()) {
             $dataProp = $this->spreadsheet->getProperties()->getLastModifiedBy();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x08),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-                                   'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+                                    'data'    => array('data' => $dataProp, 'length' => strlen($dataProp)));
             $dataSection_NumProps++;
         }
         //    Created Date/Time
         if ($this->spreadsheet->getProperties()->getCreated()) {
             $dataProp = $this->spreadsheet->getProperties()->getCreated();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-                                   'data'    => array('data' => \PhpSpreadsheet\Shared\OLE::localDateToOLE($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                                    'data'    => array('data' => \PhpSpreadsheet\Shared\OLE::localDateToOLE($dataProp)));
             $dataSection_NumProps++;
         }
         //    Modified Date/Time
         if ($this->spreadsheet->getProperties()->getModified()) {
             $dataProp = $this->spreadsheet->getProperties()->getModified();
             $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
-                                   'offset' => array('pack' => 'V'),
-                                   'type'     => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-                                   'data'    => array('data' => \PhpSpreadsheet\Shared\OLE::localDateToOLE($dataProp)));
+                                    'offset' => array('pack' => 'V'),
+                                    'type'     => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                                    'data'    => array('data' => \PhpSpreadsheet\Shared\OLE::localDateToOLE($dataProp)));
             $dataSection_NumProps++;
         }
         //    Security
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
-                               'offset' => array('pack' => 'V'),
-                               'type'     => array('pack' => 'V', 'data' => 0x03), // 4 byte signed integer
-                               'data'    => array('data' => 0x00));
+                                'offset' => array('pack' => 'V'),
+                                'type'     => array('pack' => 'V', 'data' => 0x03), // 4 byte signed integer
+                                'data'    => array('data' => 0x00));
         $dataSection_NumProps++;
 
 

Spacing +6 added lines, -6 removed lines

@@ -100,7 +100,7 @@ 
     {
         $this->spreadsheet = $spreadsheet;
 
-        $this->parser   = new Excel5\Parser();
+        $this->parser = new Excel5\Parser();
     }
 
     /**
@@ -338,9 +338,9 @@ 
                     ++$countShapes[$sheetIndex];
 
                     // create an Drawing Object for the dropdown
-                    $oDrawing  = new \PhpSpreadsheet\Worksheet\BaseDrawing();
+                    $oDrawing = new \PhpSpreadsheet\Worksheet\BaseDrawing();
                     // get the coordinates of drawing
-                    $cDrawing   = \PhpSpreadsheet\Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
+                    $cDrawing = \PhpSpreadsheet\Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
                     $oDrawing->setCoordinates($cDrawing);
                     $oDrawing->setWorksheet($sheet);
 
@@ -622,7 +622,7 @@ 
           $dataProp .= pack('v', 0x000A);
           $dataProp .= pack('v', 0x0000);
           // value
-          $dataProp .= 'Worksheet'.chr(0);
+          $dataProp .= 'Worksheet' . chr(0);
 
         $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
                                'offset' => array('pack' => 'V'),
@@ -696,7 +696,7 @@ 
                 $dataProp['data']['data'] .= chr(0);
                 $dataProp['data']['length'] += 1;
                 // Complete the string with null string for being a %4
-                $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
+                $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
                 $dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
 
                 $dataSection_Content .= pack('V', $dataProp['data']['length']);
@@ -872,7 +872,7 @@ 
                 $dataProp['data']['data'] .= chr(0);
                 $dataProp['data']['length'] += 1;
                 // Complete the string with null string for being a %4
-                $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
+                $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
                 $dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
 
                 $dataSection_Content .= pack('V', $dataProp['data']['length']);

src/PhpSpreadsheet/Writer/Excel5/Xf.php

Spacing +42 added lines, -42 removed lines

@@ -132,23 +132,23 @@ 
      */
     public function __construct(\PhpSpreadsheet\Style $style = null)
     {
-        $this->isStyleXf =     false;
+        $this->isStyleXf = false;
         $this->fontIndex = 0;
 
-        $this->numberFormatIndex     = 0;
+        $this->numberFormatIndex = 0;
 
-        $this->textJustLast  = 0;
+        $this->textJustLast = 0;
 
         $this->foregroundColor       = 0x40;
         $this->backgroundColor       = 0x41;
 
-        $this->_diag           = 0;
+        $this->_diag = 0;
 
         $this->bottomBorderColor   = 0x40;
         $this->topBorderColor      = 0x40;
         $this->leftBorderColor     = 0x40;
         $this->rightBorderColor    = 0x40;
-        $this->_diag_color     = 0x40;
+        $this->_diag_color = 0x40;
         $this->_style = $style;
     }
 
@@ -169,16 +169,16 @@ 
         }
 
         // Flags to indicate if attributes have been set.
-        $atr_num     = ($this->numberFormatIndex != 0)?1:0;
-        $atr_fnt     = ($this->fontIndex != 0)?1:0;
+        $atr_num     = ($this->numberFormatIndex != 0) ? 1 : 0;
+        $atr_fnt     = ($this->fontIndex != 0) ? 1 : 0;
         $atr_alc     = ((int) $this->_style->getAlignment()->getWrapText()) ? 1 : 0;
-        $atr_bdr     = (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())   ||
-                        self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())      ||
-                        self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle())     ||
-                        self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()))?1:0;
+        $atr_bdr     = (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) ||
+                        self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) ||
+                        self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) ||
+                        self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())) ? 1 : 0;
         $atr_pat     = (($this->foregroundColor != 0x40) ||
                         ($this->backgroundColor != 0x41) ||
-                        self::mapFillType($this->_style->getFill()->getFillType()))?1:0;
+                        self::mapFillType($this->_style->getFill()->getFillType())) ? 1 : 0;
         $atr_prot    = self::mapLocked($this->_style->getProtection()->getLocked())
                         | self::mapHidden($this->_style->getProtection()->getHidden());
 
@@ -186,7 +186,7 @@ 
         if (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) == 0) {
             $this->bottomBorderColor = 0;
         }
-        if (self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())  == 0) {
+        if (self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) == 0) {
             $this->topBorderColor = 0;
         }
         if (self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) == 0) {
@@ -199,47 +199,47 @@ 
             $this->_diag_color = 0;
         }
 
-        $record = 0x00E0;              // Record identifier
-        $length = 0x0014;              // Number of bytes to follow
+        $record = 0x00E0; // Record identifier
+        $length = 0x0014; // Number of bytes to follow
 
-        $ifnt = $this->fontIndex;   // Index to FONT record
-        $ifmt = $this->numberFormatIndex;  // Index to FORMAT record
+        $ifnt = $this->fontIndex; // Index to FONT record
+        $ifmt = $this->numberFormatIndex; // Index to FORMAT record
 
-        $align  = $this->mapHAlign($this->_style->getAlignment()->getHorizontal());       // Alignment
-        $align |= (int) $this->_style->getAlignment()->getWrapText()     << 3;
-        $align |= self::mapVAlign($this->_style->getAlignment()->getVertical())  << 4;
+        $align  = $this->mapHAlign($this->_style->getAlignment()->getHorizontal()); // Alignment
+        $align |= (int) $this->_style->getAlignment()->getWrapText() << 3;
+        $align |= self::mapVAlign($this->_style->getAlignment()->getVertical()) << 4;
         $align |= $this->textJustLast << 7;
 
-        $used_attrib  = $atr_num  << 2;
-        $used_attrib |= $atr_fnt  << 3;
-        $used_attrib |= $atr_alc  << 4;
-        $used_attrib |= $atr_bdr  << 5;
-        $used_attrib |= $atr_pat  << 6;
+        $used_attrib  = $atr_num << 2;
+        $used_attrib |= $atr_fnt << 3;
+        $used_attrib |= $atr_alc << 4;
+        $used_attrib |= $atr_bdr << 5;
+        $used_attrib |= $atr_pat << 6;
         $used_attrib |= $atr_prot << 7;
 
-        $icv  = $this->foregroundColor;      // fg and bg pattern colors
-        $icv |= $this->backgroundColor      << 7;
+        $icv  = $this->foregroundColor; // fg and bg pattern colors
+        $icv |= $this->backgroundColor << 7;
 
-        $border1  = self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle());          // Border line style and color
-        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())         << 4;
-        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())           << 8;
-        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())        << 12;
-        $border1 |= $this->leftBorderColor    << 16;
-        $border1 |= $this->rightBorderColor   << 23;
+        $border1  = self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()); // Border line style and color
+        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) << 4;
+        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) << 8;
+        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) << 12;
+        $border1 |= $this->leftBorderColor << 16;
+        $border1 |= $this->rightBorderColor << 23;
 
         $diagonalDirection = $this->_style->getBorders()->getDiagonalDirection();
         $diag_tl_to_rb = $diagonalDirection == \PhpSpreadsheet\Style\Borders::DIAGONAL_BOTH
                             || $diagonalDirection == \PhpSpreadsheet\Style\Borders::DIAGONAL_DOWN;
         $diag_tr_to_lb = $diagonalDirection == \PhpSpreadsheet\Style\Borders::DIAGONAL_BOTH
                             || $diagonalDirection == \PhpSpreadsheet\Style\Borders::DIAGONAL_UP;
-        $border1 |= $diag_tl_to_rb        << 30;
-        $border1 |= $diag_tr_to_lb        << 31;
+        $border1 |= $diag_tl_to_rb << 30;
+        $border1 |= $diag_tr_to_lb << 31;
 
-        $border2  = $this->topBorderColor;    // Border color
-        $border2 |= $this->bottomBorderColor   << 7;
-        $border2 |= $this->_diag_color     << 14;
-        $border2 |= self::mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle())           << 21;
-        $border2 |= self::mapFillType($this->_style->getFill()->getFillType())        << 26;
+        $border2  = $this->topBorderColor; // Border color
+        $border2 |= $this->bottomBorderColor << 7;
+        $border2 |= $this->_diag_color << 14;
+        $border2 |= self::mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) << 21;
+        $border2 |= self::mapFillType($this->_style->getFill()->getFillType()) << 26;
 
         $header = pack("vv", $record, $length);
 
@@ -425,8 +425,8 @@ 
         \PhpSpreadsheet\Style\Fill::FILL_PATTERN_LIGHTTRELLIS    => 0x10,
         \PhpSpreadsheet\Style\Fill::FILL_PATTERN_GRAY125         => 0x11,
         \PhpSpreadsheet\Style\Fill::FILL_PATTERN_GRAY0625        => 0x12,
-        \PhpSpreadsheet\Style\Fill::FILL_GRADIENT_LINEAR         => 0x00,    // does not exist in BIFF8
-        \PhpSpreadsheet\Style\Fill::FILL_GRADIENT_PATH           => 0x00,    // does not exist in BIFF8
+        \PhpSpreadsheet\Style\Fill::FILL_GRADIENT_LINEAR         => 0x00, // does not exist in BIFF8
+        \PhpSpreadsheet\Style\Fill::FILL_GRADIENT_PATH           => 0x00, // does not exist in BIFF8
     );
 
     /**

src/PhpSpreadsheet/Writer/Excel5/Worksheet.php

Spacing +327 added lines, -327 removed lines

@@ -215,7 +215,7 @@ 
 
         $this->_preCalculateFormulas = $preCalculateFormulas;
         $this->stringTotal        = &$str_total;
-        $this->stringUnique        = &$str_unique;
+        $this->stringUnique = &$str_unique;
         $this->stringTable        = &$str_table;
         $this->colors            = &$colors;
         $this->parser            = $parser;
@@ -226,7 +226,7 @@ 
         //$this->offset            = 0;
         $this->xlsStringMaxLength = 255;
         $this->columnInfo  = array();
-        $this->selection   = array(0,0,0,0);
+        $this->selection   = array(0, 0, 0, 0);
         $this->activePane  = 3;
 
         $this->_print_headers = 0;
@@ -242,12 +242,12 @@ 
         $minR = 1;
         $minC = 'A';
 
-        $maxR  = $this->phpSheet->getHighestRow();
+        $maxR = $this->phpSheet->getHighestRow();
         $maxC = $this->phpSheet->getHighestColumn();
 
         // Determine lowest and highest column and row
 //        $this->firstRowIndex = ($minR > 65535) ? 65535 : $minR;
-        $this->lastRowIndex = ($maxR > 65535) ? 65535 : $maxR ;
+        $this->lastRowIndex = ($maxR > 65535) ? 65535 : $maxR;
 
         $this->firstColumnIndex = \PhpSpreadsheet\Cell::columnIndexFromString($minC);
         $this->lastColumnIndex  = \PhpSpreadsheet\Cell::columnIndexFromString($maxC);
@@ -294,7 +294,7 @@ 
         }
 
         $columnDimensions = $phpSheet->getColumnDimensions();
-        $maxCol = $this->lastColumnIndex -1;
+        $maxCol = $this->lastColumnIndex - 1;
         for ($i = 0; $i <= $maxCol; ++$i) {
             $hidden = 0;
             $level = 0;
@@ -544,7 +544,7 @@ 
         }
 
         $firstCellCoordinates = \PhpSpreadsheet\Cell::coordinateFromString($firstCell); // e.g. array(0, 1)
-        $lastCellCoordinates  = \PhpSpreadsheet\Cell::coordinateFromString($lastCell);  // e.g. array(1, 6)
+        $lastCellCoordinates  = \PhpSpreadsheet\Cell::coordinateFromString($lastCell); // e.g. array(1, 6)
 
         return pack('vvvv', $firstCellCoordinates[1] - 1, $lastCellCoordinates[1] - 1, \PhpSpreadsheet\Cell::columnIndexFromString($firstCellCoordinates[0]) - 1, \PhpSpreadsheet\Cell::columnIndexFromString($lastCellCoordinates[0]) - 1);
     }
@@ -561,7 +561,7 @@ 
 
         // Return data stored in memory
         if (isset($this->_data)) {
-            $tmp   = $this->_data;
+            $tmp = $this->_data;
             unset($this->_data);
             return $tmp;
         }
@@ -618,17 +618,17 @@ 
      */
     private function writeNumber($row, $col, $num, $xfIndex)
     {
-        $record    = 0x0203;                 // Record identifier
-        $length    = 0x000E;                 // Number of bytes to follow
+        $record    = 0x0203; // Record identifier
+        $length    = 0x000E; // Number of bytes to follow
 
-        $header        = pack("vv", $record, $length);
-        $data        = pack("vvv", $row, $col, $xfIndex);
-        $xl_double    = pack("d", $num);
+        $header = pack("vv", $record, $length);
+        $data = pack("vvv", $row, $col, $xfIndex);
+        $xl_double = pack("d", $num);
         if (self::getByteOrder()) { // if it's Big Endian
             $xl_double = strrev($xl_double);
         }
 
-        $this->append($header.$data.$xl_double);
+        $this->append($header . $data . $xl_double);
         return(0);
     }
 
@@ -656,8 +656,8 @@ 
      */
     private function writeRichTextString($row, $col, $str, $xfIndex, $arrcRun)
     {
-        $record    = 0x00FD;                   // Record identifier
-        $length    = 0x000A;                   // Bytes to follow
+        $record    = 0x00FD; // Record identifier
+        $length    = 0x000A; // Bytes to follow
         $str = \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeShort($str, $arrcRun);
 
         /* check if string is already present */
@@ -666,9 +666,9 @@ 
         }
         $this->stringTotal++;
 
-        $header    = pack('vv', $record, $length);
-        $data    = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
-        $this->append($header.$data);
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
+        $this->append($header . $data);
     }
 
     /**
@@ -689,20 +689,20 @@ 
     private function writeLabel($row, $col, $str, $xfIndex)
     {
         $strlen    = strlen($str);
-        $record    = 0x0204;                   // Record identifier
-        $length    = 0x0008 + $strlen;         // Bytes to follow
+        $record    = 0x0204; // Record identifier
+        $length    = 0x0008 + $strlen; // Bytes to follow
 
         $str_error = 0;
 
         if ($strlen > $this->xlsStringMaxLength) { // LABEL must be < 255 chars
-            $str    = substr($str, 0, $this->xlsStringMaxLength);
+            $str = substr($str, 0, $this->xlsStringMaxLength);
             $length    = 0x0008 + $this->xlsStringMaxLength;
             $strlen    = $this->xlsStringMaxLength;
             $str_error = -3;
         }
 
-        $header    = pack("vv", $record, $length);
-        $data    = pack("vvvv", $row, $col, $xfIndex, $strlen);
+        $header = pack("vv", $record, $length);
+        $data = pack("vvvv", $row, $col, $xfIndex, $strlen);
         $this->append($header . $data . $str);
         return($str_error);
     }
@@ -724,8 +724,8 @@ 
      */
     private function writeLabelSst($row, $col, $str, $xfIndex)
     {
-        $record    = 0x00FD;                   // Record identifier
-        $length    = 0x000A;                   // Bytes to follow
+        $record    = 0x00FD; // Record identifier
+        $length    = 0x000A; // Bytes to follow
 
         $str = \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeLong($str);
 
@@ -735,9 +735,9 @@ 
         }
         $this->stringTotal++;
 
-        $header    = pack('vv', $record, $length);
-        $data    = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
-        $this->append($header.$data);
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
+        $this->append($header . $data);
     }
 
     /**
@@ -750,14 +750,14 @@ 
      */
     private function writeNote($row, $col, $note)
     {
-        $note_length    = strlen($note);
-        $record            = 0x001C;            // Record identifier
-        $max_length        = 2048;                // Maximun length for a NOTE record
+        $note_length = strlen($note);
+        $record            = 0x001C; // Record identifier
+        $max_length        = 2048; // Maximun length for a NOTE record
 
         // Length for this record is no more than 2048 + 6
         $length    = 0x0006 + min($note_length, 2048);
         $header    = pack("vv", $record, $length);
-        $data    = pack("vvv", $row, $col, $note_length);
+        $data = pack("vvv", $row, $col, $note_length);
         $this->append($header . $data . substr($note, 0, 2048));
 
         for ($i = $max_length; $i < $note_length; $i += $max_length) {
@@ -765,7 +765,7 @@ 
             $length = 0x0006 + strlen($chunk);
             $header = pack("vv", $record, $length);
             $data   = pack("vvv", -1, 0, strlen($chunk));
-            $this->append($header.$data.$chunk);
+            $this->append($header . $data . $chunk);
         }
         return(0);
     }
@@ -788,8 +788,8 @@ 
      */
     public function writeBlank($row, $col, $xfIndex)
     {
-        $record    = 0x0201;                 // Record identifier
-        $length    = 0x0006;                 // Number of bytes to follow
+        $record    = 0x0201; // Record identifier
+        $length    = 0x0006; // Number of bytes to follow
 
         $header    = pack("vv", $record, $length);
         $data      = pack("vvv", $row, $col, $xfIndex);
@@ -835,7 +835,7 @@ 
      */
     private function writeFormula($row, $col, $formula, $xfIndex, $calculatedValue)
     {
-        $record    = 0x0006;     // Record identifier
+        $record = 0x0006; // Record identifier
 
         // Initialize possible additional value for STRING record that should be written after the FORMULA record?
         $stringValue = null;
@@ -846,7 +846,7 @@ 
             // we use best effort to determine data type
             if (is_bool($calculatedValue)) {
                 // Boolean value
-                $num = pack('CCCvCv', 0x01, 0x00, (int)$calculatedValue, 0x00, 0x00, 0xFFFF);
+                $num = pack('CCCvCv', 0x01, 0x00, (int) $calculatedValue, 0x00, 0x00, 0xFFFF);
             } elseif (is_int($calculatedValue) || is_float($calculatedValue)) {
                 // Numeric value
                 $num = pack('d', $calculatedValue);
@@ -870,8 +870,8 @@ 
             $num = pack('d', 0x00);
         }
 
-        $grbit        = 0x03;                // Option flags
-        $unknown    = 0x0000;            // Must be zero
+        $grbit = 0x03; // Option flags
+        $unknown = 0x0000; // Must be zero
 
         // Strip the '=' or '@' sign at the beginning of the formula string
         if ($formula{0} == '=') {
@@ -887,8 +887,8 @@ 
             $error = $this->parser->parse($formula);
             $formula = $this->parser->toReversePolish();
 
-            $formlen    = strlen($formula);    // Length of the binary string
-            $length     = 0x16 + $formlen;     // Length of the record data
+            $formlen    = strlen($formula); // Length of the binary string
+            $length     = 0x16 + $formlen; // Length of the record data
 
             $header    = pack("vv", $record, $length);
 
@@ -914,7 +914,7 @@ 
      */
     private function writeStringRecord($stringValue)
     {
-        $record = 0x0207;     // Record identifier
+        $record = 0x0207; // Record identifier
         $data = \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeLong($stringValue);
 
         $length = strlen($data);
@@ -992,8 +992,8 @@ 
      */
     public function writeUrlWeb($row1, $col1, $row2, $col2, $url)
     {
-        $record      = 0x01B8;                       // Record identifier
-        $length      = 0x00000;                      // Bytes to follow
+        $record      = 0x01B8; // Record identifier
+        $length      = 0x00000; // Bytes to follow
 
         // Pack the undocumented parts of the hyperlink stream
         $unknown1    = pack("H*", "D0C9EA79F9BACE118C8200AA004BA90B02000000");
@@ -1037,8 +1037,8 @@ 
      */
     public function writeUrlInternal($row1, $col1, $row2, $col2, $url)
     {
-        $record      = 0x01B8;                       // Record identifier
-        $length      = 0x00000;                      // Bytes to follow
+        $record      = 0x01B8; // Record identifier
+        $length      = 0x00000; // Bytes to follow
 
         // Strip URL type
         $url = preg_replace('/^internal:/', '', $url);
@@ -1096,8 +1096,8 @@ 
             return; //($this->writeUrlExternal_net($row1, $col1, $row2, $col2, $url, $str, $format));
         }
 
-        $record      = 0x01B8;                       // Record identifier
-        $length      = 0x00000;                      // Bytes to follow
+        $record      = 0x01B8; // Record identifier
+        $length      = 0x00000; // Bytes to follow
 
         // Strip URL type and change Unix dir separator to Dos style (if needed)
         //
@@ -1113,7 +1113,7 @@ 
         if (preg_match('/^[A-Z]:/', $url)) {
             $absolute = 0x02; // absolute path on Windows, e.g. C:\...
         }
-        $link_type               = 0x01 | $absolute;
+        $link_type = 0x01 | $absolute;
 
         // Determine if the link contains a sheet reference and change some of the
         // parameters accordingly.
@@ -1135,7 +1135,7 @@ 
         $dir_short   = preg_replace("/\.\.\\\/", '', $dir_long) . "\0";
 
         // Store the long dir name as a wchar string (non-null terminated)
-        $dir_long       = $dir_long . "\0";
+        $dir_long = $dir_long . "\0";
 
         // Pack the lengths of the dir strings
         $dir_short_len = pack("V", strlen($dir_short));
@@ -1149,15 +1149,15 @@ 
         $unknown4 = pack("v", 0x03);
 
         // Pack the main data stream
-        $data        = pack("vvvv", $row1, $row2, $col1, $col2) .
-                          $unknown1     .
-                          $link_type    .
-                          $unknown2     .
-                          $up_count     .
-                          $dir_short_len.
-                          $dir_short    .
-                          $unknown3     .
-                          $stream_len   ;/*.
+        $data = pack("vvvv", $row1, $row2, $col1, $col2) .
+                          $unknown1 .
+                          $link_type .
+                          $unknown2 .
+                          $up_count .
+                          $dir_short_len .
+                          $dir_short .
+                          $unknown3 .
+                          $stream_len; /*.
                           $dir_long_len .
                           $unknown4     .
                           $dir_long     .
@@ -1169,7 +1169,7 @@ 
         $header   = pack("vv", $record, $length);
 
         // Write the packed data
-        $this->append($header. $data);
+        $this->append($header . $data);
         return 0;
     }
 
@@ -1185,14 +1185,14 @@ 
      */
     private function writeRow($row, $height, $xfIndex, $hidden = false, $level = 0)
     {
-        $record      = 0x0208;               // Record identifier
-        $length      = 0x0010;               // Number of bytes to follow
-
-        $colMic      = 0x0000;               // First defined column
-        $colMac      = 0x0000;               // Last defined column
-        $irwMac      = 0x0000;               // Used by Excel to optimise loading
-        $reserved    = 0x0000;               // Reserved
-        $grbit       = 0x0000;               // Option flags
+        $record      = 0x0208; // Record identifier
+        $length      = 0x0010; // Number of bytes to follow
+
+        $colMic      = 0x0000; // First defined column
+        $colMac      = 0x0000; // Last defined column
+        $irwMac      = 0x0000; // Used by Excel to optimise loading
+        $reserved    = 0x0000; // Reserved
+        $grbit       = 0x0000; // Option flags
         $ixfe        = $xfIndex;
 
         if ($height < 0) {
@@ -1201,9 +1201,9 @@ 
 
         // Use writeRow($row, null, $XF) to set XF format without setting height
         if ($height != null) {
-            $miyRw = $height * 20;  // row height
+            $miyRw = $height * 20; // row height
         } else {
-            $miyRw = 0xff;          // default row height is 256
+            $miyRw = 0xff; // default row height is 256
         }
 
         // Set the options flags. fUnsynced is used to show that the font and row
@@ -1226,7 +1226,7 @@ 
 
         $header   = pack("vv", $record, $length);
         $data     = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw, $irwMac, $reserved, $grbit, $ixfe);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1240,7 +1240,7 @@ 
         $data = pack('VVvvv', $this->firstRowIndex, $this->lastRowIndex + 1, $this->firstColumnIndex, $this->lastColumnIndex + 1, 0x0000); // reserved
 
         $header = pack("vv", $record, $length);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1248,53 +1248,53 @@ 
      */
     private function writeWindow2()
     {
-        $record         = 0x023E;     // Record identifier
+        $record         = 0x023E; // Record identifier
         $length         = 0x0012;
 
-        $grbit          = 0x00B6;     // Option flags
-        $rwTop          = 0x0000;     // Top row visible in window
-        $colLeft        = 0x0000;     // Leftmost column visible in window
+        $grbit          = 0x00B6; // Option flags
+        $rwTop          = 0x0000; // Top row visible in window
+        $colLeft        = 0x0000; // Leftmost column visible in window
 
 
         // The options flags that comprise $grbit
-        $fDspFmla       = 0;                     // 0 - bit
+        $fDspFmla       = 0; // 0 - bit
         $fDspGrid       = $this->phpSheet->getShowGridlines() ? 1 : 0; // 1
         $fDspRwCol      = $this->phpSheet->getShowRowColHeaders() ? 1 : 0; // 2
-        $fFrozen        = $this->phpSheet->getFreezePane() ? 1 : 0;        // 3
-        $fDspZeros      = 1;                     // 4
-        $fDefaultHdr    = 1;                     // 5
+        $fFrozen        = $this->phpSheet->getFreezePane() ? 1 : 0; // 3
+        $fDspZeros      = 1; // 4
+        $fDefaultHdr    = 1; // 5
         $fArabic        = $this->phpSheet->getRightToLeft() ? 1 : 0; // 6
-        $fDspGuts       = $this->outlineOn;    // 7
-        $fFrozenNoSplit = 0;                     // 0 - bit
+        $fDspGuts       = $this->outlineOn; // 7
+        $fFrozenNoSplit = 0; // 0 - bit
         // no support in PhpSpreadsheet for selected sheet, therefore sheet is only selected if it is the active sheet
         $fSelected      = ($this->phpSheet === $this->phpSheet->getParent()->getActiveSheet()) ? 1 : 0;
-        $fPaged         = 1;                     // 2
+        $fPaged         = 1; // 2
         $fPageBreakPreview = $this->phpSheet->getSheetView()->getView() === \PhpSpreadsheet\Worksheet\SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW;
 
         $grbit             = $fDspFmla;
-        $grbit            |= $fDspGrid       << 1;
-        $grbit            |= $fDspRwCol       << 2;
-        $grbit            |= $fFrozen           << 3;
-        $grbit            |= $fDspZeros       << 4;
-        $grbit            |= $fDefaultHdr       << 5;
-        $grbit            |= $fArabic           << 6;
-        $grbit            |= $fDspGuts       << 7;
+        $grbit            |= $fDspGrid << 1;
+        $grbit            |= $fDspRwCol << 2;
+        $grbit            |= $fFrozen << 3;
+        $grbit            |= $fDspZeros << 4;
+        $grbit            |= $fDefaultHdr << 5;
+        $grbit            |= $fArabic << 6;
+        $grbit            |= $fDspGuts << 7;
         $grbit            |= $fFrozenNoSplit << 8;
-        $grbit            |= $fSelected       << 9;
-        $grbit            |= $fPaged           << 10;
+        $grbit            |= $fSelected << 9;
+        $grbit            |= $fPaged << 10;
         $grbit            |= $fPageBreakPreview << 11;
 
         $header  = pack("vv", $record, $length);
         $data    = pack("vvv", $grbit, $rwTop, $colLeft);
 
         // FIXME !!!
-        $rgbHdr       = 0x0040; // Row/column heading and gridline color index
+        $rgbHdr = 0x0040; // Row/column heading and gridline color index
         $zoom_factor_page_break = ($fPageBreakPreview ? $this->phpSheet->getSheetView()->getZoomScale() : 0x0000);
-        $zoom_factor_normal =  $this->phpSheet->getSheetView()->getZoomScaleNormal();
+        $zoom_factor_normal = $this->phpSheet->getSheetView()->getZoomScaleNormal();
 
         $data .= pack("vvvvV", $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1311,8 +1311,8 @@ 
         // convert to twips
         $defaultRowHeight = (int) 20 * $defaultRowHeight;
 
-        $record   = 0x0225;      // Record identifier
-        $length   = 0x0004;      // Number of bytes to follow
+        $record   = 0x0225; // Record identifier
+        $length   = 0x0004; // Number of bytes to follow
 
         $header   = pack("vv", $record, $length);
         $data     = pack("vv", 1, $defaultRowHeight);
@@ -1326,8 +1326,8 @@ 
     {
         $defaultColWidth = 8;
 
-        $record   = 0x0055;      // Record identifier
-        $length   = 0x0002;      // Number of bytes to follow
+        $record   = 0x0055; // Record identifier
+        $length   = 0x0002; // Number of bytes to follow
 
         $header = pack("vv", $record, $length);
         $data = pack("v", $defaultColWidth);
@@ -1376,20 +1376,20 @@ 
         } else {
             $level = 0;
         }
-        $record   = 0x007D;          // Record identifier
-        $length   = 0x000C;          // Number of bytes to follow
+        $record   = 0x007D; // Record identifier
+        $length   = 0x000C; // Number of bytes to follow
 
-        $coldx   *= 256;             // Convert to units of 1/256 of a char
+        $coldx   *= 256; // Convert to units of 1/256 of a char
 
         $ixfe     = $xfIndex;
-        $reserved = 0x0000;            // Reserved
+        $reserved = 0x0000; // Reserved
 
         $level = max(0, min($level, 7));
         $grbit |= $level << 8;
 
         $header   = pack("vv", $record, $length);
         $data     = pack("vvvvvv", $colFirst, $colLast, $coldx, $ixfe, $grbit, $reserved);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1423,20 +1423,20 @@ 
         $rwFirst = min($rwFirst, 65535);
         $rwLast  = min($rwLast, 65535);
 
-        $record   = 0x001D;                  // Record identifier
-        $length   = 0x000F;                  // Number of bytes to follow
+        $record   = 0x001D; // Record identifier
+        $length   = 0x000F; // Number of bytes to follow
 
-        $pnn      = $this->activePane;     // Pane position
-        $rwAct    = $rwFirst;                // Active row
-        $colAct   = $colFirst;               // Active column
-        $irefAct  = 0;                       // Active cell ref
-        $cref     = 1;                       // Number of refs
+        $pnn      = $this->activePane; // Pane position
+        $rwAct    = $rwFirst; // Active row
+        $colAct   = $colFirst; // Active column
+        $irefAct  = 0; // Active cell ref
+        $cref     = 1; // Number of refs
 
         if (!isset($rwLast)) {
-            $rwLast   = $rwFirst;       // Last  row in reference
+            $rwLast   = $rwFirst; // Last  row in reference
         }
         if (!isset($colLast)) {
-            $colLast  = $colFirst;      // Last  col in reference
+            $colLast  = $colFirst; // Last  col in reference
         }
 
         // Swap last row/col for first row/col as necessary
@@ -1543,21 +1543,21 @@ 
         $record = 0x0867;
 
         // prepare options
-        $options  =   (int) !$this->phpSheet->getProtection()->getObjects()
-                    | (int) !$this->phpSheet->getProtection()->getScenarios()           << 1
-                    | (int) !$this->phpSheet->getProtection()->getFormatCells()         << 2
-                    | (int) !$this->phpSheet->getProtection()->getFormatColumns()       << 3
-                    | (int) !$this->phpSheet->getProtection()->getFormatRows()          << 4
-                    | (int) !$this->phpSheet->getProtection()->getInsertColumns()       << 5
-                    | (int) !$this->phpSheet->getProtection()->getInsertRows()          << 6
-                    | (int) !$this->phpSheet->getProtection()->getInsertHyperlinks()    << 7
-                    | (int) !$this->phpSheet->getProtection()->getDeleteColumns()       << 8
-                    | (int) !$this->phpSheet->getProtection()->getDeleteRows()          << 9
-                    | (int) !$this->phpSheet->getProtection()->getSelectLockedCells()   << 10
-                    | (int) !$this->phpSheet->getProtection()->getSort()                << 11
-                    | (int) !$this->phpSheet->getProtection()->getAutoFilter()          << 12
-                    | (int) !$this->phpSheet->getProtection()->getPivotTables()         << 13
-                    | (int) !$this->phpSheet->getProtection()->getSelectUnlockedCells() << 14 ;
+        $options = (int) !$this->phpSheet->getProtection()->getObjects()
+                    | (int) !$this->phpSheet->getProtection()->getScenarios() << 1
+                    | (int) !$this->phpSheet->getProtection()->getFormatCells() << 2
+                    | (int) !$this->phpSheet->getProtection()->getFormatColumns() << 3
+                    | (int) !$this->phpSheet->getProtection()->getFormatRows() << 4
+                    | (int) !$this->phpSheet->getProtection()->getInsertColumns() << 5
+                    | (int) !$this->phpSheet->getProtection()->getInsertRows() << 6
+                    | (int) !$this->phpSheet->getProtection()->getInsertHyperlinks() << 7
+                    | (int) !$this->phpSheet->getProtection()->getDeleteColumns() << 8
+                    | (int) !$this->phpSheet->getProtection()->getDeleteRows() << 9
+                    | (int) !$this->phpSheet->getProtection()->getSelectLockedCells() << 10
+                    | (int) !$this->phpSheet->getProtection()->getSort() << 11
+                    | (int) !$this->phpSheet->getProtection()->getAutoFilter() << 12
+                    | (int) !$this->phpSheet->getProtection()->getPivotTables() << 13
+                    | (int) !$this->phpSheet->getProtection()->getSelectUnlockedCells() << 14;
 
         // record data
         $recordData = pack(
@@ -1620,7 +1620,7 @@ 
 
             $length = strlen($recordData);
 
-            $record = 0x0868;        // Record identifier
+            $record = 0x0868; // Record identifier
             $header = pack("vv", $record, $length);
             $this->append($header . $recordData);
         }
@@ -1640,8 +1640,8 @@ 
      */
     private function writeExterncount($count)
     {
-        $record = 0x0016;          // Record identifier
-        $length = 0x0002;          // Number of bytes to follow
+        $record = 0x0016; // Record identifier
+        $length = 0x0002; // Number of bytes to follow
 
         $header = pack("vv", $record, $length);
         $data   = pack("v", $count);
@@ -1658,20 +1658,20 @@ 
      */
     private function writeExternsheet($sheetname)
     {
-        $record    = 0x0017;         // Record identifier
+        $record = 0x0017; // Record identifier
 
         // References to the current sheet are encoded differently to references to
         // external sheets.
         //
         if ($this->phpSheet->getTitle() == $sheetname) {
             $sheetname = '';
-            $length    = 0x02;  // The following 2 bytes
-            $cch       = 1;     // The following byte
-            $rgch      = 0x02;  // Self reference
+            $length    = 0x02; // The following 2 bytes
+            $cch       = 1; // The following byte
+            $rgch      = 0x02; // Self reference
         } else {
             $length    = 0x02 + strlen($sheetname);
             $cch       = strlen($sheetname);
-            $rgch      = 0x03;  // Reference to a sheet in the current workbook
+            $rgch      = 0x03; // Reference to a sheet in the current workbook
         }
 
         $header = pack("vv", $record, $length);
@@ -1706,8 +1706,8 @@ 
         } else {
             $pnnAct = null;
         }
-        $record  = 0x0041;       // Record identifier
-        $length  = 0x000A;       // Number of bytes to follow
+        $record  = 0x0041; // Record identifier
+        $length  = 0x000A; // Number of bytes to follow
 
         // Code specific to frozen or thawed panes.
         if ($this->phpSheet->getFreezePane()) {
@@ -1732,8 +1732,8 @@ 
             // The default column width is 8.43
             // The following slope and intersection values were interpolated.
             //
-            $y = 20*$y + 255;
-            $x = 113.879*$x + 390;
+            $y = 20 * $y + 255;
+            $x = 113.879 * $x + 390;
         }
 
 
@@ -1767,47 +1767,47 @@ 
      */
     private function writeSetup()
     {
-        $record       = 0x00A1;                  // Record identifier
-        $length       = 0x0022;                  // Number of bytes to follow
+        $record       = 0x00A1; // Record identifier
+        $length       = 0x0022; // Number of bytes to follow
 
-        $iPaperSize   = $this->phpSheet->getPageSetup()->getPaperSize();    // Paper size
+        $iPaperSize   = $this->phpSheet->getPageSetup()->getPaperSize(); // Paper size
 
         $iScale = $this->phpSheet->getPageSetup()->getScale() ?
-            $this->phpSheet->getPageSetup()->getScale() : 100;   // Print scaling factor
+            $this->phpSheet->getPageSetup()->getScale() : 100; // Print scaling factor
 
-        $iPageStart   = 0x01;                 // Starting page number
-        $iFitWidth    = (int) $this->phpSheet->getPageSetup()->getFitToWidth();    // Fit to number of pages wide
-        $iFitHeight    = (int) $this->phpSheet->getPageSetup()->getFitToHeight();    // Fit to number of pages high
-        $grbit        = 0x00;                 // Option flags
-        $iRes         = 0x0258;               // Print resolution
-        $iVRes        = 0x0258;               // Vertical print resolution
+        $iPageStart   = 0x01; // Starting page number
+        $iFitWidth    = (int) $this->phpSheet->getPageSetup()->getFitToWidth(); // Fit to number of pages wide
+        $iFitHeight = (int) $this->phpSheet->getPageSetup()->getFitToHeight(); // Fit to number of pages high
+        $grbit        = 0x00; // Option flags
+        $iRes         = 0x0258; // Print resolution
+        $iVRes        = 0x0258; // Vertical print resolution
 
-        $numHdr       = $this->phpSheet->getPageMargins()->getHeader();  // Header Margin
+        $numHdr       = $this->phpSheet->getPageMargins()->getHeader(); // Header Margin
 
-        $numFtr       = $this->phpSheet->getPageMargins()->getFooter();   // Footer Margin
-        $iCopies      = 0x01;                 // Number of copies
+        $numFtr       = $this->phpSheet->getPageMargins()->getFooter(); // Footer Margin
+        $iCopies      = 0x01; // Number of copies
 
-        $fLeftToRight = 0x0;                     // Print over then down
+        $fLeftToRight = 0x0; // Print over then down
 
         // Page orientation
         $fLandscape = ($this->phpSheet->getPageSetup()->getOrientation() == \PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_LANDSCAPE) ?
             0x0 : 0x1;
 
-        $fNoPls       = 0x0;                     // Setup not read from printer
-        $fNoColor     = 0x0;                     // Print black and white
-        $fDraft       = 0x0;                     // Print draft quality
-        $fNotes       = 0x0;                     // Print notes
-        $fNoOrient    = 0x0;                     // Orientation not set
-        $fUsePage     = 0x0;                     // Use custom starting page
+        $fNoPls       = 0x0; // Setup not read from printer
+        $fNoColor     = 0x0; // Print black and white
+        $fDraft       = 0x0; // Print draft quality
+        $fNotes       = 0x0; // Print notes
+        $fNoOrient    = 0x0; // Orientation not set
+        $fUsePage     = 0x0; // Use custom starting page
 
         $grbit           = $fLeftToRight;
-        $grbit          |= $fLandscape    << 1;
-        $grbit          |= $fNoPls        << 2;
-        $grbit          |= $fNoColor      << 3;
-        $grbit          |= $fDraft        << 4;
-        $grbit          |= $fNotes        << 5;
-        $grbit          |= $fNoOrient     << 6;
-        $grbit          |= $fUsePage      << 7;
+        $grbit          |= $fLandscape << 1;
+        $grbit          |= $fNoPls << 2;
+        $grbit          |= $fNoColor << 3;
+        $grbit          |= $fDraft << 4;
+        $grbit          |= $fNotes << 5;
+        $grbit          |= $fNoOrient << 6;
+        $grbit          |= $fUsePage << 7;
 
         $numHdr = pack("d", $numHdr);
         $numFtr = pack("d", $numFtr);
@@ -1818,7 +1818,7 @@ 
 
         $header = pack("vv", $record, $length);
         $data1  = pack("vvvvvvvv", $iPaperSize, $iScale, $iPageStart, $iFitWidth, $iFitHeight, $grbit, $iRes, $iVRes);
-        $data2  = $numHdr.$numFtr;
+        $data2  = $numHdr . $numFtr;
         $data3  = pack("v", $iCopies);
         $this->append($header . $data1 . $data2 . $data3);
     }
@@ -1828,7 +1828,7 @@ 
      */
     private function writeHeader()
     {
-        $record  = 0x0014;               // Record identifier
+        $record = 0x0014; // Record identifier
 
         /* removing for now
         // need to fix character count (multibyte!)
@@ -1842,7 +1842,7 @@ 
         $recordData = \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeLong($this->phpSheet->getHeaderFooter()->getOddHeader());
         $length = strlen($recordData);
 
-        $header   = pack("vv", $record, $length);
+        $header = pack("vv", $record, $length);
 
         $this->append($header . $recordData);
     }
@@ -1852,7 +1852,7 @@ 
      */
     private function writeFooter()
     {
-        $record  = 0x0015;               // Record identifier
+        $record = 0x0015; // Record identifier
 
         /* removing for now
         // need to fix character count (multibyte!)
@@ -1866,7 +1866,7 @@ 
         $recordData = \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeLong($this->phpSheet->getHeaderFooter()->getOddFooter());
         $length = strlen($recordData);
 
-        $header    = pack("vv", $record, $length);
+        $header = pack("vv", $record, $length);
 
         $this->append($header . $recordData);
     }
@@ -1878,15 +1878,15 @@ 
      */
     private function writeHcenter()
     {
-        $record   = 0x0083;              // Record identifier
-        $length   = 0x0002;              // Bytes to follow
+        $record   = 0x0083; // Record identifier
+        $length   = 0x0002; // Bytes to follow
 
-        $fHCenter = $this->phpSheet->getPageSetup()->getHorizontalCentered() ? 1 : 0;     // Horizontal centering
+        $fHCenter = $this->phpSheet->getPageSetup()->getHorizontalCentered() ? 1 : 0; // Horizontal centering
 
         $header    = pack("vv", $record, $length);
         $data      = pack("v", $fHCenter);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1894,10 +1894,10 @@ 
      */
     private function writeVcenter()
     {
-        $record   = 0x0084;              // Record identifier
-        $length   = 0x0002;              // Bytes to follow
+        $record   = 0x0084; // Record identifier
+        $length   = 0x0002; // Bytes to follow
 
-        $fVCenter = $this->phpSheet->getPageSetup()->getVerticalCentered() ? 1 : 0;     // Horizontal centering
+        $fVCenter = $this->phpSheet->getPageSetup()->getVerticalCentered() ? 1 : 0; // Horizontal centering
 
         $header    = pack("vv", $record, $length);
         $data      = pack("v", $fVCenter);
@@ -1909,10 +1909,10 @@ 
      */
     private function writeMarginLeft()
     {
-        $record  = 0x0026;                   // Record identifier
-        $length  = 0x0008;                   // Bytes to follow
+        $record  = 0x0026; // Record identifier
+        $length  = 0x0008; // Bytes to follow
 
-        $margin  = $this->phpSheet->getPageMargins()->getLeft();     // Margin in inches
+        $margin  = $this->phpSheet->getPageMargins()->getLeft(); // Margin in inches
 
         $header    = pack("vv", $record, $length);
         $data      = pack("d", $margin);
@@ -1928,10 +1928,10 @@ 
      */
     private function writeMarginRight()
     {
-        $record  = 0x0027;                   // Record identifier
-        $length  = 0x0008;                   // Bytes to follow
+        $record  = 0x0027; // Record identifier
+        $length  = 0x0008; // Bytes to follow
 
-        $margin  = $this->phpSheet->getPageMargins()->getRight();     // Margin in inches
+        $margin  = $this->phpSheet->getPageMargins()->getRight(); // Margin in inches
 
         $header    = pack("vv", $record, $length);
         $data      = pack("d", $margin);
@@ -1947,10 +1947,10 @@ 
      */
     private function writeMarginTop()
     {
-        $record  = 0x0028;                   // Record identifier
-        $length  = 0x0008;                   // Bytes to follow
+        $record  = 0x0028; // Record identifier
+        $length  = 0x0008; // Bytes to follow
 
-        $margin  = $this->phpSheet->getPageMargins()->getTop();     // Margin in inches
+        $margin  = $this->phpSheet->getPageMargins()->getTop(); // Margin in inches
 
         $header    = pack("vv", $record, $length);
         $data      = pack("d", $margin);
@@ -1966,10 +1966,10 @@ 
      */
     private function writeMarginBottom()
     {
-        $record  = 0x0029;                   // Record identifier
-        $length  = 0x0008;                   // Bytes to follow
+        $record  = 0x0029; // Record identifier
+        $length  = 0x0008; // Bytes to follow
 
-        $margin  = $this->phpSheet->getPageMargins()->getBottom();     // Margin in inches
+        $margin  = $this->phpSheet->getPageMargins()->getBottom(); // Margin in inches
 
         $header    = pack("vv", $record, $length);
         $data      = pack("d", $margin);
@@ -1985,10 +1985,10 @@ 
      */
     private function writePrintHeaders()
     {
-        $record      = 0x002a;                   // Record identifier
-        $length      = 0x0002;                   // Bytes to follow
+        $record      = 0x002a; // Record identifier
+        $length      = 0x0002; // Bytes to follow
 
-        $fPrintRwCol = $this->_print_headers;     // Boolean flag
+        $fPrintRwCol = $this->_print_headers; // Boolean flag
 
         $header      = pack("vv", $record, $length);
         $data        = pack("v", $fPrintRwCol);
@@ -2001,13 +2001,13 @@ 
      */
     private function writePrintGridlines()
     {
-        $record      = 0x002b;                    // Record identifier
-        $length      = 0x0002;                    // Bytes to follow
+        $record      = 0x002b; // Record identifier
+        $length      = 0x0002; // Bytes to follow
 
-        $fPrintGrid  = $this->phpSheet->getPrintGridlines() ? 1 : 0;    // Boolean flag
+        $fPrintGrid  = $this->phpSheet->getPrintGridlines() ? 1 : 0; // Boolean flag
 
         $header      = pack("vv", $record, $length);
-        $data      = pack("v", $fPrintGrid);
+        $data = pack("v", $fPrintGrid);
         $this->append($header . $data);
     }
 
@@ -2017,10 +2017,10 @@ 
      */
     private function writeGridset()
     {
-        $record      = 0x0082;                        // Record identifier
-        $length      = 0x0002;                        // Bytes to follow
+        $record      = 0x0082; // Record identifier
+        $length      = 0x0002; // Bytes to follow
 
-        $fGridSet    = !$this->phpSheet->getPrintGridlines();     // Boolean flag
+        $fGridSet    = !$this->phpSheet->getPrintGridlines(); // Boolean flag
 
         $header      = pack("vv", $record, $length);
         $data        = pack("v", $fGridSet);
@@ -2032,8 +2032,8 @@ 
      */
     private function writeAutoFilterInfo()
     {
-        $record      = 0x009D;                        // Record identifier
-        $length      = 0x0002;                        // Bytes to follow
+        $record      = 0x009D; // Record identifier
+        $length      = 0x0002; // Bytes to follow
 
         $rangeBounds = \PhpSpreadsheet\Cell::rangeBoundaries($this->phpSheet->getAutoFilter()->getRange());
         $iNumFilters = 1 + $rangeBounds[1][0] - $rangeBounds[0][0];
@@ -2052,11 +2052,11 @@ 
      */
     private function writeGuts()
     {
-        $record      = 0x0080;   // Record identifier
-        $length      = 0x0008;   // Bytes to follow
+        $record      = 0x0080; // Record identifier
+        $length      = 0x0008; // Bytes to follow
 
-        $dxRwGut     = 0x0000;   // Size of row gutter
-        $dxColGut    = 0x0000;   // Size of col gutter
+        $dxRwGut     = 0x0000; // Size of row gutter
+        $dxColGut    = 0x0000; // Size of col gutter
 
         // determine maximum row outline level
         $maxRowOutlineLevel = 0;
@@ -2064,7 +2064,7 @@ 
             $maxRowOutlineLevel = max($maxRowOutlineLevel, $rowDimension->getOutlineLevel());
         }
 
-        $col_level   = 0;
+        $col_level = 0;
 
         // Calculate the maximum column outline level. The equivalent calculation
         // for the row outline level is carried out in writeRow().
@@ -2087,7 +2087,7 @@ 
         $header      = pack("vv", $record, $length);
         $data        = pack("vvvv", $dxRwGut, $dxColGut, $maxRowOutlineLevel, $col_level);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2096,15 +2096,15 @@ 
      */
     private function writeWsbool()
     {
-        $record      = 0x0081;   // Record identifier
-        $length      = 0x0002;   // Bytes to follow
+        $record      = 0x0081; // Record identifier
+        $length      = 0x0002; // Bytes to follow
         $grbit       = 0x0000;
 
         // The only option that is of interest is the flag for fit to page. So we
         // set all the options in one go.
         //
         // Set the option flags
-        $grbit |= 0x0001;                           // Auto page breaks visible
+        $grbit |= 0x0001; // Auto page breaks visible
         if ($this->outlineStyle) {
             $grbit |= 0x0020; // Auto outline styles
         }
@@ -2164,9 +2164,9 @@ 
                 array_shift($hbreaks);
             }
 
-            $record  = 0x001b;               // Record identifier
-            $cbrk    = count($hbreaks);       // Number of page breaks
-            $length  = 2 + 6 * $cbrk;      // Bytes to follow
+            $record  = 0x001b; // Record identifier
+            $cbrk    = count($hbreaks); // Number of page breaks
+            $length  = 2 + 6 * $cbrk; // Bytes to follow
 
             $header  = pack("vv", $record, $length);
             $data    = pack("v", $cbrk);
@@ -2191,9 +2191,9 @@ 
                 array_shift($vbreaks);
             }
 
-            $record  = 0x001a;               // Record identifier
-            $cbrk    = count($vbreaks);       // Number of page breaks
-            $length  = 2 + 6 * $cbrk;      // Bytes to follow
+            $record  = 0x001a; // Record identifier
+            $cbrk    = count($vbreaks); // Number of page breaks
+            $length  = 2 + 6 * $cbrk; // Bytes to follow
 
             $header  = pack("vv", $record, $length);
             $data    = pack("v", $cbrk);
@@ -2217,15 +2217,15 @@ 
             return;
         }
 
-        $record      = 0x0012;             // Record identifier
-        $length      = 0x0002;             // Bytes to follow
+        $record      = 0x0012; // Record identifier
+        $length      = 0x0002; // Bytes to follow
 
-        $fLock      = 1;    // Worksheet is protected
+        $fLock = 1; // Worksheet is protected
 
-        $header      = pack("vv", $record, $length);
-        $data      = pack("v", $fLock);
+        $header = pack("vv", $record, $length);
+        $data = pack("v", $fLock);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2286,10 +2286,10 @@ 
             return;
         }
 
-        $record      = 0x0013;               // Record identifier
-        $length      = 0x0002;               // Bytes to follow
+        $record      = 0x0013; // Record identifier
+        $length      = 0x0002; // Bytes to follow
 
-        $wPassword   = hexdec($this->phpSheet->getProtection()->getPassword());     // Encoded password
+        $wPassword   = hexdec($this->phpSheet->getProtection()->getPassword()); // Encoded password
 
         $header      = pack("vv", $record, $length);
         $data        = pack("v", $wPassword);
@@ -2329,7 +2329,7 @@ 
         $lcb         = $size;
 
         $header      = pack("vvvvV", $record, $length, $cf, $env, $lcb);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2386,8 +2386,8 @@ 
     public function positionImage($col_start, $row_start, $x1, $y1, $width, $height)
     {
         // Initialise end cell to the same as the start cell
-        $col_end    = $col_start;  // Col containing lower right corner of object
-        $row_end    = $row_start;  // Row containing bottom right corner of object
+        $col_end    = $col_start; // Col containing lower right corner of object
+        $row_end    = $row_start; // Row containing bottom right corner of object
 
         // Zero the specified offset if greater than the cell dimensions
         if ($x1 >= \PhpSpreadsheet\Shared\Excel5::sizeCol($this->phpSheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_start))) {
@@ -2397,8 +2397,8 @@ 
             $y1 = 0;
         }
 
-        $width      = $width  + $x1 -1;
-        $height     = $height + $y1 -1;
+        $width      = $width + $x1 - 1;
+        $height     = $height + $y1 - 1;
 
         // Subtract the underlying cell widths to find the end cell of the image
         while ($width >= \PhpSpreadsheet\Shared\Excel5::sizeCol($this->phpSheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_end))) {
@@ -2418,21 +2418,21 @@ 
         if (\PhpSpreadsheet\Shared\Excel5::sizeCol($this->phpSheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_start)) == 0) {
             return;
         }
-        if (\PhpSpreadsheet\Shared\Excel5::sizeCol($this->phpSheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_end))   == 0) {
+        if (\PhpSpreadsheet\Shared\Excel5::sizeCol($this->phpSheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_end)) == 0) {
             return;
         }
         if (\PhpSpreadsheet\Shared\Excel5::sizeRow($this->phpSheet, $row_start + 1) == 0) {
             return;
         }
-        if (\PhpSpreadsheet\Shared\Excel5::sizeRow($this->phpSheet, $row_end + 1)   == 0) {
+        if (\PhpSpreadsheet\Shared\Excel5::sizeRow($this->phpSheet, $row_end + 1) == 0) {
             return;
         }
 
         // Convert the pixel values to the percentage value expected by Excel
-        $x1 = $x1     / \PhpSpreadsheet\Shared\Excel5::sizeCol($this->phpSheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_start))   * 1024;
-        $y1 = $y1     / \PhpSpreadsheet\Shared\Excel5::sizeRow($this->phpSheet, $row_start + 1)   *  256;
-        $x2 = $width  / \PhpSpreadsheet\Shared\Excel5::sizeCol($this->phpSheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_end))     * 1024; // Distance to right side of object
-        $y2 = $height / \PhpSpreadsheet\Shared\Excel5::sizeRow($this->phpSheet, $row_end + 1)     *  256; // Distance to bottom of object
+        $x1 = $x1 / \PhpSpreadsheet\Shared\Excel5::sizeCol($this->phpSheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_start)) * 1024;
+        $y1 = $y1 / \PhpSpreadsheet\Shared\Excel5::sizeRow($this->phpSheet, $row_start + 1) * 256;
+        $x2 = $width / \PhpSpreadsheet\Shared\Excel5::sizeCol($this->phpSheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_end)) * 1024; // Distance to right side of object
+        $y2 = $height / \PhpSpreadsheet\Shared\Excel5::sizeRow($this->phpSheet, $row_end + 1) * 256; // Distance to bottom of object
 
         $this->writeObjPicture($col_start, $x1, $row_start, $y1, $col_end, $x2, $row_end, $y2);
     }
@@ -2452,33 +2452,33 @@ 
      */
     private function writeObjPicture($colL, $dxL, $rwT, $dyT, $colR, $dxR, $rwB, $dyB)
     {
-        $record      = 0x005d;   // Record identifier
-        $length      = 0x003c;   // Bytes to follow
-
-        $cObj        = 0x0001;   // Count of objects in file (set to 1)
-        $OT          = 0x0008;   // Object type. 8 = Picture
-        $id          = 0x0001;   // Object ID
-        $grbit       = 0x0614;   // Option flags
-
-        $cbMacro     = 0x0000;   // Length of FMLA structure
-        $Reserved1   = 0x0000;   // Reserved
-        $Reserved2   = 0x0000;   // Reserved
-
-        $icvBack     = 0x09;     // Background colour
-        $icvFore     = 0x09;     // Foreground colour
-        $fls         = 0x00;     // Fill pattern
-        $fAuto       = 0x00;     // Automatic fill
-        $icv         = 0x08;     // Line colour
-        $lns         = 0xff;     // Line style
-        $lnw         = 0x01;     // Line weight
-        $fAutoB      = 0x00;     // Automatic border
-        $frs         = 0x0000;   // Frame style
-        $cf          = 0x0009;   // Image format, 9 = bitmap
-        $Reserved3   = 0x0000;   // Reserved
-        $cbPictFmla  = 0x0000;   // Length of FMLA structure
-        $Reserved4   = 0x0000;   // Reserved
-        $grbit2      = 0x0001;   // Option flags
-        $Reserved5   = 0x0000;   // Reserved
+        $record      = 0x005d; // Record identifier
+        $length      = 0x003c; // Bytes to follow
+
+        $cObj        = 0x0001; // Count of objects in file (set to 1)
+        $OT          = 0x0008; // Object type. 8 = Picture
+        $id          = 0x0001; // Object ID
+        $grbit       = 0x0614; // Option flags
+
+        $cbMacro     = 0x0000; // Length of FMLA structure
+        $Reserved1   = 0x0000; // Reserved
+        $Reserved2   = 0x0000; // Reserved
+
+        $icvBack     = 0x09; // Background colour
+        $icvFore     = 0x09; // Foreground colour
+        $fls         = 0x00; // Fill pattern
+        $fAuto       = 0x00; // Automatic fill
+        $icv         = 0x08; // Line colour
+        $lns         = 0xff; // Line style
+        $lnw         = 0x01; // Line weight
+        $fAutoB      = 0x00; // Automatic border
+        $frs         = 0x0000; // Frame style
+        $cf          = 0x0009; // Image format, 9 = bitmap
+        $Reserved3   = 0x0000; // Reserved
+        $cbPictFmla  = 0x0000; // Length of FMLA structure
+        $Reserved4   = 0x0000; // Reserved
+        $grbit2      = 0x0001; // Option flags
+        $Reserved5   = 0x0000; // Reserved
 
 
         $header      = pack("vv", $record, $length);
@@ -2529,16 +2529,16 @@ 
         $height = imagesy($image);
 
         $data = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
-        for ($j=$height; $j--;) {
-            for ($i=0; $i < $width; ++$i) {
+        for ($j = $height; $j--;) {
+            for ($i = 0; $i < $width; ++$i) {
                 $color = imagecolorsforindex($image, imagecolorat($image, $i, $j));
                 foreach (array("red", "green", "blue") as $key) {
                     $color[$key] = $color[$key] + round((255 - $color[$key]) * $color["alpha"] / 127);
                 }
                 $data .= chr($color["blue"]) . chr($color["green"]) . chr($color["red"]);
             }
-            if (3*$width % 4) {
-                $data .= str_repeat("\x00", 4 - 3*$width % 4);
+            if (3 * $width % 4) {
+                $data .= str_repeat("\x00", 4 - 3 * $width % 4);
             }
         }
 
@@ -2582,7 +2582,7 @@ 
         // Read and remove the bitmap size. This is more reliable than reading
         // the data size at offset 0x22.
         //
-        $size_array   = unpack("Vsa", substr($data, 0, 4));
+        $size_array = unpack("Vsa", substr($data, 0, 4));
         $size   = $size_array['sa'];
         $data   = substr($data, 4);
         $size  -= 0x36; // Subtract size of bitmap header.
@@ -2643,8 +2643,8 @@ 
             return;
         }
 
-        $record      = 0x00A0;               // Record identifier
-        $length      = 0x0004;               // Bytes to follow
+        $record      = 0x00A0; // Record identifier
+        $length      = 0x0004; // Bytes to follow
 
         $header      = pack("vv", $record, $length);
         $data        = pack("vv", $this->phpSheet->getSheetView()->getZoomScale(), 100);
@@ -2689,10 +2689,10 @@ 
             $nm = count($spOffsets) - 1; // number of shapes excluding first shape
             for ($i = 1; $i <= $nm; ++$i) {
                 // MSODRAWING record
-                $record = 0x00EC;            // Record identifier
+                $record = 0x00EC; // Record identifier
 
                 // chunk of Escher stream for one shape
-                $dataChunk = substr($data, $spOffsets[$i -1], $spOffsets[$i] - $spOffsets[$i - 1]);
+                $dataChunk = substr($data, $spOffsets[$i - 1], $spOffsets[$i] - $spOffsets[$i - 1]);
 
                 $length = strlen($dataChunk);
                 $header = pack("vv", $record, $length);
@@ -2767,20 +2767,20 @@ 
         // Write data validations?
         if (!empty($dataValidationCollection)) {
             // DATAVALIDATIONS record
-            $record = 0x01B2;      // Record identifier
-            $length = 0x0012;      // Bytes to follow
+            $record = 0x01B2; // Record identifier
+            $length = 0x0012; // Bytes to follow
 
-            $grbit  = 0x0000;       // Prompt box at cell, no cached validity data at DV records
-            $horPos = 0x00000000;  // Horizontal position of prompt box, if fixed position
-            $verPos = 0x00000000;  // Vertical position of prompt box, if fixed position
-            $objId  = 0xFFFFFFFF;  // Object identifier of drop down arrow object, or -1 if not visible
+            $grbit  = 0x0000; // Prompt box at cell, no cached validity data at DV records
+            $horPos = 0x00000000; // Horizontal position of prompt box, if fixed position
+            $verPos = 0x00000000; // Vertical position of prompt box, if fixed position
+            $objId  = 0xFFFFFFFF; // Object identifier of drop down arrow object, or -1 if not visible
 
             $header = pack('vv', $record, $length);
             $data   = pack('vVVVV', $grbit, $horPos, $verPos, $objId, count($dataValidationCollection));
-            $this->append($header.$data);
+            $this->append($header . $data);
 
             // DATAVALIDATION records
-            $record = 0x01BE;              // Record identifier
+            $record = 0x01BE; // Record identifier
 
             foreach ($dataValidationCollection as $cellCoordinate => $dataValidation) {
                 // initialize record data
@@ -2980,8 +2980,8 @@ 
      */
     private function writePageLayoutView()
     {
-        $record      = 0x088B;               // Record identifier
-        $length      = 0x0010;               // Bytes to follow
+        $record      = 0x088B; // Record identifier
+        $length      = 0x0010; // Bytes to follow
 
         $rt         = 0x088B; // 2
         $grbitFrt   = 0x0000; // 2
@@ -2997,12 +2997,12 @@ 
         $fRulerVisible     = 0;
         $fWhitespaceHidden = 0;
 
-        $grbit      = $fPageLayoutView; // 2
-        $grbit        |= $fRulerVisible       << 1;
-        $grbit        |= $fWhitespaceHidden  << 3;
+        $grbit = $fPageLayoutView; // 2
+        $grbit        |= $fRulerVisible << 1;
+        $grbit        |= $fWhitespaceHidden << 3;
 
-        $header      = pack("vv", $record, $length);
-        $data      = pack("vvVVvv", $rt, $grbitFrt, 0x00000000, 0x00000000, $wScalvePLV, $grbit);
+        $header = pack("vv", $record, $length);
+        $data = pack("vvVVvv", $rt, $grbitFrt, 0x00000000, 0x00000000, $wScalvePLV, $grbit);
         $this->append($header . $data);
     }
 
@@ -3012,7 +3012,7 @@ 
      */
     private function writeCFRule(\PhpSpreadsheet\Style\Conditional $conditional)
     {
-        $record      = 0x01B1;               // Record identifier
+        $record = 0x01B1; // Record identifier
 
         // $type : Type of the CF
         // $operatorType : Comparison operator
@@ -3132,49 +3132,49 @@ 
         }
         // Alignment
         $flags = 0;
-        $flags |= (1 == $bAlignHz      ? 0x00000001 : 0);
-        $flags |= (1 == $bAlignVt      ? 0x00000002 : 0);
-        $flags |= (1 == $bAlignWrapTx  ? 0x00000004 : 0);
-        $flags |= (1 == $bTxRotation   ? 0x00000008 : 0);
+        $flags |= (1 == $bAlignHz ? 0x00000001 : 0);
+        $flags |= (1 == $bAlignVt ? 0x00000002 : 0);
+        $flags |= (1 == $bAlignWrapTx ? 0x00000004 : 0);
+        $flags |= (1 == $bTxRotation ? 0x00000008 : 0);
         // Justify last line flag
-        $flags |= (1 == 1              ? 0x00000010 : 0);
-        $flags |= (1 == $bIndent       ? 0x00000020 : 0);
-        $flags |= (1 == $bShrinkToFit  ? 0x00000040 : 0);
+        $flags |= (1 == 1 ? 0x00000010 : 0);
+        $flags |= (1 == $bIndent ? 0x00000020 : 0);
+        $flags |= (1 == $bShrinkToFit ? 0x00000040 : 0);
         // Default
-        $flags |= (1 == 1              ? 0x00000080 : 0);
+        $flags |= (1 == 1 ? 0x00000080 : 0);
         // Protection
-        $flags |= (1 == $bProtLocked   ? 0x00000100 : 0);
-        $flags |= (1 == $bProtHidden   ? 0x00000200 : 0);
+        $flags |= (1 == $bProtLocked ? 0x00000100 : 0);
+        $flags |= (1 == $bProtHidden ? 0x00000200 : 0);
         // Border
-        $flags |= (1 == $bBorderLeft   ? 0x00000400 : 0);
-        $flags |= (1 == $bBorderRight  ? 0x00000800 : 0);
-        $flags |= (1 == $bBorderTop    ? 0x00001000 : 0);
+        $flags |= (1 == $bBorderLeft ? 0x00000400 : 0);
+        $flags |= (1 == $bBorderRight ? 0x00000800 : 0);
+        $flags |= (1 == $bBorderTop ? 0x00001000 : 0);
         $flags |= (1 == $bBorderBottom ? 0x00002000 : 0);
-        $flags |= (1 == 1              ? 0x00004000 : 0); // Top left to Bottom right border
-        $flags |= (1 == 1              ? 0x00008000 : 0); // Bottom left to Top right border
+        $flags |= (1 == 1 ? 0x00004000 : 0); // Top left to Bottom right border
+        $flags |= (1 == 1 ? 0x00008000 : 0); // Bottom left to Top right border
         // Pattern
-        $flags |= (1 == $bFillStyle    ? 0x00010000 : 0);
-        $flags |= (1 == $bFillColor    ? 0x00020000 : 0);
-        $flags |= (1 == $bFillColorBg  ? 0x00040000 : 0);
-        $flags |= (1 == 1              ? 0x00380000 : 0);
+        $flags |= (1 == $bFillStyle ? 0x00010000 : 0);
+        $flags |= (1 == $bFillColor ? 0x00020000 : 0);
+        $flags |= (1 == $bFillColorBg ? 0x00040000 : 0);
+        $flags |= (1 == 1 ? 0x00380000 : 0);
         // Font
-        $flags |= (1 == $bFormatFont   ? 0x04000000 : 0);
+        $flags |= (1 == $bFormatFont ? 0x04000000 : 0);
         // Alignment:
-        $flags |= (1 == $bFormatAlign  ? 0x08000000 : 0);
+        $flags |= (1 == $bFormatAlign ? 0x08000000 : 0);
         // Border
         $flags |= (1 == $bFormatBorder ? 0x10000000 : 0);
         // Pattern
-        $flags |= (1 == $bFormatFill   ? 0x20000000 : 0);
+        $flags |= (1 == $bFormatFill ? 0x20000000 : 0);
         // Protection
-        $flags |= (1 == $bFormatProt   ? 0x40000000 : 0);
+        $flags |= (1 == $bFormatProt ? 0x40000000 : 0);
         // Text direction
-        $flags |= (1 == 0              ? 0x80000000 : 0);
+        $flags |= (1 == 0 ? 0x80000000 : 0);
 
         // Data Blocks
         if ($bFormatFont == 1) {
             // Font Name
             if ($conditional->getStyle()->getFont()->getName() == null) {
-                $dataBlockFont =  pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
+                $dataBlockFont = pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
                 $dataBlockFont .= pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
             } else {
                 $dataBlockFont = \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeLong($conditional->getStyle()->getFont()->getName());
@@ -3413,11 +3413,11 @@ 
             // Options flags for modified font attributes
             $optionsFlags = 0;
             $optionsFlagsBold = ($conditional->getStyle()->getFont()->getBold() == null ? 1 : 0);
-            $optionsFlags |= (1 == $optionsFlagsBold  ? 0x00000002 : 0);
-            $optionsFlags |= (1 == 1                  ? 0x00000008 : 0);
-            $optionsFlags |= (1 == 1                  ? 0x00000010 : 0);
-            $optionsFlags |= (1 == 0                  ? 0x00000020 : 0);
-            $optionsFlags |= (1 == 1                  ? 0x00000080 : 0);
+            $optionsFlags |= (1 == $optionsFlagsBold ? 0x00000002 : 0);
+            $optionsFlags |= (1 == 1 ? 0x00000008 : 0);
+            $optionsFlags |= (1 == 1 ? 0x00000010 : 0);
+            $optionsFlags |= (1 == 0 ? 0x00000020 : 0);
+            $optionsFlags |= (1 == 1 ? 0x00000080 : 0);
             $dataBlockFont .= pack('V', $optionsFlags);
             // Escapement type
             $dataBlockFont .= pack('V', $fontEscapement);
@@ -3788,10 +3788,10 @@ 
                     break;
                 case \PhpSpreadsheet\Style\Fill::FILL_GRADIENT_LINEAR:
                     $blockFillPatternStyle = 0x00;
-                    break;    // does not exist in BIFF8
+                    break; // does not exist in BIFF8
                 case \PhpSpreadsheet\Style\Fill::FILL_GRADIENT_PATH:
                     $blockFillPatternStyle = 0x00;
-                    break;    // does not exist in BIFF8
+                    break; // does not exist in BIFF8
                 default:
                     $blockFillPatternStyle = 0x00;
                     break;
@@ -4179,7 +4179,7 @@ 
         if (!is_null($operand2)) {
             $data .= $operand2;
         }
-        $header      = pack('vv', $record, strlen($data));
+        $header = pack('vv', $record, strlen($data));
         $this->append($header . $data);
     }
 
@@ -4188,8 +4188,8 @@ 
      */
     private function writeCFHeader()
     {
-        $record      = 0x01B0;               // Record identifier
-        $length      = 0x0016;               // Bytes to follow
+        $record      = 0x01B0; // Record identifier
+        $length      = 0x0016; // Bytes to follow
 
         $numColumnMin = null;
         $numColumnMax = null;
@@ -4224,9 +4224,9 @@ 
             }
         }
         $needRedraw = 1;
-        $cellRange = pack('vvvv', $numRowMin-1, $numRowMax-1, $numColumnMin-1, $numColumnMax-1);
+        $cellRange = pack('vvvv', $numRowMin - 1, $numRowMax - 1, $numColumnMin - 1, $numColumnMax - 1);
 
-        $header      = pack('vv', $record, $length);
+        $header = pack('vv', $record, $length);
         $data      = pack('vv', count($arrConditional), $needRedraw);
         $data     .= $cellRange;
         $data     .= pack('v', 0x0001);

src/PhpSpreadsheet/Writer/Excel5/Parser.php

Spacing +276 added lines, -276 removed lines

@@ -114,12 +114,12 @@ 
      */
     public function __construct()
     {
-        $this->currentCharacter  = 0;
-        $this->currentToken = '';       // The token we are working on.
-        $this->formula       = '';       // The formula to parse.
-        $this->lookAhead     = '';       // The character ahead of the current char.
-        $this->parseTree    = '';       // The parse tree to be generated.
-        $this->initializeHashes();      // Initialize the hashes: ptg's and function's ptg's
+        $this->currentCharacter = 0;
+        $this->currentToken = ''; // The token we are working on.
+        $this->formula       = ''; // The formula to parse.
+        $this->lookAhead     = ''; // The character ahead of the current char.
+        $this->parseTree    = ''; // The parse tree to be generated.
+        $this->initializeHashes(); // Initialize the hashes: ptg's and function's ptg's
         $this->externalSheets = array();
         $this->references = array();
     }
@@ -245,256 +245,256 @@ 
         //
         $this->functions = array(
             // function                  ptg  args  class  vol
-            'COUNT'           => array(   0,   -1,    0,    0 ),
-            'IF'              => array(   1,   -1,    1,    0 ),
-            'ISNA'            => array(   2,    1,    1,    0 ),
-            'ISERROR'         => array(   3,    1,    1,    0 ),
-            'SUM'             => array(   4,   -1,    0,    0 ),
-            'AVERAGE'         => array(   5,   -1,    0,    0 ),
-            'MIN'             => array(   6,   -1,    0,    0 ),
-            'MAX'             => array(   7,   -1,    0,    0 ),
-            'ROW'             => array(   8,   -1,    0,    0 ),
-            'COLUMN'          => array(   9,   -1,    0,    0 ),
-            'NA'              => array(  10,    0,    0,    0 ),
-            'NPV'             => array(  11,   -1,    1,    0 ),
-            'STDEV'           => array(  12,   -1,    0,    0 ),
-            'DOLLAR'          => array(  13,   -1,    1,    0 ),
-            'FIXED'           => array(  14,   -1,    1,    0 ),
-            'SIN'             => array(  15,    1,    1,    0 ),
-            'COS'             => array(  16,    1,    1,    0 ),
-            'TAN'             => array(  17,    1,    1,    0 ),
-            'ATAN'            => array(  18,    1,    1,    0 ),
-            'PI'              => array(  19,    0,    1,    0 ),
-            'SQRT'            => array(  20,    1,    1,    0 ),
-            'EXP'             => array(  21,    1,    1,    0 ),
-            'LN'              => array(  22,    1,    1,    0 ),
-            'LOG10'           => array(  23,    1,    1,    0 ),
-            'ABS'             => array(  24,    1,    1,    0 ),
-            'INT'             => array(  25,    1,    1,    0 ),
-            'SIGN'            => array(  26,    1,    1,    0 ),
-            'ROUND'           => array(  27,    2,    1,    0 ),
-            'LOOKUP'          => array(  28,   -1,    0,    0 ),
-            'INDEX'           => array(  29,   -1,    0,    1 ),
-            'REPT'            => array(  30,    2,    1,    0 ),
-            'MID'             => array(  31,    3,    1,    0 ),
-            'LEN'             => array(  32,    1,    1,    0 ),
-            'VALUE'           => array(  33,    1,    1,    0 ),
-            'TRUE'            => array(  34,    0,    1,    0 ),
-            'FALSE'           => array(  35,    0,    1,    0 ),
-            'AND'             => array(  36,   -1,    0,    0 ),
-            'OR'              => array(  37,   -1,    0,    0 ),
-            'NOT'             => array(  38,    1,    1,    0 ),
-            'MOD'             => array(  39,    2,    1,    0 ),
-            'DCOUNT'          => array(  40,    3,    0,    0 ),
-            'DSUM'            => array(  41,    3,    0,    0 ),
-            'DAVERAGE'        => array(  42,    3,    0,    0 ),
-            'DMIN'            => array(  43,    3,    0,    0 ),
-            'DMAX'            => array(  44,    3,    0,    0 ),
-            'DSTDEV'          => array(  45,    3,    0,    0 ),
-            'VAR'             => array(  46,   -1,    0,    0 ),
-            'DVAR'            => array(  47,    3,    0,    0 ),
-            'TEXT'            => array(  48,    2,    1,    0 ),
-            'LINEST'          => array(  49,   -1,    0,    0 ),
-            'TREND'           => array(  50,   -1,    0,    0 ),
-            'LOGEST'          => array(  51,   -1,    0,    0 ),
-            'GROWTH'          => array(  52,   -1,    0,    0 ),
-            'PV'              => array(  56,   -1,    1,    0 ),
-            'FV'              => array(  57,   -1,    1,    0 ),
-            'NPER'            => array(  58,   -1,    1,    0 ),
-            'PMT'             => array(  59,   -1,    1,    0 ),
-            'RATE'            => array(  60,   -1,    1,    0 ),
-            'MIRR'            => array(  61,    3,    0,    0 ),
-            'IRR'             => array(  62,   -1,    0,    0 ),
-            'RAND'            => array(  63,    0,    1,    1 ),
-            'MATCH'           => array(  64,   -1,    0,    0 ),
-            'DATE'            => array(  65,    3,    1,    0 ),
-            'TIME'            => array(  66,    3,    1,    0 ),
-            'DAY'             => array(  67,    1,    1,    0 ),
-            'MONTH'           => array(  68,    1,    1,    0 ),
-            'YEAR'            => array(  69,    1,    1,    0 ),
-            'WEEKDAY'         => array(  70,   -1,    1,    0 ),
-            'HOUR'            => array(  71,    1,    1,    0 ),
-            'MINUTE'          => array(  72,    1,    1,    0 ),
-            'SECOND'          => array(  73,    1,    1,    0 ),
-            'NOW'             => array(  74,    0,    1,    1 ),
-            'AREAS'           => array(  75,    1,    0,    1 ),
-            'ROWS'            => array(  76,    1,    0,    1 ),
-            'COLUMNS'         => array(  77,    1,    0,    1 ),
-            'OFFSET'          => array(  78,   -1,    0,    1 ),
-            'SEARCH'          => array(  82,   -1,    1,    0 ),
-            'TRANSPOSE'       => array(  83,    1,    1,    0 ),
-            'TYPE'            => array(  86,    1,    1,    0 ),
-            'ATAN2'           => array(  97,    2,    1,    0 ),
-            'ASIN'            => array(  98,    1,    1,    0 ),
-            'ACOS'            => array(  99,    1,    1,    0 ),
-            'CHOOSE'          => array( 100,   -1,    1,    0 ),
-            'HLOOKUP'         => array( 101,   -1,    0,    0 ),
-            'VLOOKUP'         => array( 102,   -1,    0,    0 ),
-            'ISREF'           => array( 105,    1,    0,    0 ),
-            'LOG'             => array( 109,   -1,    1,    0 ),
-            'CHAR'            => array( 111,    1,    1,    0 ),
-            'LOWER'           => array( 112,    1,    1,    0 ),
-            'UPPER'           => array( 113,    1,    1,    0 ),
-            'PROPER'          => array( 114,    1,    1,    0 ),
-            'LEFT'            => array( 115,   -1,    1,    0 ),
-            'RIGHT'           => array( 116,   -1,    1,    0 ),
-            'EXACT'           => array( 117,    2,    1,    0 ),
-            'TRIM'            => array( 118,    1,    1,    0 ),
-            'REPLACE'         => array( 119,    4,    1,    0 ),
-            'SUBSTITUTE'      => array( 120,   -1,    1,    0 ),
-            'CODE'            => array( 121,    1,    1,    0 ),
-            'FIND'            => array( 124,   -1,    1,    0 ),
-            'CELL'            => array( 125,   -1,    0,    1 ),
-            'ISERR'           => array( 126,    1,    1,    0 ),
-            'ISTEXT'          => array( 127,    1,    1,    0 ),
-            'ISNUMBER'        => array( 128,    1,    1,    0 ),
-            'ISBLANK'         => array( 129,    1,    1,    0 ),
-            'T'               => array( 130,    1,    0,    0 ),
-            'N'               => array( 131,    1,    0,    0 ),
-            'DATEVALUE'       => array( 140,    1,    1,    0 ),
-            'TIMEVALUE'       => array( 141,    1,    1,    0 ),
-            'SLN'             => array( 142,    3,    1,    0 ),
-            'SYD'             => array( 143,    4,    1,    0 ),
-            'DDB'             => array( 144,   -1,    1,    0 ),
-            'INDIRECT'        => array( 148,   -1,    1,    1 ),
-            'CALL'            => array( 150,   -1,    1,    0 ),
-            'CLEAN'           => array( 162,    1,    1,    0 ),
-            'MDETERM'         => array( 163,    1,    2,    0 ),
-            'MINVERSE'        => array( 164,    1,    2,    0 ),
-            'MMULT'           => array( 165,    2,    2,    0 ),
-            'IPMT'            => array( 167,   -1,    1,    0 ),
-            'PPMT'            => array( 168,   -1,    1,    0 ),
-            'COUNTA'          => array( 169,   -1,    0,    0 ),
-            'PRODUCT'         => array( 183,   -1,    0,    0 ),
-            'FACT'            => array( 184,    1,    1,    0 ),
-            'DPRODUCT'        => array( 189,    3,    0,    0 ),
-            'ISNONTEXT'       => array( 190,    1,    1,    0 ),
-            'STDEVP'          => array( 193,   -1,    0,    0 ),
-            'VARP'            => array( 194,   -1,    0,    0 ),
-            'DSTDEVP'         => array( 195,    3,    0,    0 ),
-            'DVARP'           => array( 196,    3,    0,    0 ),
-            'TRUNC'           => array( 197,   -1,    1,    0 ),
-            'ISLOGICAL'       => array( 198,    1,    1,    0 ),
-            'DCOUNTA'         => array( 199,    3,    0,    0 ),
-            'USDOLLAR'        => array( 204,   -1,    1,    0 ),
-            'FINDB'           => array( 205,   -1,    1,    0 ),
-            'SEARCHB'         => array( 206,   -1,    1,    0 ),
-            'REPLACEB'        => array( 207,    4,    1,    0 ),
-            'LEFTB'           => array( 208,   -1,    1,    0 ),
-            'RIGHTB'          => array( 209,   -1,    1,    0 ),
-            'MIDB'            => array( 210,    3,    1,    0 ),
-            'LENB'            => array( 211,    1,    1,    0 ),
-            'ROUNDUP'         => array( 212,    2,    1,    0 ),
-            'ROUNDDOWN'       => array( 213,    2,    1,    0 ),
-            'ASC'             => array( 214,    1,    1,    0 ),
-            'DBCS'            => array( 215,    1,    1,    0 ),
-            'RANK'            => array( 216,   -1,    0,    0 ),
-            'ADDRESS'         => array( 219,   -1,    1,    0 ),
-            'DAYS360'         => array( 220,   -1,    1,    0 ),
-            'TODAY'           => array( 221,    0,    1,    1 ),
-            'VDB'             => array( 222,   -1,    1,    0 ),
-            'MEDIAN'          => array( 227,   -1,    0,    0 ),
-            'SUMPRODUCT'      => array( 228,   -1,    2,    0 ),
-            'SINH'            => array( 229,    1,    1,    0 ),
-            'COSH'            => array( 230,    1,    1,    0 ),
-            'TANH'            => array( 231,    1,    1,    0 ),
-            'ASINH'           => array( 232,    1,    1,    0 ),
-            'ACOSH'           => array( 233,    1,    1,    0 ),
-            'ATANH'           => array( 234,    1,    1,    0 ),
-            'DGET'            => array( 235,    3,    0,    0 ),
-            'INFO'            => array( 244,    1,    1,    1 ),
-            'DB'              => array( 247,   -1,    1,    0 ),
-            'FREQUENCY'       => array( 252,    2,    0,    0 ),
-            'ERROR.TYPE'      => array( 261,    1,    1,    0 ),
-            'REGISTER.ID'     => array( 267,   -1,    1,    0 ),
-            'AVEDEV'          => array( 269,   -1,    0,    0 ),
-            'BETADIST'        => array( 270,   -1,    1,    0 ),
-            'GAMMALN'         => array( 271,    1,    1,    0 ),
-            'BETAINV'         => array( 272,   -1,    1,    0 ),
-            'BINOMDIST'       => array( 273,    4,    1,    0 ),
-            'CHIDIST'         => array( 274,    2,    1,    0 ),
-            'CHIINV'          => array( 275,    2,    1,    0 ),
-            'COMBIN'          => array( 276,    2,    1,    0 ),
-            'CONFIDENCE'      => array( 277,    3,    1,    0 ),
-            'CRITBINOM'       => array( 278,    3,    1,    0 ),
-            'EVEN'            => array( 279,    1,    1,    0 ),
-            'EXPONDIST'       => array( 280,    3,    1,    0 ),
-            'FDIST'           => array( 281,    3,    1,    0 ),
-            'FINV'            => array( 282,    3,    1,    0 ),
-            'FISHER'          => array( 283,    1,    1,    0 ),
-            'FISHERINV'       => array( 284,    1,    1,    0 ),
-            'FLOOR'           => array( 285,    2,    1,    0 ),
-            'GAMMADIST'       => array( 286,    4,    1,    0 ),
-            'GAMMAINV'        => array( 287,    3,    1,    0 ),
-            'CEILING'         => array( 288,    2,    1,    0 ),
-            'HYPGEOMDIST'     => array( 289,    4,    1,    0 ),
-            'LOGNORMDIST'     => array( 290,    3,    1,    0 ),
-            'LOGINV'          => array( 291,    3,    1,    0 ),
-            'NEGBINOMDIST'    => array( 292,    3,    1,    0 ),
-            'NORMDIST'        => array( 293,    4,    1,    0 ),
-            'NORMSDIST'       => array( 294,    1,    1,    0 ),
-            'NORMINV'         => array( 295,    3,    1,    0 ),
-            'NORMSINV'        => array( 296,    1,    1,    0 ),
-            'STANDARDIZE'     => array( 297,    3,    1,    0 ),
-            'ODD'             => array( 298,    1,    1,    0 ),
-            'PERMUT'          => array( 299,    2,    1,    0 ),
-            'POISSON'         => array( 300,    3,    1,    0 ),
-            'TDIST'           => array( 301,    3,    1,    0 ),
-            'WEIBULL'         => array( 302,    4,    1,    0 ),
-            'SUMXMY2'         => array( 303,    2,    2,    0 ),
-            'SUMX2MY2'        => array( 304,    2,    2,    0 ),
-            'SUMX2PY2'        => array( 305,    2,    2,    0 ),
-            'CHITEST'         => array( 306,    2,    2,    0 ),
-            'CORREL'          => array( 307,    2,    2,    0 ),
-            'COVAR'           => array( 308,    2,    2,    0 ),
-            'FORECAST'        => array( 309,    3,    2,    0 ),
-            'FTEST'           => array( 310,    2,    2,    0 ),
-            'INTERCEPT'       => array( 311,    2,    2,    0 ),
-            'PEARSON'         => array( 312,    2,    2,    0 ),
-            'RSQ'             => array( 313,    2,    2,    0 ),
-            'STEYX'           => array( 314,    2,    2,    0 ),
-            'SLOPE'           => array( 315,    2,    2,    0 ),
-            'TTEST'           => array( 316,    4,    2,    0 ),
-            'PROB'            => array( 317,   -1,    2,    0 ),
-            'DEVSQ'           => array( 318,   -1,    0,    0 ),
-            'GEOMEAN'         => array( 319,   -1,    0,    0 ),
-            'HARMEAN'         => array( 320,   -1,    0,    0 ),
-            'SUMSQ'           => array( 321,   -1,    0,    0 ),
-            'KURT'            => array( 322,   -1,    0,    0 ),
-            'SKEW'            => array( 323,   -1,    0,    0 ),
-            'ZTEST'           => array( 324,   -1,    0,    0 ),
-            'LARGE'           => array( 325,    2,    0,    0 ),
-            'SMALL'           => array( 326,    2,    0,    0 ),
-            'QUARTILE'        => array( 327,    2,    0,    0 ),
-            'PERCENTILE'      => array( 328,    2,    0,    0 ),
-            'PERCENTRANK'     => array( 329,   -1,    0,    0 ),
-            'MODE'            => array( 330,   -1,    2,    0 ),
-            'TRIMMEAN'        => array( 331,    2,    0,    0 ),
-            'TINV'            => array( 332,    2,    1,    0 ),
-            'CONCATENATE'     => array( 336,   -1,    1,    0 ),
-            'POWER'           => array( 337,    2,    1,    0 ),
-            'RADIANS'         => array( 342,    1,    1,    0 ),
-            'DEGREES'         => array( 343,    1,    1,    0 ),
-            'SUBTOTAL'        => array( 344,   -1,    0,    0 ),
-            'SUMIF'           => array( 345,   -1,    0,    0 ),
-            'COUNTIF'         => array( 346,    2,    0,    0 ),
-            'COUNTBLANK'      => array( 347,    1,    0,    0 ),
-            'ISPMT'           => array( 350,    4,    1,    0 ),
-            'DATEDIF'         => array( 351,    3,    1,    0 ),
-            'DATESTRING'      => array( 352,    1,    1,    0 ),
-            'NUMBERSTRING'    => array( 353,    2,    1,    0 ),
-            'ROMAN'           => array( 354,   -1,    1,    0 ),
-            'GETPIVOTDATA'    => array( 358,   -1,    0,    0 ),
-            'HYPERLINK'       => array( 359,   -1,    1,    0 ),
-            'PHONETIC'        => array( 360,    1,    0,    0 ),
-            'AVERAGEA'        => array( 361,   -1,    0,    0 ),
-            'MAXA'            => array( 362,   -1,    0,    0 ),
-            'MINA'            => array( 363,   -1,    0,    0 ),
-            'STDEVPA'         => array( 364,   -1,    0,    0 ),
-            'VARPA'           => array( 365,   -1,    0,    0 ),
-            'STDEVA'          => array( 366,   -1,    0,    0 ),
-            'VARA'            => array( 367,   -1,    0,    0 ),
-            'BAHTTEXT'        => array( 368,    1,    0,    0 ),
+            'COUNT'           => array(0, -1, 0, 0),
+            'IF'              => array(1, -1, 1, 0),
+            'ISNA'            => array(2, 1, 1, 0),
+            'ISERROR'         => array(3, 1, 1, 0),
+            'SUM'             => array(4, -1, 0, 0),
+            'AVERAGE'         => array(5, -1, 0, 0),
+            'MIN'             => array(6, -1, 0, 0),
+            'MAX'             => array(7, -1, 0, 0),
+            'ROW'             => array(8, -1, 0, 0),
+            'COLUMN'          => array(9, -1, 0, 0),
+            'NA'              => array(10, 0, 0, 0),
+            'NPV'             => array(11, -1, 1, 0),
+            'STDEV'           => array(12, -1, 0, 0),
+            'DOLLAR'          => array(13, -1, 1, 0),
+            'FIXED'           => array(14, -1, 1, 0),
+            'SIN'             => array(15, 1, 1, 0),
+            'COS'             => array(16, 1, 1, 0),
+            'TAN'             => array(17, 1, 1, 0),
+            'ATAN'            => array(18, 1, 1, 0),
+            'PI'              => array(19, 0, 1, 0),
+            'SQRT'            => array(20, 1, 1, 0),
+            'EXP'             => array(21, 1, 1, 0),
+            'LN'              => array(22, 1, 1, 0),
+            'LOG10'           => array(23, 1, 1, 0),
+            'ABS'             => array(24, 1, 1, 0),
+            'INT'             => array(25, 1, 1, 0),
+            'SIGN'            => array(26, 1, 1, 0),
+            'ROUND'           => array(27, 2, 1, 0),
+            'LOOKUP'          => array(28, -1, 0, 0),
+            'INDEX'           => array(29, -1, 0, 1),
+            'REPT'            => array(30, 2, 1, 0),
+            'MID'             => array(31, 3, 1, 0),
+            'LEN'             => array(32, 1, 1, 0),
+            'VALUE'           => array(33, 1, 1, 0),
+            'TRUE'            => array(34, 0, 1, 0),
+            'FALSE'           => array(35, 0, 1, 0),
+            'AND'             => array(36, -1, 0, 0),
+            'OR'              => array(37, -1, 0, 0),
+            'NOT'             => array(38, 1, 1, 0),
+            'MOD'             => array(39, 2, 1, 0),
+            'DCOUNT'          => array(40, 3, 0, 0),
+            'DSUM'            => array(41, 3, 0, 0),
+            'DAVERAGE'        => array(42, 3, 0, 0),
+            'DMIN'            => array(43, 3, 0, 0),
+            'DMAX'            => array(44, 3, 0, 0),
+            'DSTDEV'          => array(45, 3, 0, 0),
+            'VAR'             => array(46, -1, 0, 0),
+            'DVAR'            => array(47, 3, 0, 0),
+            'TEXT'            => array(48, 2, 1, 0),
+            'LINEST'          => array(49, -1, 0, 0),
+            'TREND'           => array(50, -1, 0, 0),
+            'LOGEST'          => array(51, -1, 0, 0),
+            'GROWTH'          => array(52, -1, 0, 0),
+            'PV'              => array(56, -1, 1, 0),
+            'FV'              => array(57, -1, 1, 0),
+            'NPER'            => array(58, -1, 1, 0),
+            'PMT'             => array(59, -1, 1, 0),
+            'RATE'            => array(60, -1, 1, 0),
+            'MIRR'            => array(61, 3, 0, 0),
+            'IRR'             => array(62, -1, 0, 0),
+            'RAND'            => array(63, 0, 1, 1),
+            'MATCH'           => array(64, -1, 0, 0),
+            'DATE'            => array(65, 3, 1, 0),
+            'TIME'            => array(66, 3, 1, 0),
+            'DAY'             => array(67, 1, 1, 0),
+            'MONTH'           => array(68, 1, 1, 0),
+            'YEAR'            => array(69, 1, 1, 0),
+            'WEEKDAY'         => array(70, -1, 1, 0),
+            'HOUR'            => array(71, 1, 1, 0),
+            'MINUTE'          => array(72, 1, 1, 0),
+            'SECOND'          => array(73, 1, 1, 0),
+            'NOW'             => array(74, 0, 1, 1),
+            'AREAS'           => array(75, 1, 0, 1),
+            'ROWS'            => array(76, 1, 0, 1),
+            'COLUMNS'         => array(77, 1, 0, 1),
+            'OFFSET'          => array(78, -1, 0, 1),
+            'SEARCH'          => array(82, -1, 1, 0),
+            'TRANSPOSE'       => array(83, 1, 1, 0),
+            'TYPE'            => array(86, 1, 1, 0),
+            'ATAN2'           => array(97, 2, 1, 0),
+            'ASIN'            => array(98, 1, 1, 0),
+            'ACOS'            => array(99, 1, 1, 0),
+            'CHOOSE'          => array(100, -1, 1, 0),
+            'HLOOKUP'         => array(101, -1, 0, 0),
+            'VLOOKUP'         => array(102, -1, 0, 0),
+            'ISREF'           => array(105, 1, 0, 0),
+            'LOG'             => array(109, -1, 1, 0),
+            'CHAR'            => array(111, 1, 1, 0),
+            'LOWER'           => array(112, 1, 1, 0),
+            'UPPER'           => array(113, 1, 1, 0),
+            'PROPER'          => array(114, 1, 1, 0),
+            'LEFT'            => array(115, -1, 1, 0),
+            'RIGHT'           => array(116, -1, 1, 0),
+            'EXACT'           => array(117, 2, 1, 0),
+            'TRIM'            => array(118, 1, 1, 0),
+            'REPLACE'         => array(119, 4, 1, 0),
+            'SUBSTITUTE'      => array(120, -1, 1, 0),
+            'CODE'            => array(121, 1, 1, 0),
+            'FIND'            => array(124, -1, 1, 0),
+            'CELL'            => array(125, -1, 0, 1),
+            'ISERR'           => array(126, 1, 1, 0),
+            'ISTEXT'          => array(127, 1, 1, 0),
+            'ISNUMBER'        => array(128, 1, 1, 0),
+            'ISBLANK'         => array(129, 1, 1, 0),
+            'T'               => array(130, 1, 0, 0),
+            'N'               => array(131, 1, 0, 0),
+            'DATEVALUE'       => array(140, 1, 1, 0),
+            'TIMEVALUE'       => array(141, 1, 1, 0),
+            'SLN'             => array(142, 3, 1, 0),
+            'SYD'             => array(143, 4, 1, 0),
+            'DDB'             => array(144, -1, 1, 0),
+            'INDIRECT'        => array(148, -1, 1, 1),
+            'CALL'            => array(150, -1, 1, 0),
+            'CLEAN'           => array(162, 1, 1, 0),
+            'MDETERM'         => array(163, 1, 2, 0),
+            'MINVERSE'        => array(164, 1, 2, 0),
+            'MMULT'           => array(165, 2, 2, 0),
+            'IPMT'            => array(167, -1, 1, 0),
+            'PPMT'            => array(168, -1, 1, 0),
+            'COUNTA'          => array(169, -1, 0, 0),
+            'PRODUCT'         => array(183, -1, 0, 0),
+            'FACT'            => array(184, 1, 1, 0),
+            'DPRODUCT'        => array(189, 3, 0, 0),
+            'ISNONTEXT'       => array(190, 1, 1, 0),
+            'STDEVP'          => array(193, -1, 0, 0),
+            'VARP'            => array(194, -1, 0, 0),
+            'DSTDEVP'         => array(195, 3, 0, 0),
+            'DVARP'           => array(196, 3, 0, 0),
+            'TRUNC'           => array(197, -1, 1, 0),
+            'ISLOGICAL'       => array(198, 1, 1, 0),
+            'DCOUNTA'         => array(199, 3, 0, 0),
+            'USDOLLAR'        => array(204, -1, 1, 0),
+            'FINDB'           => array(205, -1, 1, 0),
+            'SEARCHB'         => array(206, -1, 1, 0),
+            'REPLACEB'        => array(207, 4, 1, 0),
+            'LEFTB'           => array(208, -1, 1, 0),
+            'RIGHTB'          => array(209, -1, 1, 0),
+            'MIDB'            => array(210, 3, 1, 0),
+            'LENB'            => array(211, 1, 1, 0),
+            'ROUNDUP'         => array(212, 2, 1, 0),
+            'ROUNDDOWN'       => array(213, 2, 1, 0),
+            'ASC'             => array(214, 1, 1, 0),
+            'DBCS'            => array(215, 1, 1, 0),
+            'RANK'            => array(216, -1, 0, 0),
+            'ADDRESS'         => array(219, -1, 1, 0),
+            'DAYS360'         => array(220, -1, 1, 0),
+            'TODAY'           => array(221, 0, 1, 1),
+            'VDB'             => array(222, -1, 1, 0),
+            'MEDIAN'          => array(227, -1, 0, 0),
+            'SUMPRODUCT'      => array(228, -1, 2, 0),
+            'SINH'            => array(229, 1, 1, 0),
+            'COSH'            => array(230, 1, 1, 0),
+            'TANH'            => array(231, 1, 1, 0),
+            'ASINH'           => array(232, 1, 1, 0),
+            'ACOSH'           => array(233, 1, 1, 0),
+            'ATANH'           => array(234, 1, 1, 0),
+            'DGET'            => array(235, 3, 0, 0),
+            'INFO'            => array(244, 1, 1, 1),
+            'DB'              => array(247, -1, 1, 0),
+            'FREQUENCY'       => array(252, 2, 0, 0),
+            'ERROR.TYPE'      => array(261, 1, 1, 0),
+            'REGISTER.ID'     => array(267, -1, 1, 0),
+            'AVEDEV'          => array(269, -1, 0, 0),
+            'BETADIST'        => array(270, -1, 1, 0),
+            'GAMMALN'         => array(271, 1, 1, 0),
+            'BETAINV'         => array(272, -1, 1, 0),
+            'BINOMDIST'       => array(273, 4, 1, 0),
+            'CHIDIST'         => array(274, 2, 1, 0),
+            'CHIINV'          => array(275, 2, 1, 0),
+            'COMBIN'          => array(276, 2, 1, 0),
+            'CONFIDENCE'      => array(277, 3, 1, 0),
+            'CRITBINOM'       => array(278, 3, 1, 0),
+            'EVEN'            => array(279, 1, 1, 0),
+            'EXPONDIST'       => array(280, 3, 1, 0),
+            'FDIST'           => array(281, 3, 1, 0),
+            'FINV'            => array(282, 3, 1, 0),
+            'FISHER'          => array(283, 1, 1, 0),
+            'FISHERINV'       => array(284, 1, 1, 0),
+            'FLOOR'           => array(285, 2, 1, 0),
+            'GAMMADIST'       => array(286, 4, 1, 0),
+            'GAMMAINV'        => array(287, 3, 1, 0),
+            'CEILING'         => array(288, 2, 1, 0),
+            'HYPGEOMDIST'     => array(289, 4, 1, 0),
+            'LOGNORMDIST'     => array(290, 3, 1, 0),
+            'LOGINV'          => array(291, 3, 1, 0),
+            'NEGBINOMDIST'    => array(292, 3, 1, 0),
+            'NORMDIST'        => array(293, 4, 1, 0),
+            'NORMSDIST'       => array(294, 1, 1, 0),
+            'NORMINV'         => array(295, 3, 1, 0),
+            'NORMSINV'        => array(296, 1, 1, 0),
+            'STANDARDIZE'     => array(297, 3, 1, 0),
+            'ODD'             => array(298, 1, 1, 0),
+            'PERMUT'          => array(299, 2, 1, 0),
+            'POISSON'         => array(300, 3, 1, 0),
+            'TDIST'           => array(301, 3, 1, 0),
+            'WEIBULL'         => array(302, 4, 1, 0),
+            'SUMXMY2'         => array(303, 2, 2, 0),
+            'SUMX2MY2'        => array(304, 2, 2, 0),
+            'SUMX2PY2'        => array(305, 2, 2, 0),
+            'CHITEST'         => array(306, 2, 2, 0),
+            'CORREL'          => array(307, 2, 2, 0),
+            'COVAR'           => array(308, 2, 2, 0),
+            'FORECAST'        => array(309, 3, 2, 0),
+            'FTEST'           => array(310, 2, 2, 0),
+            'INTERCEPT'       => array(311, 2, 2, 0),
+            'PEARSON'         => array(312, 2, 2, 0),
+            'RSQ'             => array(313, 2, 2, 0),
+            'STEYX'           => array(314, 2, 2, 0),
+            'SLOPE'           => array(315, 2, 2, 0),
+            'TTEST'           => array(316, 4, 2, 0),
+            'PROB'            => array(317, -1, 2, 0),
+            'DEVSQ'           => array(318, -1, 0, 0),
+            'GEOMEAN'         => array(319, -1, 0, 0),
+            'HARMEAN'         => array(320, -1, 0, 0),
+            'SUMSQ'           => array(321, -1, 0, 0),
+            'KURT'            => array(322, -1, 0, 0),
+            'SKEW'            => array(323, -1, 0, 0),
+            'ZTEST'           => array(324, -1, 0, 0),
+            'LARGE'           => array(325, 2, 0, 0),
+            'SMALL'           => array(326, 2, 0, 0),
+            'QUARTILE'        => array(327, 2, 0, 0),
+            'PERCENTILE'      => array(328, 2, 0, 0),
+            'PERCENTRANK'     => array(329, -1, 0, 0),
+            'MODE'            => array(330, -1, 2, 0),
+            'TRIMMEAN'        => array(331, 2, 0, 0),
+            'TINV'            => array(332, 2, 1, 0),
+            'CONCATENATE'     => array(336, -1, 1, 0),
+            'POWER'           => array(337, 2, 1, 0),
+            'RADIANS'         => array(342, 1, 1, 0),
+            'DEGREES'         => array(343, 1, 1, 0),
+            'SUBTOTAL'        => array(344, -1, 0, 0),
+            'SUMIF'           => array(345, -1, 0, 0),
+            'COUNTIF'         => array(346, 2, 0, 0),
+            'COUNTBLANK'      => array(347, 1, 0, 0),
+            'ISPMT'           => array(350, 4, 1, 0),
+            'DATEDIF'         => array(351, 3, 1, 0),
+            'DATESTRING'      => array(352, 1, 1, 0),
+            'NUMBERSTRING'    => array(353, 2, 1, 0),
+            'ROMAN'           => array(354, -1, 1, 0),
+            'GETPIVOTDATA'    => array(358, -1, 0, 0),
+            'HYPERLINK'       => array(359, -1, 1, 0),
+            'PHONETIC'        => array(360, 1, 0, 0),
+            'AVERAGEA'        => array(361, -1, 0, 0),
+            'MAXA'            => array(362, -1, 0, 0),
+            'MINA'            => array(363, -1, 0, 0),
+            'STDEVPA'         => array(364, -1, 0, 0),
+            'VARPA'           => array(365, -1, 0, 0),
+            'STDEVA'          => array(366, -1, 0, 0),
+            'VARA'            => array(367, -1, 0, 0),
+            'BAHTTEXT'        => array(368, 1, 0, 0),
         );
     }
 
@@ -597,7 +597,7 @@ 
      */
     private function convertFunction($token, $num_args)
     {
-        $args     = $this->functions[$token][1];
+        $args = $this->functions[$token][1];
 //        $volatile = $this->functions[$token][3];
 
         // Fixed number of args eg. TIME($i, $j, $k).
@@ -644,7 +644,7 @@ 
             // TODO: use real error codes
             throw new \PhpSpreadsheet\Writer\Exception("Unknown class $class");
         }
-        return $ptgArea . $row1 . $row2 . $col1. $col2;
+        return $ptgArea . $row1 . $row2 . $col1 . $col2;
     }
 
     /**
@@ -673,7 +673,7 @@ 
             list($row1, $col1) = $this->cellToPackedRowcol($cell1);
             list($row2, $col2) = $this->cellToPackedRowcol($cell2);
         } else { // It's a rows range (like 26:27)
-             list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1.':'.$cell2);
+             list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1 . ':' . $cell2);
         }
 
         // The ptg value depends on the class of the ptg.
@@ -687,7 +687,7 @@ 
 //            throw new \PhpSpreadsheet\Writer\Exception("Unknown class $class");
 //        }
 
-        return $ptgArea . $ext_ref . $row1 . $row2 . $col1. $col2;
+        return $ptgArea . $ext_ref . $row1 . $row2 . $col1 . $col2;
     }
 
     /**
@@ -716,7 +716,7 @@ 
 //            // TODO: use real error codes
 //            throw new \PhpSpreadsheet\Writer\Exception("Unknown class $class");
 //        }
-        return $ptgRef.$row.$col;
+        return $ptgRef . $row . $col;
     }
 
     /**
@@ -751,7 +751,7 @@ 
 //            throw new \PhpSpreadsheet\Writer\Exception("Unknown class $class");
 //        }
 
-        return $ptgRef . $ext_ref. $row . $col;
+        return $ptgRef . $ext_ref . $row . $col;
     }
 
     /**
@@ -1037,7 +1037,7 @@ 
             }
 
             if ($i < ($formula_length - 1)) {
-                $this->lookAhead = $this->formula{$i+1};
+                $this->lookAhead = $this->formula{$i + 1};
             }
             $token = '';
         }
@@ -1046,7 +1046,7 @@ 
             $token .= $this->formula{$i};
 
             if ($i < ($formula_length - 1)) {
-                $this->lookAhead = $this->formula{$i+1};
+                $this->lookAhead = $this->formula{$i + 1};
             } else {
                 $this->lookAhead = '';
             }
@@ -1061,7 +1061,7 @@ 
             }
 
             if ($i < ($formula_length - 2)) {
-                $this->lookAhead = $this->formula{$i+2};
+                $this->lookAhead = $this->formula{$i + 2};
             } else { // if we run out of characters lookAhead becomes empty
                 $this->lookAhead = '';
             }
@@ -1129,10 +1129,10 @@ 
                 } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $token) and !preg_match("/[0-9]/", $this->lookAhead)) {
                     // If it's an external range like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
                     return $token;
-                } elseif (is_numeric($token) and (!is_numeric($token.$this->lookAhead) or ($this->lookAhead == '')) and ($this->lookAhead != '!') and ($this->lookAhead != ':')) {
+                } elseif (is_numeric($token) and (!is_numeric($token . $this->lookAhead) or ($this->lookAhead == '')) and ($this->lookAhead != '!') and ($this->lookAhead != ':')) {
                     // If it's a number (check that it's not a sheet name or range)
                     return $token;
-                } elseif (preg_match("/\"([^\"]|\"\"){0,255}\"/", $token) and $this->lookAhead != '"' and (substr_count($token, '"')%2 == 0)) {
+                } elseif (preg_match("/\"([^\"]|\"\"){0,255}\"/", $token) and $this->lookAhead != '"' and (substr_count($token, '"') % 2 == 0)) {
                     // If it's a string (of maximum 255 characters)
                     return $token;
                 } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A') {
@@ -1164,7 +1164,7 @@ 
         $this->formula      = $formula;
         $this->lookAhead    = isset($formula{1}) ? $formula{1} : '';
         $this->advance();
-        $this->parseTree   = $this->condition();
+        $this->parseTree = $this->condition();
         return true;
     }
 
@@ -1329,12 +1329,12 @@ 
     private function fact()
     {
         if ($this->currentToken == "(") {
-            $this->advance();         // eat the "("
+            $this->advance(); // eat the "("
             $result = $this->parenthesizedExpression();
             if ($this->currentToken != ")") {
                 throw new \PhpSpreadsheet\Writer\Exception("')' token expected.");
             }
-            $this->advance();         // eat the ")"
+            $this->advance(); // eat the ")"
             return $result;
         }
         // if it's a reference
@@ -1377,7 +1377,7 @@ 
             // If it's a number or a percent
             if ($this->lookAhead == '%') {
                 $result = $this->createTree('ptgPercent', $this->currentToken, '');
-                $this->advance();  // Skip the percentage operator once we've pre-built that tree
+                $this->advance(); // Skip the percentage operator once we've pre-built that tree
             } else {
                 $result = $this->createTree($this->currentToken, '', '');
             }
@@ -1388,7 +1388,7 @@ 
             $result = $this->func();
             return $result;
         }
-        throw new \PhpSpreadsheet\Writer\Exception("Syntax error: ".$this->currentToken.", lookahead: ".$this->lookAhead.", current char: ".$this->currentCharacter);
+        throw new \PhpSpreadsheet\Writer\Exception("Syntax error: " . $this->currentToken . ", lookahead: " . $this->lookAhead . ", current char: " . $this->currentCharacter);
     }
 
     /**
@@ -1404,12 +1404,12 @@ 
         $function = strtoupper($this->currentToken);
         $result   = ''; // initialize result
         $this->advance();
-        $this->advance();         // eat the "("
+        $this->advance(); // eat the "("
         while ($this->currentToken != ')') {
         /**/
             if ($num_args > 0) {
                 if ($this->currentToken == "," || $this->currentToken == ";") {
-                    $this->advance();  // eat the "," or ";"
+                    $this->advance(); // eat the "," or ";"
                 } else {
                     throw new \PhpSpreadsheet\Writer\Exception("Syntax error: comma expected in function $function, arg #{$num_args}");
                 }
@@ -1431,7 +1431,7 @@ 
         }
 
         $result = $this->createTree($function, $result, $num_args);
-        $this->advance();         // eat the ")"
+        $this->advance(); // eat the ")"
         return $result;
     }
 
@@ -1511,7 +1511,7 @@ 
                 $left_tree = '';
             }
             // add it's left subtree and return.
-            return $left_tree.$this->convertFunction($tree['value'], $tree['right']);
+            return $left_tree . $this->convertFunction($tree['value'], $tree['right']);
         } else {
             $converted_tree = $this->convert($tree['value']);
         }