PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Style/Color.php

Spacing +55 added lines, -55 removed lines

@@ -357,61 +357,61 @@
         // Indexed colors
         if (is_null(self::$indexedColors)) {
             self::$indexedColors = [
-                1  => 'FF000000',    //  System Colour #1 - Black
-                2  => 'FFFFFFFF',    //  System Colour #2 - White
-                3  => 'FFFF0000',    //  System Colour #3 - Red
-                4  => 'FF00FF00',    //  System Colour #4 - Green
-                5  => 'FF0000FF',    //  System Colour #5 - Blue
-                6  => 'FFFFFF00',    //  System Colour #6 - Yellow
-                7  => 'FFFF00FF',    //  System Colour #7- Magenta
-                8  => 'FF00FFFF',    //  System Colour #8- Cyan
-                9  => 'FF800000',    //  Standard Colour #9
-                10 => 'FF008000',    //  Standard Colour #10
-                11 => 'FF000080',    //  Standard Colour #11
-                12 => 'FF808000',    //  Standard Colour #12
-                13 => 'FF800080',    //  Standard Colour #13
-                14 => 'FF008080',    //  Standard Colour #14
-                15 => 'FFC0C0C0',    //  Standard Colour #15
-                16 => 'FF808080',    //  Standard Colour #16
-                17 => 'FF9999FF',    //  Chart Fill Colour #17
-                18 => 'FF993366',    //  Chart Fill Colour #18
-                19 => 'FFFFFFCC',    //  Chart Fill Colour #19
-                20 => 'FFCCFFFF',    //  Chart Fill Colour #20
-                21 => 'FF660066',    //  Chart Fill Colour #21
-                22 => 'FFFF8080',    //  Chart Fill Colour #22
-                23 => 'FF0066CC',    //  Chart Fill Colour #23
-                24 => 'FFCCCCFF',    //  Chart Fill Colour #24
-                25 => 'FF000080',    //  Chart Line Colour #25
-                26 => 'FFFF00FF',    //  Chart Line Colour #26
-                27 => 'FFFFFF00',    //  Chart Line Colour #27
-                28 => 'FF00FFFF',    //  Chart Line Colour #28
-                29 => 'FF800080',    //  Chart Line Colour #29
-                30 => 'FF800000',    //  Chart Line Colour #30
-                31 => 'FF008080',    //  Chart Line Colour #31
-                32 => 'FF0000FF',    //  Chart Line Colour #32
-                33 => 'FF00CCFF',    //  Standard Colour #33
-                34 => 'FFCCFFFF',    //  Standard Colour #34
-                35 => 'FFCCFFCC',    //  Standard Colour #35
-                36 => 'FFFFFF99',    //  Standard Colour #36
-                37 => 'FF99CCFF',    //  Standard Colour #37
-                38 => 'FFFF99CC',    //  Standard Colour #38
-                39 => 'FFCC99FF',    //  Standard Colour #39
-                40 => 'FFFFCC99',    //  Standard Colour #40
-                41 => 'FF3366FF',    //  Standard Colour #41
-                42 => 'FF33CCCC',    //  Standard Colour #42
-                43 => 'FF99CC00',    //  Standard Colour #43
-                44 => 'FFFFCC00',    //  Standard Colour #44
-                45 => 'FFFF9900',    //  Standard Colour #45
-                46 => 'FFFF6600',    //  Standard Colour #46
-                47 => 'FF666699',    //  Standard Colour #47
-                48 => 'FF969696',    //  Standard Colour #48
-                49 => 'FF003366',    //  Standard Colour #49
-                50 => 'FF339966',    //  Standard Colour #50
-                51 => 'FF003300',    //  Standard Colour #51
-                52 => 'FF333300',    //  Standard Colour #52
-                53 => 'FF993300',    //  Standard Colour #53
-                54 => 'FF993366',    //  Standard Colour #54
-                55 => 'FF333399',    //  Standard Colour #55
+                1  => 'FF000000', //  System Colour #1 - Black
+                2  => 'FFFFFFFF', //  System Colour #2 - White
+                3  => 'FFFF0000', //  System Colour #3 - Red
+                4  => 'FF00FF00', //  System Colour #4 - Green
+                5  => 'FF0000FF', //  System Colour #5 - Blue
+                6  => 'FFFFFF00', //  System Colour #6 - Yellow
+                7  => 'FFFF00FF', //  System Colour #7- Magenta
+                8  => 'FF00FFFF', //  System Colour #8- Cyan
+                9  => 'FF800000', //  Standard Colour #9
+                10 => 'FF008000', //  Standard Colour #10
+                11 => 'FF000080', //  Standard Colour #11
+                12 => 'FF808000', //  Standard Colour #12
+                13 => 'FF800080', //  Standard Colour #13
+                14 => 'FF008080', //  Standard Colour #14
+                15 => 'FFC0C0C0', //  Standard Colour #15
+                16 => 'FF808080', //  Standard Colour #16
+                17 => 'FF9999FF', //  Chart Fill Colour #17
+                18 => 'FF993366', //  Chart Fill Colour #18
+                19 => 'FFFFFFCC', //  Chart Fill Colour #19
+                20 => 'FFCCFFFF', //  Chart Fill Colour #20
+                21 => 'FF660066', //  Chart Fill Colour #21
+                22 => 'FFFF8080', //  Chart Fill Colour #22
+                23 => 'FF0066CC', //  Chart Fill Colour #23
+                24 => 'FFCCCCFF', //  Chart Fill Colour #24
+                25 => 'FF000080', //  Chart Line Colour #25
+                26 => 'FFFF00FF', //  Chart Line Colour #26
+                27 => 'FFFFFF00', //  Chart Line Colour #27
+                28 => 'FF00FFFF', //  Chart Line Colour #28
+                29 => 'FF800080', //  Chart Line Colour #29
+                30 => 'FF800000', //  Chart Line Colour #30
+                31 => 'FF008080', //  Chart Line Colour #31
+                32 => 'FF0000FF', //  Chart Line Colour #32
+                33 => 'FF00CCFF', //  Standard Colour #33
+                34 => 'FFCCFFFF', //  Standard Colour #34
+                35 => 'FFCCFFCC', //  Standard Colour #35
+                36 => 'FFFFFF99', //  Standard Colour #36
+                37 => 'FF99CCFF', //  Standard Colour #37
+                38 => 'FFFF99CC', //  Standard Colour #38
+                39 => 'FFCC99FF', //  Standard Colour #39
+                40 => 'FFFFCC99', //  Standard Colour #40
+                41 => 'FF3366FF', //  Standard Colour #41
+                42 => 'FF33CCCC', //  Standard Colour #42
+                43 => 'FF99CC00', //  Standard Colour #43
+                44 => 'FFFFCC00', //  Standard Colour #44
+                45 => 'FFFF9900', //  Standard Colour #45
+                46 => 'FFFF6600', //  Standard Colour #46
+                47 => 'FF666699', //  Standard Colour #47
+                48 => 'FF969696', //  Standard Colour #48
+                49 => 'FF003366', //  Standard Colour #49
+                50 => 'FF339966', //  Standard Colour #50
+                51 => 'FF003300', //  Standard Colour #51
+                52 => 'FF333300', //  Standard Colour #52
+                53 => 'FF993300', //  Standard Colour #53
+                54 => 'FF993366', //  Standard Colour #54
+                55 => 'FF333399', //  Standard Colour #55
                 56 => 'FF333333'     //  Standard Colour #56
             ];
         }

