Inspection of "Merge branch 'feature/gh-7' into develop" - PHPOffice/PhpSpreadsheet - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( bf3457...467bab )

unknown

created 2016-08-14 23:21 UTC

Status

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -86,7 +86,7 @@  discard block
 block discarded – undo
      * @var integer
      * @see addContinue()
      */
-    private $limit    = 8224;
+    private $limit = 8224;
 
     /**
      * Constructor
@@ -111,9 +111,9 @@  discard block
 block discarded – undo
             $teststr = pack("d", 1.2345);
             $number  = pack("C8", 0x8D, 0x97, 0x6E, 0x12, 0x83, 0xC0, 0xF3, 0x3F);
             if ($number == $teststr) {
-                $byte_order = 0;    // Little Endian
+                $byte_order = 0; // Little Endian
             } elseif ($number == strrev($teststr)) {
-                $byte_order = 1;    // Big Endian
+                $byte_order = 1; // Big Endian
             } else {
                 // Give up. I'll fix this in a later version.
                 throw new \PHPExcel\Writer\Exception("Required floating point format not supported on this platform.");
@@ -165,16 +165,16 @@  discard block
 block discarded – undo
      */
     protected function storeBof($type)
     {
-        $record  = 0x0809;            // Record identifier    (BIFF5-BIFF8)
+        $record  = 0x0809; // Record identifier    (BIFF5-BIFF8)
         $length  = 0x0010;
 
         // by inspection of real files, MS Office Excel 2007 writes the following
         $unknown = pack("VV", 0x000100D1, 0x00000406);
 
-        $build   = 0x0DBB;            //    Excel 97
-        $year    = 0x07CC;            //    Excel 97
+        $build   = 0x0DBB; //    Excel 97
+        $year    = 0x07CC; //    Excel 97
 
-        $version = 0x0600;            //    BIFF8
+        $version = 0x0600; //    BIFF8
 
         $header  = pack("vv", $record, $length);
         $data    = pack("vvvv", $version, $type, $build, $year);
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
      */
     protected function storeEof()
     {
-        $record    = 0x000A;   // Record identifier
-        $length    = 0x0000;   // Number of bytes to follow
+        $record    = 0x000A; // Record identifier
+        $length    = 0x0000; // Number of bytes to follow
 
         $header    = pack("vv", $record, $length);
         $this->append($header);
@@ -202,8 +202,8 @@  discard block
 block discarded – undo
      */
     public function writeEof()
     {
-        $record    = 0x000A;   // Record identifier
-        $length    = 0x0000;   // Number of bytes to follow
+        $record    = 0x000A; // Record identifier
+        $length    = 0x0000; // Number of bytes to follow
         $header    = pack("vv", $record, $length);
         return $this->writeData($header);
     }
@@ -223,13 +223,13 @@  discard block
 block discarded – undo
     private function addContinue($data)
     {
         $limit  = $this->limit;
-        $record = 0x003C;         // Record identifier
+        $record = 0x003C; // Record identifier
 
         // The first 2080/8224 bytes remain intact. However, we have to change
         // the length field of the record.
         $tmp = substr($data, 0, 2) . pack("v", $limit) . substr($data, 4, $limit);
 
-        $header = pack("vv", $record, $limit);  // Headers for continue records
+        $header = pack("vv", $record, $limit); // Headers for continue records
 
         // Retrieve chunks of 2080/8224 bytes +4 for the header.
         $data_length = strlen($data);

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel5/Workbook.php 1 patch

Spacing +81 added lines, -81 removed lines patch added patch discarded remove patch

@@ -199,7 +199,7 @@  discard block
 block discarded – undo
         // It needs to call its parent's constructor explicitly
         parent::__construct();
 
-        $this->parser        = $parser;
+        $this->parser = $parser;
         $this->biffSize     = 0;
         $this->palette      = array();
         $this->countryCode = -1;
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
         $this->stringTotal      = &$str_total;
         $this->stringUnique     = &$str_unique;
         $this->stringTable      = &$str_table;
-        $this->colors        = &$colors;
+        $this->colors = &$colors;
         $this->setPaletteXl97();
 
         $this->phpExcel = $phpExcel;
@@ -221,11 +221,11 @@  discard block
 block discarded – undo
         for ($i = 0; $i < $countSheets; ++$i) {
             $phpSheet = $phpExcel->getSheet($i);
 
-            $this->parser->setExtSheet($phpSheet->getTitle(), $i);  // Register worksheet name with parser
+            $this->parser->setExtSheet($phpSheet->getTitle(), $i); // Register worksheet name with parser
 
             $supbook_index = 0x00;
             $ref = pack('vvv', $supbook_index, $i, $i);
-            $this->parser->references[] = $ref;  // Register reference with parser
+            $this->parser->references[] = $ref; // Register reference with parser
 
             // Sheet tab colors?
             if ($phpSheet->isTabColorSet()) {
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
      */
     private function calcSheetOffsets()
     {
-        $boundsheet_length = 10;  // fixed length for a BOUNDSHEET record
+        $boundsheet_length = 10; // fixed length for a BOUNDSHEET record
 
         // size of Workbook globals part 1 + 3
         $offset            = $this->_datasize;
@@ -836,9 +836,9 @@  discard block
 block discarded – undo
         $record = 0x0018;
 
         // option flags
-        $options = ($isHidden  ? 0x21 : 0x00);
+        $options = ($isHidden ? 0x21 : 0x00);
 
-        $extra  = pack(
+        $extra = pack(
             'Cvvvvv',
             0x3B,
             $sheetIndex - 1,
@@ -866,9 +866,9 @@  discard block
 block discarded – undo
      */
     private function writeCodepage()
     {
-        $record = 0x0042;             // Record identifier
-        $length = 0x0002;             // Number of bytes to follow
-        $cv  = $this->codepage;   // The code page
+        $record = 0x0042; // Record identifier
+        $length = 0x0002; // Number of bytes to follow
+        $cv = $this->codepage; // The code page
 
         $header = pack('vv', $record, $length);
         $data   = pack('v', $cv);
@@ -881,24 +881,24 @@  discard block
 block discarded – undo
      */
     private function writeWindow1()
     {
-        $record = 0x003D;   // Record identifier
-        $length = 0x0012;   // Number of bytes to follow
+        $record = 0x003D; // Record identifier
+        $length = 0x0012; // Number of bytes to follow
 
-        $xWn  = 0x0000;     // Horizontal position of window
-        $yWn  = 0x0000;     // Vertical position of window
-        $dxWn = 0x25BC;     // Width of window
-        $dyWn = 0x1572;     // Height of window
+        $xWn  = 0x0000; // Horizontal position of window
+        $yWn  = 0x0000; // Vertical position of window
+        $dxWn = 0x25BC; // Width of window
+        $dyWn = 0x1572; // Height of window
 
-        $grbit = 0x0038;    // Option flags
+        $grbit = 0x0038; // Option flags
 
         // not supported by PHPExcel, so there is only one selected sheet, the active
-        $ctabsel = 1;       // Number of workbook tabs selected
+        $ctabsel = 1; // Number of workbook tabs selected
 
-        $wTabRatio = 0x0258;    // Tab to scrollbar ratio
+        $wTabRatio = 0x0258; // Tab to scrollbar ratio
 
         // not supported by PHPExcel, set to 0
-        $itabFirst = 0;     // 1st displayed worksheet
-        $itabCur   = $this->phpExcel->getActiveSheetIndex();    // Active worksheet
+        $itabFirst = 0; // 1st displayed worksheet
+        $itabCur   = $this->phpExcel->getActiveSheetIndex(); // Active worksheet
 
         $header = pack("vv", $record, $length);
         $data   = pack("vvvvvvvvv", $xWn, $yWn, $dxWn, $dyWn, $grbit, $itabCur, $itabFirst, $ctabsel, $wTabRatio);
@@ -914,7 +914,7 @@  discard block
 block discarded – undo
     private function writeBoundSheet($sheet, $offset)
     {
         $sheetname = $sheet->getTitle();
-        $record    = 0x0085;                    // Record identifier
+        $record    = 0x0085; // Record identifier
 
         // sheet state
         switch ($sheet->getSheetState()) {
@@ -935,7 +935,7 @@  discard block
 block discarded – undo
         // sheet type
         $st = 0x00;
 
-        $grbit = 0x0000;                    // Visibility and sheet type
+        $grbit = 0x0000; // Visibility and sheet type
 
         $data = pack("VCC", $offset, $ss, $st);
         $data .= \PHPExcel\Shared\StringHelper::UTF8toBIFF8UnicodeShort($sheetname);
@@ -950,8 +950,8 @@  discard block
 block discarded – undo
      */
     private function writeSupbookInternal()
     {
-        $record    = 0x01AE;   // Record identifier
-        $length    = 0x0004;   // Bytes to follow
+        $record    = 0x01AE; // Record identifier
+        $length    = 0x0004; // Bytes to follow
 
         $header    = pack("vv", $record, $length);
         $data      = pack("vv", $this->phpExcel->getSheetCount(), 0x0401);
@@ -966,10 +966,10 @@  discard block
 block discarded – undo
     private function writeExternalsheetBiff8()
     {
         $totalReferences = count($this->parser->references);
-        $record = 0x0017;                     // Record identifier
-        $length = 2 + 6 * $totalReferences;  // Number of bytes to follow
+        $record = 0x0017; // Record identifier
+        $length = 2 + 6 * $totalReferences; // Number of bytes to follow
 
-        $supbook_index = 0;           // FIXME: only using internal SUPBOOK record
+        $supbook_index = 0; // FIXME: only using internal SUPBOOK record
         $header = pack("vv", $record, $length);
         $data   = pack('v', $totalReferences);
         for ($i = 0; $i < $totalReferences; ++$i) {
@@ -983,12 +983,12 @@  discard block
 block discarded – undo
      */
     private function writeStyle()
     {
-        $record = 0x0293;   // Record identifier
-        $length = 0x0004;   // Bytes to follow
+        $record = 0x0293; // Record identifier
+        $length = 0x0004; // Bytes to follow
 
-        $ixfe    = 0x8000;  // Index to cell style XF
-        $BuiltIn = 0x00;     // Built-in style
-        $iLevel  = 0xff;     // Outline style level
+        $ixfe    = 0x8000; // Index to cell style XF
+        $BuiltIn = 0x00; // Built-in style
+        $iLevel  = 0xff; // Outline style level
 
         $header = pack("vv", $record, $length);
         $data   = pack("vCC", $ixfe, $BuiltIn, $iLevel);
@@ -1003,14 +1003,14 @@  discard block
 block discarded – undo
      */
     private function writeNumberFormat($format, $ifmt)
     {
-        $record = 0x041E;    // Record identifier
+        $record = 0x041E; // Record identifier
 
         $numberFormatString = \PHPExcel\Shared\StringHelper::UTF8toBIFF8UnicodeLong($format);
-        $length = 2 + strlen($numberFormatString);    // Number of bytes to follow
+        $length = 2 + strlen($numberFormatString); // Number of bytes to follow
 
 
         $header = pack("vv", $record, $length);
-        $data   = pack("v", $ifmt) .  $numberFormatString;
+        $data   = pack("v", $ifmt) . $numberFormatString;
         $this->append($header . $data);
     }
 
@@ -1019,12 +1019,12 @@  discard block
 block discarded – undo
      */
     private function writeDateMode()
     {
-        $record = 0x0022;   // Record identifier
-        $length = 0x0002;   // Bytes to follow
+        $record = 0x0022; // Record identifier
+        $length = 0x0002; // Bytes to follow
 
         $f1904  = (\PHPExcel\Shared\Date::getExcelCalendar() == \PHPExcel\Shared\Date::CALENDAR_MAC_1904)
             ? 1
-            : 0;   // Flag for 1904 date system
+            : 0; // Flag for 1904 date system
 
         $header = pack("vv", $record, $length);
         $data   = pack("v", $f1904);
@@ -1045,8 +1045,8 @@  discard block
 block discarded – undo
      */
     private function writeExternalCount($cxals)
     {
-        $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", $cxals);
@@ -1064,11 +1064,11 @@  discard block
 block discarded – undo
      */
     private function writeExternalSheet($sheetname)
     {
-        $record = 0x0017;                     // Record identifier
-        $length = 0x02 + strlen($sheetname);  // Number of bytes to follow
+        $record = 0x0017; // Record identifier
+        $length = 0x02 + strlen($sheetname); // Number of bytes to follow
 
-        $cch    = strlen($sheetname);         // Length of sheet name
-        $rgch   = 0x03;                       // Filename encoding
+        $cch    = strlen($sheetname); // Length of sheet name
+        $rgch   = 0x03; // Filename encoding
 
         $header = pack("vv", $record, $length);
         $data   = pack("CC", $cch, $rgch);
@@ -1088,20 +1088,20 @@  discard block
 block discarded – undo
      */
     private function writeNameShort($index, $type, $rowmin, $rowmax, $colmin, $colmax)
     {
-        $record = 0x0018;       // Record identifier
-        $length = 0x0024;       // Number of bytes to follow
-
-        $grbit  = 0x0020;       // Option flags
-        $chKey  = 0x00;         // Keyboard shortcut
-        $cch    = 0x01;         // Length of text name
-        $cce    = 0x0015;       // Length of text definition
-        $ixals  = $index + 1;   // Sheet index
-        $itab   = $ixals;       // Equal to ixals
-        $cchCustMenu    = 0x00;         // Length of cust menu text
-        $cchDescription = 0x00;         // Length of description text
-        $cchHelptopic   = 0x00;         // Length of help topic text
-        $cchStatustext  = 0x00;         // Length of status bar text
-        $rgch           = $type;        // Built-in name type
+        $record = 0x0018; // Record identifier
+        $length = 0x0024; // Number of bytes to follow
+
+        $grbit  = 0x0020; // Option flags
+        $chKey  = 0x00; // Keyboard shortcut
+        $cch    = 0x01; // Length of text name
+        $cce    = 0x0015; // Length of text definition
+        $ixals  = $index + 1; // Sheet index
+        $itab   = $ixals; // Equal to ixals
+        $cchCustMenu    = 0x00; // Length of cust menu text
+        $cchDescription = 0x00; // Length of description text
+        $cchHelptopic   = 0x00; // Length of help topic text
+        $cchStatustext  = 0x00; // Length of status bar text
+        $rgch           = $type; // Built-in name type
 
         $unknown03 = 0x3b;
         $unknown04 = 0xffff - $index;
@@ -1152,24 +1152,24 @@  discard block
 block discarded – undo
      */
     private function writeNameLong($index, $type, $rowmin, $rowmax, $colmin, $colmax)
     {
-        $record          = 0x0018;       // Record identifier
-        $length          = 0x003d;       // Number of bytes to follow
-        $grbit           = 0x0020;       // Option flags
-        $chKey           = 0x00;         // Keyboard shortcut
-        $cch             = 0x01;         // Length of text name
-        $cce             = 0x002e;       // Length of text definition
-        $ixals           = $index + 1;   // Sheet index
-        $itab            = $ixals;       // Equal to ixals
-        $cchCustMenu     = 0x00;         // Length of cust menu text
-        $cchDescription  = 0x00;         // Length of description text
-        $cchHelptopic    = 0x00;         // Length of help topic text
-        $cchStatustext   = 0x00;         // Length of status bar text
-        $rgch            = $type;        // Built-in name type
+        $record          = 0x0018; // Record identifier
+        $length          = 0x003d; // Number of bytes to follow
+        $grbit           = 0x0020; // Option flags
+        $chKey           = 0x00; // Keyboard shortcut
+        $cch             = 0x01; // Length of text name
+        $cce             = 0x002e; // Length of text definition
+        $ixals           = $index + 1; // Sheet index
+        $itab            = $ixals; // Equal to ixals
+        $cchCustMenu     = 0x00; // Length of cust menu text
+        $cchDescription  = 0x00; // Length of description text
+        $cchHelptopic    = 0x00; // Length of help topic text
+        $cchStatustext   = 0x00; // Length of status bar text
+        $rgch            = $type; // Built-in name type
 
         $unknown01       = 0x29;
         $unknown02       = 0x002b;
         $unknown03       = 0x3b;
-        $unknown04       = 0xffff-$index;
+        $unknown04       = 0xffff - $index;
         $unknown05       = 0x0000;
         $unknown06       = 0x0000;
         $unknown07       = 0x1087;
@@ -1227,8 +1227,8 @@  discard block
 block discarded – undo
      */
     private function writeCountry()
     {
-        $record = 0x008C;    // Record identifier
-        $length = 4;         // Number of bytes to follow
+        $record = 0x008C; // Record identifier
+        $length = 4; // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
         /* using the same country code always for simplicity */
@@ -1244,8 +1244,8 @@  discard block
 block discarded – undo
      */
     private function writeRecalcId()
     {
-        $record = 0x01C1;    // Record identifier
-        $length = 8;         // Number of bytes to follow
+        $record = 0x01C1; // Record identifier
+        $length = 8; // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
 
@@ -1262,10 +1262,10 @@  discard block
 block discarded – undo
     {
         $aref = $this->palette;
 
-        $record = 0x0092;                // Record identifier
-        $length = 2 + 4 * count($aref);  // Number of bytes to follow
-        $ccv    = count($aref);          // Number of RGB values to follow
-        $data = '';                      // The RGB data
+        $record = 0x0092; // Record identifier
+        $length = 2 + 4 * count($aref); // Number of bytes to follow
+        $ccv    = count($aref); // Number of RGB values to follow
+        $data = ''; // The RGB data
 
         // Pack the RGB data
         foreach ($aref as $color) {

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel5/Xf.php 1 patch

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

@@ -133,23 +133,23 @@  discard block
 block discarded – undo
      */
     public function __construct(\PHPExcel\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;
 
     }
@@ -171,16 +171,16 @@  discard block
 block discarded – undo
         }
 
         // 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());
 
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
         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) {
@@ -201,47 +201,47 @@  discard block
 block discarded – undo
             $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 == \PHPExcel\Style\Borders::DIAGONAL_BOTH
                             || $diagonalDirection == \PHPExcel\Style\Borders::DIAGONAL_DOWN;
         $diag_tr_to_lb = $diagonalDirection == \PHPExcel\Style\Borders::DIAGONAL_BOTH
                             || $diagonalDirection == \PHPExcel\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);
 
@@ -427,8 +427,8 @@  discard block
 block discarded – undo
         \PHPExcel\Style\Fill::FILL_PATTERN_LIGHTTRELLIS    => 0x10,
         \PHPExcel\Style\Fill::FILL_PATTERN_GRAY125         => 0x11,
         \PHPExcel\Style\Fill::FILL_PATTERN_GRAY0625        => 0x12,
-        \PHPExcel\Style\Fill::FILL_GRADIENT_LINEAR         => 0x00,    // does not exist in BIFF8
-        \PHPExcel\Style\Fill::FILL_GRADIENT_PATH           => 0x00,    // does not exist in BIFF8
+        \PHPExcel\Style\Fill::FILL_GRADIENT_LINEAR         => 0x00, // does not exist in BIFF8
+        \PHPExcel\Style\Fill::FILL_GRADIENT_PATH           => 0x00, // does not exist in BIFF8
     );
 
     /**

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel5/Escher.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -92,7 +92,7 @@  discard block
 block discarded – undo
                 $innerData = '';
 
                 // write the dgg
-                $recVer            = 0x0;
+                $recVer = 0x0;
                 $recInstance    = 0x0000;
                 $recType        = 0xF006;
 
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
                 $length            = strlen($data);
 
                 $recVerInstance  = $recVer;
-                $recVerInstance |=    $recInstance << 4;
+                $recVerInstance |= $recInstance << 4;
 
                 $header = pack('vvV', $recVerInstance, $recType, $length);
 
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
                         $length            = strlen($innerData);
 
                         $recVerInstance  = $recVer;
-                        $recVerInstance |=    $recInstance << 4;
+                        $recVerInstance |= $recInstance << 4;
 
                         $header = pack('vvV', $recVerInstance, $recType, $length);
 
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
                         $length            = strlen($innerData);
 
                         $recVerInstance  = $recVer;
-                        $recVerInstance |=    $recInstance << 4;
+                        $recVerInstance |= $recInstance << 4;
 
                         $header = pack('vvV', $recVerInstance, $recType, $length);
 
@@ -406,13 +406,13 @@  discard block
 block discarded – undo
                 if ($this->object->getOPTCollection()) {
                     $optData = '';
 
-                    $recVer            = 0x3;
+                    $recVer = 0x3;
                     $recInstance    = count($this->object->getOPTCollection());
                     $recType        = 0xF00B;
                     foreach ($this->object->getOPTCollection() as $property => $value) {
                         $optData .= pack('vV', $property, $value);
                     }
-                    $length            = strlen($optData);
+                    $length = strlen($optData);
 
                     $recVerInstance  = $recVer;
                     $recVerInstance |= $recInstance << 4;
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
                 if ($this->object->getStartCoordinates()) {
                     $clientAnchorData = '';
 
-                    $recVer            = 0x0;
+                    $recVer = 0x0;
                     $recInstance    = 0x0;
                     $recType        = 0xF010;
 
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
 
                     $clientAnchorData = pack('vvvvvvvvv', $this->object->getSpFlag(), $c1, $startOffsetX, $r1, $startOffsetY, $c2, $endOffsetX, $r2, $endOffsetY);
                     
-                    $length            = strlen($clientAnchorData);
+                    $length = strlen($clientAnchorData);
 
                     $recVerInstance  = $recVer;
                     $recVerInstance |= $recInstance << 4;
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
                 if (!$this->object->getSpgr()) {
                     $clientDataData = '';
 
-                    $recVer            = 0x0;
+                    $recVer = 0x0;
                     $recInstance    = 0x0;
                     $recType        = 0xF011;
 

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel5/Font.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -85,9 +85,9 @@  discard block
 block discarded – undo
         $bFamily = 0; // Font family
         $bCharSet = \PHPExcel\Shared\Font::getCharsetFromFontName($this->font->getName()); // Character set
 
-        $record = 0x31;        // Record identifier
-        $reserved = 0x00;    // Reserved
-        $grbit = 0x00;        // Font attributes
+        $record = 0x31; // Record identifier
+        $reserved = 0x00; // Reserved
+        $grbit = 0x00; // Font attributes
         if ($this->font->getItalic()) {
             $grbit |= 0x02;
         }
@@ -134,9 +134,9 @@  discard block
 block discarded – undo
     private static function mapBold($bold)
     {
         if ($bold) {
-            return 0x2BC;  //  700 = Bold font weight
+            return 0x2BC; //  700 = Bold font weight
         }
-        return 0x190;      //  400 = Normal font weight
+        return 0x190; //  400 = Normal font weight
     }
 
     /**

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel5/Parser.php 1 patch

Spacing +276 added lines, -276 removed lines patch added patch discarded remove patch

		@@ -115,12 +115,12 @@ discard block
		block discarded – undo
115	115	*/
116	116	public function __construct()
117	117	{
118		- $this->currentCharacter = 0;
119		- $this->currentToken = ''; // The token we are working on.
120		- $this->formula = ''; // The formula to parse.
121		- $this->lookAhead = ''; // The character ahead of the current char.
122		- $this->parseTree = ''; // The parse tree to be generated.
123		- $this->initializeHashes(); // Initialize the hashes: ptg's and function's ptg's
	118	+ $this->currentCharacter = 0;
	119	+ $this->currentToken = ''; // The token we are working on.
	120	+ $this->formula = ''; // The formula to parse.
	121	+ $this->lookAhead = ''; // The character ahead of the current char.
	122	+ $this->parseTree = ''; // The parse tree to be generated.
	123	+ $this->initializeHashes(); // Initialize the hashes: ptg's and function's ptg's
124	124	$this->externalSheets = array();
125	125	$this->references = array();
126	126	}
		@@ -246,256 +246,256 @@ discard block
		block discarded – undo
246	246	//
247	247	$this->functions = array(
248	248	// function ptg args class vol
249		- 'COUNT' => array( 0, -1, 0, 0 ),
250		- 'IF' => array( 1, -1, 1, 0 ),
251		- 'ISNA' => array( 2, 1, 1, 0 ),
252		- 'ISERROR' => array( 3, 1, 1, 0 ),
253		- 'SUM' => array( 4, -1, 0, 0 ),
254		- 'AVERAGE' => array( 5, -1, 0, 0 ),
255		- 'MIN' => array( 6, -1, 0, 0 ),
256		- 'MAX' => array( 7, -1, 0, 0 ),
257		- 'ROW' => array( 8, -1, 0, 0 ),
258		- 'COLUMN' => array( 9, -1, 0, 0 ),
259		- 'NA' => array( 10, 0, 0, 0 ),
260		- 'NPV' => array( 11, -1, 1, 0 ),
261		- 'STDEV' => array( 12, -1, 0, 0 ),
262		- 'DOLLAR' => array( 13, -1, 1, 0 ),
263		- 'FIXED' => array( 14, -1, 1, 0 ),
264		- 'SIN' => array( 15, 1, 1, 0 ),
265		- 'COS' => array( 16, 1, 1, 0 ),
266		- 'TAN' => array( 17, 1, 1, 0 ),
267		- 'ATAN' => array( 18, 1, 1, 0 ),
268		- 'PI' => array( 19, 0, 1, 0 ),
269		- 'SQRT' => array( 20, 1, 1, 0 ),
270		- 'EXP' => array( 21, 1, 1, 0 ),
271		- 'LN' => array( 22, 1, 1, 0 ),
272		- 'LOG10' => array( 23, 1, 1, 0 ),
273		- 'ABS' => array( 24, 1, 1, 0 ),
274		- 'INT' => array( 25, 1, 1, 0 ),
275		- 'SIGN' => array( 26, 1, 1, 0 ),
276		- 'ROUND' => array( 27, 2, 1, 0 ),
277		- 'LOOKUP' => array( 28, -1, 0, 0 ),
278		- 'INDEX' => array( 29, -1, 0, 1 ),
279		- 'REPT' => array( 30, 2, 1, 0 ),
280		- 'MID' => array( 31, 3, 1, 0 ),
281		- 'LEN' => array( 32, 1, 1, 0 ),
282		- 'VALUE' => array( 33, 1, 1, 0 ),
283		- 'TRUE' => array( 34, 0, 1, 0 ),
284		- 'FALSE' => array( 35, 0, 1, 0 ),
285		- 'AND' => array( 36, -1, 0, 0 ),
286		- 'OR' => array( 37, -1, 0, 0 ),
287		- 'NOT' => array( 38, 1, 1, 0 ),
288		- 'MOD' => array( 39, 2, 1, 0 ),
289		- 'DCOUNT' => array( 40, 3, 0, 0 ),
290		- 'DSUM' => array( 41, 3, 0, 0 ),
291		- 'DAVERAGE' => array( 42, 3, 0, 0 ),
292		- 'DMIN' => array( 43, 3, 0, 0 ),
293		- 'DMAX' => array( 44, 3, 0, 0 ),
294		- 'DSTDEV' => array( 45, 3, 0, 0 ),
295		- 'VAR' => array( 46, -1, 0, 0 ),
296		- 'DVAR' => array( 47, 3, 0, 0 ),
297		- 'TEXT' => array( 48, 2, 1, 0 ),
298		- 'LINEST' => array( 49, -1, 0, 0 ),
299		- 'TREND' => array( 50, -1, 0, 0 ),
300		- 'LOGEST' => array( 51, -1, 0, 0 ),
301		- 'GROWTH' => array( 52, -1, 0, 0 ),
302		- 'PV' => array( 56, -1, 1, 0 ),
303		- 'FV' => array( 57, -1, 1, 0 ),
304		- 'NPER' => array( 58, -1, 1, 0 ),
305		- 'PMT' => array( 59, -1, 1, 0 ),
306		- 'RATE' => array( 60, -1, 1, 0 ),
307		- 'MIRR' => array( 61, 3, 0, 0 ),
308		- 'IRR' => array( 62, -1, 0, 0 ),
309		- 'RAND' => array( 63, 0, 1, 1 ),
310		- 'MATCH' => array( 64, -1, 0, 0 ),
311		- 'DATE' => array( 65, 3, 1, 0 ),
312		- 'TIME' => array( 66, 3, 1, 0 ),
313		- 'DAY' => array( 67, 1, 1, 0 ),
314		- 'MONTH' => array( 68, 1, 1, 0 ),
315		- 'YEAR' => array( 69, 1, 1, 0 ),
316		- 'WEEKDAY' => array( 70, -1, 1, 0 ),
317		- 'HOUR' => array( 71, 1, 1, 0 ),
318		- 'MINUTE' => array( 72, 1, 1, 0 ),
319		- 'SECOND' => array( 73, 1, 1, 0 ),
320		- 'NOW' => array( 74, 0, 1, 1 ),
321		- 'AREAS' => array( 75, 1, 0, 1 ),
322		- 'ROWS' => array( 76, 1, 0, 1 ),
323		- 'COLUMNS' => array( 77, 1, 0, 1 ),
324		- 'OFFSET' => array( 78, -1, 0, 1 ),
325		- 'SEARCH' => array( 82, -1, 1, 0 ),
326		- 'TRANSPOSE' => array( 83, 1, 1, 0 ),
327		- 'TYPE' => array( 86, 1, 1, 0 ),
328		- 'ATAN2' => array( 97, 2, 1, 0 ),
329		- 'ASIN' => array( 98, 1, 1, 0 ),
330		- 'ACOS' => array( 99, 1, 1, 0 ),
331		- 'CHOOSE' => array( 100, -1, 1, 0 ),
332		- 'HLOOKUP' => array( 101, -1, 0, 0 ),
333		- 'VLOOKUP' => array( 102, -1, 0, 0 ),
334		- 'ISREF' => array( 105, 1, 0, 0 ),
335		- 'LOG' => array( 109, -1, 1, 0 ),
336		- 'CHAR' => array( 111, 1, 1, 0 ),
337		- 'LOWER' => array( 112, 1, 1, 0 ),
338		- 'UPPER' => array( 113, 1, 1, 0 ),
339		- 'PROPER' => array( 114, 1, 1, 0 ),
340		- 'LEFT' => array( 115, -1, 1, 0 ),
341		- 'RIGHT' => array( 116, -1, 1, 0 ),
342		- 'EXACT' => array( 117, 2, 1, 0 ),
343		- 'TRIM' => array( 118, 1, 1, 0 ),
344		- 'REPLACE' => array( 119, 4, 1, 0 ),
345		- 'SUBSTITUTE' => array( 120, -1, 1, 0 ),
346		- 'CODE' => array( 121, 1, 1, 0 ),
347		- 'FIND' => array( 124, -1, 1, 0 ),
348		- 'CELL' => array( 125, -1, 0, 1 ),
349		- 'ISERR' => array( 126, 1, 1, 0 ),
350		- 'ISTEXT' => array( 127, 1, 1, 0 ),
351		- 'ISNUMBER' => array( 128, 1, 1, 0 ),
352		- 'ISBLANK' => array( 129, 1, 1, 0 ),
353		- 'T' => array( 130, 1, 0, 0 ),
354		- 'N' => array( 131, 1, 0, 0 ),
355		- 'DATEVALUE' => array( 140, 1, 1, 0 ),
356		- 'TIMEVALUE' => array( 141, 1, 1, 0 ),
357		- 'SLN' => array( 142, 3, 1, 0 ),
358		- 'SYD' => array( 143, 4, 1, 0 ),
359		- 'DDB' => array( 144, -1, 1, 0 ),
360		- 'INDIRECT' => array( 148, -1, 1, 1 ),
361		- 'CALL' => array( 150, -1, 1, 0 ),
362		- 'CLEAN' => array( 162, 1, 1, 0 ),
363		- 'MDETERM' => array( 163, 1, 2, 0 ),
364		- 'MINVERSE' => array( 164, 1, 2, 0 ),
365		- 'MMULT' => array( 165, 2, 2, 0 ),
366		- 'IPMT' => array( 167, -1, 1, 0 ),
367		- 'PPMT' => array( 168, -1, 1, 0 ),
368		- 'COUNTA' => array( 169, -1, 0, 0 ),
369		- 'PRODUCT' => array( 183, -1, 0, 0 ),
370		- 'FACT' => array( 184, 1, 1, 0 ),
371		- 'DPRODUCT' => array( 189, 3, 0, 0 ),
372		- 'ISNONTEXT' => array( 190, 1, 1, 0 ),
373		- 'STDEVP' => array( 193, -1, 0, 0 ),
374		- 'VARP' => array( 194, -1, 0, 0 ),
375		- 'DSTDEVP' => array( 195, 3, 0, 0 ),
376		- 'DVARP' => array( 196, 3, 0, 0 ),
377		- 'TRUNC' => array( 197, -1, 1, 0 ),
378		- 'ISLOGICAL' => array( 198, 1, 1, 0 ),
379		- 'DCOUNTA' => array( 199, 3, 0, 0 ),
380		- 'USDOLLAR' => array( 204, -1, 1, 0 ),
381		- 'FINDB' => array( 205, -1, 1, 0 ),
382		- 'SEARCHB' => array( 206, -1, 1, 0 ),
383		- 'REPLACEB' => array( 207, 4, 1, 0 ),
384		- 'LEFTB' => array( 208, -1, 1, 0 ),
385		- 'RIGHTB' => array( 209, -1, 1, 0 ),
386		- 'MIDB' => array( 210, 3, 1, 0 ),
387		- 'LENB' => array( 211, 1, 1, 0 ),
388		- 'ROUNDUP' => array( 212, 2, 1, 0 ),
389		- 'ROUNDDOWN' => array( 213, 2, 1, 0 ),
390		- 'ASC' => array( 214, 1, 1, 0 ),
391		- 'DBCS' => array( 215, 1, 1, 0 ),
392		- 'RANK' => array( 216, -1, 0, 0 ),
393		- 'ADDRESS' => array( 219, -1, 1, 0 ),
394		- 'DAYS360' => array( 220, -1, 1, 0 ),
395		- 'TODAY' => array( 221, 0, 1, 1 ),
396		- 'VDB' => array( 222, -1, 1, 0 ),
397		- 'MEDIAN' => array( 227, -1, 0, 0 ),
398		- 'SUMPRODUCT' => array( 228, -1, 2, 0 ),
399		- 'SINH' => array( 229, 1, 1, 0 ),
400		- 'COSH' => array( 230, 1, 1, 0 ),
401		- 'TANH' => array( 231, 1, 1, 0 ),
402		- 'ASINH' => array( 232, 1, 1, 0 ),
403		- 'ACOSH' => array( 233, 1, 1, 0 ),
404		- 'ATANH' => array( 234, 1, 1, 0 ),
405		- 'DGET' => array( 235, 3, 0, 0 ),
406		- 'INFO' => array( 244, 1, 1, 1 ),
407		- 'DB' => array( 247, -1, 1, 0 ),
408		- 'FREQUENCY' => array( 252, 2, 0, 0 ),
409		- 'ERROR.TYPE' => array( 261, 1, 1, 0 ),
410		- 'REGISTER.ID' => array( 267, -1, 1, 0 ),
411		- 'AVEDEV' => array( 269, -1, 0, 0 ),
412		- 'BETADIST' => array( 270, -1, 1, 0 ),
413		- 'GAMMALN' => array( 271, 1, 1, 0 ),
414		- 'BETAINV' => array( 272, -1, 1, 0 ),
415		- 'BINOMDIST' => array( 273, 4, 1, 0 ),
416		- 'CHIDIST' => array( 274, 2, 1, 0 ),
417		- 'CHIINV' => array( 275, 2, 1, 0 ),
418		- 'COMBIN' => array( 276, 2, 1, 0 ),
419		- 'CONFIDENCE' => array( 277, 3, 1, 0 ),
420		- 'CRITBINOM' => array( 278, 3, 1, 0 ),
421		- 'EVEN' => array( 279, 1, 1, 0 ),
422		- 'EXPONDIST' => array( 280, 3, 1, 0 ),
423		- 'FDIST' => array( 281, 3, 1, 0 ),
424		- 'FINV' => array( 282, 3, 1, 0 ),
425		- 'FISHER' => array( 283, 1, 1, 0 ),
426		- 'FISHERINV' => array( 284, 1, 1, 0 ),
427		- 'FLOOR' => array( 285, 2, 1, 0 ),
428		- 'GAMMADIST' => array( 286, 4, 1, 0 ),
429		- 'GAMMAINV' => array( 287, 3, 1, 0 ),
430		- 'CEILING' => array( 288, 2, 1, 0 ),
431		- 'HYPGEOMDIST' => array( 289, 4, 1, 0 ),
432		- 'LOGNORMDIST' => array( 290, 3, 1, 0 ),
433		- 'LOGINV' => array( 291, 3, 1, 0 ),
434		- 'NEGBINOMDIST' => array( 292, 3, 1, 0 ),
435		- 'NORMDIST' => array( 293, 4, 1, 0 ),
436		- 'NORMSDIST' => array( 294, 1, 1, 0 ),
437		- 'NORMINV' => array( 295, 3, 1, 0 ),
438		- 'NORMSINV' => array( 296, 1, 1, 0 ),
439		- 'STANDARDIZE' => array( 297, 3, 1, 0 ),
440		- 'ODD' => array( 298, 1, 1, 0 ),
441		- 'PERMUT' => array( 299, 2, 1, 0 ),
442		- 'POISSON' => array( 300, 3, 1, 0 ),
443		- 'TDIST' => array( 301, 3, 1, 0 ),
444		- 'WEIBULL' => array( 302, 4, 1, 0 ),
445		- 'SUMXMY2' => array( 303, 2, 2, 0 ),
446		- 'SUMX2MY2' => array( 304, 2, 2, 0 ),
447		- 'SUMX2PY2' => array( 305, 2, 2, 0 ),
448		- 'CHITEST' => array( 306, 2, 2, 0 ),
449		- 'CORREL' => array( 307, 2, 2, 0 ),
450		- 'COVAR' => array( 308, 2, 2, 0 ),
451		- 'FORECAST' => array( 309, 3, 2, 0 ),
452		- 'FTEST' => array( 310, 2, 2, 0 ),
453		- 'INTERCEPT' => array( 311, 2, 2, 0 ),
454		- 'PEARSON' => array( 312, 2, 2, 0 ),
455		- 'RSQ' => array( 313, 2, 2, 0 ),
456		- 'STEYX' => array( 314, 2, 2, 0 ),
457		- 'SLOPE' => array( 315, 2, 2, 0 ),
458		- 'TTEST' => array( 316, 4, 2, 0 ),
459		- 'PROB' => array( 317, -1, 2, 0 ),
460		- 'DEVSQ' => array( 318, -1, 0, 0 ),
461		- 'GEOMEAN' => array( 319, -1, 0, 0 ),
462		- 'HARMEAN' => array( 320, -1, 0, 0 ),
463		- 'SUMSQ' => array( 321, -1, 0, 0 ),
464		- 'KURT' => array( 322, -1, 0, 0 ),
465		- 'SKEW' => array( 323, -1, 0, 0 ),
466		- 'ZTEST' => array( 324, -1, 0, 0 ),
467		- 'LARGE' => array( 325, 2, 0, 0 ),
468		- 'SMALL' => array( 326, 2, 0, 0 ),
469		- 'QUARTILE' => array( 327, 2, 0, 0 ),
470		- 'PERCENTILE' => array( 328, 2, 0, 0 ),
471		- 'PERCENTRANK' => array( 329, -1, 0, 0 ),
472		- 'MODE' => array( 330, -1, 2, 0 ),
473		- 'TRIMMEAN' => array( 331, 2, 0, 0 ),
474		- 'TINV' => array( 332, 2, 1, 0 ),
475		- 'CONCATENATE' => array( 336, -1, 1, 0 ),
476		- 'POWER' => array( 337, 2, 1, 0 ),
477		- 'RADIANS' => array( 342, 1, 1, 0 ),
478		- 'DEGREES' => array( 343, 1, 1, 0 ),
479		- 'SUBTOTAL' => array( 344, -1, 0, 0 ),
480		- 'SUMIF' => array( 345, -1, 0, 0 ),
481		- 'COUNTIF' => array( 346, 2, 0, 0 ),
482		- 'COUNTBLANK' => array( 347, 1, 0, 0 ),
483		- 'ISPMT' => array( 350, 4, 1, 0 ),
484		- 'DATEDIF' => array( 351, 3, 1, 0 ),
485		- 'DATESTRING' => array( 352, 1, 1, 0 ),
486		- 'NUMBERSTRING' => array( 353, 2, 1, 0 ),
487		- 'ROMAN' => array( 354, -1, 1, 0 ),
488		- 'GETPIVOTDATA' => array( 358, -1, 0, 0 ),
489		- 'HYPERLINK' => array( 359, -1, 1, 0 ),
490		- 'PHONETIC' => array( 360, 1, 0, 0 ),
491		- 'AVERAGEA' => array( 361, -1, 0, 0 ),
492		- 'MAXA' => array( 362, -1, 0, 0 ),
493		- 'MINA' => array( 363, -1, 0, 0 ),
494		- 'STDEVPA' => array( 364, -1, 0, 0 ),
495		- 'VARPA' => array( 365, -1, 0, 0 ),
496		- 'STDEVA' => array( 366, -1, 0, 0 ),
497		- 'VARA' => array( 367, -1, 0, 0 ),
498		- 'BAHTTEXT' => array( 368, 1, 0, 0 ),
	249	+ 'COUNT' => array(0, -1, 0, 0),
	250	+ 'IF' => array(1, -1, 1, 0),
	251	+ 'ISNA' => array(2, 1, 1, 0),
	252	+ 'ISERROR' => array(3, 1, 1, 0),
	253	+ 'SUM' => array(4, -1, 0, 0),
	254	+ 'AVERAGE' => array(5, -1, 0, 0),
	255	+ 'MIN' => array(6, -1, 0, 0),
	256	+ 'MAX' => array(7, -1, 0, 0),
	257	+ 'ROW' => array(8, -1, 0, 0),
	258	+ 'COLUMN' => array(9, -1, 0, 0),
	259	+ 'NA' => array(10, 0, 0, 0),
	260	+ 'NPV' => array(11, -1, 1, 0),
	261	+ 'STDEV' => array(12, -1, 0, 0),
	262	+ 'DOLLAR' => array(13, -1, 1, 0),
	263	+ 'FIXED' => array(14, -1, 1, 0),
	264	+ 'SIN' => array(15, 1, 1, 0),
	265	+ 'COS' => array(16, 1, 1, 0),
	266	+ 'TAN' => array(17, 1, 1, 0),
	267	+ 'ATAN' => array(18, 1, 1, 0),
	268	+ 'PI' => array(19, 0, 1, 0),
	269	+ 'SQRT' => array(20, 1, 1, 0),
	270	+ 'EXP' => array(21, 1, 1, 0),
	271	+ 'LN' => array(22, 1, 1, 0),
	272	+ 'LOG10' => array(23, 1, 1, 0),
	273	+ 'ABS' => array(24, 1, 1, 0),
	274	+ 'INT' => array(25, 1, 1, 0),
	275	+ 'SIGN' => array(26, 1, 1, 0),
	276	+ 'ROUND' => array(27, 2, 1, 0),
	277	+ 'LOOKUP' => array(28, -1, 0, 0),
	278	+ 'INDEX' => array(29, -1, 0, 1),
	279	+ 'REPT' => array(30, 2, 1, 0),
	280	+ 'MID' => array(31, 3, 1, 0),
	281	+ 'LEN' => array(32, 1, 1, 0),
	282	+ 'VALUE' => array(33, 1, 1, 0),
	283	+ 'TRUE' => array(34, 0, 1, 0),
	284	+ 'FALSE' => array(35, 0, 1, 0),
	285	+ 'AND' => array(36, -1, 0, 0),
	286	+ 'OR' => array(37, -1, 0, 0),
	287	+ 'NOT' => array(38, 1, 1, 0),
	288	+ 'MOD' => array(39, 2, 1, 0),
	289	+ 'DCOUNT' => array(40, 3, 0, 0),
	290	+ 'DSUM' => array(41, 3, 0, 0),
	291	+ 'DAVERAGE' => array(42, 3, 0, 0),
	292	+ 'DMIN' => array(43, 3, 0, 0),
	293	+ 'DMAX' => array(44, 3, 0, 0),
	294	+ 'DSTDEV' => array(45, 3, 0, 0),
	295	+ 'VAR' => array(46, -1, 0, 0),
	296	+ 'DVAR' => array(47, 3, 0, 0),
	297	+ 'TEXT' => array(48, 2, 1, 0),
	298	+ 'LINEST' => array(49, -1, 0, 0),
	299	+ 'TREND' => array(50, -1, 0, 0),
	300	+ 'LOGEST' => array(51, -1, 0, 0),
	301	+ 'GROWTH' => array(52, -1, 0, 0),
	302	+ 'PV' => array(56, -1, 1, 0),
	303	+ 'FV' => array(57, -1, 1, 0),
	304	+ 'NPER' => array(58, -1, 1, 0),
	305	+ 'PMT' => array(59, -1, 1, 0),
	306	+ 'RATE' => array(60, -1, 1, 0),
	307	+ 'MIRR' => array(61, 3, 0, 0),
	308	+ 'IRR' => array(62, -1, 0, 0),
	309	+ 'RAND' => array(63, 0, 1, 1),
	310	+ 'MATCH' => array(64, -1, 0, 0),
	311	+ 'DATE' => array(65, 3, 1, 0),
	312	+ 'TIME' => array(66, 3, 1, 0),
	313	+ 'DAY' => array(67, 1, 1, 0),
	314	+ 'MONTH' => array(68, 1, 1, 0),
	315	+ 'YEAR' => array(69, 1, 1, 0),
	316	+ 'WEEKDAY' => array(70, -1, 1, 0),
	317	+ 'HOUR' => array(71, 1, 1, 0),
	318	+ 'MINUTE' => array(72, 1, 1, 0),
	319	+ 'SECOND' => array(73, 1, 1, 0),
	320	+ 'NOW' => array(74, 0, 1, 1),
	321	+ 'AREAS' => array(75, 1, 0, 1),
	322	+ 'ROWS' => array(76, 1, 0, 1),
	323	+ 'COLUMNS' => array(77, 1, 0, 1),
	324	+ 'OFFSET' => array(78, -1, 0, 1),
	325	+ 'SEARCH' => array(82, -1, 1, 0),
	326	+ 'TRANSPOSE' => array(83, 1, 1, 0),
	327	+ 'TYPE' => array(86, 1, 1, 0),
	328	+ 'ATAN2' => array(97, 2, 1, 0),
	329	+ 'ASIN' => array(98, 1, 1, 0),
	330	+ 'ACOS' => array(99, 1, 1, 0),
	331	+ 'CHOOSE' => array(100, -1, 1, 0),
	332	+ 'HLOOKUP' => array(101, -1, 0, 0),
	333	+ 'VLOOKUP' => array(102, -1, 0, 0),
	334	+ 'ISREF' => array(105, 1, 0, 0),
	335	+ 'LOG' => array(109, -1, 1, 0),
	336	+ 'CHAR' => array(111, 1, 1, 0),
	337	+ 'LOWER' => array(112, 1, 1, 0),
	338	+ 'UPPER' => array(113, 1, 1, 0),
	339	+ 'PROPER' => array(114, 1, 1, 0),
	340	+ 'LEFT' => array(115, -1, 1, 0),
	341	+ 'RIGHT' => array(116, -1, 1, 0),
	342	+ 'EXACT' => array(117, 2, 1, 0),
	343	+ 'TRIM' => array(118, 1, 1, 0),
	344	+ 'REPLACE' => array(119, 4, 1, 0),
	345	+ 'SUBSTITUTE' => array(120, -1, 1, 0),
	346	+ 'CODE' => array(121, 1, 1, 0),
	347	+ 'FIND' => array(124, -1, 1, 0),
	348	+ 'CELL' => array(125, -1, 0, 1),
	349	+ 'ISERR' => array(126, 1, 1, 0),
	350	+ 'ISTEXT' => array(127, 1, 1, 0),
	351	+ 'ISNUMBER' => array(128, 1, 1, 0),
	352	+ 'ISBLANK' => array(129, 1, 1, 0),
	353	+ 'T' => array(130, 1, 0, 0),
	354	+ 'N' => array(131, 1, 0, 0),
	355	+ 'DATEVALUE' => array(140, 1, 1, 0),
	356	+ 'TIMEVALUE' => array(141, 1, 1, 0),
	357	+ 'SLN' => array(142, 3, 1, 0),
	358	+ 'SYD' => array(143, 4, 1, 0),
	359	+ 'DDB' => array(144, -1, 1, 0),
	360	+ 'INDIRECT' => array(148, -1, 1, 1),
	361	+ 'CALL' => array(150, -1, 1, 0),
	362	+ 'CLEAN' => array(162, 1, 1, 0),
	363	+ 'MDETERM' => array(163, 1, 2, 0),
	364	+ 'MINVERSE' => array(164, 1, 2, 0),
	365	+ 'MMULT' => array(165, 2, 2, 0),
	366	+ 'IPMT' => array(167, -1, 1, 0),
	367	+ 'PPMT' => array(168, -1, 1, 0),
	368	+ 'COUNTA' => array(169, -1, 0, 0),
	369	+ 'PRODUCT' => array(183, -1, 0, 0),
	370	+ 'FACT' => array(184, 1, 1, 0),
	371	+ 'DPRODUCT' => array(189, 3, 0, 0),
	372	+ 'ISNONTEXT' => array(190, 1, 1, 0),
	373	+ 'STDEVP' => array(193, -1, 0, 0),
	374	+ 'VARP' => array(194, -1, 0, 0),
	375	+ 'DSTDEVP' => array(195, 3, 0, 0),
	376	+ 'DVARP' => array(196, 3, 0, 0),
	377	+ 'TRUNC' => array(197, -1, 1, 0),
	378	+ 'ISLOGICAL' => array(198, 1, 1, 0),
	379	+ 'DCOUNTA' => array(199, 3, 0, 0),
	380	+ 'USDOLLAR' => array(204, -1, 1, 0),
	381	+ 'FINDB' => array(205, -1, 1, 0),
	382	+ 'SEARCHB' => array(206, -1, 1, 0),
	383	+ 'REPLACEB' => array(207, 4, 1, 0),
	384	+ 'LEFTB' => array(208, -1, 1, 0),
	385	+ 'RIGHTB' => array(209, -1, 1, 0),
	386	+ 'MIDB' => array(210, 3, 1, 0),
	387	+ 'LENB' => array(211, 1, 1, 0),
	388	+ 'ROUNDUP' => array(212, 2, 1, 0),
	389	+ 'ROUNDDOWN' => array(213, 2, 1, 0),
	390	+ 'ASC' => array(214, 1, 1, 0),
	391	+ 'DBCS' => array(215, 1, 1, 0),
	392	+ 'RANK' => array(216, -1, 0, 0),
	393	+ 'ADDRESS' => array(219, -1, 1, 0),
	394	+ 'DAYS360' => array(220, -1, 1, 0),
	395	+ 'TODAY' => array(221, 0, 1, 1),
	396	+ 'VDB' => array(222, -1, 1, 0),
	397	+ 'MEDIAN' => array(227, -1, 0, 0),
	398	+ 'SUMPRODUCT' => array(228, -1, 2, 0),
	399	+ 'SINH' => array(229, 1, 1, 0),
	400	+ 'COSH' => array(230, 1, 1, 0),
	401	+ 'TANH' => array(231, 1, 1, 0),
	402	+ 'ASINH' => array(232, 1, 1, 0),
	403	+ 'ACOSH' => array(233, 1, 1, 0),
	404	+ 'ATANH' => array(234, 1, 1, 0),
	405	+ 'DGET' => array(235, 3, 0, 0),
	406	+ 'INFO' => array(244, 1, 1, 1),
	407	+ 'DB' => array(247, -1, 1, 0),
	408	+ 'FREQUENCY' => array(252, 2, 0, 0),
	409	+ 'ERROR.TYPE' => array(261, 1, 1, 0),
	410	+ 'REGISTER.ID' => array(267, -1, 1, 0),
	411	+ 'AVEDEV' => array(269, -1, 0, 0),
	412	+ 'BETADIST' => array(270, -1, 1, 0),
	413	+ 'GAMMALN' => array(271, 1, 1, 0),
	414	+ 'BETAINV' => array(272, -1, 1, 0),
	415	+ 'BINOMDIST' => array(273, 4, 1, 0),
	416	+ 'CHIDIST' => array(274, 2, 1, 0),
	417	+ 'CHIINV' => array(275, 2, 1, 0),
	418	+ 'COMBIN' => array(276, 2, 1, 0),
	419	+ 'CONFIDENCE' => array(277, 3, 1, 0),
	420	+ 'CRITBINOM' => array(278, 3, 1, 0),
	421	+ 'EVEN' => array(279, 1, 1, 0),
	422	+ 'EXPONDIST' => array(280, 3, 1, 0),
	423	+ 'FDIST' => array(281, 3, 1, 0),
	424	+ 'FINV' => array(282, 3, 1, 0),
	425	+ 'FISHER' => array(283, 1, 1, 0),
	426	+ 'FISHERINV' => array(284, 1, 1, 0),
	427	+ 'FLOOR' => array(285, 2, 1, 0),
	428	+ 'GAMMADIST' => array(286, 4, 1, 0),
	429	+ 'GAMMAINV' => array(287, 3, 1, 0),
	430	+ 'CEILING' => array(288, 2, 1, 0),
	431	+ 'HYPGEOMDIST' => array(289, 4, 1, 0),
	432	+ 'LOGNORMDIST' => array(290, 3, 1, 0),
	433	+ 'LOGINV' => array(291, 3, 1, 0),
	434	+ 'NEGBINOMDIST' => array(292, 3, 1, 0),
	435	+ 'NORMDIST' => array(293, 4, 1, 0),
	436	+ 'NORMSDIST' => array(294, 1, 1, 0),
	437	+ 'NORMINV' => array(295, 3, 1, 0),
	438	+ 'NORMSINV' => array(296, 1, 1, 0),
	439	+ 'STANDARDIZE' => array(297, 3, 1, 0),
	440	+ 'ODD' => array(298, 1, 1, 0),
	441	+ 'PERMUT' => array(299, 2, 1, 0),
	442	+ 'POISSON' => array(300, 3, 1, 0),
	443	+ 'TDIST' => array(301, 3, 1, 0),
	444	+ 'WEIBULL' => array(302, 4, 1, 0),
	445	+ 'SUMXMY2' => array(303, 2, 2, 0),
	446	+ 'SUMX2MY2' => array(304, 2, 2, 0),
	447	+ 'SUMX2PY2' => array(305, 2, 2, 0),
	448	+ 'CHITEST' => array(306, 2, 2, 0),
	449	+ 'CORREL' => array(307, 2, 2, 0),
	450	+ 'COVAR' => array(308, 2, 2, 0),
	451	+ 'FORECAST' => array(309, 3, 2, 0),
	452	+ 'FTEST' => array(310, 2, 2, 0),
	453	+ 'INTERCEPT' => array(311, 2, 2, 0),
	454	+ 'PEARSON' => array(312, 2, 2, 0),
	455	+ 'RSQ' => array(313, 2, 2, 0),
	456	+ 'STEYX' => array(314, 2, 2, 0),
	457	+ 'SLOPE' => array(315, 2, 2, 0),
	458	+ 'TTEST' => array(316, 4, 2, 0),
	459	+ 'PROB' => array(317, -1, 2, 0),
	460	+ 'DEVSQ' => array(318, -1, 0, 0),
	461	+ 'GEOMEAN' => array(319, -1, 0, 0),
	462	+ 'HARMEAN' => array(320, -1, 0, 0),
	463	+ 'SUMSQ' => array(321, -1, 0, 0),
	464	+ 'KURT' => array(322, -1, 0, 0),
	465	+ 'SKEW' => array(323, -1, 0, 0),
	466	+ 'ZTEST' => array(324, -1, 0, 0),
	467	+ 'LARGE' => array(325, 2, 0, 0),
	468	+ 'SMALL' => array(326, 2, 0, 0),
	469	+ 'QUARTILE' => array(327, 2, 0, 0),
	470	+ 'PERCENTILE' => array(328, 2, 0, 0),
	471	+ 'PERCENTRANK' => array(329, -1, 0, 0),
	472	+ 'MODE' => array(330, -1, 2, 0),
	473	+ 'TRIMMEAN' => array(331, 2, 0, 0),
	474	+ 'TINV' => array(332, 2, 1, 0),
	475	+ 'CONCATENATE' => array(336, -1, 1, 0),
	476	+ 'POWER' => array(337, 2, 1, 0),
	477	+ 'RADIANS' => array(342, 1, 1, 0),
	478	+ 'DEGREES' => array(343, 1, 1, 0),
	479	+ 'SUBTOTAL' => array(344, -1, 0, 0),
	480	+ 'SUMIF' => array(345, -1, 0, 0),
	481	+ 'COUNTIF' => array(346, 2, 0, 0),
	482	+ 'COUNTBLANK' => array(347, 1, 0, 0),
	483	+ 'ISPMT' => array(350, 4, 1, 0),
	484	+ 'DATEDIF' => array(351, 3, 1, 0),
	485	+ 'DATESTRING' => array(352, 1, 1, 0),
	486	+ 'NUMBERSTRING' => array(353, 2, 1, 0),
	487	+ 'ROMAN' => array(354, -1, 1, 0),
	488	+ 'GETPIVOTDATA' => array(358, -1, 0, 0),
	489	+ 'HYPERLINK' => array(359, -1, 1, 0),
	490	+ 'PHONETIC' => array(360, 1, 0, 0),
	491	+ 'AVERAGEA' => array(361, -1, 0, 0),
	492	+ 'MAXA' => array(362, -1, 0, 0),
	493	+ 'MINA' => array(363, -1, 0, 0),
	494	+ 'STDEVPA' => array(364, -1, 0, 0),
	495	+ 'VARPA' => array(365, -1, 0, 0),
	496	+ 'STDEVA' => array(366, -1, 0, 0),
	497	+ 'VARA' => array(367, -1, 0, 0),
	498	+ 'BAHTTEXT' => array(368, 1, 0, 0),
499	499	);
500	500	}
501	501
		@@ -598,7 +598,7 @@ discard block
		block discarded – undo
598	598	*/
599	599	private function convertFunction($token, $num_args)
600	600	{
601		- $args = $this->functions[$token][1];
	601	+ $args = $this->functions[$token][1];
602	602	// $volatile = $this->functions[$token][3];
603	603
604	604	// Fixed number of args eg. TIME($i, $j, $k).
		@@ -645,7 +645,7 @@ discard block
		block discarded – undo
645	645	// TODO: use real error codes
646	646	throw new \PHPExcel\Writer\Exception("Unknown class $class");
647	647	}
648		- return $ptgArea . $row1 . $row2 . $col1. $col2;
	648	+ return $ptgArea . $row1 . $row2 . $col1 . $col2;
649	649	}
650	650
651	651	/**
		@@ -674,7 +674,7 @@ discard block
		block discarded – undo
674	674	list($row1, $col1) = $this->cellToPackedRowcol($cell1);
675	675	list($row2, $col2) = $this->cellToPackedRowcol($cell2);
676	676	} else { // It's a rows range (like 26:27)
677		- list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1.':'.$cell2);
	677	+ list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1 . ':' . $cell2);
678	678	}
679	679
680	680	// The ptg value depends on the class of the ptg.
		@@ -688,7 +688,7 @@ discard block
		block discarded – undo
688	688	// throw new \PHPExcel\Writer\Exception("Unknown class $class");
689	689	// }
690	690
691		- return $ptgArea . $ext_ref . $row1 . $row2 . $col1. $col2;
	691	+ return $ptgArea . $ext_ref . $row1 . $row2 . $col1 . $col2;
692	692	}
693	693
694	694	/**
		@@ -717,7 +717,7 @@ discard block
		block discarded – undo
717	717	// // TODO: use real error codes
718	718	// throw new \PHPExcel\Writer\Exception("Unknown class $class");
719	719	// }
720		- return $ptgRef.$row.$col;
	720	+ return $ptgRef . $row . $col;
721	721	}
722	722
723	723	/**
		@@ -752,7 +752,7 @@ discard block
		block discarded – undo
752	752	// throw new \PHPExcel\Writer\Exception("Unknown class $class");
753	753	// }
754	754
755		- return $ptgRef . $ext_ref. $row . $col;
	755	+ return $ptgRef . $ext_ref . $row . $col;
756	756	}
757	757
758	758	/**
		@@ -1038,7 +1038,7 @@ discard block
		block discarded – undo
1038	1038	}
1039	1039
1040	1040	if ($i < ($formula_length - 1)) {
1041		- $this->lookAhead = $this->formula{$i+1};
	1041	+ $this->lookAhead = $this->formula{$i + 1};
1042	1042	}
1043	1043	$token = '';
1044	1044	}
		@@ -1047,7 +1047,7 @@ discard block
		block discarded – undo
1047	1047	$token .= $this->formula{$i};
1048	1048
1049	1049	if ($i < ($formula_length - 1)) {
1050		- $this->lookAhead = $this->formula{$i+1};
	1050	+ $this->lookAhead = $this->formula{$i + 1};
1051	1051	} else {
1052	1052	$this->lookAhead = '';
1053	1053	}
		@@ -1062,7 +1062,7 @@ discard block
		block discarded – undo
1062	1062	}
1063	1063
1064	1064	if ($i < ($formula_length - 2)) {
1065		- $this->lookAhead = $this->formula{$i+2};
	1065	+ $this->lookAhead = $this->formula{$i + 2};
1066	1066	} else { // if we run out of characters lookAhead becomes empty
1067	1067	$this->lookAhead = '';
1068	1068	}
		@@ -1130,10 +1130,10 @@ discard block
		block discarded – undo
1130	1130	} 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)) {
1131	1131	// 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
1132	1132	return $token;
1133		- } elseif (is_numeric($token) and (!is_numeric($token.$this->lookAhead) or ($this->lookAhead == '')) and ($this->lookAhead != '!') and ($this->lookAhead != ':')) {
	1133	+ } elseif (is_numeric($token) and (!is_numeric($token . $this->lookAhead) or ($this->lookAhead == '')) and ($this->lookAhead != '!') and ($this->lookAhead != ':')) {
1134	1134	// If it's a number (check that it's not a sheet name or range)
1135	1135	return $token;
1136		- } elseif (preg_match("/\"([^\"]\|\"\"){0,255}\"/", $token) and $this->lookAhead != '"' and (substr_count($token, '"')%2 == 0)) {
	1136	+ } elseif (preg_match("/\"([^\"]\|\"\"){0,255}\"/", $token) and $this->lookAhead != '"' and (substr_count($token, '"') % 2 == 0)) {
1137	1137	// If it's a string (of maximum 255 characters)
1138	1138	return $token;
1139	1139	} elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A') {
		@@ -1165,7 +1165,7 @@ discard block
		block discarded – undo
1165	1165	$this->formula = $formula;
1166	1166	$this->lookAhead = isset($formula{1}) ? $formula{1} : '';
1167	1167	$this->advance();
1168		- $this->parseTree = $this->condition();
	1168	+ $this->parseTree = $this->condition();
1169	1169	return true;
1170	1170	}
1171	1171
		@@ -1330,12 +1330,12 @@ discard block
		block discarded – undo
1330	1330	private function fact()
1331	1331	{
1332	1332	if ($this->currentToken == "(") {
1333		- $this->advance(); // eat the "("
	1333	+ $this->advance(); // eat the "("
1334	1334	$result = $this->parenthesizedExpression();
1335	1335	if ($this->currentToken != ")") {
1336	1336	throw new \PHPExcel\Writer\Exception("')' token expected.");
1337	1337	}
1338		- $this->advance(); // eat the ")"
	1338	+ $this->advance(); // eat the ")"
1339	1339	return $result;
1340	1340	}
1341	1341	// if it's a reference
		@@ -1378,7 +1378,7 @@ discard block
		block discarded – undo
1378	1378	// If it's a number or a percent
1379	1379	if ($this->lookAhead == '%') {
1380	1380	$result = $this->createTree('ptgPercent', $this->currentToken, '');
1381		- $this->advance(); // Skip the percentage operator once we've pre-built that tree
	1381	+ $this->advance(); // Skip the percentage operator once we've pre-built that tree
1382	1382	} else {
1383	1383	$result = $this->createTree($this->currentToken, '', '');
1384	1384	}
		@@ -1389,7 +1389,7 @@ discard block
		block discarded – undo
1389	1389	$result = $this->func();
1390	1390	return $result;
1391	1391	}
1392		- throw new \PHPExcel\Writer\Exception("Syntax error: ".$this->currentToken.", lookahead: ".$this->lookAhead.", current char: ".$this->currentCharacter);
	1392	+ throw new \PHPExcel\Writer\Exception("Syntax error: " . $this->currentToken . ", lookahead: " . $this->lookAhead . ", current char: " . $this->currentCharacter);
1393	1393	}
1394	1394
1395	1395	/**
		@@ -1405,12 +1405,12 @@ discard block
		block discarded – undo
1405	1405	$function = strtoupper($this->currentToken);
1406	1406	$result = ''; // initialize result
1407	1407	$this->advance();
1408		- $this->advance(); // eat the "("
	1408	+ $this->advance(); // eat the "("
1409	1409	while ($this->currentToken != ')') {
1410	1410	/**/
1411	1411	if ($num_args > 0) {
1412	1412	if ($this->currentToken == "," \|\| $this->currentToken == ";") {
1413		- $this->advance(); // eat the "," or ";"
	1413	+ $this->advance(); // eat the "," or ";"
1414	1414	} else {
1415	1415	throw new \PHPExcel\Writer\Exception("Syntax error: comma expected in function $function, arg #{$num_args}");
1416	1416	}
		@@ -1432,7 +1432,7 @@ discard block
		block discarded – undo
1432	1432	}
1433	1433
1434	1434	$result = $this->createTree($function, $result, $num_args);
1435		- $this->advance(); // eat the ")"
	1435	+ $this->advance(); // eat the ")"
1436	1436	return $result;
1437	1437	}
1438	1438
		@@ -1512,7 +1512,7 @@ discard block
		block discarded – undo
1512	1512	$left_tree = '';
1513	1513	}
1514	1514	// add it's left subtree and return.
1515		- return $left_tree.$this->convertFunction($tree['value'], $tree['right']);
	1515	+ return $left_tree . $this->convertFunction($tree['value'], $tree['right']);
1516	1516	} else {
1517	1517	$converted_tree = $this->convert($tree['value']);
1518	1518	}

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel5/Worksheet.php 1 patch

Spacing +327 added lines, -327 removed lines patch added patch discarded remove patch

@@ -216,7 +216,7 @@  discard block
 block discarded – undo
 
         $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;
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
         //$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;
@@ -243,12 +243,12 @@  discard block
 block discarded – undo
         $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 = \PHPExcel\Cell::columnIndexFromString($minC);
         $this->lastColumnIndex  = \PHPExcel\Cell::columnIndexFromString($maxC);
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
         }
 
         $columnDimensions = $phpSheet->getColumnDimensions();
-        $maxCol = $this->lastColumnIndex -1;
+        $maxCol = $this->lastColumnIndex - 1;
         for ($i = 0; $i <= $maxCol; ++$i) {
             $hidden = 0;
             $level = 0;
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
         }
 
         $firstCellCoordinates = \PHPExcel\Cell::coordinateFromString($firstCell); // e.g. array(0, 1)
-        $lastCellCoordinates  = \PHPExcel\Cell::coordinateFromString($lastCell);  // e.g. array(1, 6)
+        $lastCellCoordinates  = \PHPExcel\Cell::coordinateFromString($lastCell); // e.g. array(1, 6)
 
         return pack('vvvv', $firstCellCoordinates[1] - 1, $lastCellCoordinates[1] - 1, \PHPExcel\Cell::columnIndexFromString($firstCellCoordinates[0]) - 1, \PHPExcel\Cell::columnIndexFromString($lastCellCoordinates[0]) - 1);
     }
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
 
         // Return data stored in memory
         if (isset($this->_data)) {
-            $tmp   = $this->_data;
+            $tmp = $this->_data;
             unset($this->_data);
             return $tmp;
         }
@@ -619,17 +619,17 @@  discard block
 block discarded – undo
      */
     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);
     }
 
@@ -657,8 +657,8 @@  discard block
 block discarded – undo
      */
     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 = \PHPExcel\Shared\StringHelper::UTF8toBIFF8UnicodeShort($str, $arrcRun);
 
         /* check if string is already present */
@@ -667,9 +667,9 @@  discard block
 block discarded – undo
         }
         $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);
     }
 
     /**
@@ -690,20 +690,20 @@  discard block
 block discarded – undo
     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);
     }
@@ -725,8 +725,8 @@  discard block
 block discarded – undo
      */
     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 = \PHPExcel\Shared\StringHelper::UTF8toBIFF8UnicodeLong($str);
 
@@ -736,9 +736,9 @@  discard block
 block discarded – undo
         }
         $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);
     }
 
     /**
@@ -751,14 +751,14 @@  discard block
 block discarded – undo
      */
     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) {
@@ -766,7 +766,7 @@  discard block
 block discarded – undo
             $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);
     }
@@ -789,8 +789,8 @@  discard block
 block discarded – undo
      */
     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);
@@ -836,7 +836,7 @@  discard block
 block discarded – undo
      */
     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;
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
             // 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);
@@ -871,8 +871,8 @@  discard block
 block discarded – undo
             $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} == '=') {
@@ -888,8 +888,8 @@  discard block
 block discarded – undo
             $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);
 
@@ -915,7 +915,7 @@  discard block
 block discarded – undo
      */
     private function writeStringRecord($stringValue)
     {
-        $record = 0x0207;     // Record identifier
+        $record = 0x0207; // Record identifier
         $data = \PHPExcel\Shared\StringHelper::UTF8toBIFF8UnicodeLong($stringValue);
 
         $length = strlen($data);
@@ -993,8 +993,8 @@  discard block
 block discarded – undo
      */
     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");
@@ -1038,8 +1038,8 @@  discard block
 block discarded – undo
      */
     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);
@@ -1097,8 +1097,8 @@  discard block
 block discarded – undo
             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)
         //
@@ -1114,7 +1114,7 @@  discard block
 block discarded – undo
         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.
@@ -1136,7 +1136,7 @@  discard block
 block discarded – undo
         $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));
