PHPOffice / PhpSpreadsheet

tests/PhpSpreadsheet/SettingsTest.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
      */
     public function testGetXMLSettings()
     {
-        $result = call_user_func(array(\PhpSpreadsheet\Settings::class,'getLibXmlLoaderOptions'));
+        $result = call_user_func(array(\PhpSpreadsheet\Settings::class, 'getLibXmlLoaderOptions'));
         $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR) & $result));
     }
 
@@ -21,8 +21,8 @@ 
      */
     public function testSetXMLSettings()
     {
-        call_user_func_array(array(\PhpSpreadsheet\Settings::class,'setLibXmlLoaderOptions'), [LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID]);
-        $result = call_user_func(array(\PhpSpreadsheet\Settings::class,'getLibXmlLoaderOptions'));
+        call_user_func_array(array(\PhpSpreadsheet\Settings::class, 'setLibXmlLoaderOptions'), [LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID]);
+        $result = call_user_func(array(\PhpSpreadsheet\Settings::class, 'getLibXmlLoaderOptions'));
         $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID) & $result));
     }
 }

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/Excel2007.php

Spacing +99 added lines, -99 removed lines

@@ -137,7 +137,7 @@ 
                             'SimpleXMLElement',
                             \PhpSpreadsheet\Settings::getLibXmlLoaderOptions()
                         )
-                    );  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
+                    ); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
 
                     if ($xmlWorkbook->sheets) {
                         foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
@@ -224,7 +224,7 @@ 
                         $xml = new \XMLReader();
                         $res = $xml->xml(
                             $this->securityScanFile(
-                                'zip://'.\PhpSpreadsheet\Shared\File::realpath($pFilename).'#'."$dir/$fileWorksheet"
+                                'zip://' . \PhpSpreadsheet\Shared\File::realpath($pFilename) . '#' . "$dir/$fileWorksheet"
                             ),
                             null,
                             \PhpSpreadsheet\Settings::getLibXmlLoaderOptions()
@@ -268,7 +268,7 @@ 
         } elseif ($value == '1') {
             return true;
         } else {
-            return (bool)$c->v;
+            return (bool) $c->v;
         }
         return $value;
     }
@@ -294,15 +294,15 @@ 
         $calculatedValue    = self::$castBaseType($c);
 
         // Shared formula?