src/PhpSpreadsheet/ReferenceHelper.php

Spacing +53 added lines, -57 removed lines

@@ -169,8 +169,7 @@ 
     {
         $aBreaks = $pSheet->getBreaks();
         ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aBreaks, array('self','cellReverseSort')) :
-            uksort($aBreaks, array('self','cellSort'));
+            uksort($aBreaks, array('self', 'cellReverseSort')) : uksort($aBreaks, array('self', 'cellSort'));
 
         foreach ($aBreaks as $key => $value) {
             if (self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) {
@@ -230,8 +229,7 @@ 
     {
         $aHyperlinkCollection = $pSheet->getHyperlinkCollection();
         ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aHyperlinkCollection, array('self','cellReverseSort')) :
-            uksort($aHyperlinkCollection, array('self','cellSort'));
+            uksort($aHyperlinkCollection, array('self', 'cellReverseSort')) : uksort($aHyperlinkCollection, array('self', 'cellSort'));
 
         foreach ($aHyperlinkCollection as $key => $value) {
             $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
@@ -256,8 +254,7 @@ 
     {
         $aDataValidationCollection = $pSheet->getDataValidationCollection();
         ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aDataValidationCollection, array('self','cellReverseSort')) :
-            uksort($aDataValidationCollection, array('self','cellSort'));
+            uksort($aDataValidationCollection, array('self', 'cellReverseSort')) : uksort($aDataValidationCollection, array('self', 'cellSort'));
         
         foreach ($aDataValidationCollection as $key => $value) {
             $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
@@ -303,8 +300,7 @@ 
     {
         $aProtectedCells = $pSheet->getProtectedCells();
         ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aProtectedCells, array('self','cellReverseSort')) :
-            uksort($aProtectedCells, array('self','cellSort'));
+            uksort($aProtectedCells, array('self', 'cellReverseSort')) : uksort($aProtectedCells, array('self', 'cellSort'));
         foreach ($aProtectedCells as $key => $value) {
             $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
             if ($key != $newReference) {
@@ -389,13 +385,13 @@ 
 
         // Get coordinates of $pBefore
         $beforeColumn    = 'A';
-        $beforeRow        = 1;
+        $beforeRow = 1;
         list($beforeColumn, $beforeRow) = Cell::coordinateFromString($pBefore);
         $beforeColumnIndex = Cell::columnIndexFromString($beforeColumn);
 
         // Clear cells if we are removing columns or rows
-        $highestColumn    = $pSheet->getHighestColumn();
-        $highestRow    = $pSheet->getHighestRow();
+        $highestColumn = $pSheet->getHighestColumn();
+        $highestRow = $pSheet->getHighestRow();
 
         // 1. Clear column strips if we are removing columns
         if ($pNumCols < 0 && $beforeColumnIndex - 2 + $pNumCols > 0) {
@@ -434,12 +430,12 @@ 
             $cell = $pSheet->getCell($cellID);
             $cellIndex = Cell::columnIndexFromString($cell->getColumn());
 
-            if ($cellIndex-1 + $pNumCols < 0) {
+            if ($cellIndex - 1 + $pNumCols < 0) {
                 continue;
             }
 
             // New coordinates
-            $newCoordinates = Cell::stringFromColumnIndex($cellIndex-1 + $pNumCols) . ($cell->getRow() + $pNumRows);
+            $newCoordinates = Cell::stringFromColumnIndex($cellIndex - 1 + $pNumCols) . ($cell->getRow() + $pNumRows);
 
             // Should the cell be updated? Move value and cellXf index from one cell to another.
             if (($cellIndex >= $beforeColumnIndex) && ($cell->getRow() >= $beforeRow)) {
@@ -469,8 +465,8 @@ 
         }
 
         // Duplicate styles for the newly inserted cells
-        $highestColumn    = $pSheet->getHighestColumn();
-        $highestRow    = $pSheet->getHighestRow();
+        $highestColumn = $pSheet->getHighestColumn();
+        $highestRow = $pSheet->getHighestRow();
 
         if ($pNumCols > 0 && $beforeColumnIndex - 2 > 0) {
             for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
@@ -568,23 +564,23 @@ 
                         //    Shuffle columns in autofilter range
                         if ($pNumCols > 0) {
                             //    For insert, we shuffle from end to beginning to avoid overwriting
-                            $startColID = Cell::stringFromColumnIndex($startCol-1);
-                            $toColID = Cell::stringFromColumnIndex($startCol+$pNumCols-1);
+                            $startColID = Cell::stringFromColumnIndex($startCol - 1);
+                            $toColID = Cell::stringFromColumnIndex($startCol + $pNumCols - 1);
                             $endColID = Cell::stringFromColumnIndex($rangeEnd[0]);
 
                             $startColRef = $startCol;
                             $endColRef = $rangeEnd[0];
-                            $toColRef = $rangeEnd[0]+$pNumCols;
+                            $toColRef = $rangeEnd[0] + $pNumCols;
 
                             do {
-                                $autoFilter->shiftColumn(Cell::stringFromColumnIndex($endColRef-1), Cell::stringFromColumnIndex($toColRef-1));
+                                $autoFilter->shiftColumn(Cell::stringFromColumnIndex($endColRef - 1), Cell::stringFromColumnIndex($toColRef - 1));
                                 --$endColRef;
                                 --$toColRef;
                             } while ($startColRef <= $endColRef);
                         } else {
                             //    For delete, we shuffle from beginning to end to avoid overwriting
-                            $startColID = Cell::stringFromColumnIndex($startCol-1);
-                            $toColID = Cell::stringFromColumnIndex($startCol+$pNumCols-1);
+                            $startColID = Cell::stringFromColumnIndex($startCol - 1);
+                            $toColID = Cell::stringFromColumnIndex($startCol + $pNumCols - 1);
                             $endColID = Cell::stringFromColumnIndex($rangeEnd[0]);
                             do {
                                 $autoFilter->shiftColumn($startColID, $toColID);
@@ -652,93 +648,93 @@ 
                 $adjustCount = 0;
                 $newCellTokens = $cellTokens = array();
                 //    Search for row ranges (e.g. 'Sheet1'!3:5 or 3:5) with or without $ absolutes (e.g. $3:5)
-                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_ROWRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_ROWRANGE . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
-                        $fromString .= $match[3].':'.$match[4];
-                        $modified3 = substr($this->updateCellReference('$A'.$match[3], $pBefore, $pNumCols, $pNumRows), 2);
-                        $modified4 = substr($this->updateCellReference('$A'.$match[4], $pBefore, $pNumCols, $pNumRows), 2);
+                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
+                        $fromString .= $match[3] . ':' . $match[4];
+                        $modified3 = substr($this->updateCellReference('$A' . $match[3], $pBefore, $pNumCols, $pNumRows), 2);
+                        $modified4 = substr($this->updateCellReference('$A' . $match[4], $pBefore, $pNumCols, $pNumRows), 2);
 
-                        if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
+                        if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) {
                             if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2].'!' : '';
-                                $toString .= $modified3.':'.$modified4;
+                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
+                                $toString .= $modified3 . ':' . $modified4;
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = 100000;
                                 $row = 10000000 + trim($match[3], '$');
-                                $cellIndex = $column.$row;
+                                $cellIndex = $column . $row;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-                                $cellTokens[$cellIndex] = '/(?<!\d\$\!)'.preg_quote($fromString).'(?!\d)/i';
+                                $cellTokens[$cellIndex] = '/(?<!\d\$\!)' . preg_quote($fromString) . '(?!\d)/i';
                                 ++$adjustCount;
                             }
                         }
                     }
                 }
                 //    Search for column ranges (e.g. 'Sheet1'!C:E or C:E) with or without $ absolutes (e.g. $C:E)
-                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_COLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_COLRANGE . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
-                        $fromString .= $match[3].':'.$match[4];
-                        $modified3 = substr($this->updateCellReference($match[3].'$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
-                        $modified4 = substr($this->updateCellReference($match[4].'$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
+                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
+                        $fromString .= $match[3] . ':' . $match[4];
+                        $modified3 = substr($this->updateCellReference($match[3] . '$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
+                        $modified4 = substr($this->updateCellReference($match[4] . '$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
 
-                        if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
+                        if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) {
                             if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2].'!' : '';
-                                $toString .= $modified3.':'.$modified4;
+                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
+                                $toString .= $modified3 . ':' . $modified4;
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = Cell::columnIndexFromString(trim($match[3], '$')) + 100000;
                                 $row = 10000000;
-                                $cellIndex = $column.$row;
+                                $cellIndex = $column . $row;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])'.preg_quote($fromString).'(?![A-Z])/i';
+                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])' . preg_quote($fromString) . '(?![A-Z])/i';
                                 ++$adjustCount;
                             }
                         }
                     }
                 }
                 //    Search for cell ranges (e.g. 'Sheet1'!A3:C5 or A3:C5) with or without $ absolutes (e.g. $A1:C$5)
-                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLRANGE . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
-                        $fromString .= $match[3].':'.$match[4];
+                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
+                        $fromString .= $match[3] . ':' . $match[4];
                         $modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
                         $modified4 = $this->updateCellReference($match[4], $pBefore, $pNumCols, $pNumRows);
 
-                        if ($match[3].$match[4] !== $modified3.$modified4) {
+                        if ($match[3] . $match[4] !== $modified3 . $modified4) {
                             if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2].'!' : '';
-                                $toString .= $modified3.':'.$modified4;
+                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
+                                $toString .= $modified3 . ':' . $modified4;
                                 list($column, $row) = Cell::coordinateFromString($match[3]);
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = Cell::columnIndexFromString(trim($column, '$')) + 100000;
                                 $row = trim($row, '$') + 10000000;
-                                $cellIndex = $column.$row;
+                                $cellIndex = $column . $row;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-                                $cellTokens[$cellIndex] = '/(?<![A-Z]\$\!)'.preg_quote($fromString).'(?!\d)/i';
+                                $cellTokens[$cellIndex] = '/(?<![A-Z]\$\!)' . preg_quote($fromString) . '(?!\d)/i';
                                 ++$adjustCount;
                             }
                         }
                     }
                 }
                 //    Search for cell references (e.g. 'Sheet1'!A3 or C5) with or without $ absolutes (e.g. $A1 or C$5)
-                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLREF.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLREF . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
 
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
+                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
                         $fromString .= $match[3];
 
                         $modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
                         if ($match[3] !== $modified3) {
                             if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2].'!' : '';
+                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
                                 $toString .= $modified3;
                                 list($column, $row) = Cell::coordinateFromString($match[3]);
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
@@ -747,7 +743,7 @@ 
                                 $cellIndex = $row . $column;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])'.preg_quote($fromString).'(?!\d)/i';