@@ -1150,15 +1150,15 @@  discard block
 block discarded – undo
         $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     .
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
         $header   = pack("vv", $record, $length);
 
         // Write the packed data
-        $this->append($header. $data);
+        $this->append($header . $data);
         return 0;
     }
 
@@ -1186,14 +1186,14 @@  discard block
 block discarded – undo
      */
     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) {
@@ -1202,9 +1202,9 @@  discard block
 block discarded – undo
 
         // 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
@@ -1227,7 +1227,7 @@  discard block
 block discarded – undo
 
         $header   = pack("vv", $record, $length);
         $data     = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw, $irwMac, $reserved, $grbit, $ixfe);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1241,7 +1241,7 @@  discard block
 block discarded – undo
         $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);
     }
 
     /**
@@ -1249,53 +1249,53 @@  discard block
 block discarded – undo
      */
     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 PHPExcel 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() === \PHPExcel\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);
     }
 
     /**
@@ -1312,8 +1312,8 @@  discard block
 block discarded – undo
         // 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);
@@ -1327,8 +1327,8 @@  discard block
 block discarded – undo
     {
         $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);
@@ -1377,20 +1377,20 @@  discard block
 block discarded – undo
         } 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);
     }
 
     /**
@@ -1424,20 +1424,20 @@  discard block
 block discarded – undo
         $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
@@ -1544,21 +1544,21 @@  discard block
 block discarded – undo
         $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(
@@ -1621,7 +1621,7 @@  discard block
 block discarded – undo
 
             $length = strlen($recordData);
 
-            $record = 0x0868;        // Record identifier
+            $record = 0x0868; // Record identifier
             $header = pack("vv", $record, $length);
             $this->append($header . $recordData);
         }
@@ -1641,8 +1641,8 @@  discard block
 block discarded – undo
      */
     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);