-        if (isset($c->f['t']) && strtolower((string)$c->f['t']) == 'shared') {
+        if (isset($c->f['t']) && strtolower((string) $c->f['t']) == 'shared') {
 //            echo 'SHARED FORMULA', PHP_EOL;
-            $instance = (string)$c->f['si'];
+            $instance = (string) $c->f['si'];
 
 //            echo 'Instance ID = ', $instance, PHP_EOL;
 //
 //            echo 'Shared Formula Array:', PHP_EOL;
 //            print_r($sharedFormulas);
-            if (!isset($sharedFormulas[(string)$c->f['si']])) {
+            if (!isset($sharedFormulas[(string) $c->f['si']])) {
 //                echo 'SETTING NEW SHARED FORMULA', PHP_EOL;
 //                echo 'Master is ', $r, PHP_EOL;
 //                echo 'Formula is ', $value, PHP_EOL;
@@ -400,10 +400,10 @@ 
                     if (is_object($xmlTheme)) {
                         $xmlThemeName = $xmlTheme->attributes();
                         $xmlTheme = $xmlTheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
-                        $themeName = (string)$xmlThemeName['name'];
+                        $themeName = (string) $xmlThemeName['name'];
 
                         $colourScheme = $xmlTheme->themeElements->clrScheme->attributes();
-                        $colourSchemeName = (string)$colourScheme['name'];
+                        $colourSchemeName = (string) $colourScheme['name'];
                         $colourScheme = $xmlTheme->themeElements->clrScheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
 
                         $themeColours = array();
@@ -544,7 +544,7 @@ 
                     }
 
                     if (!is_null($macros)) {
-                        $macrosCode = $this->getFromZipArchive($zip, 'xl/vbaProject.bin');//vbaProject.bin always in 'xl' dir and always named vbaProject.bin
+                        $macrosCode = $this->getFromZipArchive($zip, 'xl/vbaProject.bin'); //vbaProject.bin always in 'xl' dir and always named vbaProject.bin
                         if ($macrosCode !== false) {
                             $excel->setMacrosCode($macrosCode);
                             $excel->setHasMacros(true);
@@ -587,9 +587,9 @@ 
                                 // We shouldn't override any of the built-in MS Excel values (values below id 164)
                                 //  But there's a lot of naughty homebrew xlsx writers that do use "reserved" id values that aren't actually used
                                 //  So we make allowance for them rather than lose formatting masks
-                                if ((int)$xf["numFmtId"] < 164 &&
-                                    \PhpSpreadsheet\Style\NumberFormat::builtInFormatCode((int)$xf["numFmtId"]) !== '') {
-                                    $numFmt = \PhpSpreadsheet\Style\NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
+                                if ((int) $xf["numFmtId"] < 164 &&
+                                    \PhpSpreadsheet\Style\NumberFormat::builtInFormatCode((int) $xf["numFmtId"]) !== '') {
+                                    $numFmt = \PhpSpreadsheet\Style\NumberFormat::builtInFormatCode((int) $xf["numFmtId"]);
                                 }
                             }
                             $quotePrefix = false;
@@ -620,8 +620,8 @@ 
                                 $tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
                                 if (isset($tmpNumFmt["formatCode"])) {
                                     $numFmt = (string) $tmpNumFmt["formatCode"];
-                                } elseif ((int)$xf["numFmtId"] < 165) {
-                                    $numFmt = \PhpSpreadsheet\Style\NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
+                                } elseif ((int) $xf["numFmtId"] < 165) {
+                                    $numFmt = \PhpSpreadsheet\Style\NumberFormat::builtInFormatCode((int) $xf["numFmtId"]);
                                 }
                             }
 
@@ -740,17 +740,17 @@ 
                                     $docSheet->getSheetView()->setView((string) $xmlSheet->sheetViews->sheetView['view']);
                                 }
                                 if (isset($xmlSheet->sheetViews->sheetView['showGridLines'])) {
-                                    $docSheet->setShowGridLines(self::boolean((string)$xmlSheet->sheetViews->sheetView['showGridLines']));
+                                    $docSheet->setShowGridLines(self::boolean((string) $xmlSheet->sheetViews->sheetView['showGridLines']));
                                 }
                                 if (isset($xmlSheet->sheetViews->sheetView['showRowColHeaders'])) {
-                                    $docSheet->setShowRowColHeaders(self::boolean((string)$xmlSheet->sheetViews->sheetView['showRowColHeaders']));
+                                    $docSheet->setShowRowColHeaders(self::boolean((string) $xmlSheet->sheetViews->sheetView['showRowColHeaders']));
                                 }
                                 if (isset($xmlSheet->sheetViews->sheetView['rightToLeft'])) {
-                                    $docSheet->setRightToLeft(self::boolean((string)$xmlSheet->sheetViews->sheetView['rightToLeft']));
+                                    $docSheet->setRightToLeft(self::boolean((string) $xmlSheet->sheetViews->sheetView['rightToLeft']));
                                 }
                                 if (isset($xmlSheet->sheetViews->sheetView->pane)) {
                                     if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
-                                        $docSheet->freezePane((string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell']);
+                                        $docSheet->freezePane((string) $xmlSheet->sheetViews->sheetView->pane['topLeftCell']);
                                     } else {
                                         $xSplit = 0;
                                         $ySplit = 0;
@@ -769,7 +769,7 @@ 
 
                                 if (isset($xmlSheet->sheetViews->sheetView->selection)) {
                                     if (isset($xmlSheet->sheetViews->sheetView->selection['sqref'])) {
-                                        $sqref = (string)$xmlSheet->sheetViews->sheetView->selection['sqref'];
+                                        $sqref = (string) $xmlSheet->sheetViews->sheetView->selection['sqref'];
                                         $sqref = explode(' ', $sqref);
                                         $sqref = $sqref[0];
                                         $docSheet->setSelectedCells($sqref);
@@ -779,7 +779,7 @@ 
 
                             if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->tabColor)) {
                                 if (isset($xmlSheet->sheetPr->tabColor['rgb'])) {
-                                    $docSheet->getTabColor()->setARGB((string)$xmlSheet->sheetPr->tabColor['rgb']);
+                                    $docSheet->getTabColor()->setARGB((string) $xmlSheet->sheetPr->tabColor['rgb']);
                                 }
                             }
                             if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr['codeName'])) {
@@ -814,13 +814,13 @@ 
                                 if (isset($xmlSheet->sheetFormatPr['customHeight']) &&
                                     self::boolean((string) $xmlSheet->sheetFormatPr['customHeight']) &&
                                     isset($xmlSheet->sheetFormatPr['defaultRowHeight'])) {
-                                    $docSheet->getDefaultRowDimension()->setRowHeight((float)$xmlSheet->sheetFormatPr['defaultRowHeight']);
+                                    $docSheet->getDefaultRowDimension()->setRowHeight((float) $xmlSheet->sheetFormatPr['defaultRowHeight']);
                                 }
                                 if (isset($xmlSheet->sheetFormatPr['defaultColWidth'])) {
-                                    $docSheet->getDefaultColumnDimension()->setWidth((float)$xmlSheet->sheetFormatPr['defaultColWidth']);
+                                    $docSheet->getDefaultColumnDimension()->setWidth((float) $xmlSheet->sheetFormatPr['defaultColWidth']);
                                 }
                                 if (isset($xmlSheet->sheetFormatPr['zeroHeight']) &&
-                                    ((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) {
+                                    ((string) $xmlSheet->sheetFormatPr['zeroHeight'] == '1')) {
                                     $docSheet->getDefaultRowDimension()->setZeroHeight(true);
                                 }
                             }
@@ -887,10 +887,10 @@ 
                                     }
 
                                     foreach ($row->c as $c) {
-                                        $r                     = (string) $c["r"];
+                                        $r = (string) $c["r"];
                                         $cellDataType         = (string) $c["t"];
                                         $value                = null;
-                                        $calculatedValue     = null;
+                                        $calculatedValue = null;
 
                                         // Read cell?
                                         if ($this->getReadFilter() !== null) {
@@ -910,7 +910,7 @@ 
                                         switch ($cellDataType) {
                                             case "s":
     //                                            echo 'String', PHP_EOL;
-                                                if ((string)$c->v != '') {
+                                                if ((string) $c->v != '') {
                                                     $value = $sharedStrings[intval($c->v)];
 
                                                     if ($value instanceof \PhpSpreadsheet\RichText) {
@@ -970,12 +970,12 @@ 
 
                                         // Check for numeric values
                                         if (is_numeric($value) && $cellDataType != 's') {
-                                            if ($value == (int)$value) {
-                                                $value = (int)$value;
-                                            } elseif ($value == (float)$value) {
-                                                $value = (float)$value;
-                                            } elseif ($value == (double)$value) {
-                                                $value = (double)$value;
+                                            if ($value == (int) $value) {
+                                                $value = (int) $value;
+                                            } elseif ($value == (float) $value) {
+                                                $value = (float) $value;
+                                            } elseif ($value == (double) $value) {
+                                                $value = (double) $value;
                                             }
                                         }
 
@@ -1009,7 +1009,7 @@ 
                             if (!$this->readDataOnly && $xmlSheet && $xmlSheet->conditionalFormatting) {
                                 foreach ($xmlSheet->conditionalFormatting as $conditional) {
                                     foreach ($conditional->cfRule as $cfRule) {
-                                        if (((string)$cfRule["type"] == \PhpSpreadsheet\Style\Conditional::CONDITION_NONE || (string)$cfRule["type"] == \PhpSpreadsheet\Style\Conditional::CONDITION_CELLIS || (string)$cfRule["type"] == \PhpSpreadsheet\Style\Conditional::CONDITION_CONTAINSTEXT || (string)$cfRule["type"] == \PhpSpreadsheet\Style\Conditional::CONDITION_EXPRESSION) && isset($dxfs[intval($cfRule["dxfId"])])) {
+                                        if (((string) $cfRule["type"] == \PhpSpreadsheet\Style\Conditional::CONDITION_NONE || (string) $cfRule["type"] == \PhpSpreadsheet\Style\Conditional::CONDITION_CELLIS || (string) $cfRule["type"] == \PhpSpreadsheet\Style\Conditional::CONDITION_CONTAINSTEXT || (string) $cfRule["type"] == \PhpSpreadsheet\Style\Conditional::CONDITION_EXPRESSION) && isset($dxfs[intval($cfRule["dxfId"])])) {
                                             $conditionals[(string) $conditional["sqref"]][intval($cfRule["priority"])] = $cfRule;
                                         }
                                     }
@@ -1020,19 +1020,19 @@ 
                                     $conditionalStyles = array();
                                     foreach ($cfRules as $cfRule) {
                                         $objConditional = new \PhpSpreadsheet\Style\Conditional();
-                                        $objConditional->setConditionType((string)$cfRule["type"]);
-                                        $objConditional->setOperatorType((string)$cfRule["operator"]);
+                                        $objConditional->setConditionType((string) $cfRule["type"]);
+                                        $objConditional->setOperatorType((string) $cfRule["operator"]);
 
-                                        if ((string)$cfRule["text"] != '') {
-                                            $objConditional->setText((string)$cfRule["text"]);
+                                        if ((string) $cfRule["text"] != '') {
+                                            $objConditional->setText((string) $cfRule["text"]);
                                         }
 
                                         if (count($cfRule->formula) > 1) {
                                             foreach ($cfRule->formula as $formula) {
-                                                $objConditional->addCondition((string)$formula);
+                                                $objConditional->addCondition((string) $formula);
                                             }
                                         } else {
-                                            $objConditional->addCondition((string)$cfRule->formula);
+                                            $objConditional->addCondition((string) $cfRule->formula);
                                         }
                                         $objConditional->setStyle(clone $dxfs[intval($cfRule["dxfId"])]);
                                         $conditionalStyles[] = $objConditional;
@@ -1210,25 +1210,25 @@ 
                                 $docHeaderFooter = $docSheet->getHeaderFooter();
 
                                 if (isset($xmlSheet->headerFooter["differentOddEven"]) &&
-                                    self::boolean((string)$xmlSheet->headerFooter["differentOddEven"])) {
+                                    self::boolean((string) $xmlSheet->headerFooter["differentOddEven"])) {
                                     $docHeaderFooter->setDifferentOddEven(true);
                                 } else {
                                     $docHeaderFooter->setDifferentOddEven(false);
                                 }
                                 if (isset($xmlSheet->headerFooter["differentFirst"]) &&
-                                    self::boolean((string)$xmlSheet->headerFooter["differentFirst"])) {
+                                    self::boolean((string) $xmlSheet->headerFooter["differentFirst"])) {
                                     $docHeaderFooter->setDifferentFirst(true);
                                 } else {
                                     $docHeaderFooter->setDifferentFirst(false);
                                 }
                                 if (isset($xmlSheet->headerFooter["scaleWithDoc"]) &&
-                                    !self::boolean((string)$xmlSheet->headerFooter["scaleWithDoc"])) {
+                                    !self::boolean((string) $xmlSheet->headerFooter["scaleWithDoc"])) {
                                     $docHeaderFooter->setScaleWithDocument(false);
                                 } else {
                                     $docHeaderFooter->setScaleWithDocument(true);
                                 }
                                 if (isset($xmlSheet->headerFooter["alignWithMargins"]) &&
-                                    !self::boolean((string)$xmlSheet->headerFooter["alignWithMargins"])) {
+                                    !self::boolean((string) $xmlSheet->headerFooter["alignWithMargins"])) {
                                     $docHeaderFooter->setAlignWithMargins(false);
                                 } else {
                                     $docHeaderFooter->setAlignWithMargins(true);
@@ -1302,7 +1302,7 @@ 
                                     );
                                     foreach ($relsWorksheet->Relationship as $ele) {
                                         if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink") {
-                                            $hyperlinks[(string)$ele["Id"]] = (string)$ele["Target"];
+                                            $hyperlinks[(string) $ele["Id"]] = (string) $ele["Target"];
                                         }
                                     }
                                 }
@@ -1316,18 +1316,18 @@ 
                                         foreach (\PhpSpreadsheet\Cell::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) {
                                             $cell = $docSheet->getCell($cellReference);
                                             if (isset($linkRel['id'])) {
-                                                $hyperlinkUrl = $hyperlinks[ (string)$linkRel['id'] ];
+                                                $hyperlinkUrl = $hyperlinks[(string) $linkRel['id']];
                                                 if (isset($hyperlink['location'])) {
                                                     $hyperlinkUrl .= '#' . (string) $hyperlink['location'];
                                                 }
                                                 $cell->getHyperlink()->setUrl($hyperlinkUrl);
                                             } elseif (isset($hyperlink['location'])) {
-                                                $cell->getHyperlink()->setUrl('sheet://' . (string)$hyperlink['location']);
+                                                $cell->getHyperlink()->setUrl('sheet://' . (string) $hyperlink['location']);
                                             }
 
                                             // Tooltip
                                             if (isset($hyperlink['tooltip'])) {
-                                                $cell->getHyperlink()->setTooltip((string)$hyperlink['tooltip']);
+                                                $cell->getHyperlink()->setTooltip((string) $hyperlink['tooltip']);
                                             }
                                         }
                                     }
@@ -1350,10 +1350,10 @@ 
                                     );
                                     foreach ($relsWorksheet->Relationship as $ele) {
                                         if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
-                                            $comments[(string)$ele["Id"]] = (string)$ele["Target"];
+                                            $comments[(string) $ele["Id"]] = (string) $ele["Target"];
                                         }
                                         if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
-                                            $vmlComments[(string)$ele["Id"]] = (string)$ele["Target"];
+                                            $vmlComments[(string) $ele["Id"]] = (string) $ele["Target"];
                                         }
                                     }
                                 }
@@ -1373,15 +1373,15 @@ 
 
                                     // Loop through authors
                                     foreach ($commentsFile->authors->author as $author) {
-                                        $authors[] = (string)$author;
+                                        $authors[] = (string) $author;
                                     }
 
                                     // Loop through contents
                                     foreach ($commentsFile->commentList->comment as $comment) {
                                         if (!empty($comment['authorId'])) {
-                                            $docSheet->getComment((string)$comment['ref'])->setAuthor($authors[(string)$comment['authorId']]);
+                                            $docSheet->getComment((string) $comment['ref'])->setAuthor($authors[(string) $comment['authorId']]);
                                         }
-                                        $docSheet->getComment((string)$comment['ref'])->setText($this->parseRichText($comment->text));
+                                        $docSheet->getComment((string) $comment['ref'])->setText($this->parseRichText($comment->text));
                                     }
                                 }
 
@@ -1401,16 +1401,16 @@ 
                                         $shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
 
                                         if (isset($shape['style'])) {
-                                            $style        = (string)$shape['style'];
-                                            $fillColor    = strtoupper(substr((string)$shape['fillcolor'], 1));
+                                            $style        = (string) $shape['style'];
+                                            $fillColor    = strtoupper(substr((string) $shape['fillcolor'], 1));
                                             $column       = null;
                                             $row          = null;
 
                                             $clientData   = $shape->xpath('.//x:ClientData');
                                             if (is_array($clientData) && !empty($clientData)) {
-                                                $clientData   = $clientData[0];
+                                                $clientData = $clientData[0];
 
-                                                if (isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note') {
+                                                if (isset($clientData['ObjectType']) && (string) $clientData['ObjectType'] == 'Note') {
                                                     $temp = $clientData->xpath('.//x:Row');
                                                     if (is_array($temp)) {
                                                         $row = $temp[0];
@@ -1507,14 +1507,14 @@ 
                                                 $imageData = $imageData[$idx];
 
                                                 $imageData = $imageData->attributes('urn:schemas-microsoft-com:office:office');
-                                                $style = self::toCSSArray((string)$shape['style']);
+                                                $style = self::toCSSArray((string) $shape['style']);
 
                                                 $hfImages[(string) $shape['id']] = new \PhpSpreadsheet\Worksheet\HeaderFooterDrawing();
                                                 if (isset($imageData['title'])) {
-                                                    $hfImages[(string) $shape['id']]->setName((string)$imageData['title']);
+                                                    $hfImages[(string) $shape['id']]->setName((string) $imageData['title']);
                                                 }
 
-                                                $hfImages[(string) $shape['id']]->setPath("zip://".\PhpSpreadsheet\Shared_File::realpath($pFilename)."#" . $drawings[(string)$imageData['relid']], false);
+                                                $hfImages[(string) $shape['id']]->setPath("zip://" . \PhpSpreadsheet\Shared_File::realpath($pFilename) . "#" . $drawings[(string) $imageData['relid']], false);
                                                 $hfImages[(string) $shape['id']]->setResizeProportional(false);
                                                 $hfImages[(string) $shape['id']]->setWidth($style['width']);
                                                 $hfImages[(string) $shape['id']]->setHeight($style['height']);
@@ -1590,7 +1590,7 @@ 
                                                     $objDrawing->setName((string) self::getArrayItem($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
                                                     $objDrawing->setDescription((string) self::getArrayItem($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
                                                     $objDrawing->setPath(
-                                                        "zip://".\PhpSpreadsheet\Shared\File::realpath($pFilename)."#" .
+                                                        "zip://" . \PhpSpreadsheet\Shared\File::realpath($pFilename) . "#" .
                                                         $images[(string) self::getArrayItem(
                                                             $blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"),
                                                             "embed"
@@ -1637,7 +1637,7 @@ 
                                                     $objDrawing->setName((string) self::getArrayItem($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
                                                     $objDrawing->setDescription((string) self::getArrayItem($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
                                                     $objDrawing->setPath(
-                                                        "zip://".\PhpSpreadsheet\Shared\File::realpath($pFilename)."#" .
+                                                        "zip://" . \PhpSpreadsheet\Shared\File::realpath($pFilename) . "#" .
                                                         $images[(string) self::getArrayItem(
                                                             $blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"),
                                                             "embed"
@@ -1676,7 +1676,7 @@ 
                                                     $chartRef       = $graphic->graphicData->children("http://schemas.openxmlformats.org/drawingml/2006/chart")->chart;
                                                     $thisChart      = (string) $chartRef->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
 
-                                                    $chartDetails[$docSheet->getTitle().'!'.$thisChart] = array(
+                                                    $chartDetails[$docSheet->getTitle() . '!' . $thisChart] = array(
                                                         'fromCoordinate'    => $fromCoordinate,
                                                         'fromOffsetX'       => $fromOffsetX,
                                                         'fromOffsetY'       => $fromOffsetY,
@@ -1696,25 +1696,25 @@ 
                             if ($xmlWorkbook->definedNames) {
                                 foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
                                     // Extract range
-                                    $extractedRange = (string)$definedName;
+                                    $extractedRange = (string) $definedName;
                                     $extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
                                     if (($spos = strpos($extractedRange, '!')) !== false) {
-                                        $extractedRange = substr($extractedRange, 0, $spos).str_replace('$', '', substr($extractedRange, $spos));
+                                        $extractedRange = substr($extractedRange, 0, $spos) . str_replace('$', '', substr($extractedRange, $spos));
                                     } else {
                                         $extractedRange = str_replace('$', '', $extractedRange);
                                     }
 
                                     // Valid range?
-                                    if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
+                                    if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
                                         continue;
                                     }
 
                                     // Some definedNames are only applicable if we are on the same sheet...
-                                    if ((string)$definedName['localSheetId'] != '' && (string)$definedName['localSheetId'] == $sheetId) {
+                                    if ((string) $definedName['localSheetId'] != '' && (string) $definedName['localSheetId'] == $sheetId) {
                                         // Switch on type
-                                        switch ((string)$definedName['name']) {
+                                        switch ((string) $definedName['name']) {
                                             case '_xlnm._FilterDatabase':
-                                                if ((string)$definedName['hidden'] !== '1') {
+                                                if ((string) $definedName['hidden'] !== '1') {
                                                     $extractedRange = explode(',', $extractedRange);
                                                     foreach ($extractedRange as $range) {
                                                         $autoFilterRange = $range;
@@ -1743,10 +1743,10 @@ 
                                                 }
                                                 break;
                                             case '_xlnm.Print_Area':
-                                                $rangeSets = explode(',', $extractedRange);        // FIXME: what if sheetname contains comma?
+                                                $rangeSets = explode(',', $extractedRange); // FIXME: what if sheetname contains comma?
                                                 $newRangeSets = array();
                                                 foreach ($rangeSets as $rangeSet) {
-                                                    $range = explode('!', $rangeSet);    // FIXME: what if sheetname contains exclamation mark?
+                                                    $range = explode('!', $rangeSet); // FIXME: what if sheetname contains exclamation mark?
                                                     $rangeSet = isset($range[1]) ? $range[1] : $range[0];
                                                     if (strpos($rangeSet, ':') === false) {
                                                         $rangeSet = $rangeSet . ':' . $rangeSet;
@@ -1771,38 +1771,38 @@ 
                         if ($xmlWorkbook->definedNames) {
                             foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
                                 // Extract range
-                                $extractedRange = (string)$definedName;
+                                $extractedRange = (string) $definedName;
                                 $extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
                                 if (($spos = strpos($extractedRange, '!')) !== false) {
-                                    $extractedRange = substr($extractedRange, 0, $spos).str_replace('$', '', substr($extractedRange, $spos));
+                                    $extractedRange = substr($extractedRange, 0, $spos) . str_replace('$', '', substr($extractedRange, $spos));
                                 } else {
                                     $extractedRange = str_replace('$', '', $extractedRange);
                                 }
 
                                 // Valid range?
-                                if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
+                                if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
                                     continue;
                                 }
 
                                 // Some definedNames are only applicable if we are on the same sheet...
-                                if ((string)$definedName['localSheetId'] != '') {
+                                if ((string) $definedName['localSheetId'] != '') {
                                     // Local defined name
                                     // Switch on type
-                                    switch ((string)$definedName['name']) {
+                                    switch ((string) $definedName['name']) {
                                         case '_xlnm._FilterDatabase':
                                         case '_xlnm.Print_Titles':
                                         case '_xlnm.Print_Area':
                                             break;
                                         default:
                                             if ($mapSheetId[(integer) $definedName['localSheetId']] !== null) {
-                                                $range = explode('!', (string)$definedName);
+                                                $range = explode('!', (string) $definedName);
                                                 if (count($range) == 2) {
                                                     $range[0] = str_replace("''", "'", $range[0]);
                                                     $range[0] = str_replace("'", "", $range[0]);
                                                     if ($worksheet = $docSheet->getParent()->getSheetByName($range[0])) {
                                                         $extractedRange = str_replace('$', '', $range[1]);
                                                         $scope = $docSheet->getParent()->getSheet($mapSheetId[(integer) $definedName['localSheetId']]);
-                                                        $excel->addNamedRange(new \PhpSpreadsheet\NamedRange((string)$definedName['name'], $worksheet, $extractedRange, true, $scope));
+                                                        $excel->addNamedRange(new \PhpSpreadsheet\NamedRange((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
                                                     }
                                                 }
                                             }
@@ -1812,9 +1812,9 @@ 
                                     // "Global" definedNames
                                     $locatedSheet = null;
                                     $extractedSheetName = '';
-                                    if (strpos((string)$definedName, '!') !== false) {
+                                    if (strpos((string) $definedName, '!') !== false) {
                                         // Extract sheet name
-                                        $extractedSheetName = \PhpSpreadsheet\Worksheet::extractSheetTitle((string)$definedName, true);
+                                        $extractedSheetName = \PhpSpreadsheet\Worksheet::extractSheetTitle((string) $definedName, true);
                                         $extractedSheetName = $extractedSheetName[0];
 
                                         // Locate sheet
@@ -1826,7 +1826,7 @@ 
                                     }
 
                                     if ($locatedSheet !== null) {
-                                        $excel->addNamedRange(new \PhpSpreadsheet\NamedRange((string)$definedName['name'], $locatedSheet, $extractedRange, false));
+                                        $excel->addNamedRange(new \PhpSpreadsheet\NamedRange((string) $definedName['name'], $locatedSheet, $extractedRange, false));
                                     }
                                 }
                             }
@@ -1877,7 +1877,7 @@ 
 //                            var_dump($charts[$chartEntryRef]);
 //
                             if (isset($charts[$chartEntryRef])) {
-                                $chartPositionRef = $charts[$chartEntryRef]['sheet'].'!'.$charts[$chartEntryRef]['id'];
+                                $chartPositionRef = $charts[$chartEntryRef]['sheet'] . '!' . $charts[$chartEntryRef]['id'];
 //                                echo 'Position Ref ', $chartPositionRef, '<br />';
                                 if (isset($chartDetails[$chartPositionRef])) {
 //                                    var_dump($chartDetails[$chartPositionRef]);
@@ -1901,17 +1901,17 @@ 
     private static function readColor($color, $background = false)
     {
         if (isset($color["rgb"])) {
-            return (string)$color["rgb"];
+            return (string) $color["rgb"];
         } elseif (isset($color["indexed"])) {
-            return \PhpSpreadsheet\Style\Color::indexedColor($color["indexed"]-7, $background)->getARGB();
+            return \PhpSpreadsheet\Style\Color::indexedColor($color["indexed"] - 7, $background)->getARGB();
         } elseif (isset($color["theme"])) {
             if (self::$theme !== null) {
-                $returnColour = self::$theme->getColourByIndex((int)$color["theme"]);
+                $returnColour = self::$theme->getColourByIndex((int) $color["theme"]);
                 if (isset($color["tint"])) {
                     $tintAdjust = (float) $color["tint"];
                     $returnColour = \PhpSpreadsheet\Style\Color::changeBrightness($returnColour, $tintAdjust);
                 }
-                return 'FF'.$returnColour;
+                return 'FF' . $returnColour;
             }
         }
 
@@ -1950,11 +1950,11 @@ 
             if (isset($style->font->u) && !isset($style->font->u["val"])) {
                 $docStyle->getFont()->setUnderline(\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE);
             } elseif (isset($style->font->u) && isset($style->font->u["val"])) {
-                $docStyle->getFont()->setUnderline((string)$style->font->u["val"]);
+                $docStyle->getFont()->setUnderline((string) $style->font->u["val"]);
             }
 
             if (isset($style->font->vertAlign) && isset($style->font->vertAlign["val"])) {
-                $vertAlign = strtolower((string)$style->font->vertAlign["val"]);
+                $vertAlign = strtolower((string) $style->font->vertAlign["val"]);
                 if ($vertAlign == 'superscript') {
                     $docStyle->getFont()->setSuperScript(true);
                 }
@@ -1976,7 +1976,7 @@ 
                 $docStyle->getFill()->getStartColor()->setARGB(self::readColor(self::getArrayItem($gradientFill->xpath("sml:stop[@position=0]"))->color));
                 $docStyle->getFill()->getEndColor()->setARGB(self::readColor(self::getArrayItem($gradientFill->xpath("sml:stop[@position=1]"))->color));
             } elseif ($style->fill->patternFill) {
-                $patternType = (string)$style->fill->patternFill["patternType"] != '' ? (string)$style->fill->patternFill["patternType"] : 'solid';
+                $patternType = (string) $style->fill->patternFill["patternType"] != '' ? (string) $style->fill->patternFill["patternType"] : 'solid';
                 $docStyle->getFill()->setFillType($patternType);
                 if ($style->fill->patternFill->fgColor) {
                     $docStyle->getFill()->getStartColor()->setARGB(self::readColor($style->fill->patternFill->fgColor, true));
@@ -2015,17 +2015,17 @@ 
             $docStyle->getAlignment()->setVertical((string) $style->alignment["vertical"]);
 
             $textRotation = 0;
-            if ((int)$style->alignment["textRotation"] <= 90) {
-                $textRotation = (int)$style->alignment["textRotation"];
-            } elseif ((int)$style->alignment["textRotation"] > 90) {
-                $textRotation = 90 - (int)$style->alignment["textRotation"];
+            if ((int) $style->alignment["textRotation"] <= 90) {
+                $textRotation = (int) $style->alignment["textRotation"];
+            } elseif ((int) $style->alignment["textRotation"] > 90) {
+                $textRotation = 90 - (int) $style->alignment["textRotation"];
             }
 
             $docStyle->getAlignment()->setTextRotation(intval($textRotation));
             $docStyle->getAlignment()->setWrapText(self::boolean((string) $style->alignment["wrapText"]));
             $docStyle->getAlignment()->setShrinkToFit(self::boolean((string) $style->alignment["shrinkToFit"]));
-            $docStyle->getAlignment()->setIndent(intval((string)$style->alignment["indent"]) > 0 ? intval((string)$style->alignment["indent"]) : 0);
-            $docStyle->getAlignment()->setReadorder(intval((string)$style->alignment["readingOrder"]) > 0 ? intval((string)$style->alignment["readingOrder"]) : 0);
+            $docStyle->getAlignment()->setIndent(intval((string) $style->alignment["indent"]) > 0 ? intval((string) $style->alignment["indent"]) : 0);
+            $docStyle->getAlignment()->setReadorder(intval((string) $style->alignment["readingOrder"]) > 0 ? intval((string) $style->alignment["readingOrder"]) : 0);
         }
 
         // protection
@@ -2095,7 +2095,7 @@ 
                             $objText->getFont()->setItalic(true);
                         }
                         if (isset($run->rPr->vertAlign) && isset($run->rPr->vertAlign["val"])) {
-                            $vertAlign = strtolower((string)$run->rPr->vertAlign["val"]);
+                            $vertAlign = strtolower((string) $run->rPr->vertAlign["val"]);
                             if ($vertAlign == 'superscript') {
                                 $objText->getFont()->setSuperScript(true);
                             }
@@ -2106,7 +2106,7 @@ 
                         if (isset($run->rPr->u) && !isset($run->rPr->u["val"])) {
                             $objText->getFont()->setUnderline(\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE);
                         } elseif (isset($run->rPr->u) && isset($run->rPr->u["val"])) {
-                            $objText->getFont()->setUnderline((string)$run->rPr->u["val"]);
+                            $objText->getFont()->setUnderline((string) $run->rPr->u["val"]);
                         }
                         if ((isset($run->rPr->strike["val"]) && self::boolean((string) $run->rPr->strike["val"])) ||
                             (isset($run->rPr->strike) && !isset($run->rPr->strike["val"]))) {
@@ -2143,8 +2143,8 @@ 
                 foreach ($UIRels->Relationship as $ele) {
                     if ($ele["Type"] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
                         // an image ?
-                        $customUIImagesNames[(string) $ele['Id']] = (string)$ele['Target'];
-                        $customUIImagesBinaries[(string)$ele['Target']] = $this->getFromZipArchive($zip, $baseDir . '/' . (string) $ele['Target']);
+                        $customUIImagesNames[(string) $ele['Id']] = (string) $ele['Target'];
+                        $customUIImagesBinaries[(string) $ele['Target']] = $this->getFromZipArchive($zip, $baseDir . '/' . (string) $ele['Target']);
                     }
                 }
             }
@@ -2174,7 +2174,7 @@ 
 
     private static function toCSSArray($style)
     {
-        $style = str_replace(array("\r","\n"), "", $style);
+        $style = str_replace(array("\r", "\n"), "", $style);
 
         $temp = explode(';', $style);
         $style = array();

src/PhpSpreadsheet/Reader/Gnumeric.php

Spacing +17 added lines, -17 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function __construct()
     {
-        $this->readFilter     = new DefaultReadFilter();
+        $this->readFilter = new DefaultReadFilter();
         $this->referenceHelper = \PhpSpreadsheet\ReferenceHelper::getInstance();
     }
 
@@ -75,7 +75,7 @@ 
         $data = fread($fh, 2);
         fclose($fh);
 
-        if ($data != chr(0x1F).chr(0x8B)) {
+        if ($data != chr(0x1F) . chr(0x8B)) {
             return false;
         }
 
@@ -96,13 +96,13 @@ 
         }
 
         $xml = new XMLReader();
-        $xml->xml($this->securityScanFile('compress.zlib://'.realpath($pFilename)), null, \PhpSpreadsheet\Settings::getLibXmlLoaderOptions());
+        $xml->xml($this->securityScanFile('compress.zlib://' . realpath($pFilename)), null, \PhpSpreadsheet\Settings::getLibXmlLoaderOptions());
         $xml->setParserProperty(2, true);
 
         $worksheetNames = array();
         while ($xml->read()) {
             if ($xml->name == 'gnm:SheetName' && $xml->nodeType == XMLReader::ELEMENT) {
-                $xml->read();    //    Move onto the value node
+                $xml->read(); //    Move onto the value node
                 $worksheetNames[] = (string) $xml->value;
             } elseif ($xml->name == 'gnm:Sheets') {
                 //    break out of the loop once we've got our sheet names rather than parse the entire file
@@ -127,7 +127,7 @@ 
         }
 
         $xml = new XMLReader();
-        $xml->xml($this->securityScanFile('compress.zlib://'.realpath($pFilename)), null, \PhpSpreadsheet\Settings::getLibXmlLoaderOptions());
+        $xml->xml($this->securityScanFile('compress.zlib://' . realpath($pFilename)), null, \PhpSpreadsheet\Settings::getLibXmlLoaderOptions());
         $xml->setParserProperty(2, true);
 
         $worksheetInfo = array();
@@ -143,14 +143,14 @@ 
 
                 while ($xml->read()) {
                     if ($xml->name == 'gnm:Name' && $xml->nodeType == XMLReader::ELEMENT) {
-                        $xml->read();    //    Move onto the value node
+                        $xml->read(); //    Move onto the value node
                         $tmpInfo['worksheetName'] = (string) $xml->value;
                     } elseif ($xml->name == 'gnm:MaxCol' && $xml->nodeType == XMLReader::ELEMENT) {
-                        $xml->read();    //    Move onto the value node
+                        $xml->read(); //    Move onto the value node
                         $tmpInfo['lastColumnIndex'] = (int) $xml->value;
                         $tmpInfo['totalColumns'] = (int) $xml->value + 1;
                     } elseif ($xml->name == 'gnm:MaxRow' && $xml->nodeType == XMLReader::ELEMENT) {
-                        $xml->read();    //    Move onto the value node
+                        $xml->read(); //    Move onto the value node
                         $tmpInfo['totalRows'] = (int) $xml->value + 1;
                         break;
                     }
@@ -348,7 +348,7 @@ 
                 if (isset($sheet->PrintInformation->Margins)) {
                     foreach ($sheet->PrintInformation->Margins->children('gnm', true) as $key => $margin) {
                         $marginAttributes = $margin->attributes();
-                        $marginSize = 72 / 100;    //    Default
+                        $marginSize = 72 / 100; //    Default
                         switch ($marginAttributes['PrefUnit']) {
                             case 'mm':
                                 $marginSize = intval($marginAttributes['Points']) / 100;
@@ -434,7 +434,7 @@ 
                             break;
                         case '20':        //    Boolean
                             $type = \PhpSpreadsheet\Cell\DataType::TYPE_BOOL;
-                            $cell = ($cell == 'TRUE') ? true: false;
+                            $cell = ($cell == 'TRUE') ? true : false;
                             break;
                         case '30':        //    Integer
                             $cell = intval($cell);
@@ -452,7 +452,7 @@ 
                         case '80':        //    Array
                     }
                 }
-                $spreadsheet->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell, $type);
+                $spreadsheet->getActiveSheet()->getCell($column . $row)->setValueExplicit($cell, $type);
             }
 
             if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
@@ -460,7 +460,7 @@ 
                     $commentAttributes = $comment->attributes();
                     //    Only comment objects are handled at the moment
                     if ($commentAttributes->Text) {
-                        $spreadsheet->getActiveSheet()->getComment((string)$commentAttributes->ObjectBound)->setAuthor((string)$commentAttributes->Author)->setText($this->parseRichText((string)$commentAttributes->Text));
+                        $spreadsheet->getActiveSheet()->getComment((string) $commentAttributes->ObjectBound)->setAuthor((string) $commentAttributes->Author)->setText($this->parseRichText((string) $commentAttributes->Text));
                     }
                 }
             }
@@ -477,7 +477,7 @@ 
                     $endColumn = \PhpSpreadsheet\Cell::stringFromColumnIndex($endColumn);
                     $endRow = ($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow'];
                     $endRow += 1;
-                    $cellRange = $startColumn.$startRow.':'.$endColumn.$endRow;
+                    $cellRange = $startColumn . $startRow . ':' . $endColumn . $endRow;
 //                    echo $cellRange,'<br />';
 
                     $styleAttributes = $styleRegion->Style->attributes();
@@ -677,19 +677,19 @@ 
             if ((!$this->readDataOnly) && (isset($sheet->Cols))) {
                 //    Column Widths
                 $columnAttributes = $sheet->Cols->attributes();
-                $defaultWidth = $columnAttributes['DefaultSizePts']  / 5.4;
+                $defaultWidth = $columnAttributes['DefaultSizePts'] / 5.4;
                 $c = 0;
                 foreach ($sheet->Cols->ColInfo as $columnOverride) {
                     $columnAttributes = $columnOverride->attributes();
                     $column = $columnAttributes['No'];
-                    $columnWidth = $columnAttributes['Unit']  / 5.4;
+                    $columnWidth = $columnAttributes['Unit'] / 5.4;
                     $hidden = ((isset($columnAttributes['Hidden'])) && ($columnAttributes['Hidden'] == '1')) ? true : false;
                     $columnCount = (isset($columnAttributes['Count'])) ? $columnAttributes['Count'] : 1;
                     while ($c < $column) {
                         $spreadsheet->getActiveSheet()->getColumnDimension(\PhpSpreadsheet\Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
                         ++$c;
                     }
-                    while (($c < ($column+$columnCount)) && ($c <= $maxCol)) {
+                    while (($c < ($column + $columnCount)) && ($c <= $maxCol)) {
                         $spreadsheet->getActiveSheet()->getColumnDimension(\PhpSpreadsheet\Cell::stringFromColumnIndex($c))->setWidth($columnWidth);
                         if ($hidden) {
                             $spreadsheet->getActiveSheet()->getColumnDimension(\PhpSpreadsheet\Cell::stringFromColumnIndex($c))->setVisible(false);
@@ -719,7 +719,7 @@ 
                         ++$r;
                         $spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
                     }
-                    while (($r < ($row+$rowCount)) && ($r < $maxRow)) {
+                    while (($r < ($row + $rowCount)) && ($r < $maxRow)) {
                         ++$r;
                         $spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($rowHeight);
                         if ($hidden) {

src/PhpSpreadsheet/Reader/Excel2007/Chart.php

Spacing +2 added lines, -2 removed lines

@@ -47,9 +47,9 @@
     private static function readColor($color, $background = false)
     {
         if (isset($color["rgb"])) {
-            return (string)$color["rgb"];
+            return (string) $color["rgb"];
         } elseif (isset($color["indexed"])) {
-            return \PhpSpreadsheet\Style\Color::indexedColor($color["indexed"]-7, $background)->getARGB();
+            return \PhpSpreadsheet\Style\Color::indexedColor($color["indexed"] - 7, $background)->getARGB();
         }
     }
 

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]);
                             }