+                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])' . preg_quote($fromString) . '(?!\d)/i';
                                 ++$adjustCount;
                             }
                         }
@@ -847,10 +843,10 @@ 
                 $jc = count($range[$i]);
                 for ($j = 0; $j < $jc; ++$j) {
                     if (ctype_alpha($range[$i][$j])) {
-                        $r = Cell::coordinateFromString($this->updateSingleCellReference($range[$i][$j].'1', $pBefore, $pNumCols, $pNumRows));
+                        $r = Cell::coordinateFromString($this->updateSingleCellReference($range[$i][$j] . '1', $pBefore, $pNumCols, $pNumRows));
                         $range[$i][$j] = $r[0];
                     } elseif (ctype_digit($range[$i][$j])) {
-                        $r = Cell::coordinateFromString($this->updateSingleCellReference('A'.$range[$i][$j], $pBefore, $pNumCols, $pNumRows));
+                        $r = Cell::coordinateFromString($this->updateSingleCellReference('A' . $range[$i][$j], $pBefore, $pNumCols, $pNumRows));
                         $range[$i][$j] = $r[1];
                     } else {
                         $range[$i][$j] = $this->updateSingleCellReference($range[$i][$j], $pBefore, $pNumCols, $pNumRows);
@@ -890,12 +886,12 @@ 
 
             // Create new column reference
             if ($updateColumn) {
-                $newColumn    = Cell::stringFromColumnIndex(Cell::columnIndexFromString($newColumn) - 1 + $pNumCols);
+                $newColumn = Cell::stringFromColumnIndex(Cell::columnIndexFromString($newColumn) - 1 + $pNumCols);
             }
 
             // Create new row reference
             if ($updateRow) {
-                $newRow    = $newRow + $pNumRows;
+                $newRow = $newRow + $pNumRows;
             }
 
             // Return new reference

src/PhpSpreadsheet/CachedObjectStorage/APC.php

Spacing +4 added lines, -4 removed lines

@@ -109,11 +109,11 @@ 
                 return true;
             }
             //    Check if the requested entry still exists in apc
-            $success = apc_fetch($this->cachePrefix.$pCoord.'.cache');
+            $success = apc_fetch($this->cachePrefix . $pCoord . '.cache');
             if ($success === false) {
                 //    Entry no longer exists in APC, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
-                throw new \PHPExcel\Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
+                throw new \PHPExcel\Exception('Cell entry ' . $pCoord . ' no longer exists in APC cache');
             }
             return true;
         }