@@ -1659,20 +1659,20 @@  discard block
 block discarded – undo
      */
     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);
@@ -1707,8 +1707,8 @@  discard block
 block discarded – undo
         } 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()) {
@@ -1733,8 +1733,8 @@  discard block
 block discarded – undo
             // 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;
         }
 
 
@@ -1768,47 +1768,47 @@  discard block
 block discarded – undo
      */
     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() == \PHPExcel\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);
@@ -1819,7 +1819,7 @@  discard block
 block discarded – undo
 
         $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);
     }
@@ -1829,7 +1829,7 @@  discard block
 block discarded – undo
      */
     private function writeHeader()
     {
-        $record  = 0x0014;               // Record identifier
+        $record = 0x0014; // Record identifier
 
         /* removing for now
         // need to fix character count (multibyte!)
@@ -1843,7 +1843,7 @@  discard block
 block discarded – undo
         $recordData = \PHPExcel\Shared\StringHelper::UTF8toBIFF8UnicodeLong($this->phpSheet->getHeaderFooter()->getOddHeader());
         $length = strlen($recordData);
 
-        $header   = pack("vv", $record, $length);
+        $header = pack("vv", $record, $length);
 
         $this->append($header . $recordData);
     }
@@ -1853,7 +1853,7 @@  discard block
 block discarded – undo
      */
     private function writeFooter()
     {
-        $record  = 0x0015;               // Record identifier
+        $record = 0x0015; // Record identifier
 
         /* removing for now
         // need to fix character count (multibyte!)
@@ -1867,7 +1867,7 @@  discard block
 block discarded – undo
         $recordData = \PHPExcel\Shared\StringHelper::UTF8toBIFF8UnicodeLong($this->phpSheet->getHeaderFooter()->getOddFooter());
         $length = strlen($recordData);
 
-        $header    = pack("vv", $record, $length);
+        $header = pack("vv", $record, $length);
 
         $this->append($header . $recordData);
     }
@@ -1879,15 +1879,15 @@  discard block
 block discarded – undo
      */
     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);
     }
 
     /**
@@ -1895,10 +1895,10 @@  discard block
 block discarded – undo
      */
     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);