@@ -141,7 +141,7 @@ 
             if ($obj === false) {
                 //    Entry no longer exists in APC, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
-                throw new \PHPExcel\Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
+                throw new \PHPExcel\Exception('Cell entry ' . $pCoord . ' no longer exists in APC cache');
             }
         } else {
             //    Return null if requested entry doesn't exist in cache
@@ -182,7 +182,7 @@ 
     public function deleteCacheData($pCoord)
     {
         //    Delete the entry from APC
-        apc_delete($this->cachePrefix.$pCoord.'.cache');
+        apc_delete($this->cachePrefix . $pCoord . '.cache');
 
         //    Delete the entry from our cell address array
         parent::deleteCacheData($pCoord);

src/PhpSpreadsheet/CachedObjectStorage/Memcache.php

Spacing +4 added lines, -4 removed lines

@@ -113,11 +113,11 @@ 
                 return true;
             }
             //    Check if the requested entry still exists in Memcache
-            $success = $this->memcache->get($this->cachePrefix.$pCoord.'.cache');
+            $success = $this->memcache->get($this->cachePrefix . $pCoord . '.cache');
             if ($success === false) {
                 //    Entry no longer exists in Memcache, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
-                throw new \PHPExcel\Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
+                throw new \PHPExcel\Exception('Cell entry ' . $pCoord . ' no longer exists in MemCache');
             }
             return true;
         }
@@ -206,7 +206,7 @@ 
         $cacheList = $this->getCellList();
         foreach ($cacheList as $cellID) {
             if ($cellID != $this->currentObjectID) {
-                $obj = $this->memcache->get($this->cachePrefix.$cellID.'.cache');
+                $obj = $this->memcache->get($this->cachePrefix . $cellID . '.cache');
                 if ($obj === false) {
                     //    Entry no longer exists in Memcache, so clear it from the cache array
                     parent::deleteCacheData($cellID);
@@ -289,7 +289,7 @@ 
     {
         $cacheList = $this->getCellList();
         foreach ($cacheList as $cellID) {
-            $this->memcache->delete($this->cachePrefix.$cellID . '.cache');
+            $this->memcache->delete($this->cachePrefix . $cellID . '.cache');
         }
     }
 

src/PhpSpreadsheet/CachedObjectStorage/CacheBase.php

Spacing +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
         foreach ($this->getCellList() as $coord) {
             sscanf($coord, '%[A-Z]%d', $c, $r);
             $row[$r] = $r;
-            $col[$c] = strlen($c).$c;
+            $col[$c] = strlen($c) . $c;
         }
         if (!empty($row)) {
             // Determine highest column and row

src/PhpSpreadsheet/CachedObjectStorage/Wincache.php

Spacing +17 added lines, -17 removed lines

@@ -57,15 +57,15 @@ 
             $this->currentObject->detach();
 
             $obj = serialize($this->currentObject);
-            if (wincache_ucache_exists($this->cachePrefix.$this->currentObjectID.'.cache')) {
-                if (!wincache_ucache_set($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
+            if (wincache_ucache_exists($this->cachePrefix . $this->currentObjectID . '.cache')) {
+                if (!wincache_ucache_set($this->cachePrefix . $this->currentObjectID . '.cache', $obj, $this->cacheTime)) {
                     $this->__destruct();
-                    throw new \PHPExcel\Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
+                    throw new \PHPExcel\Exception('Failed to store cell ' . $this->currentObjectID . ' in WinCache');
                 }
             } else {
-                if (!wincache_ucache_add($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
+                if (!wincache_ucache_add($this->cachePrefix . $this->currentObjectID . '.cache', $obj, $this->cacheTime)) {
                     $this->__destruct();
-                    throw new \PHPExcel\Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
+                    throw new \PHPExcel\Exception('Failed to store cell ' . $this->currentObjectID . ' in WinCache');
                 }
             }
             $this->currentCellIsDirty = false;
@@ -111,11 +111,11 @@ 
                 return true;
             }
             //    Check if the requested entry still exists in cache
-            $success = wincache_ucache_exists($this->cachePrefix.$pCoord.'.cache');
+            $success = wincache_ucache_exists($this->cachePrefix . $pCoord . '.cache');
             if ($success === false) {
                 //    Entry no longer exists in Wincache, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
-                throw new \PHPExcel\Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
+                throw new \PHPExcel\Exception('Cell entry ' . $pCoord . ' no longer exists in WinCache');
             }
             return true;
         }
@@ -141,11 +141,11 @@ 
         $obj = null;
         if (parent::isDataSet($pCoord)) {
             $success = false;
-            $obj = wincache_ucache_get($this->cachePrefix.$pCoord.'.cache', $success);
+            $obj = wincache_ucache_get($this->cachePrefix . $pCoord . '.cache', $success);
             if ($success === false) {
                 //    Entry no longer exists in WinCache, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
-                throw new \PHPExcel\Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
+                throw new \PHPExcel\Exception('Cell entry ' . $pCoord . ' no longer exists in WinCache');
             }
         } else {
             //    Return null if requested entry doesn't exist in cache
@@ -186,7 +186,7 @@ 
     public function deleteCacheData($pCoord)
     {
         //    Delete the entry from Wincache
-        wincache_ucache_delete($this->cachePrefix.$pCoord.'.cache');
+        wincache_ucache_delete($this->cachePrefix . $pCoord . '.cache');
 
         //    Delete the entry from our cell address array
         parent::deleteCacheData($pCoord);
@@ -208,15 +208,15 @@ 
         foreach ($cacheList as $cellID) {
             if ($cellID != $this->currentObjectID) {
                 $success = false;
-                $obj = wincache_ucache_get($this->cachePrefix.$cellID.'.cache', $success);
+                $obj = wincache_ucache_get($this->cachePrefix . $cellID . '.cache', $success);
                 if ($success === false) {
                     //    Entry no longer exists in WinCache, so clear it from the cache array
                     parent::deleteCacheData($cellID);
-                    throw new \PHPExcel\Exception('Cell entry '.$cellID.' no longer exists in Wincache');
+                    throw new \PHPExcel\Exception('Cell entry ' . $cellID . ' no longer exists in Wincache');
                 }
-                if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->cacheTime)) {
+                if (!wincache_ucache_add($newCachePrefix . $cellID . '.cache', $obj, $this->cacheTime)) {
                     $this->__destruct();
-                    throw new \PHPExcel\Exception('Failed to store cell '.$cellID.' in Wincache');
+                    throw new \PHPExcel\Exception('Failed to store cell ' . $cellID . ' in Wincache');
                 }
             }
         }
@@ -253,11 +253,11 @@ 
      */
     public function __construct(\PHPExcel\Worksheet $parent, $arguments)
     {
-        $cacheTime    = (isset($arguments['cacheTime']))    ? $arguments['cacheTime']    : 600;
+        $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
 
         if (is_null($this->cachePrefix)) {
             $baseUnique = $this->getUniqueID();
-            $this->cachePrefix = substr(md5($baseUnique), 0, 8).'.';
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8) . '.';
             $this->cacheTime = $cacheTime;
 
             parent::__construct($parent);
@@ -271,7 +271,7 @@ 
     {
         $cacheList = $this->getCellList();
         foreach ($cacheList as $cellID) {
-            wincache_ucache_delete($this->cachePrefix.$cellID.'.cache');
+            wincache_ucache_delete($this->cachePrefix . $cellID . '.cache');
         }
     }
 

src/PhpSpreadsheet/CachedObjectStorage/DiscISAM.php

Spacing +3 added lines, -3 removed lines

@@ -149,7 +149,7 @@ 
         parent::copyCellCollection($parent);
         //    Get a new id for the new file name
         $baseUnique = $this->getUniqueID();
-        $newFileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
+        $newFileName = $this->cacheDirectory . '/PHPExcel.' . $baseUnique . '.cache';
         //    Copy the existing cell cache file
         copy($this->fileName, $newFileName);
         $this->fileName = $newFileName;
@@ -184,14 +184,14 @@ 
      */
     public function __construct(\PHPExcel\Worksheet $parent, $arguments)
     {
-        $this->cacheDirectory    = ((isset($arguments['dir'])) && ($arguments['dir'] !== null))
+        $this->cacheDirectory = ((isset($arguments['dir'])) && ($arguments['dir'] !== null))
                                     ? $arguments['dir']
                                     : \PHPExcel\Shared\File::sysGetTempDir();
 
         parent::__construct($parent);
         if (is_null($this->fileHandle)) {
             $baseUnique = $this->getUniqueID();
-            $this->fileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
+            $this->fileName = $this->cacheDirectory . '/PHPExcel.' . $baseUnique . '.cache';
             $this->fileHandle = fopen($this->fileName, 'a+');
         }
     }

src/PhpSpreadsheet/CachedObjectStorage/SQLite.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
         if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
             $this->currentObject->detach();
 
-            if (!$this->DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->TableName." VALUES('".$this->currentObjectID."','".sqlite_escape_string(serialize($this->currentObject))."')")) {
+            if (!$this->DBHandle->queryExec("INSERT OR REPLACE INTO kvp_" . $this->TableName . " VALUES('" . $this->currentObjectID . "','" . sqlite_escape_string(serialize($this->currentObject)) . "')")) {
                 throw new \PHPExcel\Exception(sqlite_error_string($this->DBHandle->lastError()));
             }
             $this->currentCellIsDirty = false;
@@ -97,7 +97,7 @@ 
         }
         $this->storeData();
 
-        $query = "SELECT value FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        $query = "SELECT value FROM kvp_" . $this->TableName . " WHERE id='" . $pCoord . "'";
         $cellResultSet = $this->DBHandle->query($query, SQLITE_ASSOC);
         if ($cellResultSet === false) {
             throw new \PHPExcel\Exception(sqlite_error_string($this->DBHandle->lastError()));
@@ -132,7 +132,7 @@ 
         }
 
         //    Check if the requested entry exists in the cache
-        $query = "SELECT id FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        $query = "SELECT id FROM kvp_" . $this->TableName . " WHERE id='" . $pCoord . "'";
         $cellResultSet = $this->DBHandle->query($query, SQLITE_ASSOC);
         if ($cellResultSet === false) {
             throw new \PHPExcel\Exception(sqlite_error_string($this->DBHandle->lastError()));
@@ -157,7 +157,7 @@ 
         }
 
         //    Check if the requested entry exists in the cache
-        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        $query = "DELETE FROM kvp_" . $this->TableName . " WHERE id='" . $pCoord . "'";
         if (!$this->DBHandle->queryExec($query)) {
             throw new \PHPExcel\Exception(sqlite_error_string($this->DBHandle->lastError()));
         }
@@ -179,13 +179,13 @@ 
             $this->currentObjectID = $toAddress;
         }
 
-        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$toAddress."'";
+        $query = "DELETE FROM kvp_" . $this->TableName . " WHERE id='" . $toAddress . "'";
         $result = $this->DBHandle->exec($query);
         if ($result === false) {
             throw new \PHPExcel\Exception($this->DBHandle->lastErrorMsg());
         }
 
-        $query = "UPDATE kvp_".$this->TableName." SET id='".$toAddress."' WHERE id='".$fromAddress."'";
+        $query = "UPDATE kvp_" . $this->TableName . " SET id='" . $toAddress . "' WHERE id='" . $fromAddress . "'";
         $result = $this->DBHandle->exec($query);
         if ($result === false) {
             throw new \PHPExcel\Exception($this->DBHandle->lastErrorMsg());
@@ -206,7 +206,7 @@ 
             $this->storeData();
         }
 
-        $query = "SELECT id FROM kvp_".$this->TableName;
+        $query = "SELECT id FROM kvp_" . $this->TableName;
         $cellIdsResult = $this->DBHandle->unbufferedQuery($query, SQLITE_ASSOC);
         if ($cellIdsResult === false) {
             throw new \PHPExcel\Exception(sqlite_error_string($this->DBHandle->lastError()));
@@ -233,7 +233,7 @@ 
 
         //    Get a new id for the new table name
         $tableName = str_replace('.', '_', $this->getUniqueID());
-        if (!$this->DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+        if (!$this->DBHandle->queryExec('CREATE TABLE kvp_' . $tableName . ' (id VARCHAR(12) PRIMARY KEY, value BLOB)
             AS SELECT * FROM kvp_'.$this->TableName)
         ) {
             throw new \PHPExcel\Exception(sqlite_error_string($this->DBHandle->lastError()));
@@ -278,7 +278,7 @@ 
             if ($this->DBHandle === false) {
                 throw new \PHPExcel\Exception(sqlite_error_string($this->DBHandle->lastError()));
             }
-            if (!$this->DBHandle->queryExec('CREATE TABLE kvp_'.$this->TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) {
+            if (!$this->DBHandle->queryExec('CREATE TABLE kvp_' . $this->TableName . ' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) {
                 throw new \PHPExcel\Exception(sqlite_error_string($this->DBHandle->lastError()));
             }
         }
@@ -290,7 +290,7 @@ 
     public function __destruct()
     {
         if (!is_null($this->DBHandle)) {
-            $this->DBHandle->queryExec('DROP TABLE kvp_'.$this->TableName);
+            $this->DBHandle->queryExec('DROP TABLE kvp_' . $this->TableName);
         }
         $this->DBHandle = null;
     }

src/PhpSpreadsheet/CachedObjectStorage/SQLite3.php

Spacing +8 added lines, -8 removed lines

@@ -240,7 +240,7 @@ 
             $this->storeData();
         }
 
-        $query = "SELECT id FROM kvp_".$this->TableName;
+        $query = "SELECT id FROM kvp_" . $this->TableName;
         $cellIdsResult = $this->DBHandle->query($query);
         if ($cellIdsResult === false) {
             throw new \PHPExcel\Exception($this->DBHandle->lastErrorMsg());
@@ -267,7 +267,7 @@ 
 
         //    Get a new id for the new table name
         $tableName = str_replace('.', '_', $this->getUniqueID());
-        if (!$this->DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+        if (!$this->DBHandle->exec('CREATE TABLE kvp_' . $tableName . ' (id VARCHAR(12) PRIMARY KEY, value BLOB)
             AS SELECT * FROM kvp_'.$this->TableName)
         ) {
             throw new \PHPExcel\Exception($this->DBHandle->lastErrorMsg());
@@ -312,15 +312,15 @@ 
             if ($this->DBHandle === false) {
                 throw new \PHPExcel\Exception($this->DBHandle->lastErrorMsg());
             }
-            if (!$this->DBHandle->exec('CREATE TABLE kvp_'.$this->TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) {
+            if (!$this->DBHandle->exec('CREATE TABLE kvp_' . $this->TableName . ' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) {
                 throw new \PHPExcel\Exception($this->DBHandle->lastErrorMsg());
             }
         }
 
-        $this->selectQuery = $this->DBHandle->prepare("SELECT value FROM kvp_".$this->TableName." WHERE id = :id");
-        $this->insertQuery = $this->DBHandle->prepare("INSERT OR REPLACE INTO kvp_".$this->TableName." VALUES(:id,:data)");
-        $this->updateQuery = $this->DBHandle->prepare("UPDATE kvp_".$this->TableName." SET id=:toId WHERE id=:fromId");
-        $this->deleteQuery = $this->DBHandle->prepare("DELETE FROM kvp_".$this->TableName." WHERE id = :id");
+        $this->selectQuery = $this->DBHandle->prepare("SELECT value FROM kvp_" . $this->TableName . " WHERE id = :id");
+        $this->insertQuery = $this->DBHandle->prepare("INSERT OR REPLACE INTO kvp_" . $this->TableName . " VALUES(:id,:data)");
+        $this->updateQuery = $this->DBHandle->prepare("UPDATE kvp_" . $this->TableName . " SET id=:toId WHERE id=:fromId");
+        $this->deleteQuery = $this->DBHandle->prepare("DELETE FROM kvp_" . $this->TableName . " WHERE id = :id");
     }
 
     /**
@@ -329,7 +329,7 @@ 
     public function __destruct()
     {
         if (!is_null($this->DBHandle)) {
-            $this->DBHandle->exec('DROP TABLE kvp_'.$this->TableName);
+            $this->DBHandle->exec('DROP TABLE kvp_' . $this->TableName);
             $this->DBHandle->close();
         }
         $this->DBHandle = null;