@@ -1910,10 +1910,10 @@  discard block
 block discarded – undo
      */
     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);
@@ -1929,10 +1929,10 @@  discard block
 block discarded – undo
      */
     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);
@@ -1948,10 +1948,10 @@  discard block
 block discarded – undo
      */
     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);
@@ -1967,10 +1967,10 @@  discard block
 block discarded – undo
      */
     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);
@@ -1986,10 +1986,10 @@  discard block
 block discarded – undo
      */
     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);
@@ -2002,13 +2002,13 @@  discard block
 block discarded – undo
      */
     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);
     }
 
@@ -2018,10 +2018,10 @@  discard block
 block discarded – undo
      */
     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);
@@ -2033,8 +2033,8 @@  discard block
 block discarded – undo
      */
     private function writeAutoFilterInfo()
     {
-        $record      = 0x009D;                        // Record identifier
-        $length      = 0x0002;                        // Bytes to follow
+        $record      = 0x009D; // Record identifier
+        $length      = 0x0002; // Bytes to follow
 
         $rangeBounds = \PHPExcel\Cell::rangeBoundaries($this->phpSheet->getAutoFilter()->getRange());
         $iNumFilters = 1 + $rangeBounds[1][0] - $rangeBounds[0][0];
@@ -2053,11 +2053,11 @@  discard block
 block discarded – undo
      */
     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;
@@ -2065,7 +2065,7 @@  discard block
 block discarded – undo
             $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().
@@ -2088,7 +2088,7 @@  discard block
 block discarded – undo
         $header      = pack("vv", $record, $length);
         $data        = pack("vvvv", $dxRwGut, $dxColGut, $maxRowOutlineLevel, $col_level);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2097,15 +2097,15 @@  discard block
 block discarded – undo
      */
     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
         }
@@ -2165,9 +2165,9 @@  discard block
 block discarded – undo
                 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);
@@ -2192,9 +2192,9 @@  discard block
 block discarded – undo
                 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);
@@ -2218,15 +2218,15 @@  discard block
 block discarded – undo
             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);
     }
 
     /**
@@ -2287,10 +2287,10 @@  discard block
 block discarded – undo
             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);
@@ -2330,7 +2330,7 @@  discard block
 block discarded – undo
         $lcb         = $size;
 
         $header      = pack("vvvvV", $record, $length, $cf, $env, $lcb);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2387,8 +2387,8 @@  discard block
 block discarded – undo
     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 >= \PHPExcel\Shared\Excel5::sizeCol($this->phpSheet, \PHPExcel\Cell::stringFromColumnIndex($col_start))) {
@@ -2398,8 +2398,8 @@  discard block
 block discarded – undo
             $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 >= \PHPExcel\Shared\Excel5::sizeCol($this->phpSheet, \PHPExcel\Cell::stringFromColumnIndex($col_end))) {
@@ -2419,21 +2419,21 @@  discard block
 block discarded – undo
         if (\PHPExcel\Shared\Excel5::sizeCol($this->phpSheet, \PHPExcel\Cell::stringFromColumnIndex($col_start)) == 0) {
             return;
         }
-        if (\PHPExcel\Shared\Excel5::sizeCol($this->phpSheet, \PHPExcel\Cell::stringFromColumnIndex($col_end))   == 0) {
+        if (\PHPExcel\Shared\Excel5::sizeCol($this->phpSheet, \PHPExcel\Cell::stringFromColumnIndex($col_end)) == 0) {
             return;
         }
         if (\PHPExcel\Shared\Excel5::sizeRow($this->phpSheet, $row_start + 1) == 0) {
             return;
         }
-        if (\PHPExcel\Shared\Excel5::sizeRow($this->phpSheet, $row_end + 1)   == 0) {
+        if (\PHPExcel\Shared\Excel5::sizeRow($this->phpSheet, $row_end + 1) == 0) {
             return;
         }
 
         // Convert the pixel values to the percentage value expected by Excel
-        $x1 = $x1     / \PHPExcel\Shared\Excel5::sizeCol($this->phpSheet, \PHPExcel\Cell::stringFromColumnIndex($col_start))   * 1024;
-        $y1 = $y1     / \PHPExcel\Shared\Excel5::sizeRow($this->phpSheet, $row_start + 1)   *  256;
-        $x2 = $width  / \PHPExcel\Shared\Excel5::sizeCol($this->phpSheet, \PHPExcel\Cell::stringFromColumnIndex($col_end))     * 1024; // Distance to right side of object
-        $y2 = $height / \PHPExcel\Shared\Excel5::sizeRow($this->phpSheet, $row_end + 1)     *  256; // Distance to bottom of object
+        $x1 = $x1 / \PHPExcel\Shared\Excel5::sizeCol($this->phpSheet, \PHPExcel\Cell::stringFromColumnIndex($col_start)) * 1024;
+        $y1 = $y1 / \PHPExcel\Shared\Excel5::sizeRow($this->phpSheet, $row_start + 1) * 256;
+        $x2 = $width / \PHPExcel\Shared\Excel5::sizeCol($this->phpSheet, \PHPExcel\Cell::stringFromColumnIndex($col_end)) * 1024; // Distance to right side of object
+        $y2 = $height / \PHPExcel\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);
     }
@@ -2453,33 +2453,33 @@  discard block
 block discarded – undo
      */
     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);
@@ -2530,16 +2530,16 @@  discard block
 block discarded – undo
         $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);
             }
         }
 
@@ -2583,7 +2583,7 @@  discard block
 block discarded – undo
         // 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.
@@ -2644,8 +2644,8 @@  discard block
 block discarded – undo
             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);
@@ -2690,10 +2690,10 @@  discard block
 block discarded – undo
             $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);
@@ -2768,20 +2768,20 @@  discard block
 block discarded – undo
         // 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
@@ -2981,8 +2981,8 @@  discard block
 block discarded – undo
      */
     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
@@ -2998,12 +2998,12 @@  discard block
 block discarded – undo
         $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);
     }
 
@@ -3013,7 +3013,7 @@  discard block
 block discarded – undo
      */
     private function writeCFRule(\PHPExcel\Style\Conditional $conditional)
     {
-        $record      = 0x01B1;               // Record identifier
+        $record = 0x01B1; // Record identifier
 
         // $type : Type of the CF
         // $operatorType : Comparison operator
@@ -3133,49 +3133,49 @@  discard block
 block discarded – undo
         }
         // 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 = \PHPExcel\Shared\StringHelper::UTF8toBIFF8UnicodeLong($conditional->getStyle()->getFont()->getName());
@@ -3414,11 +3414,11 @@  discard block
 block discarded – undo
             // 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);
@@ -3789,10 +3789,10 @@  discard block
 block discarded – undo
                     break;
                 case \PHPExcel\Style\Fill::FILL_GRADIENT_LINEAR:
                     $blockFillPatternStyle = 0x00;
-                    break;    // does not exist in BIFF8
+                    break; // does not exist in BIFF8
                 case \PHPExcel\Style\Fill::FILL_GRADIENT_PATH:
                     $blockFillPatternStyle = 0x00;
-                    break;    // does not exist in BIFF8
+                    break; // does not exist in BIFF8
                 default:
                     $blockFillPatternStyle = 0x00;
                     break;
@@ -4180,7 +4180,7 @@  discard block
 block discarded – undo
         if (!is_null($operand2)) {
             $data .= $operand2;
         }
-        $header      = pack('vv', $record, strlen($data));
+        $header = pack('vv', $record, strlen($data));
         $this->append($header . $data);
     }
 
@@ -4189,8 +4189,8 @@  discard block
 block discarded – undo
      */
     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;
@@ -4225,9 +4225,9 @@  discard block
 block discarded – undo
             }
         }
         $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);

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel2007.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -41,7 +41,7 @@  discard block
 block discarded – undo
      *
      * @var Excel2007\WriterPart[]
      */
-    private $writerParts    = array();
+    private $writerParts = array();
 
     /**
      * Private Spreadsheet
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
      *
      * @var string[]
      */
-    private $stringTable    = array();
+    private $stringTable = array();
 
     /**
      * Private unique \PHPExcel\Style\Conditional HashTable
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
      *
      * @var \PHPExcel\HashTable
      */
-    private $bordersHashTable ;
+    private $bordersHashTable;
 
     /**
      * Private unique \PHPExcel\Style\NumberFormat HashTable
@@ -138,14 +138,14 @@  discard block
 block discarded – undo
             $this->writerParts[$writer] = new $class($this);
         }
 
-        $hashTablesArray = array( 'stylesConditionalHashTable',    'fillHashTable',        'fontHashTable',
-                                  'bordersHashTable',                'numFmtHashTable',        'drawingHashTable',
+        $hashTablesArray = array('stylesConditionalHashTable', 'fillHashTable', 'fontHashTable',
+                                  'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
                                   'styleHashTable'
                                 );
 
         // Set HashTable variables
         foreach ($hashTablesArray as $tableName) {
-            $this->$tableName     = new \PHPExcel\HashTable();
+            $this->$tableName = new \PHPExcel\HashTable();
         }
     }
 
@@ -233,9 +233,9 @@  discard block
 block discarded – undo
 
             //if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
             if ($this->spreadSheet->hasMacros()) {
-                $macrosCode=$this->spreadSheet->getMacrosCode();
+                $macrosCode = $this->spreadSheet->getMacrosCode();
                 if (!is_null($macrosCode)) {// we have the code ?
-                    $objZip->addFromString('xl/vbaProject.bin', $macrosCode);//allways in 'xl', allways named vbaProject.bin
+                    $objZip->addFromString('xl/vbaProject.bin', $macrosCode); //allways in 'xl', allways named vbaProject.bin
                     if ($this->spreadSheet->hasMacrosCertificate()) {//signed macros ?
                         // Yes : add the certificate file and the related rels file
                         $objZip->addFromString('xl/vbaProjectSignature.bin', $this->spreadSheet->getMacrosCertificate());
@@ -245,16 +245,16 @@  discard block
 block discarded – undo
             }
             //a custom UI in this workbook ? add it ("base" xml and additional objects (pictures) and rels)
             if ($this->spreadSheet->hasRibbon()) {
-                $tmpRibbonTarget=$this->spreadSheet->getRibbonXMLData('target');
+                $tmpRibbonTarget = $this->spreadSheet->getRibbonXMLData('target');
                 $objZip->addFromString($tmpRibbonTarget, $this->spreadSheet->getRibbonXMLData('data'));
                 if ($this->spreadSheet->hasRibbonBinObjects()) {
-                    $tmpRootPath=dirname($tmpRibbonTarget).'/';
-                    $ribbonBinObjects=$this->spreadSheet->getRibbonBinObjects('data');//the files to write
+                    $tmpRootPath = dirname($tmpRibbonTarget) . '/';
+                    $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data'); //the files to write
                     foreach ($ribbonBinObjects as $aPath => $aContent) {
-                        $objZip->addFromString($tmpRootPath.$aPath, $aContent);
+                        $objZip->addFromString($tmpRootPath . $aPath, $aContent);
                     }
                     //the rels for files
-                    $objZip->addFromString($tmpRootPath.'_rels/'.basename($tmpRibbonTarget).'.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
+                    $objZip->addFromString($tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
                 }
             }
 

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Writer/Excel5.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -339,9 +339,9 @@  discard block
 block discarded – undo
                     ++$countShapes[$sheetIndex];
 
                     // create an Drawing Object for the dropdown
-                    $oDrawing  = new \PHPExcel\Worksheet\BaseDrawing();
+                    $oDrawing = new \PHPExcel\Worksheet\BaseDrawing();
                     // get the coordinates of drawing
-                    $cDrawing   = \PHPExcel\Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
+                    $cDrawing = \PHPExcel\Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
                     $oDrawing->setCoordinates($cDrawing);
                     $oDrawing->setWorksheet($sheet);
 
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
           $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'),
@@ -697,7 +697,7 @@  discard block
 block discarded – undo
                 $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']);
@@ -873,7 +873,7 @@  discard block
 block discarded – undo
                 $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']);

Please login to merge, or discard this patch.

		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	* @var integer
87	87	* @see addContinue()
88	88	*/
89		- private $limit = 8224;
	89	+ private $limit = 8224;
90	90
91	91	/**
92	92	* Constructor
		@@ -111,9 +111,9 @@ discard block
		block discarded – undo
111	111	$teststr = pack("d", 1.2345);
112	112	$number = pack("C8", 0x8D, 0x97, 0x6E, 0x12, 0x83, 0xC0, 0xF3, 0x3F);
113	113	if ($number == $teststr) {
114		- $byte_order = 0; // Little Endian
	114	+ $byte_order = 0; // Little Endian
115	115	} elseif ($number == strrev($teststr)) {
116		- $byte_order = 1; // Big Endian
	116	+ $byte_order = 1; // Big Endian
117	117	} else {
118	118	// Give up. I'll fix this in a later version.
119	119	throw new \PHPExcel\Writer\Exception("Required floating point format not supported on this platform.");
		@@ -165,16 +165,16 @@ discard block
		block discarded – undo
165	165	*/
166	166	protected function storeBof($type)
167	167	{
168		- $record = 0x0809; // Record identifier (BIFF5-BIFF8)
	168	+ $record = 0x0809; // Record identifier (BIFF5-BIFF8)
169	169	$length = 0x0010;
170	170
171	171	// by inspection of real files, MS Office Excel 2007 writes the following
172	172	$unknown = pack("VV", 0x000100D1, 0x00000406);
173	173
174		- $build = 0x0DBB; // Excel 97
175		- $year = 0x07CC; // Excel 97
	174	+ $build = 0x0DBB; // Excel 97
	175	+ $year = 0x07CC; // Excel 97
176	176
177		- $version = 0x0600; // BIFF8
	177	+ $version = 0x0600; // BIFF8
178	178
179	179	$header = pack("vv", $record, $length);
180	180	$data = pack("vvvv", $version, $type, $build, $year);
		@@ -188,8 +188,8 @@ discard block
		block discarded – undo
188	188	*/
189	189	protected function storeEof()
190	190	{
191		- $record = 0x000A; // Record identifier
192		- $length = 0x0000; // Number of bytes to follow
	191	+ $record = 0x000A; // Record identifier
	192	+ $length = 0x0000; // Number of bytes to follow
193	193
194	194	$header = pack("vv", $record, $length);
195	195	$this->append($header);
		@@ -202,8 +202,8 @@ discard block
		block discarded – undo
202	202	*/
203	203	public function writeEof()
204	204	{
205		- $record = 0x000A; // Record identifier
206		- $length = 0x0000; // Number of bytes to follow
	205	+ $record = 0x000A; // Record identifier
	206	+ $length = 0x0000; // Number of bytes to follow
207	207	$header = pack("vv", $record, $length);
208	208	return $this->writeData($header);
209	209	}
		@@ -223,13 +223,13 @@ discard block
		block discarded – undo
223	223	private function addContinue($data)
224	224	{
225	225	$limit = $this->limit;
226		- $record = 0x003C; // Record identifier
	226	+ $record = 0x003C; // Record identifier
227	227
228	228	// The first 2080/8224 bytes remain intact. However, we have to change
229	229	// the length field of the record.
230	230	$tmp = substr($data, 0, 2) . pack("v", $limit) . substr($data, 4, $limit);
231	231
232		- $header = pack("vv", $record, $limit); // Headers for continue records
	232	+ $header = pack("vv", $record, $limit); // Headers for continue records
233	233
234	234	// Retrieve chunks of 2080/8224 bytes +4 for the header.
235	235	$data_length = strlen($data);

		@@ -199,7 +199,7 @@ discard block
		block discarded – undo
199	199	// It needs to call its parent's constructor explicitly
200	200	parent::__construct();
201	201
202		- $this->parser = $parser;
	202	+ $this->parser = $parser;
203	203	$this->biffSize = 0;
204	204	$this->palette = array();
205	205	$this->countryCode = -1;
		@@ -207,7 +207,7 @@ discard block
		block discarded – undo
207	207	$this->stringTotal = &$str_total;
208	208	$this->stringUnique = &$str_unique;
209	209	$this->stringTable = &$str_table;
210		- $this->colors = &$colors;
	210	+ $this->colors = &$colors;
211	211	$this->setPaletteXl97();
212	212
213	213	$this->phpExcel = $phpExcel;
		@@ -221,11 +221,11 @@ discard block
		block discarded – undo
221	221	for ($i = 0; $i < $countSheets; ++$i) {
222	222	$phpSheet = $phpExcel->getSheet($i);
223	223
224		- $this->parser->setExtSheet($phpSheet->getTitle(), $i); // Register worksheet name with parser
	224	+ $this->parser->setExtSheet($phpSheet->getTitle(), $i); // Register worksheet name with parser
225	225
226	226	$supbook_index = 0x00;
227	227	$ref = pack('vvv', $supbook_index, $i, $i);
228		- $this->parser->references[] = $ref; // Register reference with parser
	228	+ $this->parser->references[] = $ref; // Register reference with parser
229	229
230	230	// Sheet tab colors?
231	231	if ($phpSheet->isTabColorSet()) {
		@@ -472,7 +472,7 @@ discard block
		block discarded – undo
472	472	*/
473	473	private function calcSheetOffsets()
474	474	{
475		- $boundsheet_length = 10; // fixed length for a BOUNDSHEET record
	475	+ $boundsheet_length = 10; // fixed length for a BOUNDSHEET record
476	476
477	477	// size of Workbook globals part 1 + 3
478	478	$offset = $this->_datasize;
		@@ -836,9 +836,9 @@ discard block
		block discarded – undo
836	836	$record = 0x0018;
837	837
838	838	// option flags
839		- $options = ($isHidden ? 0x21 : 0x00);
	839	+ $options = ($isHidden ? 0x21 : 0x00);
840	840
841		- $extra = pack(
	841	+ $extra = pack(
842	842	'Cvvvvv',
843	843	0x3B,
844	844	$sheetIndex - 1,
		@@ -866,9 +866,9 @@ discard block
		block discarded – undo
866	866	*/
867	867	private function writeCodepage()
868	868	{
869		- $record = 0x0042; // Record identifier
870		- $length = 0x0002; // Number of bytes to follow
871		- $cv = $this->codepage; // The code page
	869	+ $record = 0x0042; // Record identifier
	870	+ $length = 0x0002; // Number of bytes to follow
	871	+ $cv = $this->codepage; // The code page
872	872
873	873	$header = pack('vv', $record, $length);
874	874	$data = pack('v', $cv);
		@@ -881,24 +881,24 @@ discard block
		block discarded – undo
881	881	*/
882	882	private function writeWindow1()
883	883	{
884		- $record = 0x003D; // Record identifier
885		- $length = 0x0012; // Number of bytes to follow
	884	+ $record = 0x003D; // Record identifier
	885	+ $length = 0x0012; // Number of bytes to follow
886	886
887		- $xWn = 0x0000; // Horizontal position of window
888		- $yWn = 0x0000; // Vertical position of window
889		- $dxWn = 0x25BC; // Width of window
890		- $dyWn = 0x1572; // Height of window
	887	+ $xWn = 0x0000; // Horizontal position of window
	888	+ $yWn = 0x0000; // Vertical position of window
	889	+ $dxWn = 0x25BC; // Width of window
	890	+ $dyWn = 0x1572; // Height of window
891	891
892		- $grbit = 0x0038; // Option flags
	892	+ $grbit = 0x0038; // Option flags
893	893
894	894	// not supported by PHPExcel, so there is only one selected sheet, the active
895		- $ctabsel = 1; // Number of workbook tabs selected
	895	+ $ctabsel = 1; // Number of workbook tabs selected
896	896
897		- $wTabRatio = 0x0258; // Tab to scrollbar ratio
	897	+ $wTabRatio = 0x0258; // Tab to scrollbar ratio
898	898
899	899	// not supported by PHPExcel, set to 0
900		- $itabFirst = 0; // 1st displayed worksheet
901		- $itabCur = $this->phpExcel->getActiveSheetIndex(); // Active worksheet
	900	+ $itabFirst = 0; // 1st displayed worksheet
	901	+ $itabCur = $this->phpExcel->getActiveSheetIndex(); // Active worksheet
902	902
903	903	$header = pack("vv", $record, $length);
904	904	$data = pack("vvvvvvvvv", $xWn, $yWn, $dxWn, $dyWn, $grbit, $itabCur, $itabFirst, $ctabsel, $wTabRatio);
		@@ -914,7 +914,7 @@ discard block
		block discarded – undo
914	914	private function writeBoundSheet($sheet, $offset)
915	915	{
916	916	$sheetname = $sheet->getTitle();
917		- $record = 0x0085; // Record identifier
	917	+ $record = 0x0085; // Record identifier
918	918
919	919	// sheet state
920	920	switch ($sheet->getSheetState()) {
		@@ -935,7 +935,7 @@ discard block
		block discarded – undo
935	935	// sheet type
936	936	$st = 0x00;
937	937
938		- $grbit = 0x0000; // Visibility and sheet type
	938	+ $grbit = 0x0000; // Visibility and sheet type
939	939
940	940	$data = pack("VCC", $offset, $ss, $st);
941	941	$data .= \PHPExcel\Shared\StringHelper::UTF8toBIFF8UnicodeShort($sheetname);
		@@ -950,8 +950,8 @@ discard block
		block discarded – undo
950	950	*/
951	951	private function writeSupbookInternal()
952	952	{
953		- $record = 0x01AE; // Record identifier
954		- $length = 0x0004; // Bytes to follow
	953	+ $record = 0x01AE; // Record identifier
	954	+ $length = 0x0004; // Bytes to follow
955	955
956	956	$header = pack("vv", $record, $length);
957	957	$data = pack("vv", $this->phpExcel->getSheetCount(), 0x0401);
		@@ -966,10 +966,10 @@ discard block
		block discarded – undo
966	966	private function writeExternalsheetBiff8()
967	967	{
968	968	$totalReferences = count($this->parser->references);
969		- $record = 0x0017; // Record identifier
970		- $length = 2 + 6 * $totalReferences; // Number of bytes to follow
	969	+ $record = 0x0017; // Record identifier
	970	+ $length = 2 + 6 * $totalReferences; // Number of bytes to follow
971	971
972		- $supbook_index = 0; // FIXME: only using internal SUPBOOK record
	972	+ $supbook_index = 0; // FIXME: only using internal SUPBOOK record
973	973	$header = pack("vv", $record, $length);
974	974	$data = pack('v', $totalReferences);
975	975	for ($i = 0; $i < $totalReferences; ++$i) {
		@@ -983,12 +983,12 @@ discard block
		block discarded – undo
983	983	*/
984	984	private function writeStyle()
985	985	{
986		- $record = 0x0293; // Record identifier
987		- $length = 0x0004; // Bytes to follow
	986	+ $record = 0x0293; // Record identifier
	987	+ $length = 0x0004; // Bytes to follow
988	988
989		- $ixfe = 0x8000; // Index to cell style XF
990		- $BuiltIn = 0x00; // Built-in style
991		- $iLevel = 0xff; // Outline style level
	989	+ $ixfe = 0x8000; // Index to cell style XF
	990	+ $BuiltIn = 0x00; // Built-in style
	991	+ $iLevel = 0xff; // Outline style level
992	992
993	993	$header = pack("vv", $record, $length);
994	994	$data = pack("vCC", $ixfe, $BuiltIn, $iLevel);
		@@ -1003,14 +1003,14 @@ discard block
		block discarded – undo
1003	1003	*/
1004	1004	private function writeNumberFormat($format, $ifmt)
1005	1005	{
1006		- $record = 0x041E; // Record identifier
	1006	+ $record = 0x041E; // Record identifier
1007	1007
1008	1008	$numberFormatString = \PHPExcel\Shared\StringHelper::UTF8toBIFF8UnicodeLong($format);
1009		- $length = 2 + strlen($numberFormatString); // Number of bytes to follow
	1009	+ $length = 2 + strlen($numberFormatString); // Number of bytes to follow
1010	1010
1011	1011
1012	1012	$header = pack("vv", $record, $length);
1013		- $data = pack("v", $ifmt) . $numberFormatString;
	1013	+ $data = pack("v", $ifmt) . $numberFormatString;
1014	1014	$this->append($header . $data);
1015	1015	}
1016	1016
		@@ -1019,12 +1019,12 @@ discard block
		block discarded – undo
1019	1019	*/
1020	1020	private function writeDateMode()
1021	1021	{
1022		- $record = 0x0022; // Record identifier
1023		- $length = 0x0002; // Bytes to follow
	1022	+ $record = 0x0022; // Record identifier
	1023	+ $length = 0x0002; // Bytes to follow
1024	1024
1025	1025	$f1904 = (\PHPExcel\Shared\Date::getExcelCalendar() == \PHPExcel\Shared\Date::CALENDAR_MAC_1904)
1026	1026	? 1
1027		- : 0; // Flag for 1904 date system
	1027	+ : 0; // Flag for 1904 date system
1028	1028
1029	1029	$header = pack("vv", $record, $length);
1030	1030	$data = pack("v", $f1904);
		@@ -1045,8 +1045,8 @@ discard block
		block discarded – undo
1045	1045	*/
1046	1046	private function writeExternalCount($cxals)
1047	1047	{
1048		- $record = 0x0016; // Record identifier
1049		- $length = 0x0002; // Number of bytes to follow
	1048	+ $record = 0x0016; // Record identifier
	1049	+ $length = 0x0002; // Number of bytes to follow
1050	1050
1051	1051	$header = pack("vv", $record, $length);
1052	1052	$data = pack("v", $cxals);
		@@ -1064,11 +1064,11 @@ discard block
		block discarded – undo
1064	1064	*/
1065	1065	private function writeExternalSheet($sheetname)
1066	1066	{
1067		- $record = 0x0017; // Record identifier
1068		- $length = 0x02 + strlen($sheetname); // Number of bytes to follow
	1067	+ $record = 0x0017; // Record identifier
	1068	+ $length = 0x02 + strlen($sheetname); // Number of bytes to follow
1069	1069
1070		- $cch = strlen($sheetname); // Length of sheet name
1071		- $rgch = 0x03; // Filename encoding
	1070	+ $cch = strlen($sheetname); // Length of sheet name
	1071	+ $rgch = 0x03; // Filename encoding
1072	1072
1073	1073	$header = pack("vv", $record, $length);
1074	1074	$data = pack("CC", $cch, $rgch);
		@@ -1088,20 +1088,20 @@ discard block
		block discarded – undo
1088	1088	*/
1089	1089	private function writeNameShort($index, $type, $rowmin, $rowmax, $colmin, $colmax)
1090	1090	{
1091		- $record = 0x0018; // Record identifier
1092		- $length = 0x0024; // Number of bytes to follow
1093		-
1094		- $grbit = 0x0020; // Option flags
1095		- $chKey = 0x00; // Keyboard shortcut
1096		- $cch = 0x01; // Length of text name
1097		- $cce = 0x0015; // Length of text definition
1098		- $ixals = $index + 1; // Sheet index
1099		- $itab = $ixals; // Equal to ixals
1100		- $cchCustMenu = 0x00; // Length of cust menu text
1101		- $cchDescription = 0x00; // Length of description text
1102		- $cchHelptopic = 0x00; // Length of help topic text
1103		- $cchStatustext = 0x00; // Length of status bar text
1104		- $rgch = $type; // Built-in name type
	1091	+ $record = 0x0018; // Record identifier
	1092	+ $length = 0x0024; // Number of bytes to follow
	1093	+
	1094	+ $grbit = 0x0020; // Option flags
	1095	+ $chKey = 0x00; // Keyboard shortcut
	1096	+ $cch = 0x01; // Length of text name
	1097	+ $cce = 0x0015; // Length of text definition
	1098	+ $ixals = $index + 1; // Sheet index
	1099	+ $itab = $ixals; // Equal to ixals
	1100	+ $cchCustMenu = 0x00; // Length of cust menu text
	1101	+ $cchDescription = 0x00; // Length of description text
	1102	+ $cchHelptopic = 0x00; // Length of help topic text
	1103	+ $cchStatustext = 0x00; // Length of status bar text
	1104	+ $rgch = $type; // Built-in name type
1105	1105
1106	1106	$unknown03 = 0x3b;
1107	1107	$unknown04 = 0xffff - $index;
		@@ -1152,24 +1152,24 @@ discard block
		block discarded – undo
1152	1152	*/
1153	1153	private function writeNameLong($index, $type, $rowmin, $rowmax, $colmin, $colmax)
1154	1154	{
1155		- $record = 0x0018; // Record identifier
1156		- $length = 0x003d; // Number of bytes to follow
1157		- $grbit = 0x0020; // Option flags
1158		- $chKey = 0x00; // Keyboard shortcut
1159		- $cch = 0x01; // Length of text name
1160		- $cce = 0x002e; // Length of text definition
1161		- $ixals = $index + 1; // Sheet index
1162		- $itab = $ixals; // Equal to ixals
1163		- $cchCustMenu = 0x00; // Length of cust menu text
1164		- $cchDescription = 0x00; // Length of description text
1165		- $cchHelptopic = 0x00; // Length of help topic text
1166		- $cchStatustext = 0x00; // Length of status bar text
1167		- $rgch = $type; // Built-in name type
	1155	+ $record = 0x0018; // Record identifier
	1156	+ $length = 0x003d; // Number of bytes to follow
	1157	+ $grbit = 0x0020; // Option flags
	1158	+ $chKey = 0x00; // Keyboard shortcut
	1159	+ $cch = 0x01; // Length of text name
	1160	+ $cce = 0x002e; // Length of text definition
	1161	+ $ixals = $index + 1; // Sheet index
	1162	+ $itab = $ixals; // Equal to ixals
	1163	+ $cchCustMenu = 0x00; // Length of cust menu text
	1164	+ $cchDescription = 0x00; // Length of description text
	1165	+ $cchHelptopic = 0x00; // Length of help topic text
	1166	+ $cchStatustext = 0x00; // Length of status bar text
	1167	+ $rgch = $type; // Built-in name type
1168	1168
1169	1169	$unknown01 = 0x29;
1170	1170	$unknown02 = 0x002b;
1171	1171	$unknown03 = 0x3b;
1172		- $unknown04 = 0xffff-$index;
	1172	+ $unknown04 = 0xffff - $index;
1173	1173	$unknown05 = 0x0000;
1174	1174	$unknown06 = 0x0000;
1175	1175	$unknown07 = 0x1087;
		@@ -1227,8 +1227,8 @@ discard block
		block discarded – undo
1227	1227	*/
1228	1228	private function writeCountry()
1229	1229	{
1230		- $record = 0x008C; // Record identifier
1231		- $length = 4; // Number of bytes to follow
	1230	+ $record = 0x008C; // Record identifier
	1231	+ $length = 4; // Number of bytes to follow
1232	1232
1233	1233	$header = pack('vv', $record, $length);
1234	1234	/* using the same country code always for simplicity */
		@@ -1244,8 +1244,8 @@ discard block
		block discarded – undo
1244	1244	*/
1245	1245	private function writeRecalcId()
1246	1246	{
1247		- $record = 0x01C1; // Record identifier
1248		- $length = 8; // Number of bytes to follow
	1247	+ $record = 0x01C1; // Record identifier
	1248	+ $length = 8; // Number of bytes to follow
1249	1249
1250	1250	$header = pack('vv', $record, $length);
1251	1251
		@@ -1262,10 +1262,10 @@ discard block
		block discarded – undo
1262	1262	{
1263	1263	$aref = $this->palette;
1264	1264
1265		- $record = 0x0092; // Record identifier
1266		- $length = 2 + 4 * count($aref); // Number of bytes to follow
1267		- $ccv = count($aref); // Number of RGB values to follow
1268		- $data = ''; // The RGB data
	1265	+ $record = 0x0092; // Record identifier
	1266	+ $length = 2 + 4 * count($aref); // Number of bytes to follow
	1267	+ $ccv = count($aref); // Number of RGB values to follow
	1268	+ $data = ''; // The RGB data
1269	1269
1270	1270	// Pack the RGB data
1271	1271	foreach ($aref as $color) {

		@@ -133,23 +133,23 @@ discard block
		block discarded – undo
133	133	*/
134	134	public function __construct(\PHPExcel\Style $style = null)
135	135	{
136		- $this->isStyleXf = false;
	136	+ $this->isStyleXf = false;
137	137	$this->fontIndex = 0;
138	138
139		- $this->numberFormatIndex = 0;
	139	+ $this->numberFormatIndex = 0;
140	140
141		- $this->textJustLast = 0;
	141	+ $this->textJustLast = 0;
142	142
143	143	$this->foregroundColor = 0x40;
144	144	$this->backgroundColor = 0x41;
145	145
146		- $this->_diag = 0;
	146	+ $this->_diag = 0;
147	147
148	148	$this->bottomBorderColor = 0x40;
149	149	$this->topBorderColor = 0x40;
150	150	$this->leftBorderColor = 0x40;
151	151	$this->rightBorderColor = 0x40;
152		- $this->_diag_color = 0x40;
	152	+ $this->_diag_color = 0x40;
153	153	$this->_style = $style;
154	154
155	155	}
		@@ -171,16 +171,16 @@ discard block
		block discarded – undo
171	171	}
172	172
173	173	// Flags to indicate if attributes have been set.
174		- $atr_num = ($this->numberFormatIndex != 0)?1:0;
175		- $atr_fnt = ($this->fontIndex != 0)?1:0;
	174	+ $atr_num = ($this->numberFormatIndex != 0) ? 1 : 0;
	175	+ $atr_fnt = ($this->fontIndex != 0) ? 1 : 0;
176	176	$atr_alc = ((int) $this->_style->getAlignment()->getWrapText()) ? 1 : 0;
177		- $atr_bdr = (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) \|\|
178		- self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) \|\|
179		- self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) \|\|
180		- self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()))?1:0;
	177	+ $atr_bdr = (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) \|\|
	178	+ self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) \|\|
	179	+ self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) \|\|
	180	+ self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())) ? 1 : 0;
181	181	$atr_pat = (($this->foregroundColor != 0x40) \|\|
182	182	($this->backgroundColor != 0x41) \|\|
183		- self::mapFillType($this->_style->getFill()->getFillType()))?1:0;
	183	+ self::mapFillType($this->_style->getFill()->getFillType())) ? 1 : 0;
184	184	$atr_prot = self::mapLocked($this->_style->getProtection()->getLocked())
185	185	\| self::mapHidden($this->_style->getProtection()->getHidden());
186	186
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	if (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) == 0) {
189	189	$this->bottomBorderColor = 0;
190	190	}
191		- if (self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) == 0) {
	191	+ if (self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) == 0) {
192	192	$this->topBorderColor = 0;
193	193	}
194	194	if (self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) == 0) {
		@@ -201,47 +201,47 @@ discard block
		block discarded – undo
201	201	$this->_diag_color = 0;
202	202	}
203	203
204		- $record = 0x00E0; // Record identifier
205		- $length = 0x0014; // Number of bytes to follow
	204	+ $record = 0x00E0; // Record identifier
	205	+ $length = 0x0014; // Number of bytes to follow
206	206
207		- $ifnt = $this->fontIndex; // Index to FONT record
208		- $ifmt = $this->numberFormatIndex; // Index to FORMAT record
	207	+ $ifnt = $this->fontIndex; // Index to FONT record
	208	+ $ifmt = $this->numberFormatIndex; // Index to FORMAT record
209	209
210		- $align = $this->mapHAlign($this->_style->getAlignment()->getHorizontal()); // Alignment
211		- $align \|= (int) $this->_style->getAlignment()->getWrapText() << 3;
212		- $align \|= self::mapVAlign($this->_style->getAlignment()->getVertical()) << 4;
	210	+ $align = $this->mapHAlign($this->_style->getAlignment()->getHorizontal()); // Alignment
	211	+ $align \|= (int) $this->_style->getAlignment()->getWrapText() << 3;
	212	+ $align \|= self::mapVAlign($this->_style->getAlignment()->getVertical()) << 4;
213	213	$align \|= $this->textJustLast << 7;
214	214
215		- $used_attrib = $atr_num << 2;
216		- $used_attrib \|= $atr_fnt << 3;
217		- $used_attrib \|= $atr_alc << 4;
218		- $used_attrib \|= $atr_bdr << 5;
219		- $used_attrib \|= $atr_pat << 6;
	215	+ $used_attrib = $atr_num << 2;
	216	+ $used_attrib \|= $atr_fnt << 3;
	217	+ $used_attrib \|= $atr_alc << 4;
	218	+ $used_attrib \|= $atr_bdr << 5;
	219	+ $used_attrib \|= $atr_pat << 6;
220	220	$used_attrib \|= $atr_prot << 7;
221	221
222		- $icv = $this->foregroundColor; // fg and bg pattern colors
223		- $icv \|= $this->backgroundColor << 7;
	222	+ $icv = $this->foregroundColor; // fg and bg pattern colors
	223	+ $icv \|= $this->backgroundColor << 7;
224	224
225		- $border1 = self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()); // Border line style and color
226		- $border1 \|= self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) << 4;
227		- $border1 \|= self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) << 8;
228		- $border1 \|= self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) << 12;
229		- $border1 \|= $this->leftBorderColor << 16;
230		- $border1 \|= $this->rightBorderColor << 23;
	225	+ $border1 = self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()); // Border line style and color
	226	+ $border1 \|= self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) << 4;
	227	+ $border1 \|= self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) << 8;
	228	+ $border1 \|= self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) << 12;
	229	+ $border1 \|= $this->leftBorderColor << 16;
	230	+ $border1 \|= $this->rightBorderColor << 23;
231	231
232	232	$diagonalDirection = $this->_style->getBorders()->getDiagonalDirection();
233	233	$diag_tl_to_rb = $diagonalDirection == \PHPExcel\Style\Borders::DIAGONAL_BOTH
234	234	\|\| $diagonalDirection == \PHPExcel\Style\Borders::DIAGONAL_DOWN;
235	235	$diag_tr_to_lb = $diagonalDirection == \PHPExcel\Style\Borders::DIAGONAL_BOTH
236	236	\|\| $diagonalDirection == \PHPExcel\Style\Borders::DIAGONAL_UP;
237		- $border1 \|= $diag_tl_to_rb << 30;
238		- $border1 \|= $diag_tr_to_lb << 31;
	237	+ $border1 \|= $diag_tl_to_rb << 30;
	238	+ $border1 \|= $diag_tr_to_lb << 31;
239	239
240		- $border2 = $this->topBorderColor; // Border color
241		- $border2 \|= $this->bottomBorderColor << 7;
242		- $border2 \|= $this->_diag_color << 14;
243		- $border2 \|= self::mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) << 21;
244		- $border2 \|= self::mapFillType($this->_style->getFill()->getFillType()) << 26;
	240	+ $border2 = $this->topBorderColor; // Border color
	241	+ $border2 \|= $this->bottomBorderColor << 7;
	242	+ $border2 \|= $this->_diag_color << 14;
	243	+ $border2 \|= self::mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) << 21;
	244	+ $border2 \|= self::mapFillType($this->_style->getFill()->getFillType()) << 26;
245	245
246	246	$header = pack("vv", $record, $length);
247	247
		@@ -427,8 +427,8 @@ discard block
		block discarded – undo
427	427	\PHPExcel\Style\Fill::FILL_PATTERN_LIGHTTRELLIS => 0x10,
428	428	\PHPExcel\Style\Fill::FILL_PATTERN_GRAY125 => 0x11,
429	429	\PHPExcel\Style\Fill::FILL_PATTERN_GRAY0625 => 0x12,
430		- \PHPExcel\Style\Fill::FILL_GRADIENT_LINEAR => 0x00, // does not exist in BIFF8
431		- \PHPExcel\Style\Fill::FILL_GRADIENT_PATH => 0x00, // does not exist in BIFF8
	430	+ \PHPExcel\Style\Fill::FILL_GRADIENT_LINEAR => 0x00, // does not exist in BIFF8
	431	+ \PHPExcel\Style\Fill::FILL_GRADIENT_PATH => 0x00, // does not exist in BIFF8
432	432	);
433	433
434	434	/**

		@@ -92,7 +92,7 @@ discard block
		block discarded – undo
92	92	$innerData = '';
93	93
94	94	// write the dgg
95		- $recVer = 0x0;
	95	+ $recVer = 0x0;
96	96	$recInstance = 0x0000;
97	97	$recType = 0xF006;
98	98
		@@ -206,7 +206,7 @@ discard block
		block discarded – undo
206	206	$length = strlen($data);
207	207
208	208	$recVerInstance = $recVer;
209		- $recVerInstance \|= $recInstance << 4;
	209	+ $recVerInstance \|= $recInstance << 4;
210	210
211	211	$header = pack('vvV', $recVerInstance, $recType, $length);
212	212
		@@ -237,7 +237,7 @@ discard block
		block discarded – undo
237	237	$length = strlen($innerData);
238	238
239	239	$recVerInstance = $recVer;
240		- $recVerInstance \|= $recInstance << 4;
	240	+ $recVerInstance \|= $recInstance << 4;
241	241
242	242	$header = pack('vvV', $recVerInstance, $recType, $length);
243	243
		@@ -264,7 +264,7 @@ discard block
		block discarded – undo
264	264	$length = strlen($innerData);
265	265
266	266	$recVerInstance = $recVer;
267		- $recVerInstance \|= $recInstance << 4;
	267	+ $recVerInstance \|= $recInstance << 4;
268	268
269	269	$header = pack('vvV', $recVerInstance, $recType, $length);
270	270
		@@ -406,13 +406,13 @@ discard block
		block discarded – undo
406	406	if ($this->object->getOPTCollection()) {
407	407	$optData = '';
408	408
409		- $recVer = 0x3;
	409	+ $recVer = 0x3;
410	410	$recInstance = count($this->object->getOPTCollection());
411	411	$recType = 0xF00B;
412	412	foreach ($this->object->getOPTCollection() as $property => $value) {
413	413	$optData .= pack('vV', $property, $value);
414	414	}
415		- $length = strlen($optData);
	415	+ $length = strlen($optData);
416	416
417	417	$recVerInstance = $recVer;
418	418	$recVerInstance \|= $recInstance << 4;
		@@ -425,7 +425,7 @@ discard block
		block discarded – undo
425	425	if ($this->object->getStartCoordinates()) {
426	426	$clientAnchorData = '';
427	427
428		- $recVer = 0x0;
	428	+ $recVer = 0x0;
429	429	$recInstance = 0x0;
430	430	$recType = 0xF010;
431	431
		@@ -453,7 +453,7 @@ discard block
		block discarded – undo
453	453
454	454	$clientAnchorData = pack('vvvvvvvvv', $this->object->getSpFlag(), $c1, $startOffsetX, $r1, $startOffsetY, $c2, $endOffsetX, $r2, $endOffsetY);
455	455
456		- $length = strlen($clientAnchorData);
	456	+ $length = strlen($clientAnchorData);
457	457
458	458	$recVerInstance = $recVer;
459	459	$recVerInstance \|= $recInstance << 4;
		@@ -466,7 +466,7 @@ discard block
		block discarded – undo
466	466	if (!$this->object->getSpgr()) {
467	467	$clientDataData = '';
468	468
469		- $recVer = 0x0;
	469	+ $recVer = 0x0;
470	470	$recInstance = 0x0;
471	471	$recType = 0xF011;
472	472

		@@ -85,9 +85,9 @@ discard block
		block discarded – undo
85	85	$bFamily = 0; // Font family
86	86	$bCharSet = \PHPExcel\Shared\Font::getCharsetFromFontName($this->font->getName()); // Character set
87	87
88		- $record = 0x31; // Record identifier
89		- $reserved = 0x00; // Reserved
90		- $grbit = 0x00; // Font attributes
	88	+ $record = 0x31; // Record identifier
	89	+ $reserved = 0x00; // Reserved
	90	+ $grbit = 0x00; // Font attributes
91	91	if ($this->font->getItalic()) {
92	92	$grbit \|= 0x02;
93	93	}
		@@ -134,9 +134,9 @@ discard block
		block discarded – undo
134	134	private static function mapBold($bold)
135	135	{
136	136	if ($bold) {
137		- return 0x2BC; // 700 = Bold font weight
	137	+ return 0x2BC; // 700 = Bold font weight
138	138	}
139		- return 0x190; // 400 = Normal font weight
	139	+ return 0x190; // 400 = Normal font weight
140	140	}
141	141
142	142	/**

		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	*
42	42	* @var Excel2007\WriterPart[]
43	43	*/
44		- private $writerParts = array();
	44	+ private $writerParts = array();
45	45
46	46	/**
47	47	* Private Spreadsheet
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	*
56	56	* @var string[]
57	57	*/
58		- private $stringTable = array();
	58	+ private $stringTable = array();
59	59
60	60	/**
61	61	* Private unique \PHPExcel\Style\Conditional HashTable
		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90	*
91	91	* @var \PHPExcel\HashTable
92	92	*/
93		- private $bordersHashTable ;
	93	+ private $bordersHashTable;
94	94
95	95	/**
96	96	* Private unique \PHPExcel\Style\NumberFormat HashTable
		@@ -138,14 +138,14 @@ discard block
		block discarded – undo
138	138	$this->writerParts[$writer] = new $class($this);
139	139	}
140	140
141		- $hashTablesArray = array( 'stylesConditionalHashTable', 'fillHashTable', 'fontHashTable',
142		- 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
	141	+ $hashTablesArray = array('stylesConditionalHashTable', 'fillHashTable', 'fontHashTable',
	142	+ 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
143	143	'styleHashTable'
144	144	);
145	145
146	146	// Set HashTable variables
147	147	foreach ($hashTablesArray as $tableName) {
148		- $this->$tableName = new \PHPExcel\HashTable();
	148	+ $this->$tableName = new \PHPExcel\HashTable();
149	149	}
150	150	}
151	151
		@@ -233,9 +233,9 @@ discard block
		block discarded – undo
233	233
234	234	//if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
235	235	if ($this->spreadSheet->hasMacros()) {
236		- $macrosCode=$this->spreadSheet->getMacrosCode();
	236	+ $macrosCode = $this->spreadSheet->getMacrosCode();
237	237	if (!is_null($macrosCode)) {// we have the code ?
238		- $objZip->addFromString('xl/vbaProject.bin', $macrosCode);//allways in 'xl', allways named vbaProject.bin
	238	+ $objZip->addFromString('xl/vbaProject.bin', $macrosCode); //allways in 'xl', allways named vbaProject.bin
239	239	if ($this->spreadSheet->hasMacrosCertificate()) {//signed macros ?
240	240	// Yes : add the certificate file and the related rels file
241	241	$objZip->addFromString('xl/vbaProjectSignature.bin', $this->spreadSheet->getMacrosCertificate());
		@@ -245,16 +245,16 @@ discard block
		block discarded – undo
245	245	}
246	246	//a custom UI in this workbook ? add it ("base" xml and additional objects (pictures) and rels)
247	247	if ($this->spreadSheet->hasRibbon()) {
248		- $tmpRibbonTarget=$this->spreadSheet->getRibbonXMLData('target');
	248	+ $tmpRibbonTarget = $this->spreadSheet->getRibbonXMLData('target');
249	249	$objZip->addFromString($tmpRibbonTarget, $this->spreadSheet->getRibbonXMLData('data'));
250	250	if ($this->spreadSheet->hasRibbonBinObjects()) {
251		- $tmpRootPath=dirname($tmpRibbonTarget).'/';
252		- $ribbonBinObjects=$this->spreadSheet->getRibbonBinObjects('data');//the files to write
	251	+ $tmpRootPath = dirname($tmpRibbonTarget) . '/';
	252	+ $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data'); //the files to write
253	253	foreach ($ribbonBinObjects as $aPath => $aContent) {
254		- $objZip->addFromString($tmpRootPath.$aPath, $aContent);
	254	+ $objZip->addFromString($tmpRootPath . $aPath, $aContent);
255	255	}
256	256	//the rels for files
257		- $objZip->addFromString($tmpRootPath.'_rels/'.basename($tmpRibbonTarget).'.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
	257	+ $objZip->addFromString($tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
258	258	}
259	259	}
260	260

		@@ -339,9 +339,9 @@ discard block
		block discarded – undo
339	339	++$countShapes[$sheetIndex];
340	340
341	341	// create an Drawing Object for the dropdown
342		- $oDrawing = new \PHPExcel\Worksheet\BaseDrawing();
	342	+ $oDrawing = new \PHPExcel\Worksheet\BaseDrawing();
343	343	// get the coordinates of drawing
344		- $cDrawing = \PHPExcel\Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
	344	+ $cDrawing = \PHPExcel\Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
345	345	$oDrawing->setCoordinates($cDrawing);
346	346	$oDrawing->setWorksheet($sheet);
347	347
		@@ -623,7 +623,7 @@ discard block
		block discarded – undo
623	623	$dataProp .= pack('v', 0x000A);
624	624	$dataProp .= pack('v', 0x0000);
625	625	// value
626		- $dataProp .= 'Worksheet'.chr(0);
	626	+ $dataProp .= 'Worksheet' . chr(0);
627	627
628	628	$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
629	629	'offset' => array('pack' => 'V'),
		@@ -697,7 +697,7 @@ discard block
		block discarded – undo
697	697	$dataProp['data']['data'] .= chr(0);
698	698	$dataProp['data']['length'] += 1;
699	699	// Complete the string with null string for being a %4
700		- $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
	700	+ $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
701	701	$dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
702	702
703	703	$dataSection_Content .= pack('V', $dataProp['data']['length']);
		@@ -873,7 +873,7 @@ discard block
		block discarded – undo
873	873	$dataProp['data']['data'] .= chr(0);
874	874	$dataProp['data']['length'] += 1;
875	875	// Complete the string with null string for being a %4
876		- $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
	876	+ $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
877	877	$dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
878	878
879	879	$dataSection_Content .= pack('V', $dataProp['data']['length']);

PHPOffice / PhpSpreadsheet

Push — develop ( bf3457...467bab )

Status

Category

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +81 added lines, -81 removed lines patch added patch discarded remove patch

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +276 added lines, -276 removed lines patch added patch discarded remove patch

Spacing +327 added lines, -327 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch